Commit 557f2feb authored by Simon Barner's avatar Simon Barner
Browse files

Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3337



Conflicts:
	org.fortiss.af3.deployment/META-INF/MANIFEST.MF
	org.fortiss.af3.deployment/plugin.xml
	org.fortiss.af3.exploration/META-INF/MANIFEST.MF
	org.fortiss.af3.exploration/plugin.xml
	org.fortiss.af3.partition/META-INF/MANIFEST.MF
	org.fortiss.af3.platform.beagle/META-INF/MANIFEST.MF
	org.fortiss.af3.platform.hierarchic/META-INF/MANIFEST.MF
	org.fortiss.af3.platform.hierarchic/plugin.xml
	org.fortiss.af3.platform/plugin.xml
	org.fortiss.af3.rcp.application/META-INF/MANIFEST.MF
	org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/example/.ratings
	org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/example/SimpleTrafficLightsCodeGenerationExample.java
	org.fortiss.af3.rcp.application/test-src/test/org/fortiss/af3/rcp/application/semantic/alignment/c/CCodeEquivalenceTest.java
	org.fortiss.af3.rcp.application/test-src/test/org/fortiss/af3/rcp/application/semantic/alignment/java/JavaEquivalenceTest_SimpleTrafficLights.java
	org.fortiss.af3.safetycases/META-INF/MANIFEST.MF
	org.fortiss.af3.safetycases/plugin.xml
	org.fortiss.af3.schedule/META-INF/MANIFEST.MF
	org.fortiss.af3.schedule/plugin.xml
	org.fortiss.af3.task/META-INF/MANIFEST.MF
	org.fortiss.af3.task/plugin.xml
