Bug 2442 - [ESF-Tools] New Table for Hazard Analysis
- add new hazard&risk analysis to build (include update-site)
- fix build properties
- fix version numbers
- add missing plugin.properties files
- remove first line from license check (allow for different copyright owners and years)
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
diff --git a/analysis/localanalysis/releng/org.polarsys.esf.localanalysis.releng/feature.properties b/analysis/localanalysis/releng/org.polarsys.esf.localanalysis.releng/feature.properties
index 2d332ae..2fc5f6e 100644
--- a/analysis/localanalysis/releng/org.polarsys.esf.localanalysis.releng/feature.properties
+++ b/analysis/localanalysis/releng/org.polarsys.esf.localanalysis.releng/feature.properties
@@ -1,6 +1,6 @@
featureName = ESF Core (Mandatory) (Incubation)
providerName = PolarSys
-description = Technical Core feature of ESF (Mandatory). (Incubation)
+description = Local analysis feature of ESF (Incubation)
copyright=\
Copyright (c) 2016 ALL4TEC & CEA LIST.\n\
All rights reserved. This program and the accompanying materials\n\
diff --git a/analysis/pom.xml b/analysis/pom.xml
index e461c09..a24c325 100644
--- a/analysis/pom.xml
+++ b/analysis/pom.xml
@@ -23,6 +23,7 @@
<module>common</module>
<module>fmea</module>
<module>localanalysis</module>
+ <module>riskanalysis</module>
<module>safetyreq</module>
</modules>
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/META-INF/MANIFEST.MF b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/META-INF/MANIFEST.MF
index eb25091..d607a8a 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/META-INF/MANIFEST.MF
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.esf.riskanalysis.profile;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-ClassPath: .
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/build.properties b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/build.properties
index 4465407..f7cd8a9 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/build.properties
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/build.properties
@@ -6,5 +6,6 @@
plugin.xml,\
plugin.properties
jars.compile.order = .
-source.. = src/
+source.. = src/,\
+ src-gen/
output.. = bin/
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/plugin.properties b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/plugin.properties
index 4d85cc8..fc6ccf5 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/plugin.properties
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/plugin.properties
@@ -1,4 +1,4 @@
#
-pluginName = org.polarsys.esf.riskanalysis.profile
+pluginName = ESF RiskAnalysis profile
providerName = CEA LIST
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/plugin.xml b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/plugin.xml
index 1735e14..da7c3da 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/plugin.xml
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/plugin.xml
@@ -49,7 +49,5 @@
uri="http://www.polarsys.org/esf/0.7.0/RiskAnalysis">
</factory>
</extension>
-
-
</plugin>
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/pom.xml b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/pom.xml
index 88ad28b..d389e7a 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/pom.xml
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/pom.xml
@@ -17,7 +17,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.polarsys.esf</groupId>
<artifactId>esf-tools.analysis.riskanalysis</artifactId>
@@ -29,5 +29,4 @@
<packaging>eclipse-plugin</packaging>
<name>ESFRiskAnalysis profile</name>
<description>ESFRiskAnalysis profile description.</description>
-
</project>
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/.classpath b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/.classpath
index eca7bdb..075009d 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/.classpath
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/.classpath
@@ -2,6 +2,5 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/META-INF/MANIFEST.MF b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/META-INF/MANIFEST.MF
index fe50c10..1cf603f 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/META-INF/MANIFEST.MF
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/META-INF/MANIFEST.MF
@@ -1,8 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Table
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.esf.riskanalysis.table;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Automatic-Module-Name: org.polarsys.esf.riskanalysis.table
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.papyrus.infra.nattable
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/build.properties b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/build.properties
index adb4a6e..e367621 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/build.properties
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/build.properties
@@ -1,5 +1,10 @@
#
#Wed Mar 13 12:58:58 CET 2019
-bin.includes=META-INF/,.,tableConfiguration/,icons/,plugin.xml/
+bin.includes = META-INF/,\
+ .,\
+ tableConfiguration/,\
+ icons/,\
+ plugin.xml/,\
+ plugin.properties
output..=bin/
source..=src/
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/plugin.properties b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/plugin.properties
new file mode 100644
index 0000000..5caa1b8
--- /dev/null
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/plugin.properties
@@ -0,0 +1,4 @@
+#
+
+pluginName = ESF RiskAnalysis table
+providerName = CEA LIST
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.ui/META-INF/MANIFEST.MF b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.ui/META-INF/MANIFEST.MF
index a94af61..0447081 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.ui/META-INF/MANIFEST.MF
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.ui/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Ui
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.esf.riskanalysis.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Activator: org.polarsys.esf.riskanalysis.ui.Activator
-Bundle-Vendor: CEA LIST
+Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.uml2.uml;bundle-version="5.5.0",
@@ -15,3 +15,4 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.polarsys.esf.riskanalysis.ui
Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.ui/build.properties b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.ui/build.properties
index e9863e2..0dc34f7 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.ui/build.properties
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.ui/build.properties
@@ -2,4 +2,5 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ plugin.properties
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.ui/plugin.properties b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.ui/plugin.properties
new file mode 100644
index 0000000..394b6d4
--- /dev/null
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.ui/plugin.properties
@@ -0,0 +1,4 @@
+#
+
+pluginName = ESF RiskAnalysis UI
+providerName = CEA LIST
diff --git a/analysis/riskanalysis/pom.xml b/analysis/riskanalysis/pom.xml
new file mode 100644
index 0000000..6934b27
--- /dev/null
+++ b/analysis/riskanalysis/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <properties>
+ <year>2019</year>
+ <copyrightOwner>CEA LIST</copyrightOwner>
+ </properties>
+
+
+ <!-- PROJECT DESCRIPTION -->
+ <parent>
+ <groupId>org.polarsys.esf</groupId>
+ <artifactId>esf-tools.analysis</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.polarsys.esf</groupId>
+ <artifactId>esf-tools.analysis.riskanalysis</artifactId>
+ <packaging>pom</packaging>
+ <name>ESF Tools Risk Analysis</name>
+ <description>ESF Tools Risk Analysis description</description>
+
+ <!-- MODULES -->
+ <modules>
+ <module>org.polarsys.esf.riskanalysis.profile</module>
+ <module>org.polarsys.esf.riskanalysis.table</module>
+ <module>org.polarsys.esf.riskanalysis.ui</module>
+ <module>org.polarsys.esf.riskanalysis.releng</module>
+ </modules>
+
+</project>
diff --git a/p2/category.xml b/p2/category.xml
index 5a6613d..f211468 100644
--- a/p2/category.xml
+++ b/p2/category.xml
@@ -6,6 +6,9 @@
<feature id="org.polarsys.esf.localanalysis.releng" version="0.7.0.qualifier">
<category name="org.polarsys.esf.tools.category"/>
</feature>
+ <feature id="org.polarsys.esf.riskanalysis.releng" version="0.7.0.qualifier">
+ <category name="org.polarsys.esf.tools.category"/>
+ </feature>
<feature id="org.polarsys.esf.fmea.releng" version="0.7.0.qualifier">
<category name="org.polarsys.esf.tools.category"/>
</feature>
diff --git a/pom.xml b/pom.xml
index d751ba3..856effe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,8 +98,8 @@
</plugin>
<!-- Plugin used to check the license. -->
- <!-- NB: It's not configured to write the licence header automatically. -->
- <!-- Usage: mvn licence:check -->
+ <!-- NB: It's not configured to write the license header automatically. -->
+ <!-- Usage: mvn license:check -->
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
@@ -119,7 +119,10 @@
<exclude>**/target/**</exclude>
</excludes>
<properties>
- <year>2016</year>
+ <!-- year and owner are currenly not checked (first line has been removed from template) -->
+ <!-- check plugin seems to have problems handling white space in property variables -->
+ <year>2019</year>
+ <copyrightOwner>ALL4TEC & CEA LIST</copyrightOwner>
</properties>
</configuration>
<executions>
diff --git a/releng/licence/epl.header.txt b/releng/licence/epl.header.txt
index 771b821..57a645c 100644
--- a/releng/licence/epl.header.txt
+++ b/releng/licence/epl.header.txt
@@ -1,7 +1,6 @@
-Copyright (c) ${year} ALL4TEC & CEA LIST.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
https://www.eclipse.org/legal/epl-2.0/
-SPDX-License-Identifier: EPL-2.0
\ No newline at end of file
+SPDX-License-Identifier: EPL-2.0
