From 7d59957221934d0c85b19fc2fdc6980197e90a8f Mon Sep 17 00:00:00 2001
From: Thomas Schuetz
Date: Wed, 9 Jan 2013 18:41:58 +0100
Subject: [feature] added missing generator.config

---
 features/org.eclipse.etrice.feature/feature.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'features')

diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index 1a95bfce0..465973d87 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -287,4 +287,11 @@ http://www.eclipse.org/legal/epl-v10.html
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.etrice.generator.config"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
-- 
cgit v1.2.3


From 2190e9b214bffeb8c0abf2fe187dd3017df41214 Mon Sep 17 00:00:00 2001
From: Henrik Rentz-Reichert
Date: Thu, 31 Jan 2013 18:02:13 +0100
Subject: [feature] added abstractexec plugin

---
 features/org.eclipse.etrice.feature/feature.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'features')

diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index 465973d87..3b9c725cf 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -294,4 +294,11 @@ http://www.eclipse.org/legal/epl-v10.html
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.etrice.abstractexec.behavior"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
-- 
cgit v1.2.3


From 987548cc64559991d845038bd3807172a9509d13 Mon Sep 17 00:00:00 2001
From: Henrik Rentz-Reichert
Date: Fri, 15 Feb 2013 14:42:39 +0100
Subject: [layout.feature] added separate feature for layout

---
 .../org.eclipse.etrice.layout.feature/.project     |  17 +++++
 .../org.eclipse.etrice.layout.feature/about.html   |  28 +++++++++
 .../org.eclipse.etrice.layout.feature/about.ini    |  15 +++++
 .../about.mappings                                 |   6 ++
 .../about.properties                               |  28 +++++++++
 .../build.properties                               |   8 +++
 .../feature.properties                             |   4 ++
 .../org.eclipse.etrice.layout.feature/feature.xml  |  70 +++++++++++++++++++++
 .../modeling32.png                                 | Bin 0 -> 2414 bytes
 .../org.eclipse.etrice.tests.feature/feature.xml   |   2 +-
 plugins/org.eclipse.etrice.ui.layout/.gitignore    |   1 +
 .../META-INF/MANIFEST.MF                           |   6 +-
 releng/org.eclipse.etrice.releng/buckminster.cspec |   4 +-
 releng/org.eclipse.etrice.site/feature.xml         |   4 ++
 14 files changed, 187 insertions(+), 6 deletions(-)
 create mode 100644 features/org.eclipse.etrice.layout.feature/.project
 create mode 100644 features/org.eclipse.etrice.layout.feature/about.html
 create mode 100644 features/org.eclipse.etrice.layout.feature/about.ini
 create mode 100644 features/org.eclipse.etrice.layout.feature/about.mappings
 create mode 100644 features/org.eclipse.etrice.layout.feature/about.properties
 create mode 100644 features/org.eclipse.etrice.layout.feature/build.properties
 create mode 100644 features/org.eclipse.etrice.layout.feature/feature.properties
 create mode 100644 features/org.eclipse.etrice.layout.feature/feature.xml
 create mode 100644 features/org.eclipse.etrice.layout.feature/modeling32.png
 create mode 100644 plugins/org.eclipse.etrice.ui.layout/.gitignore

(limited to 'features')

