[features] renamed o.e.e.core.feature to o.e.e.feature

18 files changed, 22 insertions, 21 deletions

diff --git a/features/org.eclipse.etrice.core.feature/.project b/features/org.eclipse.etrice.feature/.project
index 4b0920705..df46cfd79 100644
--- a/features/org.eclipse.etrice.core.feature/.project
+++ b/features/org.eclipse.etrice.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.etrice.core.feature</name>

+	<name>org.eclipse.etrice.feature</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/features/org.eclipse.etrice.core.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.etrice.feature/.settings/org.eclipse.core.resources.prefs
index 65f9d695f..65f9d695f 100644
--- a/features/org.eclipse.etrice.core.feature/.settings/org.eclipse.core.resources.prefs
+++ b/features/org.eclipse.etrice.feature/.settings/org.eclipse.core.resources.prefs
diff --git a/features/org.eclipse.etrice.core.feature/about.html b/features/org.eclipse.etrice.feature/about.html
index 82d49bf5f..82d49bf5f 100644
--- a/features/org.eclipse.etrice.core.feature/about.html
+++ b/features/org.eclipse.etrice.feature/about.html
diff --git a/features/org.eclipse.etrice.core.feature/about.ini b/features/org.eclipse.etrice.feature/about.ini
index 80baac0c3..80baac0c3 100644
--- a/features/org.eclipse.etrice.core.feature/about.ini
+++ b/features/org.eclipse.etrice.feature/about.ini
diff --git a/features/org.eclipse.etrice.core.feature/about.mappings b/features/org.eclipse.etrice.feature/about.mappings
index 720ca870f..720ca870f 100644
--- a/features/org.eclipse.etrice.core.feature/about.mappings
+++ b/features/org.eclipse.etrice.feature/about.mappings
diff --git a/features/org.eclipse.etrice.core.feature/about.properties b/features/org.eclipse.etrice.feature/about.properties
index 01aba5105..01aba5105 100644
--- a/features/org.eclipse.etrice.core.feature/about.properties
+++ b/features/org.eclipse.etrice.feature/about.properties
diff --git a/features/org.eclipse.etrice.core.feature/build.properties b/features/org.eclipse.etrice.feature/build.properties
index 6ea0d73ca..860b6c86b 100644
--- a/features/org.eclipse.etrice.core.feature/build.properties
+++ b/features/org.eclipse.etrice.feature/build.properties
@@ -11,6 +11,7 @@ bin.includes = plugin.xml,\
                feature.xml,\

                epl-v10.html,\

                license.html,\

-               feature.properties

+               feature.properties,\

+               rootfiles/

 sourcePlugin = true

 root = rootfiles

diff --git a/features/org.eclipse.etrice.core.feature/epl-v10.html b/features/org.eclipse.etrice.feature/epl-v10.html
index b15cf1af2..b15cf1af2 100644
--- a/features/org.eclipse.etrice.core.feature/epl-v10.html
+++ b/features/org.eclipse.etrice.feature/epl-v10.html
diff --git a/features/org.eclipse.etrice.core.feature/feature.properties b/features/org.eclipse.etrice.feature/feature.properties
index 56538a171..56538a171 100644
--- a/features/org.eclipse.etrice.core.feature/feature.properties
+++ b/features/org.eclipse.etrice.feature/feature.properties
diff --git a/features/org.eclipse.etrice.core.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index c39a713a1..d350d2c31 100644
--- a/features/org.eclipse.etrice.core.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <feature

-      id="org.eclipse.etrice.core.feature"

+      id="org.eclipse.etrice.feature"

       label="%featureName"

       version="0.1.0.qualifier"

       provider-name="%providerName">

@@ -9,13 +9,13 @@
       %description

    </description>

 

-   <copyright>

-      Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others.
-
-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 Description here.

+   <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.eclipse.org/legal/epl-v10.html">

diff --git a/features/org.eclipse.etrice.core.feature/license.html b/features/org.eclipse.etrice.feature/license.html
index 693054086..693054086 100644
--- a/features/org.eclipse.etrice.core.feature/license.html
+++ b/features/org.eclipse.etrice.feature/license.html
diff --git a/features/org.eclipse.etrice.core.feature/modeling32.png b/features/org.eclipse.etrice.feature/modeling32.png
index 6b08de2ad..6b08de2ad 100644
--- a/features/org.eclipse.etrice.core.feature/modeling32.png
+++ b/features/org.eclipse.etrice.feature/modeling32.png
diff --git a/features/org.eclipse.etrice.core.feature/rootfiles/epl-v10.html b/features/org.eclipse.etrice.feature/rootfiles/epl-v10.html
index b15cf1af2..b15cf1af2 100644
--- a/features/org.eclipse.etrice.core.feature/rootfiles/epl-v10.html
+++ b/features/org.eclipse.etrice.feature/rootfiles/epl-v10.html
diff --git a/features/org.eclipse.etrice.core.feature/rootfiles/notice.html b/features/org.eclipse.etrice.feature/rootfiles/notice.html
index 3d4e4ce2e..3d4e4ce2e 100644
--- a/features/org.eclipse.etrice.core.feature/rootfiles/notice.html
+++ b/features/org.eclipse.etrice.feature/rootfiles/notice.html
diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml
index 96c60a041..7fe7cb67f 100644
--- a/features/org.eclipse.etrice.tests.feature/feature.xml
+++ b/features/org.eclipse.etrice.tests.feature/feature.xml
@@ -9,13 +9,13 @@
       %description

    </description>

 

-   <copyright>

-      Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others.
-
-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 Description here.

+   <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.eclipse.org/legal/epl-v10.html">

diff --git a/releng/org.eclipse.etrice.releng/buckminster.cspec b/releng/org.eclipse.etrice.releng/buckminster.cspec
index 8acd0f14e..69b0bd299 100644
--- a/releng/org.eclipse.etrice.releng/buckminster.cspec
+++ b/releng/org.eclipse.etrice.releng/buckminster.cspec
@@ -4,7 +4,7 @@
         <cs:dependency name="com.thoughtworks.qdox" componentType="osgi.bundle"/>

         <cs:dependency name="org.aopalliance" componentType="osgi.bundle"/>

         <cs:dependency name="org.eclipse.draw2d" componentType="eclipse.feature"/>

-        <cs:dependency name="org.eclipse.etrice.core.feature" componentType="eclipse.feature"/>

+        <cs:dependency name="org.eclipse.etrice.feature" componentType="eclipse.feature"/>

         <cs:dependency name="org.eclipse.etrice.runtime.java" componentType="buckminster"/>

         <cs:dependency name="org.eclipse.etrice.runtime.java.tests" componentType="buckminster"/>

         <cs:dependency name="org.eclipse.etrice.site" componentType="eclipse.feature"/>

diff --git a/releng/org.eclipse.etrice.site/feature.properties b/releng/org.eclipse.etrice.site/feature.properties
index d5408f071..8e4894969 100644
--- a/releng/org.eclipse.etrice.site/feature.properties
+++ b/releng/org.eclipse.etrice.site/feature.properties
@@ -17,7 +17,7 @@
 # ==============================================================================

 

 providerName = eTrice (Incubation)

-featureName = eTirce Site

+featureName = eTrice Site

 description = eTrice modeling tools for event driven real-time systems based on the modeling language ROOM

 

 # Label for the update site (on download1.eclipse.org)

diff --git a/releng/org.eclipse.etrice.site/feature.xml b/releng/org.eclipse.etrice.site/feature.xml
index ab9619858..bc72a340f 100644
--- a/releng/org.eclipse.etrice.site/feature.xml
+++ b/releng/org.eclipse.etrice.site/feature.xml
@@ -20,7 +20,7 @@
       %description

    </description>

 

-   <copyright url="etrice Site contains the etrice framework and all additional features.">

+   <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
@@ -34,7 +34,7 @@ http://www.eclipse.org/legal/epl-v10.html
    </url>

 

    <includes

-         id="org.eclipse.etrice.core.feature"

+         id="org.eclipse.etrice.feature"

          version="0.0.0"/>

 

 </feature>