Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2013-06-25 11:21:53 +0000
committercletavernie2013-06-25 11:21:53 +0000
commit25210428db4d5aa9dae587d1e30ec9a22442b2ec (patch)
tree82308886735b5f899df6dea030294dcbac534d91
parent8017a0b63415856a18c1ee7c090d3b1194b86d7c (diff)
downloadorg.eclipse.papyrus-25210428db4d5aa9dae587d1e30ec9a22442b2ec.tar.gz
org.eclipse.papyrus-25210428db4d5aa9dae587d1e30ec9a22442b2ec.tar.xz
org.eclipse.papyrus-25210428db4d5aa9dae587d1e30ec9a22442b2ec.zip
411233: [Releng] Add RobotML to Releng
https://bugs.eclipse.org/bugs/show_bug.cgi?id=411233
-rw-r--r--features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.properties2
-rw-r--r--features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature/feature.properties2
-rw-r--r--features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/about.html28
-rw-r--r--features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/build.properties3
-rw-r--r--features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/feature.properties2
-rw-r--r--features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/feature.xml36
6 files changed, 18 insertions, 55 deletions
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.properties b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.properties
index 994e27cddd9..b33142816fa 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.properties
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature/feature.properties
@@ -8,7 +8,7 @@
# Contributors:
# CEA LIST - initial API and implementation
###############################################################################
-featureName=Papyrus extra: Qompass designer, develop and deploy component based applications (Incubation)
+featureName=Papyrus Qompass designer, develop and deploy component based applications (Incubation)
providerName=Eclipse Modeling Project
# "licenseURL" property - URL of the "Feature License"
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature/feature.properties b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature/feature.properties
index 031d8b34b08..836abf60a52 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature/feature.properties
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature/feature.properties
@@ -8,7 +8,7 @@
# Contributors:
# CEA LIST - initial API and implementation
###############################################################################
-featureName=Papyrus extra: Tracing support for Qompass designer (Incubation)
+featureName=Papyrus Tracing support for Qompass designer (Incubation)
providerName=Eclipse Modeling Project
# "licenseURL" property - URL of the "Feature License"
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/about.html b/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/build.properties b/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/build.properties
index 0cbf03d401b..128baaa4d3b 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/build.properties
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/build.properties
@@ -1,3 +1,6 @@
bin.includes = feature.xml,\
epl-v10.html,\
+ license.html,\
+ feature.properties
+src.includes = epl-v10.html,\
license.html
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/feature.properties b/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/feature.properties
index 18363394cf0..24e340dc534 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/feature.properties
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/feature.properties
@@ -8,7 +8,7 @@
# Contributors:
# CEA LIST - initial API and implementation
###############################################################################
-featureName=Papyrus extra: RobotML Modeling Tools (Incubation)
+featureName=Papyrus RobotML Modeling Tools (Incubation)
providerName=Eclipse Modeling Project
# "licenseURL" property - URL of the "Feature License"
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/feature.xml
index b16d979d42d..406a0897176 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature/feature.xml
@@ -1,36 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.papyrus.extra.robotml.feature"
- label="Papyrus extra: RobotML Modeling Tools (Incubation)"
+ label="%featureName"
version="0.10.0.qualifier"
- provider-name="Eclipse Modeling Project">
+ provider-name="%providerName">
<description>
RobotML Modelling Tools
</description>
- <copyright>
- ********************************
-* Copyright (c) 2010 CEA LIST.
-*
-*
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the CeCILL-C Free Software
-* License v1.0
-* which accompanies this distribution, and is available at
-* http://www.cecill.info/licences/Licence_CeCILL-C_V1-en.html
-*
-*
-* Contributors:
-* (CEA LIST) Initial API and implementation
-*********************************/
- </copyright>
-
- <license url="http://www.cecill.info/licences/Licence_CeCILL-C_V1-en.html">
- All rights reserved. This program and the accompanying materials
-are made available under the terms of the CeCILL-C Free Software License v1.0
-which accompanies this distribution, and is available at
-http://www.cecill.info/licences/Licence_CeCILL-C_V1-en.html
+ <copyright>Copyright (c) 2013 CEA LIST.
+
+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="%licenseURL">
+ %license
</license>
<plugin

Back to the top