diff --git a/features/org.eclipse.etrice.layout.feature/.project b/features/org.eclipse.etrice.layout.feature/.project
new file mode 100644
index 000000000..7380684df
--- /dev/null
+++ b/features/org.eclipse.etrice.layout.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.etrice.layout.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/org.eclipse.etrice.layout.feature/about.html b/features/org.eclipse.etrice.layout.feature/about.html
new file mode 100644
index 000000000..82d49bf5f
--- /dev/null
+++ b/features/org.eclipse.etrice.layout.feature/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/features/org.eclipse.etrice.layout.feature/about.ini b/features/org.eclipse.etrice.layout.feature/about.ini
new file mode 100644
index 000000000..80baac0c3
--- /dev/null
+++ b/features/org.eclipse.etrice.layout.feature/about.ini
@@ -0,0 +1,15 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%featureText
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=modeling32.png
+
+# Property "appName" contains name of the application (translated)
+appName=%featureName
+
diff --git a/features/org.eclipse.etrice.layout.feature/about.mappings b/features/org.eclipse.etrice.layout.feature/about.mappings
new file mode 100644
index 000000000..720ca870f
--- /dev/null
+++ b/features/org.eclipse.etrice.layout.feature/about.mappings
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
diff --git a/features/org.eclipse.etrice.layout.feature/about.properties b/features/org.eclipse.etrice.layout.feature/about.properties
new file mode 100644
index 000000000..c810e122e
--- /dev/null
+++ b/features/org.eclipse.etrice.layout.feature/about.properties
@@ -0,0 +1,28 @@
+# NLS_MESSAGEFORMAT_VAR
+
+# ==============================================================================
+# Do not change the properties between this line and the last line containing:
+# %%% END OF TRANSLATED PROPERTIES %%%
+# Instead, either redefine an existing property, or create a new property,
+# append it to the end of the file, and change the code to use the new name.
+# ==============================================================================
+
+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
+
+featureName=eTrice Layout 
+
+featureText=eTrice Layout \n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright Eclipse contributors and others. 2010-2013.  All rights reserved.\n\
+Visit http://www.eclipse.org/etrice
+
+# ==============================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# The above properties have been shipped for translation.
+# ==============================================================================
diff --git a/features/org.eclipse.etrice.layout.feature/build.properties b/features/org.eclipse.etrice.layout.feature/build.properties
new file mode 100644
index 000000000..19528f302
--- /dev/null
+++ b/features/org.eclipse.etrice.layout.feature/build.properties
@@ -0,0 +1,8 @@
+bin.includes = feature.xml,\
+               about.html,\
+               about.ini,\
+               about.mappings,\
+               about.properties,\
+               build.properties,\
+               feature.properties,\
+               modeling32.png
diff --git a/features/org.eclipse.etrice.layout.feature/feature.properties b/features/org.eclipse.etrice.layout.feature/feature.properties
new file mode 100644
index 000000000..eb8b11684
--- /dev/null
+++ b/features/org.eclipse.etrice.layout.feature/feature.properties
@@ -0,0 +1,4 @@
+featureName=eTrice 
+# "providerName" property - name of the company that provides the feature
+providerName=eTrice (Incubation)
+description= eTrice layouter for structure and behavior diagrams
diff --git a/features/org.eclipse.etrice.layout.feature/feature.xml b/features/org.eclipse.etrice.layout.feature/feature.xml
new file mode 100644
index 000000000..fa20d0af4
--- /dev/null
+++ b/features/org.eclipse.etrice.layout.feature/feature.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    <copyright>
+   
+    Copyright (c) 2010 - 2013 Protos Software GmbH.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+       Henrik Rentz-Reichert
+   
+    </copyright>
+   
+ -->
+<feature
+      id="org.eclipse.etrice.layout.feature"
+      label="%featureName"
+      version="0.3.0.qualifier"
+      provider-name="%providerName"
+      plugin="org.eclipse.etrice.core.room.ui"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      (c) 2010 - 2011 Protos Software GmbH.
+All rights reserved.   This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <requires>
+      <import plugin="org.eclipse.graphiti" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.graphiti.ui" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.gef" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.transaction" version="1.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="com.google.guava" version="8.0.0" match="greaterOrEqual"/>
+      <import plugin="de.cau.cs.kieler.kiml.graphiti" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.behavior" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.structure" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.common" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.room" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="de.cau.cs.kieler.core" version="0.8.0" match="greaterOrEqual"/>
+      <import plugin="de.cau.cs.kieler.core.kgraph" version="0.4.1" match="greaterOrEqual"/>
+      <import plugin="de.cau.cs.kieler.kiml.ui" version="0.7.1" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.etrice.ui.layout"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.etrice.layout.feature/modeling32.png b/features/org.eclipse.etrice.layout.feature/modeling32.png
new file mode 100644
index 000000000..6b08de2ad
Binary files /dev/null and b/features/org.eclipse.etrice.layout.feature/modeling32.png differ
diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml
index d1b87313f..4d2e21a2e 100644
--- a/features/org.eclipse.etrice.tests.feature/feature.xml
+++ b/features/org.eclipse.etrice.tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.etrice.tests.feature"
       label="%featureName"
-      version="0.2.0.qualifier"
+      version="0.3.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/plugins/org.eclipse.etrice.ui.layout/.gitignore b/plugins/org.eclipse.etrice.ui.layout/.gitignore
new file mode 100644
index 000000000..092357e47
--- /dev/null
+++ b/plugins/org.eclipse.etrice.ui.layout/.gitignore
@@ -0,0 +1 @@
+bin
diff --git a/plugins/org.eclipse.etrice.ui.layout/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.layout/META-INF/MANIFEST.MF
index a9921f03a..63cd8e41f 100644
--- a/plugins/org.eclipse.etrice.ui.layout/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.layout/META-INF/MANIFEST.MF
@@ -12,9 +12,9 @@ Require-Bundle: org.eclipse.graphiti;bundle-version="0.8.1",
  org.eclipse.ui.ide;bundle-version="3.5.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.0",
  com.google.guava;bundle-version="8.0.0",
