diff options
| author | Johannes Faltermeier | 2017-02-20 08:30:37 +0000 |
|---|---|---|
| committer | Johannes Faltermeier | 2017-02-20 08:32:52 +0000 |
| commit | fdeaacfce7b4a9e0657b377aea88c57e1bc0a921 (patch) | |
| tree | 11f6bbbf9fb8d468a1bff2c2a63b526ba679cae6 /bundles | |
| parent | 70405080cafddb1968932a3f809a969fd5bce58d (diff) | |
| parent | 921d7710c09e4246d10f168736f0c71e522f859a (diff) | |
| download | org.eclipse.emf.ecp.core-fdeaacfce7b4a9e0657b377aea88c57e1bc0a921.tar.gz org.eclipse.emf.ecp.core-fdeaacfce7b4a9e0657b377aea88c57e1bc0a921.tar.xz org.eclipse.emf.ecp.core-fdeaacfce7b4a9e0657b377aea88c57e1bc0a921.zip | |
Merge branch 'release_1.12.0' into feature_inputValidation
Change-Id: I5095913ddc2d3b4406037c358475dcd6082d6c28
Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>
Diffstat (limited to 'bundles')
7 files changed, 94 insertions, 4 deletions
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.json/about.html b/bundles/org.eclipse.emf.ecp.emf2web.json/about.html new file mode 100644 index 0000000000..d35d5aed64 --- /dev/null +++ b/bundles/org.eclipse.emf.ecp.emf2web.json/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 ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/bundles/org.eclipse.emf.ecp.emf2web.json/build.properties b/bundles/org.eclipse.emf.ecp.emf2web.json/build.properties index d8e2f0e92e..0ca040a19a 100644 --- a/bundles/org.eclipse.emf.ecp.emf2web.json/build.properties +++ b/bundles/org.eclipse.emf.ecp.emf2web.json/build.properties @@ -2,4 +2,6 @@ source.. = src/,\ xtend-gen/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + about.html +src.includes = about.html diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/about.html b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/about.html new file mode 100644 index 0000000000..d35d5aed64 --- /dev/null +++ b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/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 ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/bundles/org.eclipse.emf.ecp.emf2web.ui.json/build.properties b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/build.properties index 6c480f39f1..461e561286 100644 --- a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/build.properties +++ b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/build.properties @@ -3,4 +3,6 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ plugin.xml,\ - icons/ + icons/,\ + about.html +src.includes = about.html diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF index 574500c7ab..4b752bccf9 100644 --- a/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,2.0.0)", org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)", org.eclipse.emf.common.ui;bundle-version="[2.10.0,3.0.0)", - org.eclipse.core.resources;bundle-version="[3.10.1,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.10.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.11.0,4.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.eclipse.jface.databinding.swt;version="0.0.0", diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui/about.html b/bundles/org.eclipse.emf.ecp.emf2web.ui/about.html new file mode 100644 index 0000000000..d35d5aed64 --- /dev/null +++ b/bundles/org.eclipse.emf.ecp.emf2web.ui/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 ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/bundles/org.eclipse.emf.ecp.emf2web.ui/build.properties b/bundles/org.eclipse.emf.ecp.emf2web.ui/build.properties index 34d2e4d2da..9cbab3c135 100644 --- a/bundles/org.eclipse.emf.ecp.emf2web.ui/build.properties +++ b/bundles/org.eclipse.emf.ecp.emf2web.ui/build.properties @@ -1,4 +1,6 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + about.html +src.includes = about.html |