Merge pull request #9 from virtualsatellite/integration

Release 4.9.0 #3

.project

@@ -5,7 +5,13 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

de.dlr.sc.virsat.ide.branding.feature/.project

@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>

de.dlr.sc.virsat.ide.branding.feature/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

de.dlr.sc.virsat.ide.branding.feature/pom.xml

@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- *******************************************************************************
-     * Copyright (c) 2008-2019 German Aerospace Center (DLR), Simulation and Software Technology, Germany.
-     *
-     * This program and the accompanying materials are made available under the
-     * terms of the Eclipse Public License 2.0 which is available at
-     * http://www.eclipse.org/legal/epl-2.0.
-     *
-     * SPDX-License-Identifier: EPL-2.0
-     ******************************************************************************* -->
-<project>
-  <modelVersion>4.0.0</modelVersion>
+<!-- ******************************************************************************* 
+	* Copyright (c) 2008-2019 German Aerospace Center (DLR), Simulation and Software 
+	Technology, Germany. * * This program and the accompanying materials are 
+	made available under the * terms of the Eclipse Public License 2.0 which 
+	is available at * http://www.eclipse.org/legal/epl-2.0. * * SPDX-License-Identifier: 
+	EPL-2.0 ******************************************************************************* -->
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <relativePath>../maven/pom.xml</relativePath>
-    <groupId>de.dlr.sc.virsat</groupId>
-    <artifactId>de.dlr.sc.virsat.ide</artifactId>
-    <version>4.9.0-SNAPSHOT</version>
-  </parent>
+	<parent>
+		<relativePath>../maven/pom.xml</relativePath>
+		<groupId>de.dlr.sc.virsat.ide</groupId>
+		<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
+		<version>4.9.0-SNAPSHOT</version>
+	</parent>
 
-  <groupId>de.dlr.sc.virsat</groupId>
-  <artifactId>de.dlr.sc.virsat.ide.branding.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-
-  <version>4.9.0-SNAPSHOT</version>
-  <name>de.dlr.sc.virsat.ide.branding.feature</name>
+	<artifactId>de.dlr.sc.virsat.ide.branding.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+
+	<name>de.dlr.sc.virsat.ide.branding.feature</name>
 </project> 

de.dlr.sc.virsat.ide.branding.ui/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

de.dlr.sc.virsat.ide.branding.ui/.project

@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
@@ -15,8 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>

de.dlr.sc.virsat.ide.branding.ui/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+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

de.dlr.sc.virsat.ide.branding.ui/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

de.dlr.sc.virsat.ide.branding.ui/META-INF/MANIFEST.MF

@@ -4,8 +4,9 @@ Bundle-Name: VirSat Development IDE based on EPP RCP/RAP Bundle
 Bundle-SymbolicName: de.dlr.sc.virsat.ide.branding.ui;singleton:=true
 Bundle-Version: 4.9.0.qualifier
 Bundle-Vendor: DLR (German Aerospace Center)
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app
 Eclipse-BundleShape: dir
 Bundle-Localization: plugin
+Automatic-Module-Name: de.dlr.sc.virsat.ide.branding.ui

de.dlr.sc.virsat.ide.branding.ui/plugin.xml

@@ -15,18 +15,18 @@
          <property
                name="aboutText"
                value="Virtual Satellite IDE&#x0A;&#x0A;Copyright by DLR (German Aerospace Center) Simulation and Software Technology 2017.&#x0A;&#x0A;based on Eclipse for RCP and RAP Developers&#x0A;&#x0A;Version: {1}&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2017.  All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse&apos;s permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.&#x0A;&#x0A;This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/.">
-         </property>
-          <property
-               name="startupProgressRect"
-               value="72,90,251,8">
          </property>
          <property
                name="startupForegroundColor"
                value="9c9696">
+         </property>
+          <property
+               name="startupProgressRect"
+               value="5,280,230,15">
          </property>
          <property
                name="startupMessageRect"
-               value="72,110,251,20">
+               value="7,260,230,20">
          </property>
          <property
                name="aboutImage"

de.dlr.sc.virsat.ide.branding.ui/pom.xml

@@ -1,25 +1,23 @@
-<!-- *******************************************************************************
-     * Copyright (c) 2008-2019 German Aerospace Center (DLR), Simulation and Software Technology, Germany.
-     *
-     * This program and the accompanying materials are made available under the
-     * terms of the Eclipse Public License 2.0 which is available at
-     * http://www.eclipse.org/legal/epl-2.0.
-     *
-     * SPDX-License-Identifier: EPL-2.0
-     ******************************************************************************* -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ******************************************************************************* 
+	* Copyright (c) 2008-2019 German Aerospace Center (DLR), Simulation and Software 
+	Technology, Germany. * * This program and the accompanying materials are 
+	made available under the * terms of the Eclipse Public License 2.0 which 
+	is available at * http://www.eclipse.org/legal/epl-2.0. * * SPDX-License-Identifier: 
+	EPL-2.0 ******************************************************************************* -->
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
 	<parent>