- de.cau.cs.kieler.core,
- de.cau.cs.kieler.core.kgraph,
- de.cau.cs.kieler.kiml.ui,
+ de.cau.cs.kieler.core;bundle-version="0.8.0",
+ de.cau.cs.kieler.core.kgraph;bundle-version="0.4.1",
+ de.cau.cs.kieler.kiml.ui;bundle-version="0.7.1",
  de.cau.cs.kieler.kiml.graphiti;bundle-version="0.2.0",
  org.eclipse.etrice.ui.behavior;bundle-version="0.2.0",
  org.eclipse.etrice.ui.structure;bundle-version="0.2.0",
diff --git a/releng/org.eclipse.etrice.releng/buckminster.cspec b/releng/org.eclipse.etrice.releng/buckminster.cspec
index 99c4aa091..9b0ae0368 100644
--- a/releng/org.eclipse.etrice.releng/buckminster.cspec
+++ b/releng/org.eclipse.etrice.releng/buckminster.cspec
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.releng" componentType="buckminster" version="0.3.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.releng" componentType="buckminster" version="0.3.0.qualifier">
     <cs:dependencies>
         <cs:dependency name="org.eclipse.etrice.feature" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.etrice.generator.c.tests" componentType="buckminster"/>
@@ -13,6 +12,7 @@
         <cs:dependency name="org.eclipse.etrice.site" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.etrice.tests.feature" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.etrice.tutorials.java" componentType="buckminster"/>
+        <cs:dependency name="org.eclipse.etrice.layout.feature" componentType="eclipse.feature"/>
     </cs:dependencies>
     <cs:actions>
         <cs:public name="copy.sites" actor="ant">
diff --git a/releng/org.eclipse.etrice.site/feature.xml b/releng/org.eclipse.etrice.site/feature.xml
index 532614cce..56aaefcfb 100644
--- a/releng/org.eclipse.etrice.site/feature.xml
+++ b/releng/org.eclipse.etrice.site/feature.xml
@@ -37,4 +37,8 @@ http://www.eclipse.org/legal/epl-v10.html
          id="org.eclipse.etrice.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.etrice.layout.feature"
+         version="0.0.0"/>
+
 </feature>
-- 
cgit v1.2.3


From a31af05c66911e01a8531289e09de98c74aee35d Mon Sep 17 00:00:00 2001
From: Henrik Rentz-Reichert
Date: Mon, 4 Mar 2013 13:24:17 +0100
Subject: [features] added KIELER feature with update site at eclipse.org

replaced modeling with eTrice icons in features---
 features/org.eclipse.etrice.feature/about.ini      |   2 +-
 features/org.eclipse.etrice.feature/eTrice32.png   | Bin 0 -> 955 bytes
 features/org.eclipse.etrice.feature/feature.xml    |   4 ++
 features/org.eclipse.etrice.feature/modeling32.png | Bin 2414 -> 0 bytes
 .../org.eclipse.etrice.kieler.feature/.project     |  17 +++++
 .../org.eclipse.etrice.kieler.feature/about.html   |  28 ++++++++
 .../org.eclipse.etrice.kieler.feature/about.ini    |  15 ++++
 .../about.mappings                                 |   6 ++
 .../about.properties                               |  28 ++++++++
 .../build.properties                               |   7 ++
 .../org.eclipse.etrice.kieler.feature/eTrice32.png | Bin 0 -> 955 bytes
 .../feature.properties                             |   4 ++
 .../org.eclipse.etrice.kieler.feature/feature.xml  |  80 +++++++++++++++++++++
 .../org.eclipse.etrice.layout.feature/about.ini    |   2 +-
 .../org.eclipse.etrice.layout.feature/eTrice32.png | Bin 0 -> 955 bytes
 .../org.eclipse.etrice.layout.feature/feature.xml  |   8 +--
 .../modeling32.png                                 | Bin 2414 -> 0 bytes
 .../org.eclipse.etrice.tests.feature/about.ini     |   2 +-
 .../org.eclipse.etrice.tests.feature/eTrice32.png  | Bin 0 -> 955 bytes
 .../modeling32.png                                 | Bin 2414 -> 0 bytes
 plugins/org.eclipse.etrice.core.room.ui/about.ini  |   2 +-
 .../org.eclipse.etrice.core.room.ui/eTrice32.png   | Bin 0 -> 955 bytes
 .../org.eclipse.etrice.core.room.ui/modeling32.png | Bin 2414 -> 0 bytes
 23 files changed, 197 insertions(+), 8 deletions(-)
 create mode 100644 features/org.eclipse.etrice.feature/eTrice32.png
 delete mode 100644 features/org.eclipse.etrice.feature/modeling32.png
 create mode 100644 features/org.eclipse.etrice.kieler.feature/.project
 create mode 100644 features/org.eclipse.etrice.kieler.feature/about.html
 create mode 100644 features/org.eclipse.etrice.kieler.feature/about.ini
 create mode 100644 features/org.eclipse.etrice.kieler.feature/about.mappings
 create mode 100644 features/org.eclipse.etrice.kieler.feature/about.properties
 create mode 100644 features/org.eclipse.etrice.kieler.feature/build.properties
 create mode 100644 features/org.eclipse.etrice.kieler.feature/eTrice32.png
 create mode 100644 features/org.eclipse.etrice.kieler.feature/feature.properties
 create mode 100644 features/org.eclipse.etrice.kieler.feature/feature.xml
 create mode 100644 features/org.eclipse.etrice.layout.feature/eTrice32.png
 delete mode 100644 features/org.eclipse.etrice.layout.feature/modeling32.png
 create mode 100644 features/org.eclipse.etrice.tests.feature/eTrice32.png
 delete mode 100644 features/org.eclipse.etrice.tests.feature/modeling32.png
 create mode 100644 plugins/org.eclipse.etrice.core.room.ui/eTrice32.png
 delete mode 100644 plugins/org.eclipse.etrice.core.room.ui/modeling32.png

