diff options
| author | Stephan Herrmann | 2017-03-05 19:01:24 +0000 |
|---|---|---|
| committer | Stephan Herrmann | 2017-03-05 19:07:09 +0000 |
| commit | 6f3b0738e41a8eed7db3f8d62f5355c95c20a8bc (patch) | |
| tree | 94b5eb946d1354df76d95bcdae53d311a2446b4f | |
| parent | 3f00c0333bef9f2e626143a2ca82de133bbfb6d7 (diff) | |
| download | org.eclipse.objectteams-6f3b0738e41a8eed7db3f8d62f5355c95c20a8bc.tar.gz org.eclipse.objectteams-6f3b0738e41a8eed7db3f8d62f5355c95c20a8bc.tar.xz org.eclipse.objectteams-6f3b0738e41a8eed7db3f8d62f5355c95c20a8bc.zip | |
Bug 513121: provide an OT/Equinox feature compatible with OTRE weaving
26 files changed, 1008 insertions, 2 deletions
diff --git a/features/org.eclipse.objectteams.otequinox.otre.feature/.project b/features/org.eclipse.objectteams.otequinox.otre.feature/.project new file mode 100644 index 000000000..c92f04cc8 --- /dev/null +++ b/features/org.eclipse.objectteams.otequinox.otre.feature/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.objectteams.otequinox.otre.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> diff --git a/features/org.eclipse.objectteams.otequinox.otre.feature/build.properties b/features/org.eclipse.objectteams.otequinox.otre.feature/build.properties new file mode 100644 index 000000000..94bb8830a --- /dev/null +++ b/features/org.eclipse.objectteams.otequinox.otre.feature/build.properties @@ -0,0 +1,4 @@ +bin.includes = feature.xml,\ + feature.properties,\ + license.html,\ + epl-v10.html diff --git a/features/org.eclipse.objectteams.otequinox.otre.feature/epl-v10.html b/features/org.eclipse.objectteams.otequinox.otre.feature/epl-v10.html new file mode 100644 index 000000000..fd391227c --- /dev/null +++ b/features/org.eclipse.objectteams.otequinox.otre.feature/epl-v10.html @@ -0,0 +1,261 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> +<title>Eclipse Public License - Version 1.0</title> +<style type="text/css"> + body { + size: 8.5in 11.0in; + margin: 0.25in 0.5in 0.25in 0.5in; + tab-interval: 0.5in; + } + p { + margin-left: auto; + margin-top: 0.5em; + margin-bottom: 0.5em; + } + p.list { + margin-left: 0.5in; + margin-top: 0.05em; + margin-bottom: 0.05em; + } + </style> + +</head> + +<body lang="EN-US"> + +<h2>Eclipse Public License - v 1.0</h2> + +<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE +PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR +DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS +AGREEMENT.</p> + +<p><b>1. DEFINITIONS</b></p> + +<p>"Contribution" means:</p> + +<p class="list">a) in the case of the initial Contributor, the initial +code and documentation distributed under this Agreement, and</p> +<p class="list">b) in the case of each subsequent Contributor:</p> +<p class="list">i) changes to the Program, and</p> +<p class="list">ii) additions to the Program;</p> +<p class="list">where such changes and/or additions to the Program +originate from and are distributed by that particular Contributor. A +Contribution 'originates' from a Contributor if it was added to the +Program by such Contributor itself or anyone acting on such +Contributor's behalf. Contributions do not include additions to the +Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) +are not derivative works of the Program.</p> + +<p>"Contributor" means any person or entity that distributes +the Program.</p> + +<p>"Licensed Patents" mean patent claims licensable by a +Contributor which are necessarily infringed by the use or sale of its +Contribution alone or when combined with the Program.</p> + +<p>"Program" means the Contributions distributed in accordance +with this Agreement.</p> + +<p>"Recipient" means anyone who receives the Program under +this Agreement, including all Contributors.</p> + +<p><b>2. GRANT OF RIGHTS</b></p> + +<p class="list">a) Subject to the terms of this Agreement, each +Contributor hereby grants Recipient a non-exclusive, worldwide, +royalty-free copyright license to reproduce, prepare derivative works +of, publicly display, publicly perform, distribute and sublicense the +Contribution of such Contributor, if any, and such derivative works, in +source code and object code form.</p> + +<p class="list">b) Subject to the terms of this Agreement, each +Contributor hereby grants Recipient a non-exclusive, worldwide, +royalty-free patent license under Licensed Patents to make, use, sell, +offer to sell, import and otherwise transfer the Contribution of such +Contributor, if any, in source code and object code form. This patent +license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, +such addition of the Contribution causes such combination to be covered +by the Licensed Patents. The patent license shall not apply to any other +combinations which include the Contribution. No hardware per se is +licensed hereunder.</p> + +<p class="list">c) Recipient understands that although each Contributor +grants the licenses to its Contributions set forth herein, no assurances +are provided by any Contributor that the Program does not infringe the +patent or other intellectual property rights of any other entity. Each +Contributor disclaims any liability to Recipient for claims brought by +any other entity based on infringement of intellectual property rights +or otherwise. As a condition to exercising the rights and licenses +granted hereunder, each Recipient hereby assumes sole responsibility to +secure any other intellectual property rights needed, if any. For +example, if a third party patent license is required to allow Recipient +to distribute the Program, it is Recipient's responsibility to acquire +that license before distributing the Program.</p> + +<p class="list">d) Each Contributor represents that to its knowledge it +has sufficient copyright rights in its Contribution, if any, to grant +the copyright license set forth in this Agreement.</p> + +<p><b>3. REQUIREMENTS</b></p> + +<p>A Contributor may choose to distribute the Program in object code +form under its own license agreement, provided that:</p> + +<p class="list">a) it complies with the terms and conditions of this +Agreement; and</p> + +<p class="list">b) its license agreement:</p> + +<p class="list">i) effectively disclaims on behalf of all Contributors +all warranties and conditions, express and implied, including warranties +or conditions of title and non-infringement, and implied warranties or +conditions of merchantability and fitness for a particular purpose;</p> + +<p class="list">ii) effectively excludes on behalf of all Contributors +all liability for damages, including direct, indirect, special, +incidental and consequential damages, such as lost profits;</p> + +<p class="list">iii) states that any provisions which differ from this +Agreement are offered by that Contributor alone and not by any other +party; and</p> + +<p class="list">iv) states that source code for the Program is available +from such Contributor, and informs licensees how to obtain it in a +reasonable manner on or through a medium customarily used for software +exchange.</p> + +<p>When the Program is made available in source code form:</p> + +<p class="list">a) it must be made available under this Agreement; and</p> + +<p class="list">b) a copy of this Agreement must be included with each +copy of the Program.</p> + +<p>Contributors may not remove or alter any copyright notices contained +within the Program.</p> + +<p>Each Contributor must identify itself as the originator of its +Contribution, if any, in a manner that reasonably allows subsequent +Recipients to identify the originator of the Contribution.</p> + +<p><b>4. COMMERCIAL DISTRIBUTION</b></p> + +<p>Commercial distributors of software may accept certain +responsibilities with respect to end users, business partners and the +like. While this license is intended to facilitate the commercial use of +the Program, the Contributor who includes the Program in a commercial +product offering should do so in a manner which does not create +potential liability for other Contributors. Therefore, if a Contributor +includes the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and +indemnify every other Contributor ("Indemnified Contributor") +against any losses, damages and costs (collectively "Losses") +arising from claims, lawsuits and other legal actions brought by a third +party against the Indemnified Contributor to the extent caused by the +acts or omissions of such Commercial Contributor in connection with its +distribution of the Program in a commercial product offering. The +obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In +order to qualify, an Indemnified Contributor must: a) promptly notify +the Commercial Contributor in writing of such claim, and b) allow the +Commercial Contributor to control, and cooperate with the Commercial +Contributor in, the defense and any related settlement negotiations. The +Indemnified Contributor may participate in any such claim at its own +expense.</p> + +<p>For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those +performance claims and warranties, and if a court requires any other +Contributor to pay any damages as a result, the Commercial Contributor +must pay those damages.</p> + +<p><b>5. NO WARRANTY</b></p> + +<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS +PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS +OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, +ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY +OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely +responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its +exercise of rights under this Agreement , including but not limited to +the risks and costs of program errors, compliance with applicable laws, +damage to or loss of data, programs or equipment, and unavailability or +interruption of operations.</p> + +<p><b>6. DISCLAIMER OF LIABILITY</b></p> + +<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT +NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING +WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR +DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED +HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p> + +<p><b>7. GENERAL</b></p> + +<p>If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further action +by the parties hereto, such provision shall be reformed to the minimum +extent necessary to make such provision valid and enforceable.</p> + +<p>If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other +software or hardware) infringes such Recipient's patent(s), then such +Recipient's rights granted under Section 2(b) shall terminate as of the +date such litigation is filed.</p> + +<p>All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of time +after becoming aware of such noncompliance. If all Recipient's rights +under this Agreement terminate, Recipient agrees to cease use and +distribution of the Program as soon as reasonably practicable. However, +Recipient's obligations under this Agreement and any licenses granted by +Recipient relating to the Program shall continue and survive.</p> + +<p>Everyone is permitted to copy and distribute copies of this +Agreement, but in order to avoid inconsistency the Agreement is +copyrighted and may only be modified in the following manner. The +Agreement Steward reserves the right to publish new versions (including +revisions) of this Agreement from time to time. No one other than the +Agreement Steward has the right to modify this Agreement. The Eclipse +Foundation is the initial Agreement Steward. The Eclipse Foundation may +assign the responsibility to serve as the Agreement Steward to a +suitable separate entity. Each new version of the Agreement will be +given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version +of the Agreement is published, Contributor may elect to distribute the +Program (including its Contributions) under the new version. Except as +expressly stated in Sections 2(a) and 2(b) above, Recipient receives no +rights or licenses to the intellectual property of any Contributor under +this Agreement, whether expressly, by implication, estoppel or +otherwise. All rights in the Program not expressly granted under this +Agreement are reserved.</p> + +<p>This Agreement is governed by the laws of the State of New York and +the intellectual property laws of the United States of America. No party +to this Agreement will bring a legal action under this Agreement more +than one year after the cause of action arose. Each party waives its +rights to a jury trial in any resulting litigation.</p> + +</body> + +</html> diff --git a/features/org.eclipse.objectteams.otequinox.otre.feature/feature.properties b/features/org.eclipse.objectteams.otequinox.otre.feature/feature.properties new file mode 100644 index 000000000..14d363566 --- /dev/null +++ b/features/org.eclipse.objectteams.otequinox.otre.feature/feature.properties @@ -0,0 +1,151 @@ +############################################################################### +# 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 +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +# Fraunhofer FIRST - initial API and implementation +# Technical University Berlin - initial API and implementation +############################################################################### +# feature.properties +# contains externalized strings for feature.xml +# "%foo" in feature.xml corresponds to the key "foo" in this file +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file should be translated. + +featureName=Object Teams Equinox Integration (Traditional Variant - OTRE) +providerName=Eclipse.org - Object Teams + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +licenseURL=license.html + +# "license" property - text of the "Feature Update License" +# should be plain text version of license agreement pointed to be "licenseURL" +license=\ +Eclipse Foundation Software User Agreement\n\ +April 9, 2014\n\ +\n\ +Usage Of Content\n\ +\n\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ +OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ +USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ +AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ +NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ +AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ +AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ +OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ +OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ +\n\ +Applicable Licenses\n\ +\n\ +Unless otherwise indicated, all Content made available by the\n\ +Eclipse Foundation is provided to you under the terms and conditions of\n\ +the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ +provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ +For purposes of the EPL, "Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code,\n\ +documentation and other files maintained in the Eclipse Foundation source code\n\ +repository ("Repository") in software modules ("Modules") and made available\n\ +as downloadable archives ("Downloads").\n\ +\n\ +\t- Content may be structured and packaged into modules to facilitate delivering,\n\ +\t extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ +\t plug-in fragments ("Fragments"), and features ("Features").\n\ +\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ +\t in a directory named "plugins".\n\ +\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ +\t Each Feature may be packaged as a sub-directory in a directory named "features".\n\ +\t Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ +\t numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ +\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\ +\t named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be\n\ +contained in files named "about.html" ("Abouts"). The terms and\n\ +conditions governing Features and Included Features should be contained\n\ +in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ +Licenses may be located in any directory of a Download or Module\n\ +including, but not limited to the following locations:\n\ +\n\ +\t- The top-level (root) directory\n\ +\t- Plug-in and Fragment directories\n\ +\t- Inside Plug-ins and Fragments packaged as JARs\n\ +\t- Sub-directories of the directory named "src" of certain Plug-ins\n\ +\t- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ +Provisioning Technology (as defined below), you must agree to a license ("Feature \n\ +Update License") during the installation process. If the Feature contains\n\ +Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform\n\ +you where you can locate them. Feature Update Licenses may be found in\n\ +the "license" property of files named "feature.properties" found within a Feature.\n\ +Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\ +terms and conditions (or references to such terms and conditions) that\n\ +govern your use of the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ +TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ +SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ +\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ +\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ +\t- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ +\n\ +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ +TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ +is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ +govern that particular Content.\n\ +\n\ +\n\Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which include,\n\ +but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\ +the purpose of allowing users to install software, documentation, information and/or\n\ +other materials (collectively "Installable Software"). This capability is provided with\n\ +the intent of allowing such users to install, extend and update Eclipse-based products.\n\ +Information about packaging Installable Software is available at\n\ +http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\ +\n\ +You may use Provisioning Technology to allow other parties to install Installable Software.\n\ +You shall be responsible for enabling the applicable license agreements relating to the\n\ +Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ +in accordance with the Specification. By using Provisioning Technology in such a manner and\n\ +making it available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the following:\n\ +\n\ +\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ +\t the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ +\t extending or updating the functionality of an Eclipse-based product.\n\ +\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ +\t Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ +\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ +\t govern the use of the Installable Software ("Installable Software Agreement") and such\n\ +\t Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ +\t with the Specification. Such Installable Software Agreement must inform the user of the\n\ +\t terms and conditions that govern the Installable Software and must solicit acceptance by\n\ +\t the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ +\t indication of agreement by the user, the provisioning Technology will complete installation\n\ +\t of the Installable Software.\n\ +\n\ +Cryptography\n\ +\n\ +Content may contain encryption software. The country in which you are\n\ +currently may have restrictions on the import, possession, and use,\n\ +and/or re-export to another country, of encryption software. BEFORE\n\ +using any encryption software, please check the country's laws,\n\ +regulations and policies concerning the import, possession, or use, and\n\ +re-export of encryption software, to see if this is permitted.\n\ +\n\ +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +########### end of license property ##########################################
\ No newline at end of file diff --git a/features/org.eclipse.objectteams.otequinox.otre.feature/feature.xml b/features/org.eclipse.objectteams.otequinox.otre.feature/feature.xml new file mode 100644 index 000000000..299f5d169 --- /dev/null +++ b/features/org.eclipse.objectteams.otequinox.otre.feature/feature.xml @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.eclipse.objectteams.otequinox.otre" + label="%featureName" + version="2.5.3.qualifier" + provider-name="%providerName" + plugin="org.eclipse.objectteams.otequinox" + colocation-affinity="org.eclipse.rcp"> + + <description url="http://www.eclipse.org/objectteams"> + This feature enables Equinox to run plugins written in OT/J. + </description> + + <copyright> + The copyright is held by the Technische Unversität Berlin +Author: Stephan Herrmann. + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <url> + <update label="Object Teams Updates" url="http://download.eclipse.org/objectteams/updates/ot2.5"/> + <discovery label="Orbit Repository" url="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository"/> + </url> + + <plugin + id="org.eclipse.objectteams.runtime" + download-size="89" + install-size="202" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.objectteams.otre" + download-size="89" + install-size="202" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.apache.bcel" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.objectteams.otequinox" + download-size="27" + install-size="52" + version="0.0.0" + unpack="true"/> + + <plugin + id="org.eclipse.objectteams.otequinox.branding.otre" + download-size="15" + install-size="20" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.objectteams.eclipse.monitor" + download-size="12" + install-size="22" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/features/org.eclipse.objectteams.otequinox.otre.feature/license.html b/features/org.eclipse.objectteams.otequinox.otre.feature/license.html new file mode 100644 index 000000000..c3d34c3c2 --- /dev/null +++ b/features/org.eclipse.objectteams.otequinox.otre.feature/license.html @@ -0,0 +1,107 @@ +<?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"> +<h2>Eclipse Foundation Software User Agreement</h2> +<p>April 9, 2014</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 + 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> + +<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 + 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 +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> +</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 +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 +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>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> + +<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> diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/.classpath b/plugins/org.eclipse.objectteams.otequinox.branding.otre/.classpath new file mode 100644 index 000000000..4f5151223 --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/.classpath @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="OTRE"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/.project b/plugins/org.eclipse.objectteams.otequinox.branding.otre/.project new file mode 100644 index 000000000..9f3528c34 --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/.project @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.objectteams.otequinox.branding.otre</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.objectteams.otdt.builder.OTJBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.objectteams.otdt.OTJavaNature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + </natures> +</projectDescription> diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.objectteams.otequinox.branding.otre/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..50b27db04 --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,27 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.objectteams.otdt.compiler.option.joinpoint_queries=disabled +org.eclipse.objectteams.otdt.compiler.option.scoped_keywords=enabled +org.eclipse.objectteams.otdt.compiler.option.weaving_scheme=OTRE +org.eclipse.objectteams.otdt.compiler.problem.abstract_potential_relevant_role=warning +org.eclipse.objectteams.otdt.compiler.problem.basecall=warning +org.eclipse.objectteams.otdt.compiler.problem.binding_conventions=error +org.eclipse.objectteams.otdt.compiler.problem.decapsulation=warning +org.eclipse.objectteams.otdt.compiler.problem.deprecated_path_syntax=warning +org.eclipse.objectteams.otdt.compiler.problem.effectless_fieldaccess=warning +org.eclipse.objectteams.otdt.compiler.problem.fragile_callin=warning +org.eclipse.objectteams.otdt.compiler.problem.incomplete_build=error +org.eclipse.objectteams.otdt.compiler.problem.inferred_callout=error +org.eclipse.objectteams.otdt.compiler.problem.potential_ambiguous_playedby=warning +org.eclipse.objectteams.otdt.compiler.problem.unsafe_liftctor=warning +org.eclipse.objectteams.otdt.compiler.problem.unused_parammap=warning diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox.branding.otre/META-INF/MANIFEST.MF new file mode 100644 index 000000000..c56e34838 --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/META-INF/MANIFEST.MF @@ -0,0 +1,15 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.objectteams.otequinox.branding.otre;singleton:=true +Bundle-Version: 2.5.0.qualifier +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", + org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)", + org.eclipse.ui;bundle-version="[3.7.0,4.0.0)", + org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-ActivationPolicy: lazy +Bundle-Activator: org.eclipse.objectteams.otequinox.branding.Activator +Export-Package: org.eclipse.objectteams.otequinox.internal.branding;ot-aspect-host="org.eclipse.objectteams.otequinox.branding";x-friends:="org.eclipse.ui.workbench" diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/META-INF/p2.inf b/plugins/org.eclipse.objectteams.otequinox.branding.otre/META-INF/p2.inf new file mode 100644 index 000000000..e53dac5ad --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/META-INF/p2.inf @@ -0,0 +1,5 @@ +requires.1.namespace=org.eclipse.equinox.p2.iu +requires.1.name=org.eclipse.objectteams.otequinox.branding +requires.1.range=[2.5.0,3.0.0) +requires.1.min=0 +requires.1.max=0 diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/about.html b/plugins/org.eclipse.objectteams.otequinox.branding.otre/about.html new file mode 100644 index 000000000..66ef6f682 --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 15, 2010</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> + +</body> +</html>
\ No newline at end of file diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/build.properties b/plugins/org.eclipse.objectteams.otequinox.branding.otre/build.properties new file mode 100644 index 000000000..30bfd0e0e --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/build.properties @@ -0,0 +1,8 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + plugin.xml,\ + .,\ + icons/,\ + plugin.properties,\ + about.html diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/icons/signed_adapted.gif b/plugins/org.eclipse.objectteams.otequinox.branding.otre/icons/signed_adapted.gif Binary files differnew file mode 100644 index 000000000..986fa4208 --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/icons/signed_adapted.gif diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/icons/unsigned_adapted.gif b/plugins/org.eclipse.objectteams.otequinox.branding.otre/icons/unsigned_adapted.gif Binary files differnew file mode 100644 index 000000000..915a4e78f --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/icons/unsigned_adapted.gif diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/plugin.properties b/plugins/org.eclipse.objectteams.otequinox.branding.otre/plugin.properties new file mode 100644 index 000000000..1be1cb322 --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/plugin.properties @@ -0,0 +1,2 @@ +pluginName=OT/Equinox Branding Integration +providerName=Eclipse.org - Object Teams diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/plugin.xml b/plugins/org.eclipse.objectteams.otequinox.branding.otre/plugin.xml new file mode 100644 index 000000000..608cd8259 --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/plugin.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> +<plugin> + <extension + point="org.eclipse.objectteams.otequinox.aspectBindings"> + <aspectBinding icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/calloutbinding_obj.gif"> + <team class="org.eclipse.objectteams.otequinox.internal.branding.BrandingAdaptor" + activation="ALL_THREADS" + icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"/> + <basePlugin + id="org.eclipse.ui.workbench" + icon="platform:/plugin/org.eclipse.pde.ui/icons/obj16/plugin_obj.png"/> + </aspectBinding> + </extension> + +</plugin> diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/src/org/eclipse/objectteams/otequinox/branding/Activator.java b/plugins/org.eclipse.objectteams.otequinox.branding.otre/src/org/eclipse/objectteams/otequinox/branding/Activator.java new file mode 100644 index 000000000..5f971e500 --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/src/org/eclipse/objectteams/otequinox/branding/Activator.java @@ -0,0 +1,98 @@ +/********************************************************************** + * This file is part of "Object Teams Development Tooling"-Software + * + * Copyright 2009 Stephan Herrmann. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * $Id: Activator.java 23461 2010-02-04 22:10:39Z stephan $ + * + * Please visit http://www.eclipse.org/objectteams for updates and contact. + * + * Contributors: + * Stephan Herrmann - Initial API and implementation + **********************************************************************/ +package org.eclipse.objectteams.otequinox.branding; + +import org.eclipse.jface.resource.ImageRegistry; +import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + + +/** + * This bundle activator is only responsible for managing two icons, + * see {@link #getImage(String)}. + * + * @author stephan + * @since 1.4.0 + */ +public class Activator extends AbstractUIPlugin { + + /** "Signed" icon with aspect binding decoration. */ + public static final String IMG_SIGNED_ADAPTED = "org.eclipse.objectteams.otequinox.branding.signed_adapted"; //$NON-NLS-1$ + + /** "Unsigned" icon with aspect binding decoration. */ + public static final String IMG_UNSIGNED_ADAPTED = "org.eclipse.objectteams.otequinox.branding.unsigned_adapted"; //$NON-NLS-1$ + + /** The plug-in ID */ + public static final String PLUGIN_ID = "org.eclipse.objectteams.otequinox.branding"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + private ImageRegistry imageRegistry; + + /** + * The constructor + */ + public Activator() { + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + + /** + * Get an image identified by the given key. Supported values are + * {@link #IMG_SIGNED_ADAPTED} and {@link #IMG_UNSIGNED_ADAPTED}. + * @param key + * @return a cached imaged, if valid key was given, otherwise null. + */ + public Image getImage(String key) { + if (this.imageRegistry == null) + initializeImageRegistry(); + return this.imageRegistry.get(key); + } + + private void initializeImageRegistry() { + this.imageRegistry = new ImageRegistry(); + this.imageRegistry.put(IMG_SIGNED_ADAPTED, imageDescriptorFromPlugin(PLUGIN_ID, "icons/signed_adapted.gif")); //$NON-NLS-1$ + this.imageRegistry.put(IMG_UNSIGNED_ADAPTED, imageDescriptorFromPlugin(PLUGIN_ID, "icons/unsigned_adapted.gif")); //$NON-NLS-1$ + } +} diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/src/org/eclipse/objectteams/otequinox/internal/branding/BrandingAdaptor.java b/plugins/org.eclipse.objectteams.otequinox.branding.otre/src/org/eclipse/objectteams/otequinox/internal/branding/BrandingAdaptor.java new file mode 100644 index 000000000..3b4046a49 --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/src/org/eclipse/objectteams/otequinox/internal/branding/BrandingAdaptor.java @@ -0,0 +1,101 @@ +/********************************************************************** + * This file is part of "Object Teams Development Tooling"-Software + * + * Copyright 2004, 2006 Fraunhofer Gesellschaft, Munich, Germany, + * for its Fraunhofer Institute for Computer Architecture and Software + * Technology (FIRST), Berlin, Germany and Technical University Berlin, + * Germany. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * $Id:AboutAdaptor.java 15202 2007-01-28 11:30:50Z stephan $ + * + * Please visit http://www.eclipse.org/objectteams for updates and contact. + * + * Contributors: + * Fraunhofer FIRST - Initial API and implementation + * Technical University Berlin - Initial API and implementation + **********************************************************************/ +package org.eclipse.objectteams.otequinox.internal.branding; + +import java.util.HashSet; + +import org.eclipse.objectteams.otequinox.TransformerPlugin; +import org.eclipse.objectteams.otequinox.branding.Activator; +import org.eclipse.swt.graphics.Image; + +import base org.eclipse.ui.internal.about.AboutBundleData; +import base org.eclipse.ui.internal.about.AboutPluginsPage.BundleTableLabelProvider; + +/** + * This aspect adapts the branding of the Eclipse workbench by + * - adapting the about plug-ins dialog, displaying as a self-application + * which plug-ins have been adapted by an OT/J aspect. + * + * @author stephan + * @version $Id:AboutAdaptor.java 15202 2007-01-28 11:30:50Z stephan $ + */ +@SuppressWarnings("restriction") +public team class BrandingAdaptor +{ + public BrandingAdaptor() { + } + + /** Append OT-adaptations to the version number of any adapted bundle. */ + protected class AboutBundleAdaptor playedBy AboutBundleData + base when (isAdaptedBaseBundle(base)) + { + callin String getVersion() + { + String adaptationString = ""; //$NON-NLS-1$ + HashSet<String> reportedPlugins = new HashSet<String>(); + adaptationString = BrandingMessages.BrandingAdaptor_OT_adapted_by; + for (String element : TransformerPlugin.getDefault().getAdaptingAspectPlugins(getID())) + { + if (!reportedPlugins.contains(element)) + adaptationString = adaptationString+"\n* "+element; //$NON-NLS-1$ + reportedPlugins.add(element); + } + return base.getVersion() + adaptationString; + } + getVersion <- replace getVersion; + + String getID() -> String getId(); + boolean isSigned() -> boolean isSigned(); + boolean isSignedDetermined() -> boolean isSignedDetermined(); + } + + /** + * For all adapted bundles replace the singed/unsigned icons with + * a variant that is decorated with a aspect binding icon. + */ + protected class IconAdaptor playedBy BundleTableLabelProvider { + + Image getAdaptedSigningColumnImage(AboutBundleAdaptor data) <- replace Image getColumnImage(Object element, int columnIndex) + base when (columnIndex == 0 && isAdaptedBaseBundle(element)) + with { data <- (AboutBundleData)element } + + @SuppressWarnings("basecall") + callin Image getAdaptedSigningColumnImage(AboutBundleAdaptor data) { + if (data.isSignedDetermined()) { + if (data.isSigned()) + return Activator.getDefault().getImage(Activator.IMG_SIGNED_ADAPTED); + else + return Activator.getDefault().getImage(Activator.IMG_UNSIGNED_ADAPTED); + } + return base.getAdaptedSigningColumnImage(data); + } + } + + /** Is 'element' an AboutBundleData object representing a bundle that is adapted by an OT/Equinox bundle? */ + public static boolean isAdaptedBaseBundle(Object element) { + // use qualified name, because AboutBundleData is a role's base class thus considered alien to this team: + if (element instanceof org.eclipse.ui.internal.about.AboutBundleData) { + String symbolicName = ((org.eclipse.ui.internal.about.AboutBundleData)element).getId(); + return TransformerPlugin.getDefault().isAdaptedBasePlugin(symbolicName); + } + return false; + } +}
\ No newline at end of file diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/src/org/eclipse/objectteams/otequinox/internal/branding/BrandingMessages.java b/plugins/org.eclipse.objectteams.otequinox.branding.otre/src/org/eclipse/objectteams/otequinox/internal/branding/BrandingMessages.java new file mode 100644 index 000000000..2ecacf13d --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/src/org/eclipse/objectteams/otequinox/internal/branding/BrandingMessages.java @@ -0,0 +1,33 @@ +/********************************************************************** + * This file is part of "Object Teams Development Tooling"-Software + * + * Copyright 2009 Stephan Herrmann. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * $Id: BrandingMessages.java 23461 2010-02-04 22:10:39Z stephan $ + * + * Please visit http://www.eclipse.org/objectteams for updates and contact. + * + * Contributors: + * Stephan Herrmann - Initial API and implementation + **********************************************************************/ +package org.eclipse.objectteams.otequinox.internal.branding; + +import org.eclipse.osgi.util.NLS; + +public class BrandingMessages extends NLS { + private static final String BUNDLE_NAME = BrandingMessages.class.getName(); + + public static String BrandingAdaptor_OT_adapted_by; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, BrandingMessages.class); + } + + private BrandingMessages() { + // don't instantiate + } +} diff --git a/plugins/org.eclipse.objectteams.otequinox.branding.otre/src/org/eclipse/objectteams/otequinox/internal/branding/BrandingMessages.properties b/plugins/org.eclipse.objectteams.otequinox.branding.otre/src/org/eclipse/objectteams/otequinox/internal/branding/BrandingMessages.properties new file mode 100644 index 000000000..3d383d46d --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding.otre/src/org/eclipse/objectteams/otequinox/internal/branding/BrandingMessages.properties @@ -0,0 +1 @@ +BrandingAdaptor_OT_adapted_by=\n**** OT-adapted by: diff --git a/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/p2.inf b/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/p2.inf new file mode 100644 index 000000000..d627be144 --- /dev/null +++ b/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/p2.inf @@ -0,0 +1,5 @@ +requires.1.namespace=org.eclipse.equinox.p2.iu +requires.1.name=org.eclipse.objectteams.otequinox.branding.otre +requires.1.range=[2.5.0,3.0.0) +requires.1.min=0 +requires.1.max=0 diff --git a/releng/build-scripts/bin/addDownloadStats.xsl b/releng/build-scripts/bin/addDownloadStats.xsl index 4967a89dc..93ff3daad 100644 --- a/releng/build-scripts/bin/addDownloadStats.xsl +++ b/releng/build-scripts/bin/addDownloadStats.xsl @@ -43,6 +43,10 @@ Stephan Herrmann - adaptation for Object Teams <xsl:call-template name="artifact_properties"/> </xsl:template> + <xsl:template match="artifact[@classifier='org.eclipse.update.feature' and @id='org.eclipse.objectteams.otequinox.otre']/properties"> + <xsl:call-template name="artifact_properties"/> + </xsl:template> + <xsl:template match="artifact[@classifier='org.eclipse.update.feature' and @id='org.eclipse.objectteams.otequinox.turbo']/properties"> <xsl:call-template name="artifact_properties"/> </xsl:template> diff --git a/releng/build-scripts/build/OTDT-Build/allElements.xml b/releng/build-scripts/build/OTDT-Build/allElements.xml index f166213ed..603726ad1 100644 --- a/releng/build-scripts/build/OTDT-Build/allElements.xml +++ b/releng/build-scripts/build/OTDT-Build/allElements.xml @@ -27,6 +27,11 @@ <property name="id" value="org.eclipse.objectteams.otequinox" /> </ant> + <ant antfile="${genericTargets}" target="${target}" > + <property name="type" value="feature" /> + <property name="id" value="org.eclipse.objectteams.otequinox.otre" /> + </ant> + <ant antfile="${genericTargets}" target="${target}" > <property name="type" value="feature" /> <property name="id" value="org.eclipse.objectteams.otequinox.turbo" /> @@ -96,7 +101,15 @@ <property name="p2.build.repo" value="file://${otdtUpdatesDir}"/> </ant> </target> - + + <!-- set output repository for otequinox.otre.feature: --> + <property name="assemble.org.eclipse.objectteams.otequinox.otre.p2" value="true" /> + <target name="assemble.org.eclipse.objectteams.otequinox.otre.p2"> + <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> + <property name="p2.build.repo" value="file://${otdtUpdatesDir}"/> + </ant> + </target> + <!-- set output repository for otequinox.turbo.feature: --> <property name="assemble.org.eclipse.objectteams.otequinox.turbo.p2" value="true" /> <target name="assemble.org.eclipse.objectteams.otequinox.turbo.p2"> diff --git a/releng/build-scripts/build/p2helper.xml b/releng/build-scripts/build/p2helper.xml index 88704b9a0..31cda67ba 100644 --- a/releng/build-scripts/build/p2helper.xml +++ b/releng/build-scripts/build/p2helper.xml @@ -56,6 +56,7 @@ <param name="sourceUpdatesDir" value="${otdtUpdatesDir}"/> <param name="targetEclipseDir" value="${test.eclipseDir}"/> </antcall> + <!-- don't install incompatible org.eclipse.objectteams.otequinox.otre.feature.group --> <!-- optional: --> <antcall target="installFeature"> <param name="feature" value="org.eclipse.objectteams.otequinox.turbo.feature.group"/> diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in index a2d45149b..708d4b34a 100644 --- a/releng/map/otdt.map.in +++ b/releng/map/otdt.map.in @@ -5,6 +5,7 @@ feature@org.eclipse.objectteams.otdt=GIT,repo=git://git.eclipse.org/gitroot/obje feature@org.eclipse.objectteams.otdt.source.feature=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.source.feature,tag=branches/maintenance/OTDT_2.5.x
feature@org.eclipse.objectteams.otdt.core.patch=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.core.patch,tag=branches/maintenance/OTDT_2.5.x
feature@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otequinox.feature,tag=branches/maintenance/OTDT_2.5.x
+feature@org.eclipse.objectteams.otequinox.otre=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otequinox.otre.feature,tag=branches/maintenance/OTDT_2.5.x
feature@org.eclipse.objectteams.otequinox.turbo=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otequinox.turbo.feature,tag=builds/201506091717
!-- Also don't use version numbers for those plugins that hold the various otre jars: --
@@ -32,7 +33,8 @@ plugin@org.eclipse.objectteams.eclipse.monitor=GIT,repo=git://git.eclipse.org/gi !plugin@org.eclipse.objectteams.otdt.metrics.export=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.metrics.export
!** OT/J Plugins **! -plugin@org.eclipse.objectteams.otequinox.branding=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.branding,tag=builds/201606070956
+plugin@org.eclipse.objectteams.otequinox.branding=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.branding,tag=branches/maintenance/OTDT_2.5.x
+plugin@org.eclipse.objectteams.otequinox.branding.otre=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.branding.otre,tag=branches/maintenance/OTDT_2.5.x
plugin@org.eclipse.objectteams.otdt.jdt.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.jdt.ui,tag=builds/201606070956
plugin@org.eclipse.objectteams.otdt.ui.help=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.ui.help,tag=builds/201606070956
plugin@org.eclipse.objectteams.otdt.apt=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.apt,tag=builds/201606070956
|
