From 2603c1bf9ca151c9b691b3e4292981362255bf8d Mon Sep 17 00:00:00 2001 From: dibpinto <131255173+dibpinto@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:15:53 +0100 Subject: [PATCH] capicxx-dbus-tools 3.2.15 (#18) - Update gitignore and cleanup project - Added workflow to build the project in Ubuntu, Windows, and macOS --- CHANGES | 4 + CommonAPI-Examples/.gitignore | 1 + CommonAPI-Examples/BlueZ/.cproject | 59 ------ CommonAPI-Examples/BlueZ/.gitignore | 3 - CommonAPI-Examples/BlueZ/.project | 27 --- CommonAPI-Examples/LegacyTest/.project | 27 --- CommonAPI-Examples/ObjectPathSimple/.cproject | 42 ---- CommonAPI-Examples/ObjectPathSimple/.project | 27 --- CommonAPI-Examples/UDisks2/.cproject | 59 ------ CommonAPI-Examples/UDisks2/.gitignore | 3 - CommonAPI-Examples/UDisks2/.project | 27 --- CommonAPI-Examples/VariantSimple/.cproject | 59 ------ CommonAPI-Examples/VariantSimple/.gitignore | 2 - CommonAPI-Examples/VariantSimple/.project | 27 --- docx/.project | 27 --- .../.gitignore | 2 - .../.project | 17 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.core.runtime.prefs | 2 - .../feature.xml | 2 +- org.genivi.commonapi.dbus.cli.feature/pom.xml | 2 +- .../.gitignore | 2 - .../.metadata/.log | 193 ------------------ .../.root/.indexes/properties.version | 1 - .../org.eclipse.core.resources.prefs | 2 - .../.project | 11 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.core.runtime.prefs | 2 - .../commonapi_dbus_cli.product | 2 +- org.genivi.commonapi.dbus.cli.product/pom.xml | 2 +- org.genivi.commonapi.dbus.cli/.classpath | 7 - org.genivi.commonapi.dbus.cli/.gitignore | 3 - org.genivi.commonapi.dbus.cli/.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 | 6 +- org.genivi.commonapi.dbus.cli/pom.xml | 2 +- org.genivi.commonapi.dbus.feature/.gitignore | 2 - org.genivi.commonapi.dbus.feature/.project | 19 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.core.runtime.prefs | 2 - org.genivi.commonapi.dbus.feature/feature.xml | 2 +- org.genivi.commonapi.dbus.feature/pom.xml | 2 +- org.genivi.commonapi.dbus.releng/.gitignore | 1 - org.genivi.commonapi.dbus.releng/.project | 11 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.core.runtime.prefs | 2 - org.genivi.commonapi.dbus.releng/pom.xml | 2 +- org.genivi.commonapi.dbus.target/.gitignore | 1 - org.genivi.commonapi.dbus.target/.project | 11 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.core.runtime.prefs | 2 - org.genivi.commonapi.dbus.target/pom.xml | 2 +- org.genivi.commonapi.dbus.ui/.classpath | 7 - org.genivi.commonapi.dbus.ui/.gitignore | 3 - org.genivi.commonapi.dbus.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 | 6 +- org.genivi.commonapi.dbus.ui/pom.xml | 2 +- .../.gitignore | 2 - org.genivi.commonapi.dbus.updatesite/.project | 11 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.core.runtime.prefs | 2 - .../category.xml | 4 +- org.genivi.commonapi.dbus.updatesite/pom.xml | 2 +- .../.gitignore | 2 - .../.project | 17 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.core.runtime.prefs | 2 - .../feature.xml | 2 +- .../pom.xml | 2 +- .../.classpath | 7 - .../.gitignore | 3 - org.genivi.commonapi.dbus.validator/.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 | 6 +- org.genivi.commonapi.dbus.validator/pom.xml | 2 +- .../.gitignore | 4 - org.genivi.commonapi.dbus/.classpath | 9 - org.genivi.commonapi.dbus/.gitignore | 5 - org.genivi.commonapi.dbus/.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.dbus/pom.xml | 2 +- org.genivi.commonapi.releng/pom.xml | 4 +- test/.project | 27 --- test/fakeLegacyService/fakeLegacyService.py | 123 +++++------ .../sendToFakeLegacyService.py | 22 +- test/src/DBusAddressTranslatorTest.cpp | 8 +- test/src/DBusBroadcastTest.cpp | 9 +- test/src/DBusCommunicationTest.cpp | 10 +- test/src/DBusFactoryTest.cpp | 9 +- test/src/DBusFreedesktopPropertiesTest.cpp | 2 + test/src/DBusInputStreamTest.cpp | 18 +- test/src/DBusLoadTest.cpp | 13 +- test/src/DBusMainLoopIntegrationTest.cpp | 12 +- test/src/DBusManagedTest.cpp | 15 +- test/src/DBusMultipleConnectionTest.cpp | 9 +- test/src/DBusObjectPathTest.cpp | 10 +- test/src/DBusPolymorphicTest.cpp | 2 + test/src/DBusProxyTest.cpp | 31 +-- test/src/DBusRuntimeTest.cpp | 4 +- test/src/DBusTestUtils.hpp | 1 + test/src/DBusUnixFDTest.cpp | 11 +- test/src/DBusVariantTypeTest.cpp | 11 +- test/src/DemoMainLoop.hpp | 18 +- test/src/stubs/ObjectPathStubImpl.cpp | 1 + test/src/stubs/UnixFDStubImpl.cpp | 1 + test/src/stubs/VariantTypeStubImpl.cpp | 1 + 116 files changed, 214 insertions(+), 1151 deletions(-) create mode 100644 CommonAPI-Examples/.gitignore delete mode 100644 CommonAPI-Examples/BlueZ/.cproject delete mode 100644 CommonAPI-Examples/BlueZ/.gitignore delete mode 100644 CommonAPI-Examples/BlueZ/.project delete mode 100644 CommonAPI-Examples/LegacyTest/.project delete mode 100644 CommonAPI-Examples/ObjectPathSimple/.cproject delete mode 100644 CommonAPI-Examples/ObjectPathSimple/.project delete mode 100644 CommonAPI-Examples/UDisks2/.cproject delete mode 100644 CommonAPI-Examples/UDisks2/.gitignore delete mode 100644 CommonAPI-Examples/UDisks2/.project delete mode 100644 CommonAPI-Examples/VariantSimple/.cproject delete mode 100644 CommonAPI-Examples/VariantSimple/.gitignore delete mode 100644 CommonAPI-Examples/VariantSimple/.project delete mode 100644 docx/.project delete mode 100644 org.genivi.commonapi.dbus.cli.feature/.gitignore delete mode 100644 org.genivi.commonapi.dbus.cli.feature/.project delete mode 100644 org.genivi.commonapi.dbus.cli.feature/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.genivi.commonapi.dbus.cli.feature/.settings/org.eclipse.core.runtime.prefs delete mode 100644 org.genivi.commonapi.dbus.cli.product/.gitignore delete mode 100644 org.genivi.commonapi.dbus.cli.product/.metadata/.log delete mode 100644 org.genivi.commonapi.dbus.cli.product/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version delete mode 100644 org.genivi.commonapi.dbus.cli.product/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.genivi.commonapi.dbus.cli.product/.project delete mode 100644 org.genivi.commonapi.dbus.cli.product/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.genivi.commonapi.dbus.cli.product/.settings/org.eclipse.core.runtime.prefs delete mode 100644 org.genivi.commonapi.dbus.cli/.classpath delete mode 100644 org.genivi.commonapi.dbus.cli/.gitignore delete mode 100644 org.genivi.commonapi.dbus.cli/.project delete mode 100644 org.genivi.commonapi.dbus.cli/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.genivi.commonapi.dbus.cli/.settings/org.eclipse.core.runtime.prefs delete mode 100644 org.genivi.commonapi.dbus.cli/.settings/org.eclipse.jdt.core.prefs delete mode 100644 org.genivi.commonapi.dbus.feature/.gitignore delete mode 100644 org.genivi.commonapi.dbus.feature/.project delete mode 100644 org.genivi.commonapi.dbus.feature/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.genivi.commonapi.dbus.feature/.settings/org.eclipse.core.runtime.prefs delete mode 100644 org.genivi.commonapi.dbus.releng/.gitignore delete mode 100644 org.genivi.commonapi.dbus.releng/.project delete mode 100644 org.genivi.commonapi.dbus.releng/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.genivi.commonapi.dbus.releng/.settings/org.eclipse.core.runtime.prefs delete mode 100644 org.genivi.commonapi.dbus.target/.gitignore delete mode 100644 org.genivi.commonapi.dbus.target/.project delete mode 100644 org.genivi.commonapi.dbus.target/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.genivi.commonapi.dbus.target/.settings/org.eclipse.core.runtime.prefs delete mode 100644 org.genivi.commonapi.dbus.ui/.classpath delete mode 100644 org.genivi.commonapi.dbus.ui/.gitignore delete mode 100644 org.genivi.commonapi.dbus.ui/.project delete mode 100644 org.genivi.commonapi.dbus.ui/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.genivi.commonapi.dbus.ui/.settings/org.eclipse.core.runtime.prefs delete mode 100644 org.genivi.commonapi.dbus.ui/.settings/org.eclipse.jdt.core.prefs delete mode 100644 org.genivi.commonapi.dbus.updatesite/.gitignore delete mode 100644 org.genivi.commonapi.dbus.updatesite/.project delete mode 100644 org.genivi.commonapi.dbus.updatesite/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.genivi.commonapi.dbus.updatesite/.settings/org.eclipse.core.runtime.prefs delete mode 100644 org.genivi.commonapi.dbus.validator.feature/.gitignore delete mode 100644 org.genivi.commonapi.dbus.validator.feature/.project delete mode 100644 org.genivi.commonapi.dbus.validator.feature/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.genivi.commonapi.dbus.validator.feature/.settings/org.eclipse.core.runtime.prefs delete mode 100644 org.genivi.commonapi.dbus.validator/.classpath delete mode 100644 org.genivi.commonapi.dbus.validator/.gitignore delete mode 100644 org.genivi.commonapi.dbus.validator/.project delete mode 100644 org.genivi.commonapi.dbus.validator/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.genivi.commonapi.dbus.validator/.settings/org.eclipse.core.runtime.prefs delete mode 100644 org.genivi.commonapi.dbus.validator/.settings/org.eclipse.jdt.core.prefs delete mode 100644 org.genivi.commonapi.dbus/.classpath delete mode 100644 org.genivi.commonapi.dbus/.gitignore delete mode 100644 org.genivi.commonapi.dbus/.project delete mode 100644 org.genivi.commonapi.dbus/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.genivi.commonapi.dbus/.settings/org.eclipse.core.runtime.prefs delete mode 100644 org.genivi.commonapi.dbus/.settings/org.eclipse.jdt.core.prefs delete mode 100644 test/.project diff --git a/CHANGES b/CHANGES index e83f63a..72847fb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,9 @@ Changes ======= +v3.2.15 +- Update gitignore and cleanup project +- Added workflow to build the project in Ubuntu, Windows, and macOS + v3.2.12 - Generate D-bus Code fails using fidl diff --git a/CommonAPI-Examples/.gitignore b/CommonAPI-Examples/.gitignore new file mode 100644 index 0000000..5c644e1 --- /dev/null +++ b/CommonAPI-Examples/.gitignore @@ -0,0 +1 @@ +*/build diff --git a/CommonAPI-Examples/BlueZ/.cproject b/CommonAPI-Examples/BlueZ/.cproject deleted file mode 100644 index 9b9979b..0000000 --- a/CommonAPI-Examples/BlueZ/.cproject +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CommonAPI-Examples/BlueZ/.gitignore b/CommonAPI-Examples/BlueZ/.gitignore deleted file mode 100644 index de407cd..0000000 --- a/CommonAPI-Examples/BlueZ/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -build -src-gen -.settings diff --git a/CommonAPI-Examples/BlueZ/.project b/CommonAPI-Examples/BlueZ/.project deleted file mode 100644 index 6f105f1..0000000 --- a/CommonAPI-Examples/BlueZ/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - BlueZExample - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/CommonAPI-Examples/LegacyTest/.project b/CommonAPI-Examples/LegacyTest/.project deleted file mode 100644 index 6dd3319..0000000 --- a/CommonAPI-Examples/LegacyTest/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - LegacyTest - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/CommonAPI-Examples/ObjectPathSimple/.cproject b/CommonAPI-Examples/ObjectPathSimple/.cproject deleted file mode 100644 index 686dd6f..0000000 --- a/CommonAPI-Examples/ObjectPathSimple/.cproject +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CommonAPI-Examples/ObjectPathSimple/.project b/CommonAPI-Examples/ObjectPathSimple/.project deleted file mode 100644 index 6c31a67..0000000 --- a/CommonAPI-Examples/ObjectPathSimple/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - ObjectPathSimple - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/CommonAPI-Examples/UDisks2/.cproject b/CommonAPI-Examples/UDisks2/.cproject deleted file mode 100644 index 713142d..0000000 --- a/CommonAPI-Examples/UDisks2/.cproject +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CommonAPI-Examples/UDisks2/.gitignore b/CommonAPI-Examples/UDisks2/.gitignore deleted file mode 100644 index de407cd..0000000 --- a/CommonAPI-Examples/UDisks2/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -build -src-gen -.settings diff --git a/CommonAPI-Examples/UDisks2/.project b/CommonAPI-Examples/UDisks2/.project deleted file mode 100644 index 3010954..0000000 --- a/CommonAPI-Examples/UDisks2/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - UDisks2 - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/CommonAPI-Examples/VariantSimple/.cproject b/CommonAPI-Examples/VariantSimple/.cproject deleted file mode 100644 index c66eef4..0000000 --- a/CommonAPI-Examples/VariantSimple/.cproject +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CommonAPI-Examples/VariantSimple/.gitignore b/CommonAPI-Examples/VariantSimple/.gitignore deleted file mode 100644 index 5fb7e99..0000000 --- a/CommonAPI-Examples/VariantSimple/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -src-gen diff --git a/CommonAPI-Examples/VariantSimple/.project b/CommonAPI-Examples/VariantSimple/.project deleted file mode 100644 index 7ae2465..0000000 --- a/CommonAPI-Examples/VariantSimple/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - VariantSimple - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/docx/.project b/docx/.project deleted file mode 100644 index 1253fb9..0000000 --- a/docx/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - CommonAPI-D-Bus-Tools.docx - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/org.genivi.commonapi.dbus.cli.feature/.gitignore b/org.genivi.commonapi.dbus.cli.feature/.gitignore deleted file mode 100644 index 873d37a..0000000 --- a/org.genivi.commonapi.dbus.cli.feature/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -/target diff --git a/org.genivi.commonapi.dbus.cli.feature/.project b/org.genivi.commonapi.dbus.cli.feature/.project deleted file mode 100644 index 1d6fab4..0000000 --- a/org.genivi.commonapi.dbus.cli.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.genivi.commonapi.dbus.cli.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/org.genivi.commonapi.dbus.cli.feature/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.dbus.cli.feature/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/org.genivi.commonapi.dbus.cli.feature/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.genivi.commonapi.dbus.cli.feature/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.dbus.cli.feature/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22..0000000 --- a/org.genivi.commonapi.dbus.cli.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.dbus.cli.feature/feature.xml b/org.genivi.commonapi.dbus.cli.feature/feature.xml index 86553eb..57253c7 100644 --- a/org.genivi.commonapi.dbus.cli.feature/feature.xml +++ b/org.genivi.commonapi.dbus.cli.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.genivi.commonapi.dbus.cli.feature/pom.xml b/org.genivi.commonapi.dbus.cli.feature/pom.xml index ad7d9f7..1a32907 100644 --- a/org.genivi.commonapi.dbus.cli.feature/pom.xml +++ b/org.genivi.commonapi.dbus.cli.feature/pom.xml @@ -7,7 +7,7 @@ commonapi org.genivi.commonapi.dbus.releng - 3.2.14-SNAPSHOT + 3.2.15-SNAPSHOT ../org.genivi.commonapi.dbus.releng diff --git a/org.genivi.commonapi.dbus.cli.product/.gitignore b/org.genivi.commonapi.dbus.cli.product/.gitignore deleted file mode 100644 index 873d37a..0000000 --- a/org.genivi.commonapi.dbus.cli.product/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -/target diff --git a/org.genivi.commonapi.dbus.cli.product/.metadata/.log b/org.genivi.commonapi.dbus.cli.product/.metadata/.log deleted file mode 100644 index 3cd3810..0000000 --- a/org.genivi.commonapi.dbus.cli.product/.metadata/.log +++ /dev/null @@ -1,193 +0,0 @@ -!SESSION 2015-02-12 11:34:10.067 ----------------------------------------------- -eclipse.buildId=unknown -java.version=1.7.0_65 -java.vendor=Oracle Corporation -BootLoader constants: OS=linux, ARCH=x86, WS=gtk, NL=en_US -Framework arguments: -product org.genivi.commonapi.dbus.cli.product -c /home/notbert/project/workspace_generator/output_dbus /home/notbert/project/workspace_CommonAPI_Examples/tutorialE05/E05Manager.fidl -p /home/notbert/project/workspace_generator/input/licenseText.txt -Command-line arguments: -product org.genivi.commonapi.dbus.cli.product -data /home/notbert/project/git/ascgit017.CommonAPI-D-Bus-Tools/org.genivi.commonapi.dbus.cli.product -dev file:/home/notbert/project/workspace_generator/.metadata/.plugins/org.eclipse.pde.core/commonapi_dbus_console.product/dev.properties -os linux -ws gtk -arch x86 -consoleLog -c /home/notbert/project/workspace_generator/output_dbus /home/notbert/project/workspace_CommonAPI_Examples/tutorialE05/E05Manager.fidl -p /home/notbert/project/workspace_generator/input/licenseText.txt - -!ENTRY org.genivi.commonapi.console 4 2 2015-02-12 11:34:12.209 -!MESSAGE Problems occurred when invoking code from plug-in: "org.genivi.commonapi.console". -!STACK 0 -java.lang.IllegalArgumentException: A slot with name 'DEFAULT_OUTPUT' has not been configured. - at org.eclipse.xtext.generator.JavaIoFileSystemAccess.getFile(JavaIoFileSystemAccess.java:149) - at org.eclipse.xtext.generator.JavaIoFileSystemAccess.generateFile(JavaIoFileSystemAccess.java:78) - at org.eclipse.xtext.generator.AbstractFileSystemAccess.generateFile(AbstractFileSystemAccess.java:97) - at org.genivi.commonapi.core.generator.FInterfaceGenerator.generate(FInterfaceGenerator.java:53) - at org.genivi.commonapi.core.generator.FrancaGenerator$6.apply(FrancaGenerator.java:283) - at org.genivi.commonapi.core.generator.FrancaGenerator$6.apply(FrancaGenerator.java:1) - at org.eclipse.xtext.xbase.lib.IteratorExtensions.forEach(IteratorExtensions.java:360) - at org.eclipse.xtext.xbase.lib.IterableExtensions.forEach(IterableExtensions.java:331) - at org.genivi.commonapi.core.generator.FrancaGenerator.doGenerateComponents(FrancaGenerator.java:286) - at org.genivi.commonapi.core.generator.FrancaGenerator.doGenerate(FrancaGenerator.java:193) - at org.genivi.commonapi.dbus.generator.FrancaDBusGenerator.doGenerate(FrancaDBusGenerator.java:96) - at org.genivi.commonapi.core.cli.CommandlineToolMain.doGenerate(CommandlineToolMain.java:233) - at org.genivi.commonapi.dbus.cli.DBusCommandlineToolMain.generateDBus(DBusCommandlineToolMain.java:70) - at org.genivi.commonapi.dbus.cli.CommandLineHandler.excute(CommandLineHandler.java:71) - at org.genivi.commonapi.console.CommandExecuter$1.run(CommandExecuter.java:231) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.genivi.commonapi.console.CommandExecuter.executeCommand(CommandExecuter.java:216) - at org.genivi.commonapi.console.internal.Application.start(Application.java:30) - at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196) - at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:134) - at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104) - at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:380) - at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:235) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:606) - at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:648) - at org.eclipse.equinox.launcher.Main.basicRun(Main.java:603) - at org.eclipse.equinox.launcher.Main.run(Main.java:1465) - at org.eclipse.equinox.launcher.Main.main(Main.java:1438) - -!ENTRY org.genivi.commonapi.console 4 0 2015-02-12 11:34:12.213 -!MESSAGE A slot with name 'DEFAULT_OUTPUT' has not been configured. -!STACK 0 -java.lang.IllegalArgumentException: A slot with name 'DEFAULT_OUTPUT' has not been configured. - at org.eclipse.xtext.generator.JavaIoFileSystemAccess.getFile(JavaIoFileSystemAccess.java:149) - at org.eclipse.xtext.generator.JavaIoFileSystemAccess.generateFile(JavaIoFileSystemAccess.java:78) - at org.eclipse.xtext.generator.AbstractFileSystemAccess.generateFile(AbstractFileSystemAccess.java:97) - at org.genivi.commonapi.core.generator.FInterfaceGenerator.generate(FInterfaceGenerator.java:53) - at org.genivi.commonapi.core.generator.FrancaGenerator$6.apply(FrancaGenerator.java:283) - at org.genivi.commonapi.core.generator.FrancaGenerator$6.apply(FrancaGenerator.java:1) - at org.eclipse.xtext.xbase.lib.IteratorExtensions.forEach(IteratorExtensions.java:360) - at org.eclipse.xtext.xbase.lib.IterableExtensions.forEach(IterableExtensions.java:331) - at org.genivi.commonapi.core.generator.FrancaGenerator.doGenerateComponents(FrancaGenerator.java:286) - at org.genivi.commonapi.core.generator.FrancaGenerator.doGenerate(FrancaGenerator.java:193) - at org.genivi.commonapi.dbus.generator.FrancaDBusGenerator.doGenerate(FrancaDBusGenerator.java:96) - at org.genivi.commonapi.core.cli.CommandlineToolMain.doGenerate(CommandlineToolMain.java:233) - at org.genivi.commonapi.dbus.cli.DBusCommandlineToolMain.generateDBus(DBusCommandlineToolMain.java:70) - at org.genivi.commonapi.dbus.cli.CommandLineHandler.excute(CommandLineHandler.java:71) - at org.genivi.commonapi.console.CommandExecuter$1.run(CommandExecuter.java:231) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.genivi.commonapi.console.CommandExecuter.executeCommand(CommandExecuter.java:216) - at org.genivi.commonapi.console.internal.Application.start(Application.java:30) - at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196) - at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:134) - at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104) - at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:380) - at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:235) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:606) - at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:648) - at org.eclipse.equinox.launcher.Main.basicRun(Main.java:603) - at org.eclipse.equinox.launcher.Main.run(Main.java:1465) - at org.eclipse.equinox.launcher.Main.main(Main.java:1438) -!SESSION 2015-02-12 11:52:43.516 ----------------------------------------------- -eclipse.buildId=unknown -java.version=1.7.0_65 -java.vendor=Oracle Corporation -BootLoader constants: OS=linux, ARCH=x86, WS=gtk, NL=en_US -Framework arguments: -product org.genivi.commonapi.dbus.cli.product -c /home/notbert/project/workspace_generator/output_dbus /home/notbert/project/workspace_CommonAPI_Examples/tutorialE05/E05Manager.fidl -p /home/notbert/project/workspace_generator/input/licenseText.txt -Command-line arguments: -product org.genivi.commonapi.dbus.cli.product -data /home/notbert/project/git/ascgit017.CommonAPI-D-Bus-Tools/org.genivi.commonapi.dbus.cli.product -dev file:/home/notbert/project/workspace_generator/.metadata/.plugins/org.eclipse.pde.core/commonapi_dbus_console.product/dev.properties -os linux -ws gtk -arch x86 -consoleLog -c /home/notbert/project/workspace_generator/output_dbus /home/notbert/project/workspace_CommonAPI_Examples/tutorialE05/E05Manager.fidl -p /home/notbert/project/workspace_generator/input/licenseText.txt - -!ENTRY org.genivi.commonapi.console 4 2 2015-02-12 11:53:46.330 -!MESSAGE Problems occurred when invoking code from plug-in: "org.genivi.commonapi.console". -!STACK 0 -java.lang.NullPointerException - at org.eclipse.core.internal.preferences.EclipsePreferences.put(EclipsePreferences.java:908) - at org.genivi.commonapi.core.cli.CommandlineToolMain.setDestination(CommandlineToolMain.java:108) - at org.genivi.commonapi.dbus.cli.CommandLineHandler.excute(CommandLineHandler.java:51) - at org.genivi.commonapi.console.CommandExecuter$1.run(CommandExecuter.java:231) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.genivi.commonapi.console.CommandExecuter.executeCommand(CommandExecuter.java:216) - at org.genivi.commonapi.console.internal.Application.start(Application.java:30) - at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196) - at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:134) - at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104) - at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:380) - at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:235) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:606) - at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:648) - at org.eclipse.equinox.launcher.Main.basicRun(Main.java:603) - at org.eclipse.equinox.launcher.Main.run(Main.java:1465) - at org.eclipse.equinox.launcher.Main.main(Main.java:1438) - -!ENTRY org.genivi.commonapi.console 4 0 2015-02-12 11:53:46.348 -!MESSAGE -!STACK 0 -java.lang.NullPointerException - at org.eclipse.core.internal.preferences.EclipsePreferences.put(EclipsePreferences.java:908) - at org.genivi.commonapi.core.cli.CommandlineToolMain.setDestination(CommandlineToolMain.java:108) - at org.genivi.commonapi.dbus.cli.CommandLineHandler.excute(CommandLineHandler.java:51) - at org.genivi.commonapi.console.CommandExecuter$1.run(CommandExecuter.java:231) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.genivi.commonapi.console.CommandExecuter.executeCommand(CommandExecuter.java:216) - at org.genivi.commonapi.console.internal.Application.start(Application.java:30) - at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196) - at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:134) - at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104) - at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:380) - at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:235) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:606) - at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:648) - at org.eclipse.equinox.launcher.Main.basicRun(Main.java:603) - at org.eclipse.equinox.launcher.Main.run(Main.java:1465) - at org.eclipse.equinox.launcher.Main.main(Main.java:1438) -!SESSION 2015-02-12 11:54:17.190 ----------------------------------------------- -eclipse.buildId=unknown -java.version=1.7.0_65 -java.vendor=Oracle Corporation -BootLoader constants: OS=linux, ARCH=x86, WS=gtk, NL=en_US -Framework arguments: -product org.genivi.commonapi.dbus.cli.product -c /home/notbert/project/workspace_generator/output_dbus /home/notbert/project/workspace_CommonAPI_Examples/tutorialE05/E05Manager.fidl -p /home/notbert/project/workspace_generator/input/licenseText.txt -Command-line arguments: -product org.genivi.commonapi.dbus.cli.product -data /home/notbert/project/git/ascgit017.CommonAPI-D-Bus-Tools/org.genivi.commonapi.dbus.cli.product -dev file:/home/notbert/project/workspace_generator/.metadata/.plugins/org.eclipse.pde.core/commonapi_dbus_console.product/dev.properties -os linux -ws gtk -arch x86 -consoleLog -c /home/notbert/project/workspace_generator/output_dbus /home/notbert/project/workspace_CommonAPI_Examples/tutorialE05/E05Manager.fidl -p /home/notbert/project/workspace_generator/input/licenseText.txt - -!ENTRY org.genivi.commonapi.console 4 2 2015-02-12 11:54:19.035 -!MESSAGE Problems occurred when invoking code from plug-in: "org.genivi.commonapi.console". -!STACK 0 -java.lang.NullPointerException - at org.eclipse.core.internal.preferences.EclipsePreferences.put(EclipsePreferences.java:908) - at org.genivi.commonapi.core.cli.CommandlineToolMain.setDestination(CommandlineToolMain.java:108) - at org.genivi.commonapi.dbus.cli.CommandLineHandler.excute(CommandLineHandler.java:51) - at org.genivi.commonapi.console.CommandExecuter$1.run(CommandExecuter.java:231) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.genivi.commonapi.console.CommandExecuter.executeCommand(CommandExecuter.java:216) - at org.genivi.commonapi.console.internal.Application.start(Application.java:30) - at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196) - at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:134) - at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104) - at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:380) - at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:235) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:606) - at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:648) - at org.eclipse.equinox.launcher.Main.basicRun(Main.java:603) - at org.eclipse.equinox.launcher.Main.run(Main.java:1465) - at org.eclipse.equinox.launcher.Main.main(Main.java:1438) - -!ENTRY org.genivi.commonapi.console 4 0 2015-02-12 11:54:19.054 -!MESSAGE -!STACK 0 -java.lang.NullPointerException - at org.eclipse.core.internal.preferences.EclipsePreferences.put(EclipsePreferences.java:908) - at org.genivi.commonapi.core.cli.CommandlineToolMain.setDestination(CommandlineToolMain.java:108) - at org.genivi.commonapi.dbus.cli.CommandLineHandler.excute(CommandLineHandler.java:51) - at org.genivi.commonapi.console.CommandExecuter$1.run(CommandExecuter.java:231) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.genivi.commonapi.console.CommandExecuter.executeCommand(CommandExecuter.java:216) - at org.genivi.commonapi.console.internal.Application.start(Application.java:30) - at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196) - at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:134) - at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104) - at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:380) - at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:235) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:606) - at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:648) - at org.eclipse.equinox.launcher.Main.basicRun(Main.java:603) - at org.eclipse.equinox.launcher.Main.run(Main.java:1465) - at org.eclipse.equinox.launcher.Main.main(Main.java:1438) diff --git a/org.genivi.commonapi.dbus.cli.product/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/org.genivi.commonapi.dbus.cli.product/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version deleted file mode 100644 index 6b2aaa7..0000000 --- a/org.genivi.commonapi.dbus.cli.product/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/org.genivi.commonapi.dbus.cli.product/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.dbus.cli.product/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index dffc6b5..0000000 --- a/org.genivi.commonapi.dbus.cli.product/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -version=1 diff --git a/org.genivi.commonapi.dbus.cli.product/.project b/org.genivi.commonapi.dbus.cli.product/.project deleted file mode 100644 index bb81170..0000000 --- a/org.genivi.commonapi.dbus.cli.product/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - org.genivi.commonapi.dbus.cli.product - - - - - - - - diff --git a/org.genivi.commonapi.dbus.cli.product/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.dbus.cli.product/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/org.genivi.commonapi.dbus.cli.product/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.genivi.commonapi.dbus.cli.product/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.dbus.cli.product/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22..0000000 --- a/org.genivi.commonapi.dbus.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.dbus.cli.product/commonapi_dbus_cli.product b/org.genivi.commonapi.dbus.cli.product/commonapi_dbus_cli.product index 4c05f12..cffde0d 100644 --- 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 @@ - + diff --git a/org.genivi.commonapi.dbus.cli.product/pom.xml b/org.genivi.commonapi.dbus.cli.product/pom.xml index d20c1b3..3a37c4c 100644 --- a/org.genivi.commonapi.dbus.cli.product/pom.xml +++ b/org.genivi.commonapi.dbus.cli.product/pom.xml @@ -144,7 +144,7 @@ commonapi org.genivi.commonapi.dbus.releng - 3.2.14-SNAPSHOT + 3.2.15-SNAPSHOT ../org.genivi.commonapi.dbus.releng diff --git a/org.genivi.commonapi.dbus.cli/.classpath b/org.genivi.commonapi.dbus.cli/.classpath deleted file mode 100644 index eca7bdb..0000000 --- a/org.genivi.commonapi.dbus.cli/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/org.genivi.commonapi.dbus.cli/.gitignore b/org.genivi.commonapi.dbus.cli/.gitignore deleted file mode 100644 index ad19da6..0000000 --- a/org.genivi.commonapi.dbus.cli/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*~ -/bin -/target diff --git a/org.genivi.commonapi.dbus.cli/.project b/org.genivi.commonapi.dbus.cli/.project deleted file mode 100644 index 1258432..0000000 --- a/org.genivi.commonapi.dbus.cli/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.genivi.commonapi.dbus.cli - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.genivi.commonapi.dbus.cli/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.dbus.cli/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/org.genivi.commonapi.dbus.cli/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.genivi.commonapi.dbus.cli/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.dbus.cli/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22..0000000 --- a/org.genivi.commonapi.dbus.cli/.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.dbus.cli/.settings/org.eclipse.jdt.core.prefs b/org.genivi.commonapi.dbus.cli/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61..0000000 --- a/org.genivi.commonapi.dbus.cli/.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.dbus.cli/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.cli/META-INF/MANIFEST.MF index 7c5c8dc..da36025 100644 --- 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: GENIVI CommonAPI D-Bus Console Interface Bundle-SymbolicName: org.genivi.commonapi.dbus.cli;singleton:=true -Bundle-Version: 3.2.14.qualifier +Bundle-Version: 3.2.15.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.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.dbus;bundle-version="3.2.14" + org.genivi.commonapi.console;bundle-version="3.2.15", + org.genivi.commonapi.dbus;bundle-version="3.2.15" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: BMW AG diff --git a/org.genivi.commonapi.dbus.cli/pom.xml b/org.genivi.commonapi.dbus.cli/pom.xml index 80defea..982e97e 100644 --- a/org.genivi.commonapi.dbus.cli/pom.xml +++ b/org.genivi.commonapi.dbus.cli/pom.xml @@ -7,7 +7,7 @@ commonapi org.genivi.commonapi.dbus.releng - 3.2.14-SNAPSHOT + 3.2.15-SNAPSHOT ../org.genivi.commonapi.dbus.releng diff --git a/org.genivi.commonapi.dbus.feature/.gitignore b/org.genivi.commonapi.dbus.feature/.gitignore deleted file mode 100644 index 873d37a..0000000 --- a/org.genivi.commonapi.dbus.feature/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -/target diff --git a/org.genivi.commonapi.dbus.feature/.project b/org.genivi.commonapi.dbus.feature/.project deleted file mode 100644 index 87baaba..0000000 --- a/org.genivi.commonapi.dbus.feature/.project +++ /dev/null @@ -1,19 +0,0 @@ - - - org.genivi.commonapi.dbus.feature - - - org.genivi.commonapi.dbus - org.genivi.commonapi.dbus.ui - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/org.genivi.commonapi.dbus.feature/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.dbus.feature/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/org.genivi.commonapi.dbus.feature/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.genivi.commonapi.dbus.feature/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.dbus.feature/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22..0000000 --- a/org.genivi.commonapi.dbus.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.dbus.feature/feature.xml b/org.genivi.commonapi.dbus.feature/feature.xml index 02e0a4b..774c7b2 100644 --- a/org.genivi.commonapi.dbus.feature/feature.xml +++ b/org.genivi.commonapi.dbus.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.genivi.commonapi.dbus.feature/pom.xml b/org.genivi.commonapi.dbus.feature/pom.xml index 0a7a7b5..285fcdc 100644 --- a/org.genivi.commonapi.dbus.feature/pom.xml +++ b/org.genivi.commonapi.dbus.feature/pom.xml @@ -7,7 +7,7 @@ commonapi org.genivi.commonapi.dbus.releng - 3.2.14-SNAPSHOT + 3.2.15-SNAPSHOT ../org.genivi.commonapi.dbus.releng diff --git a/org.genivi.commonapi.dbus.releng/.gitignore b/org.genivi.commonapi.dbus.releng/.gitignore deleted file mode 100644 index b25c15b..0000000 --- a/org.genivi.commonapi.dbus.releng/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/org.genivi.commonapi.dbus.releng/.project b/org.genivi.commonapi.dbus.releng/.project deleted file mode 100644 index 54af3e8..0000000 --- a/org.genivi.commonapi.dbus.releng/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - org.genivi.commonapi.dbus.releng - - - - - - - - diff --git a/org.genivi.commonapi.dbus.releng/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.dbus.releng/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/org.genivi.commonapi.dbus.releng/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.genivi.commonapi.dbus.releng/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.dbus.releng/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22..0000000 --- a/org.genivi.commonapi.dbus.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.dbus.releng/pom.xml b/org.genivi.commonapi.dbus.releng/pom.xml index eb7fdf8..48c9ad1 100644 --- a/org.genivi.commonapi.dbus.releng/pom.xml +++ b/org.genivi.commonapi.dbus.releng/pom.xml @@ -20,7 +20,7 @@ commonapi org.genivi.commonapi.releng - 3.2.14-SNAPSHOT + 3.2.15-SNAPSHOT ../org.genivi.commonapi.releng diff --git a/org.genivi.commonapi.dbus.target/.gitignore b/org.genivi.commonapi.dbus.target/.gitignore deleted file mode 100644 index b25c15b..0000000 --- a/org.genivi.commonapi.dbus.target/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/org.genivi.commonapi.dbus.target/.project b/org.genivi.commonapi.dbus.target/.project deleted file mode 100644 index 72c4be3..0000000 --- a/org.genivi.commonapi.dbus.target/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - org.genivi.commonapi.dbus.target - - - - - - - - \ No newline at end of file diff --git a/org.genivi.commonapi.dbus.target/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.dbus.target/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/org.genivi.commonapi.dbus.target/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.genivi.commonapi.dbus.target/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.dbus.target/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22..0000000 --- a/org.genivi.commonapi.dbus.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.dbus.target/pom.xml b/org.genivi.commonapi.dbus.target/pom.xml index bd7085a..d1385fd 100644 --- a/org.genivi.commonapi.dbus.target/pom.xml +++ b/org.genivi.commonapi.dbus.target/pom.xml @@ -7,7 +7,7 @@ commonapi org.genivi.commonapi.releng - 3.2.14-SNAPSHOT + 3.2.15-SNAPSHOT ../org.genivi.commonapi.releng diff --git a/org.genivi.commonapi.dbus.ui/.classpath b/org.genivi.commonapi.dbus.ui/.classpath deleted file mode 100644 index eca7bdb..0000000 --- a/org.genivi.commonapi.dbus.ui/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/org.genivi.commonapi.dbus.ui/.gitignore b/org.genivi.commonapi.dbus.ui/.gitignore deleted file mode 100644 index ad19da6..0000000 --- a/org.genivi.commonapi.dbus.ui/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*~ -/bin -/target diff --git a/org.genivi.commonapi.dbus.ui/.project b/org.genivi.commonapi.dbus.ui/.project deleted file mode 100644 index 23a4228..0000000 --- a/org.genivi.commonapi.dbus.ui/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.genivi.commonapi.dbus.ui - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.genivi.commonapi.dbus.ui/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.dbus.ui/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/org.genivi.commonapi.dbus.ui/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.genivi.commonapi.dbus.ui/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.dbus.ui/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22..0000000 --- a/org.genivi.commonapi.dbus.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.dbus.ui/.settings/org.eclipse.jdt.core.prefs b/org.genivi.commonapi.dbus.ui/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61..0000000 --- a/org.genivi.commonapi.dbus.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.dbus.ui/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.ui/META-INF/MANIFEST.MF index 75f986d..113ba38 100644 --- 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 CommonAPI D-Bus UI Bundle-SymbolicName: org.genivi.commonapi.dbus.ui;singleton:=true -Bundle-Version: 3.2.14.qualifier +Bundle-Version: 3.2.15.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="[5.0.1,6.0.0)";visibility:=reexport, - org.genivi.commonapi.core.ui;bundle-version="3.2.14";visibility:=reexport, - org.genivi.commonapi.dbus;bundle-version="3.2.14";visibility:=reexport, + org.genivi.commonapi.core.ui;bundle-version="3.2.15";visibility:=reexport, + org.genivi.commonapi.dbus;bundle-version="3.2.15";visibility:=reexport, 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)" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.genivi.commonapi.dbus.ui/pom.xml b/org.genivi.commonapi.dbus.ui/pom.xml index d023c99..9254fb2 100644 --- a/org.genivi.commonapi.dbus.ui/pom.xml +++ b/org.genivi.commonapi.dbus.ui/pom.xml @@ -7,7 +7,7 @@ commonapi org.genivi.commonapi.dbus.releng - 3.2.14-SNAPSHOT + 3.2.15-SNAPSHOT ../org.genivi.commonapi.dbus.releng diff --git a/org.genivi.commonapi.dbus.updatesite/.gitignore b/org.genivi.commonapi.dbus.updatesite/.gitignore deleted file mode 100644 index 873d37a..0000000 --- a/org.genivi.commonapi.dbus.updatesite/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -/target diff --git a/org.genivi.commonapi.dbus.updatesite/.project b/org.genivi.commonapi.dbus.updatesite/.project deleted file mode 100644 index 698d231..0000000 --- a/org.genivi.commonapi.dbus.updatesite/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - org.genivi.commonapi.dbus.updatesite - - - - - - - - \ No newline at end of file diff --git a/org.genivi.commonapi.dbus.updatesite/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.dbus.updatesite/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/org.genivi.commonapi.dbus.updatesite/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.genivi.commonapi.dbus.updatesite/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.dbus.updatesite/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22..0000000 --- a/org.genivi.commonapi.dbus.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.dbus.updatesite/category.xml b/org.genivi.commonapi.dbus.updatesite/category.xml index 0f5a520..08cfcf5 100644 --- a/org.genivi.commonapi.dbus.updatesite/category.xml +++ b/org.genivi.commonapi.dbus.updatesite/category.xml @@ -1,9 +1,9 @@ - + - + diff --git a/org.genivi.commonapi.dbus.updatesite/pom.xml b/org.genivi.commonapi.dbus.updatesite/pom.xml index 05a353b..acfae8b 100644 --- a/org.genivi.commonapi.dbus.updatesite/pom.xml +++ b/org.genivi.commonapi.dbus.updatesite/pom.xml @@ -7,7 +7,7 @@ commonapi org.genivi.commonapi.dbus.releng - 3.2.14-SNAPSHOT + 3.2.15-SNAPSHOT ../org.genivi.commonapi.dbus.releng diff --git a/org.genivi.commonapi.dbus.validator.feature/.gitignore b/org.genivi.commonapi.dbus.validator.feature/.gitignore deleted file mode 100644 index 873d37a..0000000 --- a/org.genivi.commonapi.dbus.validator.feature/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -/target diff --git a/org.genivi.commonapi.dbus.validator.feature/.project b/org.genivi.commonapi.dbus.validator.feature/.project deleted file mode 100644 index d3c20d0..0000000 --- a/org.genivi.commonapi.dbus.validator.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.genivi.commonapi.dbus.validator.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/org.genivi.commonapi.dbus.validator.feature/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.dbus.validator.feature/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/org.genivi.commonapi.dbus.validator.feature/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.genivi.commonapi.dbus.validator.feature/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.dbus.validator.feature/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22..0000000 --- a/org.genivi.commonapi.dbus.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.dbus.validator.feature/feature.xml b/org.genivi.commonapi.dbus.validator.feature/feature.xml index fd4b5eb..42159db 100644 --- a/org.genivi.commonapi.dbus.validator.feature/feature.xml +++ b/org.genivi.commonapi.dbus.validator.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.genivi.commonapi.dbus.validator.feature/pom.xml b/org.genivi.commonapi.dbus.validator.feature/pom.xml index dc7cb56..293b004 100644 --- a/org.genivi.commonapi.dbus.validator.feature/pom.xml +++ b/org.genivi.commonapi.dbus.validator.feature/pom.xml @@ -7,7 +7,7 @@ commonapi org.genivi.commonapi.dbus.releng - 3.2.14-SNAPSHOT + 3.2.15-SNAPSHOT ../org.genivi.commonapi.dbus.releng diff --git a/org.genivi.commonapi.dbus.validator/.classpath b/org.genivi.commonapi.dbus.validator/.classpath deleted file mode 100644 index eca7bdb..0000000 --- a/org.genivi.commonapi.dbus.validator/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/org.genivi.commonapi.dbus.validator/.gitignore b/org.genivi.commonapi.dbus.validator/.gitignore deleted file mode 100644 index ad19da6..0000000 --- a/org.genivi.commonapi.dbus.validator/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*~ -/bin -/target diff --git a/org.genivi.commonapi.dbus.validator/.project b/org.genivi.commonapi.dbus.validator/.project deleted file mode 100644 index 785e30b..0000000 --- a/org.genivi.commonapi.dbus.validator/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.genivi.commonapi.dbus.validator - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.genivi.commonapi.dbus.validator/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.dbus.validator/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/org.genivi.commonapi.dbus.validator/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.genivi.commonapi.dbus.validator/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.dbus.validator/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22..0000000 --- a/org.genivi.commonapi.dbus.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.dbus.validator/.settings/org.eclipse.jdt.core.prefs b/org.genivi.commonapi.dbus.validator/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61..0000000 --- a/org.genivi.commonapi.dbus.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.dbus.validator/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.validator/META-INF/MANIFEST.MF index 508308f..c16ae5b 100644 --- a/org.genivi.commonapi.dbus.validator/META-INF/MANIFEST.MF +++ b/org.genivi.commonapi.dbus.validator/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GENIVI CommonAPI D-Bus Validator Bundle-SymbolicName: org.genivi.commonapi.dbus.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.dbus.ui;bundle-version="3.2.14";visibility:=reexport + org.genivi.commonapi.core;bundle-version="3.2.15";visibility:=reexport, + org.genivi.commonapi.dbus.ui;bundle-version="3.2.15";visibility:=reexport Export-Package: org.genivi.commonapi.dbus.validator Automatic-Module-Name: org.genivi.commonapi.dbus.validator diff --git a/org.genivi.commonapi.dbus.validator/pom.xml b/org.genivi.commonapi.dbus.validator/pom.xml index 6f4fe93..60f5935 100644 --- a/org.genivi.commonapi.dbus.validator/pom.xml +++ b/org.genivi.commonapi.dbus.validator/pom.xml @@ -7,7 +7,7 @@ commonapi org.genivi.commonapi.dbus.releng - 3.2.14-SNAPSHOT + 3.2.15-SNAPSHOT ../org.genivi.commonapi.dbus.releng diff --git a/org.genivi.commonapi.dbus.verification/.gitignore b/org.genivi.commonapi.dbus.verification/.gitignore index 1c82aaf..9c893f6 100644 --- a/org.genivi.commonapi.dbus.verification/.gitignore +++ b/org.genivi.commonapi.dbus.verification/.gitignore @@ -1,7 +1,3 @@ *~ /.deps /build -/src-gen -/.cproject -/.project -/.settings diff --git a/org.genivi.commonapi.dbus/.classpath b/org.genivi.commonapi.dbus/.classpath deleted file mode 100644 index bc001b4..0000000 --- a/org.genivi.commonapi.dbus/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/org.genivi.commonapi.dbus/.gitignore b/org.genivi.commonapi.dbus/.gitignore deleted file mode 100644 index bf5c825..0000000 --- a/org.genivi.commonapi.dbus/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*~ -/bin -/target -/xtend-gen -/src-gen diff --git a/org.genivi.commonapi.dbus/.project b/org.genivi.commonapi.dbus/.project deleted file mode 100644 index 003a46c..0000000 --- a/org.genivi.commonapi.dbus/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.genivi.commonapi.dbus - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.xtext.ui.shared.xtextNature - org.eclipse.pde.PluginNature - - diff --git a/org.genivi.commonapi.dbus/.settings/org.eclipse.core.resources.prefs b/org.genivi.commonapi.dbus/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/org.genivi.commonapi.dbus/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.genivi.commonapi.dbus/.settings/org.eclipse.core.runtime.prefs b/org.genivi.commonapi.dbus/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22..0000000 --- a/org.genivi.commonapi.dbus/.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.dbus/.settings/org.eclipse.jdt.core.prefs b/org.genivi.commonapi.dbus/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61..0000000 --- a/org.genivi.commonapi.dbus/.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.dbus/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus/META-INF/MANIFEST.MF index 15fa030..2a09069 100644 --- a/org.genivi.commonapi.dbus/META-INF/MANIFEST.MF +++ b/org.genivi.commonapi.dbus/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GENIVI CommonAPI D-Bus C++ Generator Bundle-Vendor: BMW AG -Bundle-Version: 3.2.14.qualifier +Bundle-Version: 3.2.15.qualifier Bundle-SymbolicName: org.genivi.commonapi.dbus;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.dbus.generator, diff --git a/org.genivi.commonapi.dbus/pom.xml b/org.genivi.commonapi.dbus/pom.xml index b48f9eb..05b101e 100644 --- a/org.genivi.commonapi.dbus/pom.xml +++ b/org.genivi.commonapi.dbus/pom.xml @@ -7,7 +7,7 @@ commonapi org.genivi.commonapi.dbus.releng - 3.2.14-SNAPSHOT + 3.2.15-SNAPSHOT ../org.genivi.commonapi.dbus.releng 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 @@ 4.0.0 commonapi org.genivi.commonapi.releng - 3.2.14-SNAPSHOT + 3.2.15-SNAPSHOT pom 0.22.0 @@ -46,7 +46,7 @@ commonapi ${target.id} - 3.2.14-SNAPSHOT + 3.2.15-SNAPSHOT diff --git a/test/.project b/test/.project deleted file mode 100644 index d4fae4c..0000000 --- a/test/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - CommonAPI-D-Bus-Tools.test - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/test/fakeLegacyService/fakeLegacyService.py b/test/fakeLegacyService/fakeLegacyService.py index bc0f60d..821a81c 100644 --- a/test/fakeLegacyService/fakeLegacyService.py +++ b/test/fakeLegacyService/fakeLegacyService.py @@ -5,85 +5,88 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -import sys -import traceback -import gobject -import math +from gi.repository import GLib import dbus import dbus.service import dbus.mainloop.glib import argparse -parser=argparse.ArgumentParser( - description='''Registers a fake Legacy Service (with or without Object Manager)''') -parser.add_argument('service', help='DBus Service Name') -parser.add_argument('object_path', help='DBus Object Path') -parser.add_argument('interface', help='DBus Interface name') -parser.add_argument("--withObjectManager", help="has DBus Object Manager", action="store_true") -args=parser.parse_args() +parser = argparse.ArgumentParser( + description="""Registers a fake Legacy Service (with or without Object Manager)""" +) +parser.add_argument("service", help="DBus Service Name") +parser.add_argument("object_path", help="DBus Object Path") +parser.add_argument("interface", help="DBus Interface name") +parser.add_argument( + "--withObjectManager", help="has DBus Object Manager", action="store_true" +) +args = parser.parse_args() SERVICE = args.service OBJECT_PATH = args.object_path INTERFACE = args.interface -loop = gobject.MainLoop() +loop = GLib.MainLoop() dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) class FakeLegacyService(dbus.service.Object): - def __init__(self, loop): - busName = dbus.service.BusName(SERVICE , bus = dbus.SessionBus()) - dbus.service.Object.__init__(self, busName, OBJECT_PATH) - #self.properties = {'RestartReason': 1, 'ShutdownReason': 2, 'WakeUpReason' :3, 'BootMode' :4} - self.ABus="" - self.APath="" - self.loop=loop + def __init__(self, loop): + busName = dbus.service.BusName(SERVICE, bus=dbus.SessionBus()) + dbus.service.Object.__init__(self, busName, OBJECT_PATH) + # self.properties = {'RestartReason': 1, 'ShutdownReason': 2, 'WakeUpReason' :3, 'BootMode' :4} + self.ABus = "" + self.APath = "" + self.loop = loop - @dbus.service.method(dbus_interface='fake.legacy.service' + '.Introspectable', out_signature = 's') - def Introspect(self): - f = open('fake.legacy.service.xml', "r") - text = f.read() - return text - - @dbus.service.method(dbus_interface=INTERFACE, in_signature = 'i', out_signature = 'ii') - def TestMethod(self, input): - val1=input - 5 - val2=input + 5 - return val1, val2 + @dbus.service.method( + dbus_interface="fake.legacy.service" + ".Introspectable", out_signature="s" + ) + def Introspect(self): + f = open("fake.legacy.service.xml", "r") + text = f.read() + return text - @dbus.service.method(dbus_interface=INTERFACE, out_signature = 'si') - def OtherTestMethod(self): - greeting='Hello' - identifier=42 - return greeting, identifier + @dbus.service.method(dbus_interface=INTERFACE, in_signature="i", out_signature="ii") + def TestMethod(self, input): + val1 = input - 5 + val2 = input + 5 + return val1, val2 - @dbus.service.method(dbus_interface=INTERFACE) - def finish(self): - self.loop.quit() - return 0 + @dbus.service.method(dbus_interface=INTERFACE, out_signature="si") + def OtherTestMethod(self): + greeting = "Hello" + identifier = 42 + return greeting, identifier + + @dbus.service.method(dbus_interface=INTERFACE) + def finish(self): + self.loop.quit() + return 0 class ObjectManager(dbus.service.Object): - def __init__(self, loop): - busName = dbus.service.BusName(SERVICE, bus = dbus.SessionBus()) - dbus.service.Object.__init__(self, busName, '/') - self.ABus="" - self.APath="" - self.loop=loop + def __init__(self, loop): + busName = dbus.service.BusName(SERVICE, bus=dbus.SessionBus()) + dbus.service.Object.__init__(self, busName, "/") + self.ABus = "" + self.APath = "" + self.loop = loop - @dbus.service.method(dbus_interface='org.freedesktop.DBus.ObjectManager', out_signature = 'a{oa{sa{sv}}}') - def GetManagedObjects(self): - response = {} - idict = {} - idict[INTERFACE] = {} - idict['fake.legacy.service' + '.Introspectable'] = {} - response[OBJECT_PATH] = idict - objectManager = OBJECT_PATH [0 : OBJECT_PATH.rfind('/')] - response[objectManager] = {} - return response + @dbus.service.method( + dbus_interface="org.freedesktop.DBus.ObjectManager", + out_signature="a{oa{sa{sv}}}", + ) + def GetManagedObjects(self): + response = {} + idict = {} + idict[INTERFACE] = {} + idict["fake.legacy.service" + ".Introspectable"] = {} + response[OBJECT_PATH] = idict + objectManager = OBJECT_PATH[0 : OBJECT_PATH.rfind("/")] + response[objectManager] = {} + return response nsm = FakeLegacyService(loop) -if args.withObjectManager : - ObjectManager(loop) - -loop.run() - +if args.withObjectManager: + ObjectManager(loop) +loop.run() diff --git a/test/fakeLegacyService/sendToFakeLegacyService.py b/test/fakeLegacyService/sendToFakeLegacyService.py index 44c2ae4..222eae6 100644 --- a/test/fakeLegacyService/sendToFakeLegacyService.py +++ b/test/fakeLegacyService/sendToFakeLegacyService.py @@ -6,26 +6,22 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. */ import sys -import traceback -import gobject -import math import dbus import dbus.service import argparse -parser=argparse.ArgumentParser( - description='''Finish fake Legacy Service''') -parser.add_argument('command', help='Command (e.g. finish)') -parser.add_argument('service', help='DBus Service Name') -parser.add_argument('object_path', help='DBus Object Path') -parser.add_argument('interface', help='DBus Interface name') -args=parser.parse_args() +parser = argparse.ArgumentParser(description="""Finish fake Legacy Service""") +parser.add_argument("command", help="Command (e.g. finish)") +parser.add_argument("service", help="DBus Service Name") +parser.add_argument("object_path", help="DBus Object Path") +parser.add_argument("interface", help="DBus Interface name") +args = parser.parse_args() COMMAND = args.command SERVICE = args.service OBJECT_PATH = args.object_path INTERFACE = args.interface - + def finish(interface): try: bus = dbus.SessionBus() @@ -34,13 +30,13 @@ def finish(interface): iface.finish() return 0 except: - print "Service not existing, therefore could not be stopped" + print("Service not existing, therefore could not be stopped") return 1 def main(): if COMMAND == "finish": return finish(INTERFACE) - + return 0 sys.exit(main()) diff --git a/test/src/DBusAddressTranslatorTest.cpp b/test/src/DBusAddressTranslatorTest.cpp index b44bb67..5a29962 100644 --- a/test/src/DBusAddressTranslatorTest.cpp +++ b/test/src/DBusAddressTranslatorTest.cpp @@ -3,11 +3,11 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. - -#include #include #include +#include + #include #ifndef COMMONAPI_INTERNAL_COMPILATION @@ -448,7 +448,7 @@ TEST_F(AddressTranslatorTest, ServicesUsingPredefinedAddressesCanCommunicate) { defaultTestProxy->testVoidPredefinedTypeMethod(v1, v2, stat); ASSERT_EQ(stat, CommonAPI::CallStatus::SUCCESS); - + runtime->unregisterService(commonApiAddress.getDomain(), stub->getStubAdapter()->getInterface(), commonApiAddress.getInstance()); } @@ -499,7 +499,7 @@ void callPythonService(std::string _pythonFileNameAndCommand) { "is not set!"; std::stringstream stream; - stream << "python " << pathToFolderForFakeLegacyService << "/" << _pythonFileNameAndCommand; + stream << "python3 " << pathToFolderForFakeLegacyService << "/" << _pythonFileNameAndCommand; int resultCode = system(stream.str().c_str()); EXPECT_EQ(0, resultCode); diff --git a/test/src/DBusBroadcastTest.cpp b/test/src/DBusBroadcastTest.cpp index 0f6586c..42f6b19 100644 --- a/test/src/DBusBroadcastTest.cpp +++ b/test/src/DBusBroadcastTest.cpp @@ -3,18 +3,19 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -#include - #include #include -#include #include +#include #include #include #include -#include +#include #include #include +#include + +#include #include diff --git a/test/src/DBusCommunicationTest.cpp b/test/src/DBusCommunicationTest.cpp index 2923c3f..d489d0b 100644 --- a/test/src/DBusCommunicationTest.cpp +++ b/test/src/DBusCommunicationTest.cpp @@ -3,20 +3,20 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -#include - #include #include -#include #include +#include #include #include #include -#include +#include #include #include +#include #include +#include #include @@ -217,7 +217,7 @@ TEST_F(DBusCommunicationTest, RemoteAsyncMethodCallWithErrorReplyProxyNotAvailab errorReplyEventReceived = true; }); - std::function timeoutCallback = + std::function timeoutCallback = std::bind(&DBusCommunicationTest::recvTimeout, this, std::placeholders::_1, std::placeholders::_2); CommonAPI::CallInfo info(100); diff --git a/test/src/DBusFactoryTest.cpp b/test/src/DBusFactoryTest.cpp index 880c052..9c96f23 100644 --- a/test/src/DBusFactoryTest.cpp +++ b/test/src/DBusFactoryTest.cpp @@ -3,19 +3,20 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -#include - #include #include -#include #include #include +#include #include #include #include -#include +#include #include #include +#include + +#include #include diff --git a/test/src/DBusFreedesktopPropertiesTest.cpp b/test/src/DBusFreedesktopPropertiesTest.cpp index 17cec5e..3db881c 100644 --- a/test/src/DBusFreedesktopPropertiesTest.cpp +++ b/test/src/DBusFreedesktopPropertiesTest.cpp @@ -3,6 +3,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. +#include + #include #include diff --git a/test/src/DBusInputStreamTest.cpp b/test/src/DBusInputStreamTest.cpp index 73cad26..f9b8199 100644 --- a/test/src/DBusInputStreamTest.cpp +++ b/test/src/DBusInputStreamTest.cpp @@ -7,22 +7,18 @@ #define COMMONAPI_INTERNAL_COMPILATION #endif -#include -#include - -#include "DBusTestUtils.hpp" - -#include - -#include - -#include - #include #include +#include #include +#include +#include +#include +#include + +#include "DBusTestUtils.hpp" class InputStreamTest: public ::testing::Test { protected: diff --git a/test/src/DBusLoadTest.cpp b/test/src/DBusLoadTest.cpp index 34fab9a..26ac437 100644 --- a/test/src/DBusLoadTest.cpp +++ b/test/src/DBusLoadTest.cpp @@ -3,20 +3,21 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -#include - +#include #include #include -#include #include +#include +#include #include #include #include -#include -#include +#include #include #include -#include +#include + +#include #include diff --git a/test/src/DBusMainLoopIntegrationTest.cpp b/test/src/DBusMainLoopIntegrationTest.cpp index f971323..b129412 100644 --- a/test/src/DBusMainLoopIntegrationTest.cpp +++ b/test/src/DBusMainLoopIntegrationTest.cpp @@ -3,22 +3,24 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -#include - #include #include -#include #include +#include #include #include #include -#include +#include #include #include +#include + #ifndef _WIN32 #include #endif +#include + #include #ifndef COMMONAPI_INTERNAL_COMPILATION @@ -365,7 +367,7 @@ class DBusInGLibMainLoopTest: public ::testing::Test { dbusChannel_ = g_io_channel_unix_new(fileDesc.fd); GSource* gWatch = g_io_create_watch(dbusChannel_, static_cast(fileDesc.events)); - g_source_set_callback(gWatch, reinterpret_cast(&gWatchDispatcher), watch, NULL); + g_source_set_callback(gWatch, G_SOURCE_FUNC(&gWatchDispatcher), watch, NULL); const auto& dependentSources = watch->getDependentDispatchSources(); for (auto dependentSourceIterator = dependentSources.begin(); diff --git a/test/src/DBusManagedTest.cpp b/test/src/DBusManagedTest.cpp index b7b8be2..ca9cd49 100644 --- a/test/src/DBusManagedTest.cpp +++ b/test/src/DBusManagedTest.cpp @@ -7,6 +7,14 @@ #define _GLIBCXX_USE_NANOSLEEP #endif +#include +#include +#include +#include + +#include +#include + #include #define COMMONAPI_INTERNAL_COMPILATION @@ -30,13 +38,6 @@ #include "v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp" #include "v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp" -#include -#include -#include -#include - -#include - #define VERSION v1_0 static const std::string serviceConnectionId = "managed-test-service"; diff --git a/test/src/DBusMultipleConnectionTest.cpp b/test/src/DBusMultipleConnectionTest.cpp index 20e183d..1c69612 100644 --- a/test/src/DBusMultipleConnectionTest.cpp +++ b/test/src/DBusMultipleConnectionTest.cpp @@ -3,18 +3,19 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -#include - #include #include -#include #include +#include #include #include #include -#include +#include #include #include +#include + +#include #include diff --git a/test/src/DBusObjectPathTest.cpp b/test/src/DBusObjectPathTest.cpp index 5e47d3d..3c8d01c 100644 --- a/test/src/DBusObjectPathTest.cpp +++ b/test/src/DBusObjectPathTest.cpp @@ -8,14 +8,16 @@ * @file DBusObjectPathTest */ -#include #include -#include -#include #include +#include +#include #include +#include + #include -#include "CommonAPI/CommonAPI.hpp" + +#include #ifndef COMMONAPI_INTERNAL_COMPILATION #define COMMONAPI_INTERNAL_COMPILATION diff --git a/test/src/DBusPolymorphicTest.cpp b/test/src/DBusPolymorphicTest.cpp index 0109af9..1df72c4 100644 --- a/test/src/DBusPolymorphicTest.cpp +++ b/test/src/DBusPolymorphicTest.cpp @@ -3,6 +3,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. +#include + #include #include "CommonAPI/CommonAPI.hpp" diff --git a/test/src/DBusProxyTest.cpp b/test/src/DBusProxyTest.cpp index bcf1bdf..a6eda4e 100644 --- a/test/src/DBusProxyTest.cpp +++ b/test/src/DBusProxyTest.cpp @@ -7,6 +7,16 @@ #define _GLIBCXX_USE_NANOSLEEP #endif +#include +#include +#include +#include +#include +#include +#include + +#include + #include #ifndef COMMONAPI_INTERNAL_COMPILATION @@ -36,15 +46,6 @@ #include "DBusTestUtils.hpp" -#include - -#include -#include -#include -#include -#include -#include - static const std::string domain = "local"; static const std::string commonApiAddress = "CommonAPI.DBus.tests.DBusProxyTestService"; static const std::string commonApiAddressExtended = "CommonAPI.DBus.tests.DBusProxyTestService2"; @@ -285,7 +286,7 @@ TEST_F(ProxyTest, CallMethodFromParentInterface) { std::this_thread::sleep_for(std::chrono::microseconds(10 * 1000)); } EXPECT_TRUE(extendedProxy->isAvailable()); - + bool wasCalled = false; extendedProxy->testEmptyMethodAsync( [&](const CommonAPI::CallStatus& callStatus) { @@ -294,7 +295,7 @@ TEST_F(ProxyTest, CallMethodFromParentInterface) { }); std::this_thread::sleep_for(std::chrono::microseconds(100000)); EXPECT_TRUE(wasCalled); - + deregisterExtendedStub(); } @@ -341,7 +342,7 @@ TEST_F(ProxyTest, CanHandleRemoteAttributeFromParentInterface) { uint32_t value; std::this_thread::sleep_for(std::chrono::microseconds(50000)); - + auto& testAttribute = extendedProxy->getTestPredefinedTypeAttributeAttribute(); testAttribute.getValue(callStatus, value); @@ -354,7 +355,7 @@ TEST_F(ProxyTest, CanHandleRemoteAttributeFromParentInterface) { EXPECT_EQ(callStatus, CommonAPI::CallStatus::SUCCESS); EXPECT_EQ(value, responseValue); - + std::this_thread::sleep_for(std::chrono::microseconds(50000)); deregisterExtendedStub(); } @@ -518,7 +519,7 @@ class ProxyTestCreateAndDeleteFakeLegacyService: public ::testing::Test { auto addressTranslator = CommonAPI::DBus::DBusAddressTranslator::get(); CommonAPI::DBus::DBusAddress dbusAddress; addressTranslator->translate(capiAddress, dbusAddress); - + fakeLegacyServices_.push_back(dbusAddress); if(_withObjectManager) { startFakeLegacyServiceWithObjectMananger(dbusAddress); @@ -606,7 +607,7 @@ class ProxyTestCreateAndDeleteFakeLegacyService: public ::testing::Test { "is not set!"; std::stringstream stream; - stream << "python " << pathToFolderForFakeLegacyService << "/" << _pythonFileNameAndCommand + " &"; + stream << "python3 " << pathToFolderForFakeLegacyService << "/" << _pythonFileNameAndCommand + " &"; int resultCode = system(stream.str().c_str()); EXPECT_EQ(0, resultCode); diff --git a/test/src/DBusRuntimeTest.cpp b/test/src/DBusRuntimeTest.cpp index f3c7bd9..eb5ebcb 100644 --- a/test/src/DBusRuntimeTest.cpp +++ b/test/src/DBusRuntimeTest.cpp @@ -3,10 +3,10 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -#include - #include +#include + #include //#include diff --git a/test/src/DBusTestUtils.hpp b/test/src/DBusTestUtils.hpp index 2343ec1..173f545 100644 --- a/test/src/DBusTestUtils.hpp +++ b/test/src/DBusTestUtils.hpp @@ -11,6 +11,7 @@ #endif #include + #include #include diff --git a/test/src/DBusUnixFDTest.cpp b/test/src/DBusUnixFDTest.cpp index 113a1f5..c7c3cd7 100644 --- a/test/src/DBusUnixFDTest.cpp +++ b/test/src/DBusUnixFDTest.cpp @@ -8,14 +8,17 @@ * @file DBusUnixFDPathTest */ -#include #include -#include -#include #include +#include +#include #include +#include +#include + #include -#include "CommonAPI/CommonAPI.hpp" + +#include #ifndef COMMONAPI_INTERNAL_COMPILATION #define COMMONAPI_INTERNAL_COMPILATION diff --git a/test/src/DBusVariantTypeTest.cpp b/test/src/DBusVariantTypeTest.cpp index 9bc51aa..ced718f 100644 --- a/test/src/DBusVariantTypeTest.cpp +++ b/test/src/DBusVariantTypeTest.cpp @@ -8,14 +8,17 @@ * @file DBusVariantTypeTest */ -#include #include -#include -#include #include +#include +#include #include +#include +#include + #include -#include "CommonAPI/CommonAPI.hpp" + +#include #ifndef COMMONAPI_INTERNAL_COMPILATION #define COMMONAPI_INTERNAL_COMPILATION diff --git a/test/src/DemoMainLoop.hpp b/test/src/DemoMainLoop.hpp index b5d5c1d..1338a68 100644 --- a/test/src/DemoMainLoop.hpp +++ b/test/src/DemoMainLoop.hpp @@ -6,15 +6,11 @@ #ifndef DEMO_MAIN_LOOP_H_ #define DEMO_MAIN_LOOP_H_ -#if !defined (COMMONAPI_INTERNAL_COMPILATION) -#define COMMONAPI_INTERNAL_COMPILATION -#endif - -#include - -#include -#include +#include #include +#include +#include + #ifdef _WIN32 #include #else @@ -23,9 +19,11 @@ #include #endif +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif -#include - +#include namespace CommonAPI { diff --git a/test/src/stubs/ObjectPathStubImpl.cpp b/test/src/stubs/ObjectPathStubImpl.cpp index 9713e90..0ecca07 100644 --- a/test/src/stubs/ObjectPathStubImpl.cpp +++ b/test/src/stubs/ObjectPathStubImpl.cpp @@ -5,6 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include + #include "ObjectPathStubImpl.hpp" namespace v1 { diff --git a/test/src/stubs/UnixFDStubImpl.cpp b/test/src/stubs/UnixFDStubImpl.cpp index 77408c1..22c9254 100644 --- a/test/src/stubs/UnixFDStubImpl.cpp +++ b/test/src/stubs/UnixFDStubImpl.cpp @@ -5,6 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include + #include "UnixFDStubImpl.hpp" namespace v1 { diff --git a/test/src/stubs/VariantTypeStubImpl.cpp b/test/src/stubs/VariantTypeStubImpl.cpp index e0c7dc2..4264570 100644 --- a/test/src/stubs/VariantTypeStubImpl.cpp +++ b/test/src/stubs/VariantTypeStubImpl.cpp @@ -5,6 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include + #include "VariantTypeStubImpl.hpp" namespace v1 {