diff options
| author | Igor Fedorenko | 2011-12-27 03:17:49 +0000 |
|---|---|---|
| committer | Igor Fedorenko | 2011-12-27 03:17:49 +0000 |
| commit | ce71df9254ab0717f525453ed739f838d721318c (patch) | |
| tree | d97813588e014a2d3768b2b11b7996d9655eb754 /FROMCVS | |
| parent | 5df92eb2bb324a509944b49a03f7613f7f4cbf2b (diff) | |
| download | eclipse.platform.releng.aggregator-ce71df9254ab0717f525453ed739f838d721318c.tar.gz eclipse.platform.releng.aggregator-ce71df9254ab0717f525453ed739f838d721318c.tar.xz eclipse.platform.releng.aggregator-ce71df9254ab0717f525453ed739f838d721318c.zip | |
updated from cvs to match 4.2M4
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
Diffstat (limited to 'FROMCVS')
79 files changed, 338 insertions, 591 deletions
diff --git a/FROMCVS/org.eclipse.platform-feature/.project b/FROMCVS/org.eclipse.platform-feature/.project index 9f53c704e..9f53c704e 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/.project +++ b/FROMCVS/org.eclipse.platform-feature/.project diff --git a/FROMCVS/org.eclipse.platform-feature/CVS/Entries b/FROMCVS/org.eclipse.platform-feature/CVS/Entries index ff421cb44..257ea8c1b 100644 --- a/FROMCVS/org.eclipse.platform-feature/CVS/Entries +++ b/FROMCVS/org.eclipse.platform-feature/CVS/Entries @@ -1,18 +1,6 @@ -D/configuration.files//// -D/gtk//// -D/hpux.motif.ia64//// -D/linux.motif//// -D/macosx.carbon//// -D/macosx.cocoa//// -D/motif//// -D/rootfiles//// -D/sourceTemplateFeature//// -D/sourceTemplateFragment//// -D/sourceTemplatePlugin//// -D/win32//// -D/wpf//// -/.project/1.4/Mon Aug 4 14:33:45 2008//Tv20111025 -/build.properties/1.86/Tue May 3 18:22:23 2011/-ko/Tv20111025 -/eclipse_update_120.jpg/1.4/Fri Jun 17 15:32:58 2005/-kb/Tv20111025 -/feature.properties/1.35/Fri May 20 06:17:00 2011/-ko/Tv20111025 -/feature.xml/1.233/dummy timestamp from new-entry/-ko/Tv20111025 +/.project/1.1.2.1/Thu Apr 1 19:44:14 2010//Tv20111129 +/build.properties/1.1.2.2/Thu Mar 3 16:45:29 2011//Tv20111129 +/eclipse_update_120.jpg/1.1.2.1/Thu Apr 1 19:44:15 2010/-kb/Tv20111129 +/feature.properties/1.1.2.7/Tue Nov 29 16:27:25 2011//Tv20111129 +/feature.xml/1.1.2.12/Tue Nov 29 16:27:25 2011//Tv20111129 +D diff --git a/FROMCVS/org.eclipse.platform-feature/CVS/Entries.Log b/FROMCVS/org.eclipse.platform-feature/CVS/Entries.Log new file mode 100644 index 000000000..b9670f65b --- /dev/null +++ b/FROMCVS/org.eclipse.platform-feature/CVS/Entries.Log @@ -0,0 +1,4 @@ +A D/rootfiles//// +A D/sourceTemplateFeature//// +A D/sourceTemplateFragment//// +A D/sourceTemplatePlugin//// diff --git a/FROMCVS/org.eclipse.platform-feature/CVS/Repository b/FROMCVS/org.eclipse.platform-feature/CVS/Repository index 5c01b516d..559e9e5dd 100644 --- a/FROMCVS/org.eclipse.platform-feature/CVS/Repository +++ b/FROMCVS/org.eclipse.platform-feature/CVS/Repository @@ -1 +1 @@ -org.eclipse.platform-feature +org.eclipse.sdk-feature/features/org.eclipse.platform-feature diff --git a/FROMCVS/org.eclipse.platform-feature/CVS/Tag b/FROMCVS/org.eclipse.platform-feature/CVS/Tag index 944181ef8..631901937 100644 --- a/FROMCVS/org.eclipse.platform-feature/CVS/Tag +++ b/FROMCVS/org.eclipse.platform-feature/CVS/Tag @@ -1 +1 @@ -Nv20111025 +Nv20111129 diff --git a/FROMCVS/org.eclipse.platform-feature/build.properties b/FROMCVS/org.eclipse.platform-feature/build.properties index c27f41f8f..851cf2729 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/build.properties +++ b/FROMCVS/org.eclipse.platform-feature/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2011 IBM Corporation and others. +# Copyright (c) 2000, 2009 IBM Corporation 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 @@ -8,10 +8,11 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -bin.includes = feature.xml,\ - feature.properties,\ - eclipse_update_120.jpg +bin.includes =\ +eclipse_update_120.jpg,\ +feature.xml,\ +feature.properties generatedVersionLength=45 -root=rootfiles +root=rootfiles
\ No newline at end of file diff --git a/FROMCVS/org.eclipse.platform-feature/eclipse_update_120.jpg b/FROMCVS/org.eclipse.platform-feature/eclipse_update_120.jpg Binary files differindex bfdf708ad..bfdf708ad 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/eclipse_update_120.jpg +++ b/FROMCVS/org.eclipse.platform-feature/eclipse_update_120.jpg diff --git a/FROMCVS/org.eclipse.platform-feature/feature.properties b/FROMCVS/org.eclipse.platform-feature/feature.properties index 44f26f0d4..9c1b37842 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/feature.properties +++ b/FROMCVS/org.eclipse.platform-feature/feature.properties @@ -21,7 +21,7 @@ featureName=Eclipse Platform providerName=Eclipse.org # "description" property - description of the feature -description=Common OS-independent base of the Eclipse platform (binary runtime and user documentation). +description=Common OS-independent base of the Eclipse platform. (Binary runtime and user documentation.) # "copyright" property - text of the "Feature Update Copyright" copyright=\ @@ -30,7 +30,4 @@ All rights reserved. This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License v1.0\n\ which accompanies this distribution, and is available at\n\ http://www.eclipse.org/legal/epl-v10.html\n\ -\n\ -Contributors:\n\ - IBM Corporation - initial API and implementation\n ################ end of copyright property ####################################
\ No newline at end of file diff --git a/FROMCVS/org.eclipse.platform-feature/feature.xml b/FROMCVS/org.eclipse.platform-feature/feature.xml index 7b4da20c5..7247c7310 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/feature.xml +++ b/FROMCVS/org.eclipse.platform-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.platform" label="%featureName" - version="3.8.0.qualifier" + version="4.2.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg" license-feature="org.eclipse.license" @@ -76,13 +76,6 @@ unpack="false"/> <plugin - id="org.eclipse.core.boot" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.core.filebuffers" download-size="0" install-size="0" @@ -193,13 +186,6 @@ unpack="false"/> <plugin - id="org.eclipse.help.appserver" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.ltk.core.refactoring" download-size="0" install-size="0" @@ -382,34 +368,6 @@ unpack="false"/> <plugin - id="org.eclipse.update.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.update.scheduler" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.update.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.ui.workbench.compatibility" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true"/> - - <plugin id="org.eclipse.core.filesystem.aix.ppc" os="aix" arch="ppc" @@ -513,25 +471,6 @@ unpack="false"/> <plugin - id="org.eclipse.update.core.linux" - os="linux" - arch="x86" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin - id="org.eclipse.update.core.win32" - os="win32" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin id="org.eclipse.ui.views.properties.tabbed" download-size="0" install-size="0" diff --git a/FROMCVS/org.eclipse.platform-feature/pom.xml b/FROMCVS/org.eclipse.platform-feature/pom.xml index 116f72959..17a675f38 100644 --- a/FROMCVS/org.eclipse.platform-feature/pom.xml +++ b/FROMCVS/org.eclipse.platform-feature/pom.xml @@ -12,7 +12,7 @@ <groupId>org.eclipse.platform-feature</groupId> <artifactId>org.eclipse.platform</artifactId> - <version>3.8.0-SNAPSHOT</version> + <version>4.2.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build> diff --git a/FROMCVS/org.eclipse.platform-feature/rootfiles/.eclipseproduct b/FROMCVS/org.eclipse.platform-feature/rootfiles/.eclipseproduct index d81df5fa9..0eb0cd7a0 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/rootfiles/.eclipseproduct +++ b/FROMCVS/org.eclipse.platform-feature/rootfiles/.eclipseproduct @@ -1,3 +1,3 @@ name=Eclipse Platform id=org.eclipse.platform -version=3.7.0
\ No newline at end of file +version=4.2.0
\ No newline at end of file diff --git a/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Entries b/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Entries index 794e52fcd..b35fb33f1 100644 --- a/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Entries +++ b/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Entries @@ -1,5 +1,4 @@ -D/configuration//// -D/readme//// -/.eclipseproduct/1.9/Thu Jul 29 14:36:10 2010/-kb/Tv20111025 -/epl-v10.html/1.1/Fri Feb 25 23:53:14 2005/-kk/Tv20111025 -/notice.html/1.8/Fri Feb 4 20:39:16 2011//Tv20111025 +/.eclipseproduct/1.1.2.4/Tue Nov 29 16:31:28 2011//Tv20111129 +/epl-v10.html/1.1.2.1/Thu Apr 1 19:44:17 2010//Tv20111129 +/notice.html/1.1.2.2/Tue Jun 8 13:51:06 2010//Tv20111129 +D diff --git a/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Entries.Log b/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Entries.Log new file mode 100644 index 000000000..3ac87b6d6 --- /dev/null +++ b/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Entries.Log @@ -0,0 +1 @@ +A D/readme//// diff --git a/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Repository b/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Repository index 94a0f31ee..685525319 100644 --- a/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Repository +++ b/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Repository @@ -1 +1 @@ -org.eclipse.platform-feature/rootfiles +org.eclipse.sdk-feature/features/org.eclipse.platform-feature/rootfiles diff --git a/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Tag b/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Tag index 944181ef8..631901937 100644 --- a/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Tag +++ b/FROMCVS/org.eclipse.platform-feature/rootfiles/CVS/Tag @@ -1 +1 @@ -Nv20111025 +Nv20111129 diff --git a/FROMCVS/org.eclipse.platform-feature/rootfiles/epl-v10.html b/FROMCVS/org.eclipse.platform-feature/rootfiles/epl-v10.html index ed4b19665..ed4b19665 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/rootfiles/epl-v10.html +++ b/FROMCVS/org.eclipse.platform-feature/rootfiles/epl-v10.html diff --git a/FROMCVS/org.eclipse.platform-feature/rootfiles/notice.html b/FROMCVS/org.eclipse.platform-feature/rootfiles/notice.html index dc5aefd67..c184ca36a 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/rootfiles/notice.html +++ b/FROMCVS/org.eclipse.platform-feature/rootfiles/notice.html @@ -1,18 +1,19 @@ -<!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"> +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!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>Eclipse Foundation Software User Agreement</title> -</head><body lang="EN-US"> +</head> + +<body lang="EN-US"> <h2>Eclipse Foundation Software User Agreement</h2> -<p>February 1, 2011</p> +<p>April 14, 2010</p> <h3>Usage Of Content</h3> <p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND @@ -20,73 +21,43 @@ <h3>Applicable Licenses</h3> -<p>Unless otherwise indicated, all Content made available by the Eclipse - Foundation is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also - 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>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 + ("EPL"). A copy of the EPL is provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, -documentation and other files maintained in the Eclipse Foundation -source code - repository ("Repository") in software modules ("Modules") and made -available as downloadable archives ("Downloads").</p> +<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> <ul> - <li>Content may be structured and packaged into modules to -facilitate delivering, extending, and upgrading the Content. Typical -modules may include plug-ins ("Plug-ins"), plug-in fragments -("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or -Fragments and associated material. Each Feature may be packaged as a -sub-directory in a directory named "features". Within a Feature, files -named "feature.xml" may contain a list of the names and version numbers -of the Plug-ins + <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> + <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> + <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included -Features"). Within a Feature, files named "feature.xml" may contain a -list of the names and version numbers of Included Features.</li> + <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> </ul> -<p>The terms and conditions governing Plug-ins and Fragments should be -contained in files named "about.html" ("Abouts"). The terms and -conditions governing Features and -Included Features should be contained in files named "license.html" -("Feature Licenses"). Abouts and Feature Licenses may be located in any - directory of a Download or Module +<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and +Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:</p> <ul> <li>The top-level (root) directory</li> <li>Plug-in and Fragment directories</li> <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> + <li>Sub-directories of the directory named "src" of certain Plug-ins</li> <li>Feature directories</li> </ul> -<p>Note: if a Feature made available by the Eclipse Foundation is -installed using the Provisioning Technology (as defined below), you must - agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the -Feature Update License should either provide you with the terms and -conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be -found in the "license" property of files named "feature.properties" -found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the -terms and conditions (or references to such terms and conditions) that -govern your use of the associated Content in +<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the +installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or +inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in that directory.</p> -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. - SOME OF THESE +<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> <ul> - <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> @@ -94,69 +65,43 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> </ul> -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND -CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, -or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions -govern that particular Content.</p> +<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please +contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> <h3>Use of Provisioning Technology</h3> -<p>The Eclipse Foundation makes available provisioning software, -examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of -allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This -capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about -packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install - Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to - be presented to, and accepted by, the users of the Provisioning -Technology - in accordance with the Specification. By using Provisioning -Technology in such a manner and making it available in accordance with -the - Specification, you further acknowledge your agreement to, and the -acquisition of all necessary rights to permit the following:</p> +<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a + href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> + ("Specification").</p> + +<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> <ol> - <li>A series of actions may occur ("Provisioning Process") in -which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, -extending or updating the functionality of an Eclipse-based + <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology + on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based product.</li> - <li>During the Provisioning Process, the Provisioning Technology -may cause third party Installable Software or a portion thereof to be + <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user -the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable -Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable -Software Agreement must inform the user of the terms and conditions that - govern - the Installable Software and must solicit acceptance by the end -user in the manner prescribed in such Installable Software Agreement. -Upon such - indication of agreement by the user, the provisioning Technology -will complete installation of the Installable Software.</li> + <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable + Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target + Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern + the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such + indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> </ol> <h3>Cryptography</h3> -<p>Content may contain encryption software. The country in which you are - currently may have restrictions on the import, possession, and use, -and/or re-export to - another country, of encryption software. BEFORE using any encryption -software, please check the country's laws, regulations and policies -concerning the import, - possession, or use, and re-export of encryption software, to see if -this is permitted.</p> +<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to + another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, + possession, or use, and re-export of encryption software, to see if this is permitted.</p> <p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body></html>
\ No newline at end of file +</body> +</html> diff --git a/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/CVS/Entries b/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/CVS/Entries index f0835c834..8e4058d2c 100644 --- a/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/CVS/Entries +++ b/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/CVS/Entries @@ -1,2 +1,2 @@ -/readme_eclipse.html/1.147/Thu Sep 1 07:21:32 2011//Tv20111025 +/readme_eclipse.html/1.1.2.10/Sun Jun 12 22:04:06 2011//Tv20111129 D diff --git a/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/CVS/Repository b/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/CVS/Repository index b73952b33..82c7ab09f 100644 --- a/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/CVS/Repository +++ b/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/CVS/Repository @@ -1 +1 @@ -org.eclipse.platform-feature/rootfiles/readme +org.eclipse.sdk-feature/features/org.eclipse.platform-feature/rootfiles/readme diff --git a/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/CVS/Tag b/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/CVS/Tag index 944181ef8..631901937 100644 --- a/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/CVS/Tag +++ b/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/CVS/Tag @@ -1 +1 @@ -Nv20111025 +Nv20111129 diff --git a/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/readme_eclipse.html b/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/readme_eclipse.html index c618726ee..c2a8167dd 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/readme_eclipse.html +++ b/FROMCVS/org.eclipse.platform-feature/rootfiles/readme/readme_eclipse.html @@ -2,13 +2,13 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> -<title>Eclipse Project Release Notes 3.7</title> +<title>Eclipse Project Release Notes 4.1</title> </head> <body> <h1>Eclipse Project Release Notes</h1> -<p>Release 3.7.0<br/> - Last revised June 14, 2011</p> +<p>Release 4.1.0<br/> + Last revised June 12th, 2011</p> <p align="left"><strong>This software is OSI Certified Open Source Software.<br/> OSI Certified is a certification mark of the Open Source Initiative. </strong></p> <blockquote> @@ -32,7 +32,7 @@ OSI Certified is a certification mark of the Open Source Initiative. </stro Java Platform itself. Portions are targeted to specific classes of operating environments, requiring their source code to only reference facilities available in particular class libraries (e.g. J2ME Foundation 1.1, J2SE 1.4, Java 5, etc).</p> -<p>In general, the 3.7 release of the Eclipse Project is developed on a mix +<p>In general, the 4.1 release of the Eclipse Project is developed on a mix of Java SE 5 and Java SE 6 VMs. As such, the Eclipse SDK as a whole is targeted at all modern, desktop Java VMs. Most functionality is available for Java SE 5 level development everywhere, and extended development capabilities are made @@ -47,7 +47,7 @@ OSI Certified is a certification mark of the Open Source Initiative. </stro them we cannot vouch for them. Problems encountered when running Eclipse on a non-reference platform that cannot be recreated on any reference platform will be given lower priority than problems with running Eclipse on a reference platform.</p> -<p>Eclipse 3.7 is tested and validated on the following reference platforms:</p> +<p>Eclipse 4.1 is tested and validated on the following reference platforms:</p> <style type="text/css"> table.platforms { border-width: 1px; @@ -213,57 +213,57 @@ OSI Certified is a certification mark of the Open Source Initiative. </stro <p>German and Japanese locales are tested.</p> <h2>2. <a name="Compatibility"></a>Compatibility with Previous Releases</h2> -<h3>Compatibility of Release 3.7 with 3.6</h3> -<p>Eclipse 3.7 is compatible with Eclipse 3.6 (and all earlier 3.x versions).</p> +<h3>Compatibility of Release 4.1 with 3.7</h3> +<p>Eclipse 4.1 is compatible with Eclipse 3.7 (and all earlier 3.x versions).</p> -<p><strong>API Contract Compatibility:</strong> Eclipse SDK 3.7 is upwards +<p><strong>API Contract Compatibility:</strong> Eclipse SDK 4.1 is upwards contract-compatible with Eclipse SDK 3.6 except in those areas noted in the <a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/org.eclipse.platform.doc.isv/porting/eclipse_3_7_porting_guide.html" target="_top"> - <em>Eclipse 3.7 Plug-in Migration Guide</em> + <em>Eclipse 4.1 Plug-in Migration Guide</em> </a>. Programs that use affected APIs and extension points will need to be ported - to Eclipse SDK 3.7 APIs. Downward contract compatibility - is not supported. There is no guarantee that compliance with Eclipse SDK 3.7 + to Eclipse SDK 4.1 APIs. Downward contract compatibility + is not supported. There is no guarantee that compliance with Eclipse SDK 4.1 APIs would ensure compliance with Eclipse SDK 3.6 APIs. Refer to <a href="http://wiki.eclipse.org/index.php/Evolving_Java-based_APIs"> <em>Evolving Java-based APIs</em> </a> for a discussion of the kinds of API changes that maintain contract compatibility.</p> -<p><strong>Binary (plug-in) Compatibility:</strong> Eclipse SDK 3.7 is upwards +<p><strong>Binary (plug-in) Compatibility:</strong> Eclipse SDK 4.1 is upwards binary-compatible with Eclipse SDK 3.6 except in those areas noted in the <a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/org.eclipse.platform.doc.isv/porting/eclipse_3_7_porting_guide.html" target="_top"> - <em>Eclipse 3.7 Plug-in Migration Guide</em> + <em>Eclipse 4.1 Plug-in Migration Guide</em> </a>. Downward plug-in compatibility is not supported. Plug-ins for Eclipse SDK - 3.7 will not be usable in Eclipse SDK 3.6. Refer to + 4.1 will not be usable in Eclipse SDK 3.6. Refer to <a href="http://wiki.eclipse.org/index.php/Evolving_Java-based_APIs"> <em>Evolving Java-based APIs</em> </a> for a discussion of the kinds of API changes that maintain binary compatibility.</p> -<p><strong>Source Compatibility:</strong> Eclipse SDK 3.7 is upwards source-compatible +<p><strong>Source Compatibility:</strong> Eclipse SDK 4.1 is upwards source-compatible with Eclipse SDK 3.6 except in the areas noted in the <a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/org.eclipse.platform.doc.isv/porting/eclipse_3_7_porting_guide.html" target="_top"> - <em>Eclipse 3.7 Plug-in Migration Guide</em> + <em>Eclipse 4.1 Plug-in Migration Guide</em> </a>. This means that source files written to use Eclipse SDK 3.6 APIs might successfully compile and run against Eclipse - SDK 3.7 APIs, although this is not guaranteed. Downward source compatibility + SDK 4.1 APIs, although this is not guaranteed. Downward source compatibility is not supported. If source files use new Eclipse SDK APIs, they will not be usable with an earlier version of the Eclipse SDK. </p> -<p><strong>Workspace Compatibility:</strong> Eclipse SDK 3.7 is upwards +<p><strong>Workspace Compatibility:</strong> Eclipse SDK 4.1 is upwards workspace-compatible with earlier 3.x versions of the Eclipse SDK unless noted. - This means that workspaces and projects created with Eclipse SDK 3.6 .. 3.0 can be successfully - opened by Eclipse SDK 3.7 and upgraded to a 3.7 workspace. This includes both + This means that workspaces and projects created with Eclipse SDK 3.7 .. 3.0 can be successfully + opened by Eclipse SDK 4.1 and upgraded to a 4.1 workspace. This includes both hidden metadata, which is localized to a particular workspace, as well as metadata files found within a workspace project (e.g., the .project file), which may propagate between workspaces via file copying or team repositories. Individual - plug-ins developed for Eclipse SDK 3.7 should provide similar upwards compatibility + plug-ins developed for Eclipse SDK 4.1 should provide similar upwards compatibility for their hidden and visible workspace metadata created by earlier versions; - 3.7 plug-in developers are responsible for ensuring that their plug-ins recognize + 4.1 plug-in developers are responsible for ensuring that their plug-ins recognize metadata from earlier versions and process it appropriately. User interface session state may be discarded when a workspace is upgraded. Downward workspace compatibility is not supported. A workspace created (or opened) by - a product based on Eclipse 3.7 will be unusable with a product based on an earlier + a product based on Eclipse 4.1 will be unusable with a product based on an earlier version of Eclipse. Visible metadata files created (or overwritten) by Eclipse - 3.7 will generally be unusable with earlier versions of Eclipse. </p> + 4.1 will generally be unusable with earlier versions of Eclipse. </p> <p><strong>Non-compliant usage of API's</strong>: All non-API methods and classes, and certainly everything in a package with "internal" in its name or @@ -281,6 +281,7 @@ OSI Certified is a certification mark of the Open Source Initiative. </stro <blockquote> <a href="#I-General"> 3.1 General problems</a><br/> + <a href="#I-General-Eclipse4">3.1.0 Eclipse4 Issues</a><br/> <a href="#I-General-Startup">3.1.1 Startup</a><br/> <a href="#I-General-GCJ">3.1.2 GCJ</a><br/> <a href="#I-General-64bitJava">3.1.3 64-bit Java HotSpot(TM) VM</a><br/> @@ -306,11 +307,20 @@ OSI Certified is a certification mark of the Open Source Initiative. </stro <p>Note: Bug numbers refer to the Eclipse project bug database at <a href="http://dev.eclipse.org/bugs/">http://bugs.eclipse.org/bugs/</a></p> <h3>3.1 <a name="I-General">General problems</a></h3> +<h3>3.1.0 <a name="I-General-Eclipse4">General - Eclipse4 Issues</a></h3> +<p>The focus on 4.1 has been on bringing it up to a point where it's functionally +usable on a day-to-day basis. In general we've achieved this, we have a ways to go before +we can match the legacy eclipse's 100+ million man-hours of use. +</p> +<p>See <a href="http://wiki.eclipse.org/Eclipse4.1/KnownIssues">Eclipse 4.1 Known Issues</a> +for our current list of issues. +</p> + <h3>3.1.1 <a name="I-General-Startup">General - Startup</a></h3> <h4>Installation/Configuration issues that can cause Eclipse to fail start</h4> <p>Here are some common problems that can cause Eclipse not to start:</p> <ul> - <li>As shown <a href="#TargetOperatingEnvironments">above</a>, Eclipse 3.7 requires + <li>As shown <a href="#TargetOperatingEnvironments">above</a>, Eclipse 4.1 requires at least a Java SE 5. Perhaps an older version of the VM is being found in your path. To explicitly specify which VM to run with, use the Eclipse <tt>-vm</tt> command-line argument. (See also the <a href="#RunningEclipse">Running Eclipse</a> @@ -395,10 +405,10 @@ Eg: <code>Build id: M20070212-1330 (Ubuntu version: 3.2.2-0ubuntu3)</code> It is imperative that 64-bit builds are downloaded and used if a 64-bit Java runtime environment has been installed. Below are two sample tarball names of -version 3.7.0 of the Eclipse SDK packaged for 32-bit and 64-bit processors. +version 4.1.0 of the Eclipse SDK packaged for 32-bit and 64-bit processors. -<pre>eclipse-SDK-3.7-linux-gtk.tar.gz (32-bit) -eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz (64-bit)</pre> +<pre>eclipse-SDK-4.1-linux-gtk.tar.gz (32-bit) +eclipse-SDK-4.1-linux-gtk-x86_64.tar.gz (64-bit)</pre> <p>To run Eclipse with an alternate Java runtime environment, the path to the Java virtual machine's binary must be identified. With an Eclipse installation from @@ -883,11 +893,6 @@ The workaround for this problem is to specify Java property <code>org.eclipse.sw which instructs SWT to always use Cairo for all GC calls (advanced graphics). An easy way to set this property is to specify VM argument <code>-Dorg.eclipse.swt.internal.gtk.useCairo=true</code> when launching Eclipse or your SWT application. (bugs <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=345650">345650</a> and <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=333965">333965</a>)</p> -<p>There is also a potential clipping problem when using Cairo with GTK versions > 2.18 (see bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=349354">349354</a>). -The temporary workaround is to set an environment variable GDK_NATIVE_WINDOWS=1 in a shell and then launch Eclipse or your SWT application from that same shell.</p> - -<h4>Menus do not appear in Unity desktop menu bar</h4> -<p>On recent Ubuntu Linux distributions that feature the Unity desktop, the menus from the workbench will not appear in the top desktop menu bar. They will continue to appear in the shell.</p> <h3>3.2.7 <a name="I-Platform-Team-CVS">Platform - Team - CVS</a></h3> @@ -1029,7 +1034,7 @@ The workaround is to use the <code>-XX:+UseParallelGC</code> VM option. (bug <a due to a bug in the XML parser that is shipped with those VMs. A workaround is to use a J2SE 5.0 VM or an IBM 6.0 VM. Another workaround is to replace the XML parser using the -<a href="http://download.oracle.com/javase/6/docs/technotes/guides/standards/index.html">Java Endorsed Standards Override Mechanism</a>: +<a href="http://java.sun.com/javase/6/docs/technotes/guides/standards/index.html">Java Endorsed Standards Override Mechanism</a>: </p> <ol> <li>Get original versions of xml-apis.jar, xercesImpl.jar, xalan.jar, and serializer.jar from Apache, e.g. @@ -1247,7 +1252,7 @@ This is because a target's runtime configuration only contains plug-ins specific by running the Eclipse executable included with the release (you also need a Java SE 5 JRE, not included with the Eclipse SDK). On Windows, the executable file is called <samp>eclipse.exe</samp>, and is located in the <code>eclipse</code> sub-directory of the install. If -installed at <code>c:\eclipse-SDK-3.7-win32</code>, the executable is <code>c:\eclipse-SDK-3.7-win32\eclipse\eclipse.exe</code>. +installed at <code>c:\eclipse-SDK-4.1-win32</code>, the executable is <code>c:\eclipse-SDK-4.1-win32\eclipse\eclipse.exe</code>. <b>Note:</b> Set-up on most other operating environments is analogous. Special instructions for Mac OS X are listed <a href="#macosx">below</a>.</p> @@ -1399,8 +1404,8 @@ list on start-up, or</li> </p> <h2>6. <a name="InteroperabilityWithPreviousReleases">Interoperability with Previous Releases</a></h2> -<h3>6.1 Interoperability of Release 3.7 with previous releases</h3> -<h4>Sharing projects between heterogeneous Eclipse 3.7 and 3.6</h4> +<h3>6.1 Interoperability of Release 4.1 with previous releases</h3> +<h4>Sharing projects between heterogeneous Eclipse 4.1 and 3.7</h4> <p>Special care is required when a project in a team repository is being loaded and operated on by developers using Eclipse-based products based on different feature or plug-in versions. The general problem is that the existence, @@ -1408,61 +1413,61 @@ contents, and interpretation of metadata files in the workspaces may be specific to a particular feature or plug-in version, and differ between versions. The workspace compatibility guarantees only cover cases where all developers upgrade their Eclipse workspaces in lock step. In those cases there should be no problem -with shared metadata. However, when some developers are working in Eclipse 3.7 -while others are working in Eclipse 3.6, there are no such guarantees. +with shared metadata. However, when some developers are working in Eclipse 4.1 +while others are working in Eclipse 3.7, there are no such guarantees. This section provides advice for what to do and not to do. It addresses the specific issues with the Eclipse SDK.</p> -<p>The typical failure mode is noticed by the 3.7 user. 3.7 metadata is lost -when a 3.6 user saves changes and then commits the updated metadata files to the +<p>The typical failure mode is noticed by the 4.1 user. 4.1 metadata is lost +when a 3.7 user saves changes and then commits the updated metadata files to the repository. Here's how things typically go awry:</p> <ul> - <li>A user working in Eclipse 3.7 creates or modifies a project in a way that - results in changes to a shared metadata file that rely on 3.7-specific + <li>A user working in Eclipse 4.1 creates or modifies a project in a way that + results in changes to a shared metadata file that rely on 4.1-specific information. The user then commits the updated project files, including the shared metadata file, to the shared repository.</li> - <li>Another user working in Eclipse 3.6 shares this project from the same - repository. The 3.7-specific information in the shared metadata file is not - understood by Eclipse 3.6, and is generally discarded or ignored without + <li>Another user working in Eclipse 3.7 shares this project from the same + repository. The 4.1-specific information in the shared metadata file is not + understood by Eclipse 3.7, and is generally discarded or ignored without warning. The user modifies the project in a way that results in changes to the shared metadata file, causing the shared metadata file to be rewritten - without any of the 3.7-specific information. The user commits the updated + without any of the 4.1-specific information. The user commits the updated project files, including the shared metadata file, to the shared repository. The user is generally unaware that shared information has just been lost as a result of their actions.</li> - <li>A user working in Eclipse 3.7 picks up the changes to a project from the + <li>A user working in Eclipse 4.1 picks up the changes to a project from the shared repository, including the updated shared metadata file. The user may be unaware that they have just taken a retrograde step until later when things start to malfunction.</li> </ul> <p>Here are some things to watch out for when sharing projects between -Eclipse 3.7 and earlier 3.x releases:</p> +Eclipse 4.1 and earlier 3.x releases:</p> <ul> <li><b>Virtual folders</b> - - Eclipse 3.7 supports a notion of <i>virtual folders</i> that did not exist - in Eclipse 3.5 or earlier. If such virtual folders are created in 3.7, and the project + Eclipse 4.1 supports a notion of <i>virtual folders</i> that did not exist + in Eclipse 3.5 or earlier. If such virtual folders are created in 4.1, and the project is subsequently loaded into an Eclipse 3.5 or earlier workspace, these folders will not be recognized. Recommendation: avoid creating virtual folders where project compatibility with Eclipse 3.5 or earlier is required.</li> <li><b>Resource filters</b> - - Eclipse 3.7 supports a notion of <i>resource filters</i> that did not exist - in Eclipse 3.5 or earlier. If such filters are added to resources in 3.7, and the project + Eclipse 4.1 supports a notion of <i>resource filters</i> that did not exist + in Eclipse 3.5 or earlier. If such filters are added to resources in 4.1, and the project is subsequently loaded into an Eclipse 3.5 or earlier workspace, these filters will not be recognized. Recommendation: avoid creating resource filters where project compatibility with Eclipse 3.5 or earlier is required.</li> <li><b>Predefined path variables</b> - - Eclipse 3.7 supports a set of built in path variables that can be used as the basis + Eclipse 4.1 supports a set of built in path variables that can be used as the basis for linked resource locations. Such variables will not be defined automatically in Eclipse 3.5 or earlier. If compatibility with 3.5 or earlier workspace is required, users on 3.5 or earlier workspaces will need to define such path variables manually. </li> </ul> -<h4>Using Eclipse 3.7 to develop plug-ins that work in Eclipse 3.6</h4> -<p>It is also possible (and reasonable) to use Eclipse 3.7 to develop a plug-in - intended to work in Eclipse 3.6 or earlier. Use the <b>Plug-in Development > +<h4>Using Eclipse 4.1 to develop plug-ins that work in Eclipse 3.7</h4> +<p>It is also possible (and reasonable) to use Eclipse 4.1 to develop a plug-in + intended to work in Eclipse 3.7 or earlier. Use the <b>Plug-in Development > Target Platform </b>preference page to locate non-workspace plug-ins in an Eclipse - 3.6 install. This ensures that the code for your plug-in is being compiled and - tested against Eclipse 3.6 APIs, extension points, and plug-ins. (The above + 3.7 install. This ensures that the code for your plug-in is being compiled and + tested against Eclipse 3.7 APIs, extension points, and plug-ins. (The above list of concerns do not apply since they affect the layout and interpretation of files in the plug-in <i>project</i> but none affect the actual deployed form of the plug-in.)</p> @@ -1484,9 +1489,9 @@ of others.</p> <h2><a name="Appendix1">Appendix 1: Execution Environment by Bundle</a></h2> -<p>In the table below, the "3.7 minimum execution environment" +<p>In the table below, the "4.1 minimum execution environment" column indicates the minimum Java class library requirements of each bundle - for the 3.7 release, where the value is one of:</p> + for the 4.1 release, where the value is one of:</p> <table border="0" width="90%"> <tbody> <tr> @@ -1542,7 +1547,7 @@ of others.</p> <tbody> <tr> <td width="290"><strong>Bundle</strong></td> - <td width="60"><div align="center"><p align="center"><b>3.7<br/>minimum<br/>execution<br/>environment</b></p></div></td> + <td width="60"><div align="center"><p align="center"><b>4.1<br/>minimum<br/>execution<br/>environment</b></p></div></td> </tr> <tr> <td>com.ibm.icu</td> @@ -2258,11 +2263,7 @@ of others.</p> </tr> <tr> <td>org.eclipse.ui.workbench</td> - <td><div align="center">F1.1</div></td> - </tr> - <tr> - <td>org.eclipse.ui.workbench.compatibility</td> - <td><div align="center">1.4</div></td> + <td><div align="center">1.5</div></td> </tr> <tr> <td>org.eclipse.ui.workbench.texteditor</td> @@ -2273,22 +2274,6 @@ of others.</p> <td><div align="center">F1.0</div></td> </tr> <tr> - <td>org.eclipse.update.core</td> - <td><div align="center">F1.1</div></td> - </tr> - <tr> - <td>org.eclipse.update.core.win32</td> - <td><div align="center">not specified</div></td> - </tr> - <tr> - <td>org.eclipse.update.scheduler</td> - <td><div align="center">F1.0</div></td> - </tr> - <tr> - <td>org.eclipse.update.ui</td> - <td><div align="center">F1.0</div></td> - </tr> - <tr> <td>org.hamcrest.core</td> <td><div align="center">1.5</div></td> </tr> @@ -2324,4 +2309,4 @@ of others.</p> </table> </body> -</html>
\ No newline at end of file +</html> diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/CVS/Entries b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/CVS/Entries index f28f27e38..906e6f52c 100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/CVS/Entries +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/CVS/Entries @@ -1,4 +1,4 @@ -/build.properties/1.55/Tue Oct 25 15:01:24 2011//Tv20111025 -/eclipse_update_120.jpg/1.3/Fri Jun 17 15:32:58 2005/-kb/Tv20111025 -/feature.properties/1.20/Tue May 3 18:22:23 2011//Tv20111025 +/build.properties/1.1.2.7/Fri Oct 28 14:15:49 2011//Tv20111129 +/eclipse_update_120.jpg/1.1.2.1/Thu Apr 1 19:44:07 2010/-kb/Tv20111129 +/feature.properties/1.1.2.5/Thu Mar 3 16:45:29 2011//Tv20111129 D diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/CVS/Repository b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/CVS/Repository index cbaab259c..5c855fb5c 100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/CVS/Repository +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/CVS/Repository @@ -1 +1 @@ -org.eclipse.platform-feature/sourceTemplateFeature +org.eclipse.sdk-feature/features/org.eclipse.platform-feature/sourceTemplateFeature diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/CVS/Tag b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/CVS/Tag index 944181ef8..631901937 100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/CVS/Tag +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/CVS/Tag @@ -1 +1 @@ -Nv20111025 +Nv20111129 diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/build.properties b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/build.properties index 29940a0f8..e037e267c 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/build.properties +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2011 IBM Corporation and others. +# Copyright (c) 2000, 2009 IBM Corporation 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 @@ -9,29 +9,21 @@ # IBM Corporation - initial API and implementation ############################################################################### bin.includes =\ +epl-v10.html,\ eclipse_update_120.jpg,\ feature.xml,\ -feature.properties +feature.properties,\ +license.html -generate.feature@org.eclipse.rcp.source=org.eclipse.rcp,plugin@com.ibm.icu.source;version=4.4.2.qualifier;unpack="false",\ +generate.feature@org.eclipse.rcp.source=org.eclipse.rcp,feature@org.eclipse.e4.rcp.source,plugin@com.ibm.icu.source;version=4.2.1.qualifier;unpack="false",\ plugin@org.apache.felix.gogo.command.source;version=0.8.0.qualifier;unpack="false",\ plugin@org.apache.felix.gogo.runtime.source;version=0.8.0.qualifier;unpack="false",\ plugin@org.apache.felix.gogo.shell.source;version=0.8.0.qualifier;unpack="false" -generate.feature@org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.user.ui,\ - feature@org.eclipse.equinox.p2.core.feature.source,\ - feature@org.eclipse.equinox.p2.extras.feature.source,\ - feature@org.eclipse.equinox.p2.rcp.feature.source,\ - plugin@org.eclipse.ecf.source;version=3.1.300.qualifier;unpack="false",\ - plugin@org.eclipse.ecf.ssl.source;version=1.0.100.qualifier;unpack="false",\ - plugin@org.eclipse.ecf.identity.source;version=3.1.100.qualifier;unpack="false",\ - plugin@org.eclipse.ecf.filetransfer.source;version=5.0.0.qualifier;unpack="false",\ - plugin@org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\ - plugin@org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\ - plugin@org.eclipse.ecf.provider.filetransfer.httpclient.source;version=4.0.0.qualifier;unpack="false",\ - plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\ - plugin@org.apache.commons.codec.source;version=1.3.0.qualifier;unpack="false,\ - plugin@org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false" - + + + + + diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/eclipse_update_120.jpg b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/eclipse_update_120.jpg Binary files differindex bfdf708ad..bfdf708ad 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/eclipse_update_120.jpg +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/eclipse_update_120.jpg diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/feature.properties b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/feature.properties index 1feb7fa4f..8f2437226 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/feature.properties +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFeature/feature.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2011 IBM Corporation and others. +# Copyright (c) 2000, 2010 IBM Corporation 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 @@ -25,7 +25,7 @@ description=Common OS-independent API documentation and source code zips for the # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2000, 2009 IBM Corporation and others.\n\ +Copyright (c) 2000, 2011 IBM Corporation and others.\n\ All rights reserved. This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License v1.0\n\ which accompanies this distribution, and is available at\n\ diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/CVS/Entries b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/CVS/Entries index b5b836330..34b81cc80 100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/CVS/Entries +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/CVS/Entries @@ -1,3 +1,3 @@ -/about.html/1.3/Thu Jun 1 21:23:58 2006//Tv20111025 -/build.properties/1.1/Mon Jun 13 18:34:40 2005//Tv20111025 +/about.html/1.1.2.1/Thu Apr 1 19:44:16 2010//Tv20111129 +/build.properties/1.1.2.1/Thu Apr 1 19:44:16 2010//Tv20111129 D diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/CVS/Repository b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/CVS/Repository index c1f9a9749..f0478c40f 100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/CVS/Repository +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/CVS/Repository @@ -1 +1 @@ -org.eclipse.platform-feature/sourceTemplateFragment +org.eclipse.sdk-feature/features/org.eclipse.platform-feature/sourceTemplateFragment diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/CVS/Tag b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/CVS/Tag index 944181ef8..631901937 100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/CVS/Tag +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/CVS/Tag @@ -1 +1 @@ -Nv20111025 +Nv20111129 diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/about.html b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/about.html index c207d05a6..c207d05a6 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/about.html +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/about.html diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/build.properties b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/build.properties index c43df59d6..c43df59d6 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/build.properties +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplateFragment/build.properties diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/CVS/Entries b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/CVS/Entries index 16a9d4202..639fee584 100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/CVS/Entries +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/CVS/Entries @@ -1,9 +1,9 @@ -/about.html/1.5/Thu Jun 1 21:23:58 2006//Tv20111025 -/about.ini/1.3/Mon Apr 17 20:00:15 2006/-kb/Tv20111025 -/about.mappings/1.2/Thu Jun 26 13:47:14 2003/-kb/Tv20111025 -/about.properties/1.12/Wed May 4 10:54:57 2011//Tv20111025 -/build.properties/1.8/Tue May 29 15:47:04 2007//Tv20111025 -/eclipse32.gif/1.4/Thu Jun 16 14:12:44 2005/-kb/Tv20111025 -/eclipse32.png/1.1/Mon Apr 17 20:00:15 2006/-kb/Tv20111025 -/plugin.properties/1.5/Sat Feb 26 14:08:49 2005//Tv20111025 +/about.html/1.1.2.1/Thu Apr 1 19:44:11 2010//Tv20111129 +/about.ini/1.1.2.1/Thu Apr 1 19:44:10 2010//Tv20111129 +/about.mappings/1.1.2.1/Thu Apr 1 19:44:12 2010//Tv20111129 +/about.properties/1.1.2.3/Tue Nov 29 16:27:25 2011//Tv20111129 +/build.properties/1.1.2.1/Thu Apr 1 19:44:11 2010//Tv20111129 +/eclipse32.gif/1.1.2.1/Thu Apr 1 19:44:10 2010/-kb/Tv20111129 +/eclipse32.png/1.1.2.1/Thu Apr 1 19:44:12 2010/-kb/Tv20111129 +/plugin.properties/1.1.2.1/Thu Apr 1 19:44:12 2010//Tv20111129 D diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/CVS/Repository b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/CVS/Repository index 3be44b5d2..5f8a3a3b8 100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/CVS/Repository +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/CVS/Repository @@ -1 +1 @@ -org.eclipse.platform-feature/sourceTemplatePlugin +org.eclipse.sdk-feature/features/org.eclipse.platform-feature/sourceTemplatePlugin diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/CVS/Tag b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/CVS/Tag index 944181ef8..631901937 100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/CVS/Tag +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/CVS/Tag @@ -1 +1 @@ -Nv20111025 +Nv20111129 diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.html b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.html index c207d05a6..c207d05a6 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.html +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.html diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.ini b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.ini index 669383fed..669383fed 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.ini +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.ini diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.mappings b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.mappings index bddaab431..bddaab431 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.mappings +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.mappings diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.properties b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.properties index f7e23958f..53d73e0f3 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.properties +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/about.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2011 IBM Corporation and others. +# Copyright (c) 2000, 2010 IBM Corporation 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 diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/build.properties b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/build.properties index c15ef741c..c15ef741c 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/build.properties +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/build.properties diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/eclipse32.gif b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/eclipse32.gif Binary files differindex e6ad7ccd7..e6ad7ccd7 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/eclipse32.gif +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/eclipse32.gif diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/eclipse32.png b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/eclipse32.png Binary files differindex 568fac1d0..568fac1d0 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/eclipse32.png +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/eclipse32.png diff --git a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/plugin.properties b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/plugin.properties index eee6c3ccb..eee6c3ccb 100755..100644 --- a/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/plugin.properties +++ b/FROMCVS/org.eclipse.platform-feature/sourceTemplatePlugin/plugin.properties diff --git a/FROMCVS/org.eclipse.rcp-feature/CVS/Entries b/FROMCVS/org.eclipse.rcp-feature/CVS/Entries index 291c97d34..cfb58da78 100644 --- a/FROMCVS/org.eclipse.rcp-feature/CVS/Entries +++ b/FROMCVS/org.eclipse.rcp-feature/CVS/Entries @@ -3,8 +3,8 @@ D/rootfiles//// D/sourceTemplateFeature//// D/sourceTemplateFragment//// D/sourceTemplatePlugin//// -/.project/1.2/Tue Jun 15 13:30:04 2004//Tv20111111 -/build.properties/1.65/Fri Jan 14 16:10:49 2011//Tv20111111 -/eclipse_update_120.jpg/1.6/Fri Jan 7 20:48:50 2011/-kb/Tv20111111 -/feature.properties/1.19/Fri Jan 21 20:07:05 2011//Tv20111111 -/feature.xml/1.139/Tue Nov 8 21:17:13 2011//Tv20111111 +/.project/1.2/Tue Jun 15 13:30:04 2004//Tv20111129 +/build.properties/1.57.4.1/Result of merge//Tv20111129 +/eclipse_update_120.jpg/1.2/Sun Dec 25 17:22:56 2011/-kb/Tv20111129 +/feature.properties/1.7.4.4/Sun Dec 25 17:22:56 2011//Tv20111129 +/feature.xml/1.115.2.19/Sun Dec 25 17:22:56 2011//Tv20111129 diff --git a/FROMCVS/org.eclipse.rcp-feature/CVS/Tag b/FROMCVS/org.eclipse.rcp-feature/CVS/Tag index 798e46087..631901937 100644 --- a/FROMCVS/org.eclipse.rcp-feature/CVS/Tag +++ b/FROMCVS/org.eclipse.rcp-feature/CVS/Tag @@ -1 +1 @@ -Nv20111111 +Nv20111129 diff --git a/FROMCVS/org.eclipse.rcp-feature/build.properties b/FROMCVS/org.eclipse.rcp-feature/build.properties index a05219100..a8d68ec52 100755 --- a/FROMCVS/org.eclipse.rcp-feature/build.properties +++ b/FROMCVS/org.eclipse.rcp-feature/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 IBM Corporation 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 diff --git a/FROMCVS/org.eclipse.rcp-feature/eclipse_update_120.jpg b/FROMCVS/org.eclipse.rcp-feature/eclipse_update_120.jpg Binary files differindex bfdf708ad..bfdf708ad 100755..100644 --- a/FROMCVS/org.eclipse.rcp-feature/eclipse_update_120.jpg +++ b/FROMCVS/org.eclipse.rcp-feature/eclipse_update_120.jpg diff --git a/FROMCVS/org.eclipse.rcp-feature/feature.properties b/FROMCVS/org.eclipse.rcp-feature/feature.properties index 11812c081..9afbed396 100755..100644 --- a/FROMCVS/org.eclipse.rcp-feature/feature.properties +++ b/FROMCVS/org.eclipse.rcp-feature/feature.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2010 IBM Corporation and others. +# Copyright (c) 2000, 2011 IBM Corporation 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 @@ -28,7 +28,7 @@ description=Rich Client Platform # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2000, 2010 IBM Corporation and others.\n\ +Copyright (c) 2000, 2011 Eclipse contributors and others.\n\ All rights reserved. This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License v1.0\n\ which accompanies this distribution, and is available at\n\ diff --git a/FROMCVS/org.eclipse.rcp-feature/feature.xml b/FROMCVS/org.eclipse.rcp-feature/feature.xml index 55e48458c..35b4063d4 100755..100644 --- a/FROMCVS/org.eclipse.rcp-feature/feature.xml +++ b/FROMCVS/org.eclipse.rcp-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.rcp" label="%featureName" - version="3.8.0.qualifier" + version="4.2.0.qualifier" provider-name="%providerName" plugin="org.eclipse.rcp" image="eclipse_update_120.jpg" @@ -21,9 +21,9 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.eclipse.org/eclipse/updates/3.5"/> - </url> + <includes + id="org.eclipse.e4.rcp" + version="0.0.0"/> <plugin id="com.ibm.icu" @@ -87,13 +87,6 @@ install-size="0" version="0.0.0" unpack="false"/> - - <plugin - id="org.eclipse.core.runtime.compatibility.auth" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> <plugin id="org.eclipse.osgi" @@ -152,16 +145,6 @@ unpack="false"/> <plugin - id="org.eclipse.ui.cocoa" - os="macosx" - ws="cocoa" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin id="org.eclipse.update.configurator" download-size="0" install-size="0" @@ -543,7 +526,7 @@ version="0.0.0" fragment="true"/> - <plugin +<plugin id="org.eclipse.equinox.console" download-size="0" install-size="0" @@ -571,13 +554,4 @@ install-size="0" version="0.0.0" unpack="false"/> - - - <plugin - id="org.eclipse.equinox.bidi" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> diff --git a/FROMCVS/org.eclipse.rcp-feature/pom.xml b/FROMCVS/org.eclipse.rcp-feature/pom.xml index 1267eaee4..797be6c6b 100644 --- a/FROMCVS/org.eclipse.rcp-feature/pom.xml +++ b/FROMCVS/org.eclipse.rcp-feature/pom.xml @@ -12,7 +12,7 @@ <groupId>org.eclipse.platform-feature</groupId> <artifactId>org.eclipse.rcp</artifactId> - <version>3.8.0-SNAPSHOT</version> + <version>4.2.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build> diff --git a/FROMCVS/org.eclipse.rcp-feature/rootfiles/CVS/Tag b/FROMCVS/org.eclipse.rcp-feature/rootfiles/CVS/Tag index cfaeb69b3..71495a432 100644 --- a/FROMCVS/org.eclipse.rcp-feature/rootfiles/CVS/Tag +++ b/FROMCVS/org.eclipse.rcp-feature/rootfiles/CVS/Tag @@ -1 +1 @@ -Tv20111111 +Tv20111129 diff --git a/FROMCVS/org.eclipse.rcp-feature/rootfiles/configuration/CVS/Entries b/FROMCVS/org.eclipse.rcp-feature/rootfiles/configuration/CVS/Entries index 86e0a3a37..e15eb6211 100644 --- a/FROMCVS/org.eclipse.rcp-feature/rootfiles/configuration/CVS/Entries +++ b/FROMCVS/org.eclipse.rcp-feature/rootfiles/configuration/CVS/Entries @@ -1,2 +1,2 @@ -/config.ini/1.14/Fri Feb 6 15:31:50 2009/-kb/Tv20111111 +/config.ini/1.14/Fri Feb 6 15:31:50 2009/-kb/Tv20111129 D diff --git a/FROMCVS/org.eclipse.rcp-feature/rootfiles/configuration/CVS/Tag b/FROMCVS/org.eclipse.rcp-feature/rootfiles/configuration/CVS/Tag index 798e46087..631901937 100644 --- a/FROMCVS/org.eclipse.rcp-feature/rootfiles/configuration/CVS/Tag +++ b/FROMCVS/org.eclipse.rcp-feature/rootfiles/configuration/CVS/Tag @@ -1 +1 @@ -Nv20111111 +Nv20111129 diff --git a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/CVS/Entries b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/CVS/Entries index bd136d30c..6a0706af2 100644 --- a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/CVS/Entries +++ b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/CVS/Entries @@ -1,4 +1,4 @@ -/build.properties/1.6/Mon Jan 17 15:04:45 2011//Tv20111111 -/eclipse_update_120.jpg/1.4/Thu Jan 6 22:35:40 2011/-kb/Tv20111111 -/feature.properties/1.13/Fri Jan 21 20:07:05 2011//Tv20111111 +/build.properties/1.5.14.2/Sun Dec 25 17:22:56 2011//Tv20111129 +/eclipse_update_120.jpg/1.2/Sun Dec 25 17:22:56 2011/-kb/Tv20111129 +/feature.properties/1.7.4.5/Sun Dec 25 17:22:56 2011//Tv20111129 D diff --git a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/CVS/Tag b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/CVS/Tag index 798e46087..631901937 100644 --- a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/CVS/Tag +++ b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/CVS/Tag @@ -1 +1 @@ -Nv20111111 +Nv20111129 diff --git a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/build.properties b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/build.properties index ef23cda31..e3bf4f556 100755..100644 --- a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/build.properties +++ b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/build.properties @@ -13,5 +13,4 @@ eclipse_update_120.jpg,\ feature.xml,\ feature.properties - - +generate.feature@org.eclipse.e4.rcp.source=org.eclipse.e4.rcp
\ No newline at end of file diff --git a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/eclipse_update_120.jpg b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/eclipse_update_120.jpg Binary files differindex bfdf708ad..bfdf708ad 100755..100644 --- a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/eclipse_update_120.jpg +++ b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/eclipse_update_120.jpg diff --git a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/feature.properties b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/feature.properties index ae04e6ab8..c12dc3bc0 100755..100644 --- a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/feature.properties +++ b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFeature/feature.properties @@ -25,7 +25,7 @@ description=Source code zips for the Eclipse RCP. # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2000, 2010 IBM Corporation and others.\n\ +Copyright (c) 2000, 2011 Eclipse contributors and others.\n\ All rights reserved. This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License v1.0\n\ which accompanies this distribution, and is available at\n\ diff --git a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFragment/CVS/Entries b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFragment/CVS/Entries index 61ba1e8fb..d960e4922 100644 --- a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFragment/CVS/Entries +++ b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFragment/CVS/Entries @@ -1,2 +1,3 @@ -/build.properties/1.1/Mon Jun 13 18:34:39 2005//Tv20111111 +/about.html/1.3/Thu Jun 1 21:24:39 2006//Tv20111129 +/build.properties/1.1/Mon Jun 13 18:34:39 2005//Tv20111129 D diff --git a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFragment/CVS/Tag b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFragment/CVS/Tag index 798e46087..631901937 100644 --- a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFragment/CVS/Tag +++ b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFragment/CVS/Tag @@ -1 +1 @@ -Nv20111111 +Nv20111129 diff --git a/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFragment/about.html b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFragment/about.html new file mode 100644 index 000000000..c207d05a6 --- /dev/null +++ b/FROMCVS/org.eclipse.rcp-feature/sourceTemplateFragment/about.html @@ -0,0 +1,33 @@ +<!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>May 10, 2006</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> + +<h3>Source Code</h3> +<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license +agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the +src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p> + +</body> +</html>
\ No newline at end of file diff --git a/FROMCVS/org.eclipse.rcp-feature/sourceTemplatePlugin/CVS/Entries b/FROMCVS/org.eclipse.rcp-feature/sourceTemplatePlugin/CVS/Entries index 81324a7be..4e93e4363 100644 --- a/FROMCVS/org.eclipse.rcp-feature/sourceTemplatePlugin/CVS/Entries +++ b/FROMCVS/org.eclipse.rcp-feature/sourceTemplatePlugin/CVS/Entries @@ -1,9 +1,9 @@ -/about.html/1.3/Thu Jun 1 21:24:39 2006//Tv20111111 -/about.ini/1.2/Mon Apr 17 19:38:39 2006//Tv20111111 -/about.mappings/1.1/Wed Jun 1 23:22:47 2005//Tv20111111 -/about.properties/1.9/Thu May 20 15:41:26 2010//Tv20111111 -/build.properties/1.3/Wed May 30 22:03:23 2007//Tv20111111 -/eclipse32.gif/1.3/Thu Jun 16 02:37:54 2005/-kb/Tv20111111 -/eclipse32.png/1.1/Mon Apr 17 19:38:39 2006/-kb/Tv20111111 -/plugin.properties/1.1/Wed Jun 1 23:22:47 2005//Tv20111111 +/about.html/1.3/Thu Jun 1 21:24:39 2006//Tv20111129 +/about.ini/1.2/Mon Apr 17 19:38:39 2006//Tv20111129 +/about.mappings/1.1/Wed Jun 1 23:22:47 2005//Tv20111129 +/about.properties/1.8.4.2/Sun Dec 25 17:22:56 2011//Tv20111129 +/build.properties/1.3/Wed May 30 22:03:23 2007//Tv20111129 +/eclipse32.gif/1.3/Thu Jun 16 02:37:54 2005/-kb/Tv20111129 +/eclipse32.png/1.1/Mon Apr 17 19:38:39 2006/-kb/Tv20111129 +/plugin.properties/1.1/Wed Jun 1 23:22:47 2005//Tv20111129 D diff --git a/FROMCVS/org.eclipse.rcp-feature/sourceTemplatePlugin/CVS/Tag b/FROMCVS/org.eclipse.rcp-feature/sourceTemplatePlugin/CVS/Tag index 798e46087..631901937 100644 --- a/FROMCVS/org.eclipse.rcp-feature/sourceTemplatePlugin/CVS/Tag +++ b/FROMCVS/org.eclipse.rcp-feature/sourceTemplatePlugin/CVS/Tag @@ -1 +1 @@ -Nv20111111 +Nv20111129 diff --git a/FROMCVS/org.eclipse.rcp-feature/sourceTemplatePlugin/about.properties b/FROMCVS/org.eclipse.rcp-feature/sourceTemplatePlugin/about.properties index 7a5cd9103..a696091c2 100755..100644 --- a/FROMCVS/org.eclipse.rcp-feature/sourceTemplatePlugin/about.properties +++ b/FROMCVS/org.eclipse.rcp-feature/sourceTemplatePlugin/about.properties @@ -21,6 +21,6 @@ blurb=Eclipse RCP Plug-in Developer Resources\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ -(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.\n\ +(c) Copyright Eclipse contributors and others 2000, 2011. All rights reserved.\n\ Visit http://www.eclipse.org/rcp diff --git a/FROMCVS/org.eclipse.rcp/CVS/Entries b/FROMCVS/org.eclipse.rcp/CVS/Entries index aab8bbb95..2de928fe8 100644 --- a/FROMCVS/org.eclipse.rcp/CVS/Entries +++ b/FROMCVS/org.eclipse.rcp/CVS/Entries @@ -1,11 +1,11 @@ D/META-INF//// -/.project/1.1/Wed Jun 1 19:07:14 2005/-kk/Tv20110504-0800 -/about.html/1.3/Mon Jun 5 15:05:59 2006/-kk/Tv20110504-0800 -/about.ini/1.2/Mon Apr 17 19:59:54 2006/-kk/Tv20110504-0800 -/about.mappings/1.1/Wed Jun 1 19:07:14 2005/-kk/Tv20110504-0800 -/about.properties/1.9/Wed May 4 10:55:24 2011/-kk/Tv20110504-0800 -/build.properties/1.8/Thu Nov 15 01:47:53 2007/-kk/Tv20110504-0800 -/eclipse32.gif/1.4/Wed Apr 19 18:15:31 2006/-kb/Tv20110504-0800 -/eclipse32.png/1.5/Fri Apr 28 04:06:50 2006/-kb/Tv20110504-0800 -/notice.html/1.2/Fri Feb 4 20:39:18 2011/-kk/Tv20110504-0800 -/plugin.properties/1.2/Fri Jun 3 14:04:35 2005/-kk/Tv20110504-0800 +/.project/1.1/Wed Jun 1 19:07:14 2005/-kk/Tv20110127-2200 +/about.html/1.3/Mon Jun 5 15:05:59 2006/-kk/Tv20110127-2200 +/about.ini/1.2/Mon Apr 17 19:59:54 2006/-kk/Tv20110127-2200 +/about.mappings/1.1/Wed Jun 1 19:07:14 2005/-kk/Tv20110127-2200 +/about.properties/1.7.4.2/Sun Dec 25 17:22:27 2011/-kk/Tv20110127-2200 +/build.properties/1.8/Thu Nov 15 01:47:53 2007/-kk/Tv20110127-2200 +/eclipse32.gif/1.4/Wed Apr 19 18:15:31 2006/-kb/Tv20110127-2200 +/eclipse32.png/1.5/Fri Apr 28 04:06:50 2006/-kb/Tv20110127-2200 +/notice.html/1.1/Sun Dec 25 17:22:27 2011/-kk/Tv20110127-2200 +/plugin.properties/1.2/Fri Jun 3 14:04:35 2005/-kk/Tv20110127-2200 diff --git a/FROMCVS/org.eclipse.rcp/CVS/Tag b/FROMCVS/org.eclipse.rcp/CVS/Tag index f0d94d005..6a42af988 100644 --- a/FROMCVS/org.eclipse.rcp/CVS/Tag +++ b/FROMCVS/org.eclipse.rcp/CVS/Tag @@ -1 +1 @@ -Nv20110504-0800 +Nv20110127-2200 diff --git a/FROMCVS/org.eclipse.rcp/META-INF/CVS/Entries b/FROMCVS/org.eclipse.rcp/META-INF/CVS/Entries index 7781d3906..71e792947 100644 --- a/FROMCVS/org.eclipse.rcp/META-INF/CVS/Entries +++ b/FROMCVS/org.eclipse.rcp/META-INF/CVS/Entries @@ -1,2 +1,2 @@ -/MANIFEST.MF/1.7/Sat Dec 24 14:05:19 2011/-kk/Tv20110504-0800 +/MANIFEST.MF/1.5.4.3/Sun Dec 25 17:22:27 2011/-kk/Tv20110127-2200 D diff --git a/FROMCVS/org.eclipse.rcp/META-INF/CVS/Tag b/FROMCVS/org.eclipse.rcp/META-INF/CVS/Tag index f0d94d005..6a42af988 100644 --- a/FROMCVS/org.eclipse.rcp/META-INF/CVS/Tag +++ b/FROMCVS/org.eclipse.rcp/META-INF/CVS/Tag @@ -1 +1 @@ -Nv20110504-0800 +Nv20110127-2200 diff --git a/FROMCVS/org.eclipse.rcp/META-INF/MANIFEST.MF b/FROMCVS/org.eclipse.rcp/META-INF/MANIFEST.MF index 0e0432334..47912458a 100755..100644 --- a/FROMCVS/org.eclipse.rcp/META-INF/MANIFEST.MF +++ b/FROMCVS/org.eclipse.rcp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rcp; singleton:=true -Bundle-Version: 3.7.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Eclipse-AutoStart: true diff --git a/FROMCVS/org.eclipse.rcp/about.properties b/FROMCVS/org.eclipse.rcp/about.properties index bcaa894e2..fafd3e78e 100755..100644 --- a/FROMCVS/org.eclipse.rcp/about.properties +++ b/FROMCVS/org.eclipse.rcp/about.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2011 IBM Corporation and others. +# Copyright (c) 2000, 2010 IBM Corporation 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 diff --git a/FROMCVS/org.eclipse.rcp/notice.html b/FROMCVS/org.eclipse.rcp/notice.html index dc5aefd67..c6af966b6 100755..100644 --- a/FROMCVS/org.eclipse.rcp/notice.html +++ b/FROMCVS/org.eclipse.rcp/notice.html @@ -1,162 +1,79 @@ -<!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>Eclipse Foundation Software User Agreement</title> -</head><body lang="EN-US"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<html> +<head> +<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> +<title>Eclipse.org Software User Agreement</title> +</head> + +<body lang="EN-US" link=blue vlink=purple> <h2>Eclipse Foundation Software User Agreement</h2> -<p>February 1, 2011</p> +<p>March 17, 2005</p> <h3>Usage Of Content</h3> <p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse - Foundation is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also - 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>Content includes, but is not limited to, source code, object code, -documentation and other files maintained in the Eclipse Foundation -source code - repository ("Repository") in software modules ("Modules") and made -available as downloadable archives ("Downloads").</p> - + +<h3>Applicable Licenses</h3> + +<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 + ("EPL"). A copy of the EPL is provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS + modules ("Modules") and made available as downloadable archives ("Downloads").</p> + <ul> - <li>Content may be structured and packaged into modules to -facilitate delivering, extending, and upgrading the Content. Typical -modules may include plug-ins ("Plug-ins"), plug-in fragments -("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or -Fragments and associated material. Each Feature may be packaged as a -sub-directory in a directory named "features". Within a Feature, files -named "feature.xml" may contain a list of the names and version numbers -of the Plug-ins + <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> + <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> + <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included -Features"). Within a Feature, files named "feature.xml" may contain a -list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be -contained in files named "about.html" ("Abouts"). The terms and -conditions governing Features and -Included Features should be contained in files named "license.html" -("Feature Licenses"). Abouts and Feature Licenses may be located in any - directory of a Download or Module + <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> +</ul> + +<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and +Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:</p> <ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> + <li>The top-level (root) directory</li> + <li>Plug-in and Fragment directories</li> + <li>Inside Plug-ins and Fragments packaged as JARs</li> + <li>Sub-directories of the directory named "src" of certain Plug-ins</li> + <li>Feature directories</li> </ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is -installed using the Provisioning Technology (as defined below), you must - agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the -Feature Update License should either provide you with the terms and -conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be -found in the "license" property of files named "feature.properties" -found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the -terms and conditions (or references to such terms and conditions) that -govern your use of the associated Content in + +<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the +installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or +inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in that directory.</p> -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. - SOME OF THESE +<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> <ul> - <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> + <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> + <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> + <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> + <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li> + <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> + <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> </ul> -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND -CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, -or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions -govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, -examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of -allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This -capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about -packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install - Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to - be presented to, and accepted by, the users of the Provisioning -Technology - in accordance with the Specification. By using Provisioning -Technology in such a manner and making it available in accordance with -the - Specification, you further acknowledge your agreement to, and the -acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in -which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, -extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology -may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user -the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable -Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable -Software Agreement must inform the user of the terms and conditions that - govern - the Installable Software and must solicit acceptance by the end -user in the manner prescribed in such Installable Software Agreement. -Upon such - indication of agreement by the user, the provisioning Technology -will complete installation of the Installable Software.</li> -</ol> +<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please +contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> <h3>Cryptography</h3> -<p>Content may contain encryption software. The country in which you are - currently may have restrictions on the import, possession, and use, -and/or re-export to - another country, of encryption software. BEFORE using any encryption -software, please check the country's laws, regulations and policies -concerning the import, - possession, or use, and re-export of encryption software, to see if -this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> -</body></html>
\ No newline at end of file +<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to + another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, + possession, or use, and re-export of encryption software, to see if this is permitted.</p> + +<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> +</body> +</html> diff --git a/FROMCVS/org.eclipse.rcp/pom.xml b/FROMCVS/org.eclipse.rcp/pom.xml index 777843b71..acb438d07 100644 --- a/FROMCVS/org.eclipse.rcp/pom.xml +++ b/FROMCVS/org.eclipse.rcp/pom.xml @@ -12,7 +12,7 @@ <groupId>org.eclipse.cvs</groupId> <artifactId>org.eclipse.rcp</artifactId> - <version>3.7.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/FROMCVS/org.eclipse.sdk-feature/CVS/Entries b/FROMCVS/org.eclipse.sdk-feature/CVS/Entries index f62c80941..b9280a019 100644 --- a/FROMCVS/org.eclipse.sdk-feature/CVS/Entries +++ b/FROMCVS/org.eclipse.sdk-feature/CVS/Entries @@ -4,8 +4,8 @@ D/macosx.cocoa//// D/motif//// D/win32//// D/wpf//// -/.project/1.1/Tue Jun 15 14:08:48 2004//Tv20111208a -/build.properties/1.113/Sun Dec 25 12:57:16 2011//Tv20111208a -/eclipse_update_120.jpg/1.11/Fri Jan 7 20:48:48 2011/-kb/Tv20111208a -/feature.properties/1.35/Fri Jan 21 20:07:03 2011//Tv20111208a -/feature.xml/1.39/Sat Dec 24 14:05:19 2011//Tv20111208a +/.project/1.1/Tue Jun 15 14:08:48 2004//Tv20111129 +/build.properties/1.72.2.6/Sun Dec 25 17:23:36 2011//Tv20111129 +/eclipse_update_120.jpg/1.3/Sun Dec 25 17:23:36 2011/-kb/Tv20111129 +/feature.properties/1.18.2.6/Sun Dec 25 17:23:36 2011//Tv20111129 +/feature.xml/1.25.2.4/Sun Dec 25 17:23:36 2011//Tv20111129 diff --git a/FROMCVS/org.eclipse.sdk-feature/CVS/Tag b/FROMCVS/org.eclipse.sdk-feature/CVS/Tag index 7a4877baf..631901937 100644 --- a/FROMCVS/org.eclipse.sdk-feature/CVS/Tag +++ b/FROMCVS/org.eclipse.sdk-feature/CVS/Tag @@ -1 +1 @@ -Nv20111208a +Nv20111129 diff --git a/FROMCVS/org.eclipse.sdk-feature/build.properties b/FROMCVS/org.eclipse.sdk-feature/build.properties index d1714e9d7..6e73e8118 100644 --- a/FROMCVS/org.eclipse.sdk-feature/build.properties +++ b/FROMCVS/org.eclipse.sdk-feature/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 IBM Corporation 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 @@ -15,29 +15,4 @@ generate.feature@org.eclipse.platform.source=org.eclipse.platform,feature@org.ec plugin@com.jcraft.jsch.source;version=0.1.41.qualifier;unpack="false",\ exclude@org.eclipse.platform.doc.user -generate.feature@org.eclipse.jdt.source=org.eclipse.jdt, plugin@org.eclipse.jdt.doc.isv;unpack="false",\ -plugin@org.junit.source;version=3.8.2.qualifier;unpack="false",\ -plugin@org.junit.source;version=4.8.2.qualifier;unpack="false",\ -plugin@org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\ -exclude@org.eclipse.jdt.doc.user -generate.feature@org.eclipse.pde.source=org.eclipse.pde,plugin@org.objectweb.asm.source;version=3.3.1.qualifier;unpack="false",\exclude@org.eclipse.pde.doc.user -generate.feature@org.eclipse.cvs.source=org.eclipse.cvs -generate.feature@org.eclipse.help.source=org.eclipse.help,\ - plugin@javax.servlet.source;version=3.0.0.qualifier;unpack="false",\ - plugin@javax.servlet.jsp.source;version=2.2.0.qualifier;unpack="false",\ - plugin@org.apache.jasper.glassfish.source;version=2.2.2.qualifier;unpack="false",\ - plugin@com.sun.el.source;version=2.2.0.qualifier;unpack="false",\ - plugin@org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\ - plugin@org.apache.lucene.source;version=2.9.1.qualifier;unpack="false",\ - plugin@org.apache.lucene.analysis.source;version=2.9.1.qualifier;unpack="false",\ - plugin@org.apache.lucene.core.source;version=2.9.1.qualifier;unpack="false",\ - plugin@org.eclipse.jetty.continuation.source;version=8.1.0.qualifier;unpack="false",\ - plugin@org.eclipse.jetty.http.source;version=8.1.0.qualifier;unpack="false",\ - plugin@org.eclipse.jetty.io.source;version=8.1.0.qualifier;unpack="false",\ - plugin@org.eclipse.jetty.security.source;version=8.1.0.qualifier;unpack="false",\ - plugin@org.eclipse.jetty.server.source;version=8.1.0.qualifier;unpack="false",\ - plugin@org.eclipse.jetty.servlet.source;version=8.1.0.qualifier;unpack="false",\ - plugin@org.eclipse.jetty.util.source;version=8.1.0.qualifier;unpack="false",\ - plugin@org.eclipse.javax.el.source;version=2.2.0.qualifier;unpack="false" - -generatedVersionLength=45 +generatedVersionLength=45
\ No newline at end of file diff --git a/FROMCVS/org.eclipse.sdk-feature/eclipse_update_120.jpg b/FROMCVS/org.eclipse.sdk-feature/eclipse_update_120.jpg Binary files differindex bfdf708ad..bfdf708ad 100755..100644 --- a/FROMCVS/org.eclipse.sdk-feature/eclipse_update_120.jpg +++ b/FROMCVS/org.eclipse.sdk-feature/eclipse_update_120.jpg diff --git a/FROMCVS/org.eclipse.sdk-feature/feature.properties b/FROMCVS/org.eclipse.sdk-feature/feature.properties index 3d9b8dd54..2aad67591 100755..100644 --- a/FROMCVS/org.eclipse.sdk-feature/feature.properties +++ b/FROMCVS/org.eclipse.sdk-feature/feature.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2010 IBM Corporation and others. +# Copyright (c) 2000, 2011 IBM Corporation 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 @@ -25,12 +25,9 @@ description=SDK for Eclipse. # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2000, 2010 IBM Corporation and others.\n\ +Copyright (c) 2000, 2011 Eclipse contributors and others.\n\ All rights reserved. This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License v1.0\n\ which accompanies this distribution, and is available at\n\ http://www.eclipse.org/legal/epl-v10.html\n\ -\n\ -Contributors:\n\ - IBM Corporation - initial API and implementation\n ################ end of copyright property ####################################
\ No newline at end of file diff --git a/FROMCVS/org.eclipse.sdk-feature/feature.xml b/FROMCVS/org.eclipse.sdk-feature/feature.xml index 8da881910..7d7beb329 100755..100644 --- a/FROMCVS/org.eclipse.sdk-feature/feature.xml +++ b/FROMCVS/org.eclipse.sdk-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.sdk" label="%featureName" - version="3.8.0.qualifier" + version="4.2.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg" license-feature="org.eclipse.license" diff --git a/FROMCVS/org.eclipse.sdk-feature/pom.xml b/FROMCVS/org.eclipse.sdk-feature/pom.xml index 8678f75e7..da244b06a 100644 --- a/FROMCVS/org.eclipse.sdk-feature/pom.xml +++ b/FROMCVS/org.eclipse.sdk-feature/pom.xml @@ -12,7 +12,7 @@ <groupId>org.eclipse.platform-feature</groupId> <artifactId>org.eclipse.sdk</artifactId> - <version>3.8.0-SNAPSHOT</version> + <version>4.2.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build> |