(limited to 'features')

diff --git a/features/org.eclipse.etrice.feature/about.ini b/features/org.eclipse.etrice.feature/about.ini
index 80baac0c3..1db854929 100644
--- a/features/org.eclipse.etrice.feature/about.ini
+++ b/features/org.eclipse.etrice.feature/about.ini
@@ -8,7 +8,7 @@
 aboutText=%featureText
 
 # Property "featureImage" contains path to feature image (32x32)
-featureImage=modeling32.png
+featureImage=eTrice32.png
 
 # Property "appName" contains name of the application (translated)
 appName=%featureName
diff --git a/features/org.eclipse.etrice.feature/eTrice32.png b/features/org.eclipse.etrice.feature/eTrice32.png
new file mode 100644
index 000000000..1670cce38
Binary files /dev/null and b/features/org.eclipse.etrice.feature/eTrice32.png differ
diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index 3b9c725cf..b8b627690 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -36,6 +36,10 @@ which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html
    </copyright>
 
+   <includes
+         id="org.eclipse.etrice.layout.feature"
+         version="0.0.0"/>
+
    <requires>
       <import plugin="org.eclipse.emf.ecore" version="2.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.common" version="2.6.0" match="greaterOrEqual"/>
diff --git a/features/org.eclipse.etrice.feature/modeling32.png b/features/org.eclipse.etrice.feature/modeling32.png
deleted file mode 100644
index 6b08de2ad..000000000
Binary files a/features/org.eclipse.etrice.feature/modeling32.png and /dev/null differ
diff --git a/features/org.eclipse.etrice.kieler.feature/.project b/features/org.eclipse.etrice.kieler.feature/.project
new file mode 100644
index 000000000..171755304
--- /dev/null
+++ b/features/org.eclipse.etrice.kieler.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.etrice.kieler.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/org.eclipse.etrice.kieler.feature/about.html b/features/org.eclipse.etrice.kieler.feature/about.html
new file mode 100644
index 000000000..82d49bf5f
--- /dev/null
+++ b/features/org.eclipse.etrice.kieler.feature/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/features/org.eclipse.etrice.kieler.feature/about.ini b/features/org.eclipse.etrice.kieler.feature/about.ini
new file mode 100644
index 000000000..1db854929
--- /dev/null
+++ b/features/org.eclipse.etrice.kieler.feature/about.ini
@@ -0,0 +1,15 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%featureText
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=eTrice32.png
+
+# Property "appName" contains name of the application (translated)
+appName=%featureName
+
diff --git a/features/org.eclipse.etrice.kieler.feature/about.mappings b/features/org.eclipse.etrice.kieler.feature/about.mappings
new file mode 100644
index 000000000..720ca870f
--- /dev/null
+++ b/features/org.eclipse.etrice.kieler.feature/about.mappings
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
diff --git a/features/org.eclipse.etrice.kieler.feature/about.properties b/features/org.eclipse.etrice.kieler.feature/about.properties
new file mode 100644
index 000000000..c810e122e
--- /dev/null
+++ b/features/org.eclipse.etrice.kieler.feature/about.properties
@@ -0,0 +1,28 @@
+# NLS_MESSAGEFORMAT_VAR
+
+# ==============================================================================
+# Do not change the properties between this line and the last line containing:
+# %%% END OF TRANSLATED PROPERTIES %%%
+# Instead, either redefine an existing property, or create a new property,
+# append it to the end of the file, and change the code to use the new name.
+# ==============================================================================
+
+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
+
+featureName=eTrice Layout 
+
+featureText=eTrice Layout \n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright Eclipse contributors and others. 2010-2013.  All rights reserved.\n\
+Visit http://www.eclipse.org/etrice
+
+# ==============================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# The above properties have been shipped for translation.
+# ==============================================================================
diff --git a/features/org.eclipse.etrice.kieler.feature/build.properties b/features/org.eclipse.etrice.kieler.feature/build.properties
new file mode 100644
index 000000000..b78681a6c
--- /dev/null
+++ b/features/org.eclipse.etrice.kieler.feature/build.properties
@@ -0,0 +1,7 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               eTrice32.png,\
+               about.properties,\
+               about.mappings,\
+               about.ini,\
+               about.html
diff --git a/features/org.eclipse.etrice.kieler.feature/eTrice32.png b/features/org.eclipse.etrice.kieler.feature/eTrice32.png
new file mode 100644
index 000000000..1670cce38
Binary files /dev/null and b/features/org.eclipse.etrice.kieler.feature/eTrice32.png differ
diff --git a/features/org.eclipse.etrice.kieler.feature/feature.properties b/features/org.eclipse.etrice.kieler.feature/feature.properties
new file mode 100644
index 000000000..511708f5b
--- /dev/null
+++ b/features/org.eclipse.etrice.kieler.feature/feature.properties
@@ -0,0 +1,4 @@
+featureName=eTrice 
+# "providerName" property - name of the company that provides the feature
+providerName=eTrice (Incubation)
+description= eTrice feature for KIELER plug-ins
diff --git a/features/org.eclipse.etrice.kieler.feature/feature.xml b/features/org.eclipse.etrice.kieler.feature/feature.xml
new file mode 100644
index 000000000..23bb20648
--- /dev/null
+++ b/features/org.eclipse.etrice.kieler.feature/feature.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.etrice.kieler.feature"
+      label="KIELER"
+      version="0.0.3.qualifier"
+      provider-name="eTrice (incubation)">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <url>
+      <update label="KIELER" url="http://download.eclipse.org/etrice/KIELER/kieler-0.7.1"/>
+   </url>
+
+   <plugin
+         id="de.cau.cs.kieler.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="de.cau.cs.kieler.kiml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="de.cau.cs.kieler.kiml.graphiti"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="de.cau.cs.kieler.kiml.graphviz.dot"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="de.cau.cs.kieler.core.kgraph"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="de.cau.cs.kieler.kiml.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="de.cau.cs.kieler.kiml.service"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="de.cau.cs.kieler.kiml.graphviz.layouter"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.etrice.layout.feature/about.ini b/features/org.eclipse.etrice.layout.feature/about.ini
index 80baac0c3..1db854929 100644
--- a/features/org.eclipse.etrice.layout.feature/about.ini
+++ b/features/org.eclipse.etrice.layout.feature/about.ini
@@ -8,7 +8,7 @@
 aboutText=%featureText
 
 # Property "featureImage" contains path to feature image (32x32)
-featureImage=modeling32.png
+featureImage=eTrice32.png
 
 # Property "appName" contains name of the application (translated)
 appName=%featureName
diff --git a/features/org.eclipse.etrice.layout.feature/eTrice32.png b/features/org.eclipse.etrice.layout.feature/eTrice32.png
new file mode 100644
index 000000000..1670cce38
Binary files /dev/null and b/features/org.eclipse.etrice.layout.feature/eTrice32.png differ
diff --git a/features/org.eclipse.etrice.layout.feature/feature.xml b/features/org.eclipse.etrice.layout.feature/feature.xml
index fa20d0af4..b25add670 100644
--- a/features/org.eclipse.etrice.layout.feature/feature.xml
+++ b/features/org.eclipse.etrice.layout.feature/feature.xml
@@ -40,6 +40,10 @@ http://www.eclipse.org/legal/epl-v10.html
       [Enter License Description here.]
    </license>
 
+   <includes
+         id="org.eclipse.etrice.kieler.feature"
+         version="0.0.0"/>
+
    <requires>
       <import plugin="org.eclipse.graphiti" version="0.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.graphiti.ui" version="0.8.1" match="greaterOrEqual"/>
@@ -50,14 +54,10 @@ http://www.eclipse.org/legal/epl-v10.html
       <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="com.google.guava" version="8.0.0" match="greaterOrEqual"/>
-      <import plugin="de.cau.cs.kieler.kiml.graphiti" version="0.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.etrice.ui.behavior" version="0.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.etrice.ui.structure" version="0.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.etrice.ui.common" version="0.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.etrice.core.room" version="0.2.0" match="greaterOrEqual"/>
-      <import plugin="de.cau.cs.kieler.core" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="de.cau.cs.kieler.core.kgraph" version="0.4.1" match="greaterOrEqual"/>
-      <import plugin="de.cau.cs.kieler.kiml.ui" version="0.7.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.etrice.layout.feature/modeling32.png b/features/org.eclipse.etrice.layout.feature/modeling32.png
deleted file mode 100644
index 6b08de2ad..000000000
Binary files a/features/org.eclipse.etrice.layout.feature/modeling32.png and /dev/null differ
diff --git a/features/org.eclipse.etrice.tests.feature/about.ini b/features/org.eclipse.etrice.tests.feature/about.ini
index 80baac0c3..1db854929 100644
--- a/features/org.eclipse.etrice.tests.feature/about.ini
+++ b/features/org.eclipse.etrice.tests.feature/about.ini
@@ -8,7 +8,7 @@
 aboutText=%featureText
 
 # Property "featureImage" contains path to feature image (32x32)
-featureImage=modeling32.png
+featureImage=eTrice32.png
 
 # Property "appName" contains name of the application (translated)
 appName=%featureName
diff --git a/features/org.eclipse.etrice.tests.feature/eTrice32.png b/features/org.eclipse.etrice.tests.feature/eTrice32.png
new file mode 100644
index 000000000..1670cce38
Binary files /dev/null and b/features/org.eclipse.etrice.tests.feature/eTrice32.png differ
diff --git a/features/org.eclipse.etrice.tests.feature/modeling32.png b/features/org.eclipse.etrice.tests.feature/modeling32.png
deleted file mode 100644
index 6b08de2ad..000000000
Binary files a/features/org.eclipse.etrice.tests.feature/modeling32.png and /dev/null differ
diff --git a/plugins/org.eclipse.etrice.core.room.ui/about.ini b/plugins/org.eclipse.etrice.core.room.ui/about.ini
index 80baac0c3..1db854929 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/about.ini
+++ b/plugins/org.eclipse.etrice.core.room.ui/about.ini
@@ -8,7 +8,7 @@
 aboutText=%featureText
 
 # Property "featureImage" contains path to feature image (32x32)
-featureImage=modeling32.png
+featureImage=eTrice32.png
 
 # Property "appName" contains name of the application (translated)
 appName=%featureName
diff --git a/plugins/org.eclipse.etrice.core.room.ui/eTrice32.png b/plugins/org.eclipse.etrice.core.room.ui/eTrice32.png
new file mode 100644
index 000000000..1670cce38
Binary files /dev/null and b/plugins/org.eclipse.etrice.core.room.ui/eTrice32.png differ
diff --git a/plugins/org.eclipse.etrice.core.room.ui/modeling32.png b/plugins/org.eclipse.etrice.core.room.ui/modeling32.png
deleted file mode 100644
index 6b08de2ad..000000000
Binary files a/plugins/org.eclipse.etrice.core.room.ui/modeling32.png and /dev/null differ
-- 
cgit v1.2.3


From 9a1648f646fe8ecfb1b21b2d6e00e89369b51ef9 Mon Sep 17 00:00:00 2001
From: Henrik Rentz-Reichert
Date: Tue, 5 Mar 2013 11:36:48 +0100
Subject: [features] turned containments into dependencies

---
 features/org.eclipse.etrice.feature/feature.xml    |   5 +-
 .../org.eclipse.etrice.kieler.feature/feature.xml  | 110 +++++++++++++++++++--
 .../org.eclipse.etrice.layout.feature/feature.xml  |   5 +-
 3 files changed, 104 insertions(+), 16 deletions(-)

(limited to 'features')

diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index b8b627690..f35049d82 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -36,10 +36,6 @@ which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html
    </copyright>
 
-   <includes
-         id="org.eclipse.etrice.layout.feature"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.emf.ecore" version="2.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.common" version="2.6.0" match="greaterOrEqual"/>
@@ -113,6 +109,7 @@ http://www.eclipse.org/legal/epl-v10.html
       <import plugin="org.hamcrest.core"/>
       <import plugin="org.eclipse.xtext.common.types.ui" version="2.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.ui.codetemplates.ui" version="2.1.1" match="greaterOrEqual"/>
+      <import feature="org.eclipse.etrice.layout.feature" version="0.3.0.qualifier"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.etrice.kieler.feature/feature.xml b/features/org.eclipse.etrice.kieler.feature/feature.xml
index 23bb20648..e07cc8f43 100644
--- a/features/org.eclipse.etrice.kieler.feature/feature.xml
+++ b/features/org.eclipse.etrice.kieler.feature/feature.xml
@@ -2,19 +2,113 @@
 <feature
       id="org.eclipse.etrice.kieler.feature"
       label="KIELER"
-      version="0.0.3.qualifier"
-      provider-name="eTrice (incubation)">
+      version="0.3.0.qualifier"
+      provider-name="eTrice (Incubation)">
 
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+   <description>
+      %description
    </description>
 
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      (c) 2010 - 2013 Protos Software GmbH.
+All rights reserved.   This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+Copyright for the referenced plug-ins
+(c) 2013 Christian-Albrechts-University of Kiel / Department of Computer Science / Real-Time and Embedded Systems Group
    </copyright>
 
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
+   <license url="http://www.eclipse.org/legal/epl-v10.html">
+      Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+&quot;Contribution&quot; means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor&apos;s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+&quot;Contributor&quot; means any person or entity that distributes the Program.
+
+&quot;Licensed Patents&quot; mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+&quot;Program&quot; means the Contributions distributed in accordance with this Agreement.
+
+&quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient&apos;s responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor&apos;s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient&apos;s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
    </license>
 
    <url>
diff --git a/features/org.eclipse.etrice.layout.feature/feature.xml b/features/org.eclipse.etrice.layout.feature/feature.xml
index b25add670..282fcb0d7 100644
--- a/features/org.eclipse.etrice.layout.feature/feature.xml
+++ b/features/org.eclipse.etrice.layout.feature/feature.xml
@@ -40,10 +40,6 @@ http://www.eclipse.org/legal/epl-v10.html
       [Enter License Description here.]
    </license>
 
-   <includes
-         id="org.eclipse.etrice.kieler.feature"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.graphiti" version="0.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.graphiti.ui" version="0.8.1" match="greaterOrEqual"/>
@@ -58,6 +54,7 @@ http://www.eclipse.org/legal/epl-v10.html
       <import plugin="org.eclipse.etrice.ui.structure" version="0.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.etrice.ui.common" version="0.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.etrice.core.room" version="0.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.etrice.kieler.feature" version="0.0.3.qualifier"/>
    </requires>
 
    <plugin
-- 
cgit v1.2.3


From acac1e7e6191a7459f9c1bee5901ee24a2e0d33e Mon Sep 17 00:00:00 2001
From: Henrik Rentz-Reichert
Date: Tue, 5 Mar 2013 12:52:58 +0100
Subject: [layout.feature] include kieler rather then adding dependency

---
 features/org.eclipse.etrice.layout.feature/feature.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'features')

diff --git a/features/org.eclipse.etrice.layout.feature/feature.xml b/features/org.eclipse.etrice.layout.feature/feature.xml
index 282fcb0d7..b25add670 100644
--- a/features/org.eclipse.etrice.layout.feature/feature.xml
+++ b/features/org.eclipse.etrice.layout.feature/feature.xml
@@ -40,6 +40,10 @@ http://www.eclipse.org/legal/epl-v10.html
       [Enter License Description here.]
    </license>
 
+   <includes
+         id="org.eclipse.etrice.kieler.feature"
+         version="0.0.0"/>
+
    <requires>
       <import plugin="org.eclipse.graphiti" version="0.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.graphiti.ui" version="0.8.1" match="greaterOrEqual"/>
@@ -54,7 +58,6 @@ http://www.eclipse.org/legal/epl-v10.html
       <import plugin="org.eclipse.etrice.ui.structure" version="0.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.etrice.ui.common" version="0.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.etrice.core.room" version="0.2.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.etrice.kieler.feature" version="0.0.3.qualifier"/>
    </requires>
 
    <plugin
-- 
cgit v1.2.3


From 0cfb582b70f84448b8551bdea4e432e27a71bafb Mon Sep 17 00:00:00 2001
From: Henrik Rentz-Reichert
Date: Tue, 5 Mar 2013 17:24:31 +0100
Subject: [site] added KIELER to site

---
 features/org.eclipse.etrice.layout.feature/feature.xml | 5 +----
 releng/org.eclipse.etrice.site/feature.xml             | 5 +++++
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'features')

diff --git a/features/org.eclipse.etrice.layout.feature/feature.xml b/features/org.eclipse.etrice.layout.feature/feature.xml
index b25add670..9f12dbb37 100644
--- a/features/org.eclipse.etrice.layout.feature/feature.xml
+++ b/features/org.eclipse.etrice.layout.feature/feature.xml
@@ -40,10 +40,6 @@ http://www.eclipse.org/legal/epl-v10.html
       [Enter License Description here.]
    </license>
 
-   <includes
-         id="org.eclipse.etrice.kieler.feature"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.graphiti" version="0.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.graphiti.ui" version="0.8.1" match="greaterOrEqual"/>
@@ -58,6 +54,7 @@ http://www.eclipse.org/legal/epl-v10.html
       <import plugin="org.eclipse.etrice.ui.structure" version="0.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.etrice.ui.common" version="0.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.etrice.core.room" version="0.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.etrice.kieler.feature" version="0.3.0.qualifier"/>
    </requires>
 
    <plugin