-		<artifactId>de.dlr.sc.virsat.ide</artifactId>
-		<groupId>de.dlr.sc.virsat</groupId>
-		<version>4.9.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
+		<groupId>de.dlr.sc.virsat.ide</groupId>
+		<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
+		<version>4.9.0-SNAPSHOT</version>
 	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>de.dlr.sc.virsat</groupId>
+
 	<artifactId>de.dlr.sc.virsat.ide.branding.ui</artifactId>
 	<name>de.dlr.sc.virsat.ide.branding.ui</name>
-	<version>4.9.0-SNAPSHOT</version>
-
 	<packaging>eclipse-plugin</packaging>
 </project>

de.dlr.sc.virsat.ide.dependencies.feature/.project

@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>

de.dlr.sc.virsat.ide.dependencies.feature/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

de.dlr.sc.virsat.ide.dependencies.feature/feature.xml

@@ -66,4 +66,5 @@ by German Aerospace Center (DLR e.V.)
       <import feature="org.sonatype.tycho.m2e.feature" version="0.8.1.201704211436"/>
       <import feature="de.jcup.yamleditor" version="1.4.2"/>
    </requires>
+
 </feature>

de.dlr.sc.virsat.ide.dependencies.feature/pom.xml

@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- *******************************************************************************
-     * Copyright (c) 2008-2019 German Aerospace Center (DLR), Simulation and Software Technology, Germany.
-     *
-     * This program and the accompanying materials are made available under the
-     * terms of the Eclipse Public License 2.0 which is available at
-     * http://www.eclipse.org/legal/epl-2.0.
-     *
-     * SPDX-License-Identifier: EPL-2.0
-     ******************************************************************************* -->
-<project>
-  <modelVersion>4.0.0</modelVersion>
+<!-- ******************************************************************************* 
+	* Copyright (c) 2008-2019 German Aerospace Center (DLR), Simulation and Software 
+	Technology, Germany. * * This program and the accompanying materials are 
+	made available under the * terms of the Eclipse Public License 2.0 which 
+	is available at * http://www.eclipse.org/legal/epl-2.0. * * SPDX-License-Identifier: 
+	EPL-2.0 ******************************************************************************* -->
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <relativePath>../maven/pom.xml</relativePath>
-    <groupId>de.dlr.sc.virsat</groupId>
-    <artifactId>de.dlr.sc.virsat.ide</artifactId>
-    <version>4.9.0-SNAPSHOT</version>
-  </parent>
+	<parent>
+		<relativePath>../maven/pom.xml</relativePath>
+		<groupId>de.dlr.sc.virsat.ide</groupId>
+		<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
+		<version>4.9.0-SNAPSHOT</version>
+	</parent>
 
-  <groupId>de.dlr.sc.virsat</groupId>
-  <artifactId>de.dlr.sc.virsat.ide.dependencies.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-
-  <version>4.9.0-SNAPSHOT</version>
-  <name>de.dlr.sc.virsat.ide.dependencies.feature</name>
+	<artifactId>de.dlr.sc.virsat.ide.dependencies.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+
+	<name>de.dlr.sc.virsat.ide.dependencies.feature</name>
 </project> 

de.dlr.sc.virsat.ide.docs.feature/.project

@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>

de.dlr.sc.virsat.ide.docs.feature/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

de.dlr.sc.virsat.ide.docs.feature/pom.xml

@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- *******************************************************************************
-     * Copyright (c) 2008-2019 German Aerospace Center (DLR), Simulation and Software Technology, Germany.
-     *
-     * This program and the accompanying materials are made available under the
-     * terms of the Eclipse Public License 2.0 which is available at
-     * http://www.eclipse.org/legal/epl-2.0.
-     *
-     * SPDX-License-Identifier: EPL-2.0
-     ******************************************************************************* -->
-<project>
-  <modelVersion>4.0.0</modelVersion>
+<!-- ******************************************************************************* 
+	* Copyright (c) 2008-2019 German Aerospace Center (DLR), Simulation and Software 
+	Technology, Germany. * * This program and the accompanying materials are 
+	made available under the * terms of the Eclipse Public License 2.0 which 
+	is available at * http://www.eclipse.org/legal/epl-2.0. * * SPDX-License-Identifier: 
+	EPL-2.0 ******************************************************************************* -->
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <relativePath>../maven/pom.xml</relativePath>
-    <groupId>de.dlr.sc.virsat</groupId>
-    <artifactId>de.dlr.sc.virsat.ide</artifactId>
-    <version>4.9.0-SNAPSHOT</version>
-  </parent>
+	<parent>
+		<relativePath>../maven/pom.xml</relativePath>
+		<groupId>de.dlr.sc.virsat.ide</groupId>
+		<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
+		<version>4.9.0-SNAPSHOT</version>
+	</parent>
 
-  <groupId>de.dlr.sc.virsat</groupId>
-  <artifactId>de.dlr.sc.virsat.ide.docs.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-
-  <version>4.9.0-SNAPSHOT</version>
-  <name>de.dlr.sc.virsat.ide.docs.feature</name>
+	<artifactId>de.dlr.sc.virsat.ide.docs.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+
+	<name>de.dlr.sc.virsat.ide.docs.feature</name>
 </project> 

de.dlr.sc.virsat.ide.license.feature/.project

@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>

de.dlr.sc.virsat.ide.license.feature/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1