Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2012-01-31 16:23:17 +0000
committervlorenzo2012-01-31 16:23:17 +0000
commita1ef8fa8ea7e209ea721ad984a172d57daef7abd (patch)
treea576a8d1cafe2b5d5232d9a63b4a2476597771e9 /features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature
parent1792d698e047233aa3e49a83e1948babf305bbd8 (diff)
downloadorg.eclipse.papyrus-a1ef8fa8ea7e209ea721ad984a172d57daef7abd.tar.gz
org.eclipse.papyrus-a1ef8fa8ea7e209ea721ad984a172d57daef7abd.tar.xz
org.eclipse.papyrus-a1ef8fa8ea7e209ea721ad984a172d57daef7abd.zip
365919: [Architecture - SVN - Build] Rewrite the Build
https://bugs.eclipse.org/bugs/show_bug.cgi?id=365919 Revert to the revision 7075 (build broken)
Diffstat (limited to 'features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature')
-rw-r--r--features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature/build.properties3
-rw-r--r--features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature/feature.properties138
-rw-r--r--features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature/feature.xml16
3 files changed, 10 insertions, 147 deletions
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature/build.properties b/features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature/build.properties
index defbc6b4796..d0510275908 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature/build.properties
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature/build.properties
@@ -1,6 +1,5 @@
bin.includes = license.html,\
feature.xml,\
- epl-v10.html,\
- feature.properties
+ epl-v10.html
src.includes = epl-v10.html,\
license.html
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature/feature.properties b/features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature/feature.properties
deleted file mode 100644
index dac1453a755..00000000000
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature/feature.properties
+++ /dev/null
@@ -1,138 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-
-# "featureName" property - name of the feature
-featureName=Papyrus Documentation View (Incubation)
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature/feature.xml
index 134714a41f4..bebdefe098d 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.documentation.feature/feature.xml
@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.papyrus.views.documentation.feature"
- label="%featureName"
+ label="Papyrus Documentation View (Incubation)"
version="0.9.0.qualifier"
- provider-name="%providerName">
+ provider-name="Eclipse Modeling Project">
+
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
<copyright url="http://www.eclipse.org/legal/epl-v10.html">
- Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de
-Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana
-and others
+ Copyright (c) 2011 CEA LIST.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License
v1.0
@@ -16,8 +18,8 @@ which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
</copyright>
- <license url="%licenseURL">
- %license
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
</license>
<plugin

Back to the top