diff --git a/releng/org.eclipse.etrice.site/feature.xml b/releng/org.eclipse.etrice.site/feature.xml
index 56aaefcfb..59a4c2fc0 100644
--- a/releng/org.eclipse.etrice.site/feature.xml
+++ b/releng/org.eclipse.etrice.site/feature.xml
@@ -31,6 +31,7 @@ http://www.eclipse.org/legal/epl-v10.html
 
    <url>
       <update url="http://www.eclipse.org/downloads/download.php?file=/etrice/updates/0.1.0/&amp;protocol=http&amp;format=xml"/>
+      <discovery label="KIELER provided by eTrice" url="http://download.eclipse.org/etrice/KIELER/kieler-0.7.1"/>
    </url>
 
    <includes
@@ -41,4 +42,8 @@ http://www.eclipse.org/legal/epl-v10.html
          id="org.eclipse.etrice.layout.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.etrice.kieler.feature"
+         version="0.0.0"/>
+
 </feature>
-- 
cgit v1.2.3


From e40615243bd8c5e535b6c138b5fb5e8b7d83c0ef Mon Sep 17 00:00:00 2001
From: Henrik Rentz-Reichert
Date: Tue, 5 Mar 2013 17:31:36 +0100
Subject: [layout.feature] changed feature name

---
 features/org.eclipse.etrice.layout.feature/feature.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'features')

diff --git a/features/org.eclipse.etrice.layout.feature/feature.properties b/features/org.eclipse.etrice.layout.feature/feature.properties
index eb8b11684..f5e16b883 100644
--- a/features/org.eclipse.etrice.layout.feature/feature.properties
+++ b/features/org.eclipse.etrice.layout.feature/feature.properties
@@ -1,4 +1,4 @@
-featureName=eTrice 
+featureName=eTrice Layout Feature
 # "providerName" property - name of the company that provides the feature
 providerName=eTrice (Incubation)
 description= eTrice layouter for structure and behavior diagrams
-- 
cgit v1.2.3


From 37ef33890f89ce8affdbf52d02208c79191c7b9c Mon Sep 17 00:00:00 2001
From: Henrik Rentz-Reichert
Date: Tue, 5 Mar 2013 18:18:56 +0100
Subject: [*.feature] include eTrice32.png in build

---
 features/org.eclipse.etrice.feature/build.properties        | 3 ++-
 features/org.eclipse.etrice.layout.feature/build.properties | 3 ++-
 features/org.eclipse.etrice.layout.feature/feature.xml      | 4 ++--
 features/org.eclipse.etrice.tests.feature/build.properties  | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'features')

diff --git a/features/org.eclipse.etrice.feature/build.properties b/features/org.eclipse.etrice.feature/build.properties
index 087cbe3c5..8e7a7ca1c 100644
--- a/features/org.eclipse.etrice.feature/build.properties
+++ b/features/org.eclipse.etrice.feature/build.properties
@@ -5,5 +5,6 @@ bin.includes = about.html,\
                about.properties,\
                feature.xml,\
                feature.properties,\
-               modeling32.png
+               modeling32.png,\
+               eTrice32.png
 sourcePlugin = true
diff --git a/features/org.eclipse.etrice.layout.feature/build.properties b/features/org.eclipse.etrice.layout.feature/build.properties
index 19528f302..16b118c53 100644
--- a/features/org.eclipse.etrice.layout.feature/build.properties
+++ b/features/org.eclipse.etrice.layout.feature/build.properties
@@ -5,4 +5,5 @@ bin.includes = feature.xml,\
                about.properties,\
                build.properties,\
                feature.properties,\
-               modeling32.png
+               modeling32.png,\
+               eTrice32.png
diff --git a/features/org.eclipse.etrice.layout.feature/feature.xml b/features/org.eclipse.etrice.layout.feature/feature.xml
index 9f12dbb37..bd4538f96 100644
--- a/features/org.eclipse.etrice.layout.feature/feature.xml
+++ b/features/org.eclipse.etrice.layout.feature/feature.xml
@@ -23,8 +23,8 @@
       license-feature="org.eclipse.license"
       license-feature-version="1.0.0.qualifier">
 
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+   <description>
+      %description
    </description>
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
diff --git a/features/org.eclipse.etrice.tests.feature/build.properties b/features/org.eclipse.etrice.tests.feature/build.properties
index 6ea0d73ca..4811c0105 100644
--- a/features/org.eclipse.etrice.tests.feature/build.properties
+++ b/features/org.eclipse.etrice.tests.feature/build.properties
@@ -11,6 +11,7 @@ bin.includes = plugin.xml,\
                feature.xml,\
                epl-v10.html,\
                license.html,\
-               feature.properties
+               feature.properties,\
+               eTrice32.png
 sourcePlugin = true
 root = rootfiles
-- 
cgit v1.2.3