Signed-off-by: Simon Barner's avatarSimon Barner <barner@fortiss.org>
parents 591984f8 3da07deb
/*/bin/
/*/build/
/*/generated-src/
*.rej
.DS_Store
._.DS_Store
/*/bin/
/*/build/
/*/generated-src/
/*/target/
/target/
*.rej
.DS_Store
._.DS_Store
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/com.microsoft.z3.jar" sourcepath="lib/com.microsoft.z3-src.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="build"/>
......
......@@ -5,11 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.fortiss.ide.dev_tools.emf.builder.EcoreBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.systemfocus.tooling.emfgeneration.git.EcoreBuilderGIT</name>
<arguments>
......@@ -30,21 +25,6 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.fortiss.ide.dev_tools.warnings.RemoveWarningsBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.fortiss.ide.dev_tools.warnings.GuidelinesChecker</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.systemfocus.tooling.codereview.builder.CodeReviewBuilder</name>
<arguments>
......@@ -62,7 +42,6 @@
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.systemfocus.tooling.codereview.nature.CodeReviewNature</nature>
......
......@@ -8,7 +8,7 @@ Bundle-ClassPath: lib/com.microsoft.z3.jar,
.
Bundle-Vendor: fortiss GmbH
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Activator: com.microsoft.z3.AF3z3Activator
Bundle-NativeCode: lib/x64/libz3.so ; lib/x64/libz3java.so ; osname = linux ; processor = x86_64,
......@@ -19,4 +19,5 @@ Bundle-NativeCode: lib/x64/libz3.so ; lib/x64/libz3java.so ; osname = linux ; pr
Export-Package: com.microsoft.z3,
com.microsoft.z3.enumerations
Eclipse-BundleShape: dir
Require-Bundle: org.fortiss.tooling.base
Require-Bundle: org.fortiss.tooling.base;visibility:=reexport,
javax.activation;bundle-version="1.1.0";visibility:=reexport
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="build"/>
</classpath>
......@@ -20,21 +20,6 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.fortiss.ide.dev_tools.warnings.RemoveWarningsBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.fortiss.ide.dev_tools.warnings.GuidelinesChecker</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.systemfocus.tooling.codereview.builder.CodeReviewBuilder</name>
<arguments>
......@@ -52,7 +37,6 @@
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.systemfocus.tooling.codereview.nature.CodeReviewNature</nature>
......
......@@ -10,7 +10,7 @@ Require-Bundle: eu.fbk.af3.tools.diagram;bundle-version="1.0.0",
org.fortiss.af3.specification,
org.eclipse.ui.workbench,
org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Vendor: FBK (Fondazione Bruno Kessler)
Export-Package: eu.fbk.af3.tools.diagram.ui.commands,
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-css-1.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-dom-1.8.jar"/>
......
......@@ -5,11 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.fortiss.ide.dev_tools.emf.builder.EcoreBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.systemfocus.tooling.emfgeneration.git.EcoreBuilderGIT</name>
<arguments>
......@@ -30,21 +25,6 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.fortiss.ide.dev_tools.warnings.RemoveWarningsBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.fortiss.ide.dev_tools.warnings.GuidelinesChecker</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.systemfocus.tooling.codereview.builder.CodeReviewBuilder</name>
<arguments>
......@@ -62,7 +42,6 @@
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.systemfocus.tooling.codereview.nature.CodeReviewNature</nature>
......
......@@ -8,7 +8,7 @@ Bundle-Activator: eu.fbk.af3.tools.diagram.Activator
Bundle-Vendor: FBK (Fondazione Bruno Kessler)
Require-Bundle: org.eclipse.core.runtime,
org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
lib/batik-anim-1.8.jar,
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="build"/>
......
......@@ -20,21 +20,6 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.fortiss.ide.dev_tools.warnings.RemoveWarningsBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.fortiss.ide.dev_tools.warnings.GuidelinesChecker</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.systemfocus.tooling.codereview.builder.CodeReviewBuilder</name>
<arguments>
......@@ -52,7 +37,6 @@
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.systemfocus.tooling.codereview.nature.CodeReviewNature</nature>
......
......@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui.ide;visibility:=reexport,
org.fortiss.af3.project,
org.fortiss.af3.schedule.ui
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: fortiss GmbH
Export-Package: org.fortiss.af3.allocation.ui,
org.fortiss.af3.allocation.ui.editor,
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="generated-src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="build"/>
......
......@@ -5,11 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.fortiss.ide.dev_tools.emf.builder.EcoreBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.systemfocus.tooling.emfgeneration.git.EcoreBuilderGIT</name>
<arguments>
......@@ -30,21 +25,6 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.fortiss.ide.dev_tools.warnings.RemoveWarningsBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.fortiss.ide.dev_tools.warnings.GuidelinesChecker</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.systemfocus.tooling.codereview.builder.CodeReviewBuilder</name>
<arguments>
......@@ -62,7 +42,6 @@
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.systemfocus.tooling.codereview.nature.CodeReviewNature</nature>
......
Manifest-Version: 1.0
Automatic-Module-Name: org.fortiss.af3.allocation
Bundle-ManifestVersion: 2
Bundle-Name: fortiss Allocation Model
Bundle-SymbolicName: org.fortiss.af3.allocation;singleton:=true
Bundle-Version: 2.14.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: fortiss GmbH
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.fortiss.af3.allocation.AF3AllocationActivator
Require-Bundle: org.fortiss.tooling.base;visibility:=reexport,
org.fortiss.af3.project
Export-Package: org.fortiss.af3.allocation,
org.fortiss.af3.allocation.compose,
org.fortiss.af3.allocation.model,
org.fortiss.af3.allocation.model.impl,
org.fortiss.af3.allocation.model.util,
org.fortiss.af3.allocation.utils
Manifest-Version: 1.0
Automatic-Module-Name: org.fortiss.af3.allocation
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.fortiss.af3.allocation;singleton:=true
Bundle-Version: 2.14.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.fortiss.af3.allocation.AF3AllocationActivator
Require-Bundle: org.fortiss.tooling.base;visibility:=reexport,
org.fortiss.af3.project
Export-Package: org.fortiss.af3.allocation,
org.fortiss.af3.allocation.compose,
org.fortiss.af3.allocation.model,
org.fortiss.af3.allocation.model.impl,
org.fortiss.af3.allocation.model.util,
org.fortiss.af3.allocation.utils
......@@ -6,10 +6,9 @@
<extension point="org.eclipse.emf.ecore.generated_package">
<!-- @generated allocation -->
<package
uri="http://www.fortiss.org/af3/allocation"
class="org.fortiss.af3.allocation.model.AF3AllocationPackage"
genModel="model/allocation.genmodel"
uri="http://www.fortiss.org/af3/allocation">
</package>
genModel="model/allocation.genmodel"/>
</extension>
<extension point="org.fortiss.tooling.kernel.modelElementCompositor">
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="build"/>
......
......@@ -20,21 +20,6 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.fortiss.ide.dev_tools.warnings.RemoveWarningsBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.fortiss.ide.dev_tools.warnings.GuidelinesChecker</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.systemfocus.tooling.codereview.builder.CodeReviewBuilder</name>
<arguments>
......@@ -52,7 +37,6 @@
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.systemfocus.tooling.codereview.nature.CodeReviewNature</nature>
......
......@@ -9,7 +9,7 @@ Require-Bundle: org.fortiss.af3.expression.ui;visibility:=reexport,
org.fortiss.af3.component;visibility:=reexport,
org.fortiss.af3.mira
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: fortiss GmbH
Export-Package: org.fortiss.af3.component.ui,
org.fortiss.af3.component.ui.behavior,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment