diff options
| author | Pierre-Charles David | 2015-12-08 14:58:13 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2015-12-09 15:12:07 +0000 |
| commit | 090d82749af2343235087b29449d1d2d7971fd04 (patch) | |
| tree | dab5558ee7366b446511dcd2c5287a05eaddd71b | |
| parent | e3375485a674fba56f803f9cf794d253c0404c9e (diff) | |
| download | org.eclipse.sirius-090d82749af2343235087b29449d1d2d7971fd04.tar.gz org.eclipse.sirius-090d82749af2343235087b29449d1d2d7971fd04.tar.xz org.eclipse.sirius-090d82749af2343235087b29449d1d2d7971fd04.zip | |
[482528] Add the EEF-dependant parts into the build
The incubation update-site now contains 3 features:
* oes.incubation.interpreter with only the interpreter API;
* oes.incubation.properties with the VSM extension metamodel and the
EEF-dependant runtime which converts it into EEF-compatible model;
* oes.incubation with all the incubation features (currently the two
above).
There is a cyclic dependency (oes.ui.properties depends on EEF2, which
itself depends on oes.common.interpreter), which required "polluting"
the main target platforms with both EEF2 and the previously built
oes.common.interpreter!); see the new modules/eef-ng.tpd.
Bug: 482528
Change-Id: Ieba867378916acf3230302b15221e4634134c383
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
36 files changed, 1180 insertions, 70 deletions
diff --git a/incubation/org.eclipse.sirius.incubation.interpreter/.project b/incubation/org.eclipse.sirius.incubation.interpreter/.project new file mode 100644 index 0000000000..af4c9690e4 --- /dev/null +++ b/incubation/org.eclipse.sirius.incubation.interpreter/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.sirius.incubation.interpreter</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/incubation/org.eclipse.sirius.incubation.interpreter/build.properties b/incubation/org.eclipse.sirius.incubation.interpreter/build.properties new file mode 100644 index 0000000000..58974d4f44 --- /dev/null +++ b/incubation/org.eclipse.sirius.incubation.interpreter/build.properties @@ -0,0 +1,13 @@ +# ==================================================================== +# Copyright (c) 2015 Obeo +# 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: +# Obeo - initial API and implementation +# ==================================================================== +bin.includes = feature.xml,\ + feature.properties,\ + epl-v10.html diff --git a/incubation/org.eclipse.sirius.incubation.interpreter/epl-v10.html b/incubation/org.eclipse.sirius.incubation.interpreter/epl-v10.html new file mode 100644 index 0000000000..ed4b196655 --- /dev/null +++ b/incubation/org.eclipse.sirius.incubation.interpreter/epl-v10.html @@ -0,0 +1,328 @@ +<html xmlns:o="urn:schemas-microsoft-com:office:office" +xmlns:w="urn:schemas-microsoft-com:office:word" +xmlns="http://www.w3.org/TR/REC-html40"> + +<head> +<meta http-equiv=Content-Type content="text/html; charset=windows-1252"> +<meta name=ProgId content=Word.Document> +<meta name=Generator content="Microsoft Word 9"> +<meta name=Originator content="Microsoft Word 9"> +<link rel=File-List +href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"> +<title>Eclipse Public License - Version 1.0</title> +<!--[if gte mso 9]><xml> + <o:DocumentProperties> + <o:Revision>2</o:Revision> + <o:TotalTime>3</o:TotalTime> + <o:Created>2004-03-05T23:03:00Z</o:Created> + <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved> + <o:Pages>4</o:Pages> + <o:Words>1626</o:Words> + <o:Characters>9270</o:Characters> + <o:Lines>77</o:Lines> + <o:Paragraphs>18</o:Paragraphs> + <o:CharactersWithSpaces>11384</o:CharactersWithSpaces> + <o:Version>9.4402</o:Version> + </o:DocumentProperties> +</xml><![endif]--><!--[if gte mso 9]><xml> + <w:WordDocument> + <w:TrackRevisions/> + </w:WordDocument> +</xml><![endif]--> +<style> +<!-- + /* Font Definitions */ +@font-face + {font-family:Tahoma; + panose-1:2 11 6 4 3 5 4 4 2 4; + mso-font-charset:0; + mso-generic-font-family:swiss; + mso-font-pitch:variable; + mso-font-signature:553679495 -2147483648 8 0 66047 0;} + /* Style Definitions */ +p.MsoNormal, li.MsoNormal, div.MsoNormal + {mso-style-parent:""; + margin:0in; + margin-bottom:.0001pt; + mso-pagination:widow-orphan; + font-size:12.0pt; + font-family:"Times New Roman"; + mso-fareast-font-family:"Times New Roman";} +p + {margin-right:0in; + mso-margin-top-alt:auto; + mso-margin-bottom-alt:auto; + margin-left:0in; + mso-pagination:widow-orphan; + font-size:12.0pt; + font-family:"Times New Roman"; + mso-fareast-font-family:"Times New Roman";} +p.BalloonText, li.BalloonText, div.BalloonText + {mso-style-name:"Balloon Text"; + margin:0in; + margin-bottom:.0001pt; + mso-pagination:widow-orphan; + font-size:8.0pt; + font-family:Tahoma; + mso-fareast-font-family:"Times New Roman";} +@page Section1 + {size:8.5in 11.0in; + margin:1.0in 1.25in 1.0in 1.25in; + mso-header-margin:.5in; + mso-footer-margin:.5in; + mso-paper-source:0;} +div.Section1 + {page:Section1;} +--> +</style> +</head> + +<body lang=EN-US style='tab-interval:.5in'> + +<div class=Section1> + +<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b> +</p> + +<p><span style='font-size:10.0pt'>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.</span> </p> + +<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p> + +<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a) +in the case of the initial Contributor, the initial code and documentation +distributed under this Agreement, and<br clear=left> +b) in the case of each subsequent Contributor:</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i) +changes to the Program, and</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii) +additions to the Program;</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p> + +<p><span style='font-size:10.0pt'>"Contributor" means any person or +entity that distributes the Program.</span> </p> + +<p><span style='font-size:10.0pt'>"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. </span></p> + +<p><span style='font-size:10.0pt'>"Program" means the Contributions +distributed in accordance with this Agreement.</span> </p> + +<p><span style='font-size:10.0pt'>"Recipient" means anyone who +receives the Program under this Agreement, including all Contributors.</span> </p> + +<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a) +Subject to the terms of this Agreement, each Contributor hereby grants Recipient +a non-exclusive, worldwide, royalty-free copyright license to<span +style='color:red'> </span>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.</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) +Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p> + +<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p> + +<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the +Program in object code form under its own license agreement, provided that:</span> +</p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a) +it complies with the terms and conditions of this Agreement; and</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) +its license agreement:</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii) +effectively excludes on behalf of all Contributors all liability for damages, +including direct, indirect, special, incidental and consequential damages, such +as lost profits; </span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii) +states that any provisions which differ from this Agreement are offered by that +Contributor alone and not by any other party; and</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p> + +<p><span style='font-size:10.0pt'>When the Program is made available in source +code form:</span> </p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a) +it must be made available under this Agreement; and </span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a +copy of this Agreement must be included with each copy of the Program. </span></p> + +<p><span style='font-size:10.0pt'>Contributors may not remove or alter any +copyright notices contained within the Program. </span></p> + +<p><span style='font-size:10.0pt'>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. </span></p> + +<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p> + +<p><span style='font-size:10.0pt'>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.</span> </p> + +<p><span style='font-size:10.0pt'>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.</span> </p> + +<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p> + +<p><span style='font-size:10.0pt'>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. </span></p> + +<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p> + +<p><span style='font-size:10.0pt'>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.</span> </p> + +<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p> + +<p><span style='font-size:10.0pt'>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.</span> </p> + +<p><span style='font-size:10.0pt'>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. </span></p> + +<p><span style='font-size:10.0pt'>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. </span></p> + +<p><span style='font-size:10.0pt'>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.</span> </p> + +<p><span style='font-size:10.0pt'>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.</span> </p> + +<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p> + +</div> + +</body> + +</html>
\ No newline at end of file diff --git a/incubation/org.eclipse.sirius.incubation.interpreter/feature.properties b/incubation/org.eclipse.sirius.incubation.interpreter/feature.properties new file mode 100644 index 0000000000..f3fdc72763 --- /dev/null +++ b/incubation/org.eclipse.sirius.incubation.interpreter/feature.properties @@ -0,0 +1,21 @@ +# ==================================================================== +# Copyright (c) 2015 Obeo +# 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: +# Obeo - initial API and implementation +# ==================================================================== +featureName = Sirius Interpreter API - Incubation +providerName = Eclipse Modeling Project +copyright=\ +Copyright (c) 2015 Obeo 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\ + Obeo - initial API and implementation\n diff --git a/incubation/org.eclipse.sirius.incubation.interpreter/feature.xml b/incubation/org.eclipse.sirius.incubation.interpreter/feature.xml new file mode 100644 index 0000000000..769fe58cc6 --- /dev/null +++ b/incubation/org.eclipse.sirius.incubation.interpreter/feature.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2015 Obeo + 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: + Obeo - Initial API and implementation +--> +<feature + id="org.eclipse.sirius.incubation.interpreter" + label="%featureName" + version="4.0.0.qualifier" + provider-name="%providerName" + license-feature="org.eclipse.license" + license-feature-version="0.0.0"> + + <description url="http://www.eclipse.org/sirius"> + Sirius generic interpreter API, not yet ready for production. APIs may break and behavior may change at any point without notice, use at your own risk. + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <plugin + id="org.eclipse.sirius.common.interpreter" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/incubation/org.eclipse.sirius.incubation.interpreter/pom.xml b/incubation/org.eclipse.sirius.incubation.interpreter/pom.xml new file mode 100644 index 0000000000..afe1d53189 --- /dev/null +++ b/incubation/org.eclipse.sirius.incubation.interpreter/pom.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2015 Obeo + 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: + Obeo - Initial API and implementation +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.sirius</groupId> + <artifactId>sirius-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath> + </parent> + + <artifactId>org.eclipse.sirius.incubation.interpreter</artifactId> + <packaging>eclipse-feature</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-source-feature-plugin</artifactId> + <version>${tycho-extras-version}</version> + <executions> + <execution> + <id>source-feature</id> + <phase>package</phase> + <goals> + <goal>source-feature</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attached-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> diff --git a/incubation/org.eclipse.sirius.incubation.properties/.project b/incubation/org.eclipse.sirius.incubation.properties/.project new file mode 100644 index 0000000000..1bf026da1c --- /dev/null +++ b/incubation/org.eclipse.sirius.incubation.properties/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.sirius.incubation.properties</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/incubation/org.eclipse.sirius.incubation.properties/build.properties b/incubation/org.eclipse.sirius.incubation.properties/build.properties new file mode 100644 index 0000000000..58974d4f44 --- /dev/null +++ b/incubation/org.eclipse.sirius.incubation.properties/build.properties @@ -0,0 +1,13 @@ +# ==================================================================== +# Copyright (c) 2015 Obeo +# 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: +# Obeo - initial API and implementation +# ==================================================================== +bin.includes = feature.xml,\ + feature.properties,\ + epl-v10.html diff --git a/incubation/org.eclipse.sirius.incubation.properties/epl-v10.html b/incubation/org.eclipse.sirius.incubation.properties/epl-v10.html new file mode 100644 index 0000000000..ed4b196655 --- /dev/null +++ b/incubation/org.eclipse.sirius.incubation.properties/epl-v10.html @@ -0,0 +1,328 @@ +<html xmlns:o="urn:schemas-microsoft-com:office:office" +xmlns:w="urn:schemas-microsoft-com:office:word" +xmlns="http://www.w3.org/TR/REC-html40"> + +<head> +<meta http-equiv=Content-Type content="text/html; charset=windows-1252"> +<meta name=ProgId content=Word.Document> +<meta name=Generator content="Microsoft Word 9"> +<meta name=Originator content="Microsoft Word 9"> +<link rel=File-List +href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"> +<title>Eclipse Public License - Version 1.0</title> +<!--[if gte mso 9]><xml> + <o:DocumentProperties> + <o:Revision>2</o:Revision> + <o:TotalTime>3</o:TotalTime> + <o:Created>2004-03-05T23:03:00Z</o:Created> + <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved> + <o:Pages>4</o:Pages> + <o:Words>1626</o:Words> + <o:Characters>9270</o:Characters> + <o:Lines>77</o:Lines> + <o:Paragraphs>18</o:Paragraphs> + <o:CharactersWithSpaces>11384</o:CharactersWithSpaces> + <o:Version>9.4402</o:Version> + </o:DocumentProperties> +</xml><![endif]--><!--[if gte mso 9]><xml> + <w:WordDocument> + <w:TrackRevisions/> + </w:WordDocument> +</xml><![endif]--> +<style> +<!-- + /* Font Definitions */ +@font-face + {font-family:Tahoma; + panose-1:2 11 6 4 3 5 4 4 2 4; + mso-font-charset:0; + mso-generic-font-family:swiss; + mso-font-pitch:variable; + mso-font-signature:553679495 -2147483648 8 0 66047 0;} + /* Style Definitions */ +p.MsoNormal, li.MsoNormal, div.MsoNormal + {mso-style-parent:""; + margin:0in; + margin-bottom:.0001pt; + mso-pagination:widow-orphan; + font-size:12.0pt; + font-family:"Times New Roman"; + mso-fareast-font-family:"Times New Roman";} +p + {margin-right:0in; + mso-margin-top-alt:auto; + mso-margin-bottom-alt:auto; + margin-left:0in; + mso-pagination:widow-orphan; + font-size:12.0pt; + font-family:"Times New Roman"; + mso-fareast-font-family:"Times New Roman";} +p.BalloonText, li.BalloonText, div.BalloonText + {mso-style-name:"Balloon Text"; + margin:0in; + margin-bottom:.0001pt; + mso-pagination:widow-orphan; + font-size:8.0pt; + font-family:Tahoma; + mso-fareast-font-family:"Times New Roman";} +@page Section1 + {size:8.5in 11.0in; + margin:1.0in 1.25in 1.0in 1.25in; + mso-header-margin:.5in; + mso-footer-margin:.5in; + mso-paper-source:0;} +div.Section1 + {page:Section1;} +--> +</style> +</head> + +<body lang=EN-US style='tab-interval:.5in'> + +<div class=Section1> + +<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b> +</p> + +<p><span style='font-size:10.0pt'>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.</span> </p> + +<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p> + +<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a) +in the case of the initial Contributor, the initial code and documentation +distributed under this Agreement, and<br clear=left> +b) in the case of each subsequent Contributor:</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i) +changes to the Program, and</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii) +additions to the Program;</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p> + +<p><span style='font-size:10.0pt'>"Contributor" means any person or +entity that distributes the Program.</span> </p> + +<p><span style='font-size:10.0pt'>"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. </span></p> + +<p><span style='font-size:10.0pt'>"Program" means the Contributions +distributed in accordance with this Agreement.</span> </p> + +<p><span style='font-size:10.0pt'>"Recipient" means anyone who +receives the Program under this Agreement, including all Contributors.</span> </p> + +<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a) +Subject to the terms of this Agreement, each Contributor hereby grants Recipient +a non-exclusive, worldwide, royalty-free copyright license to<span +style='color:red'> </span>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.</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) +Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p> + +<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p> + +<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the +Program in object code form under its own license agreement, provided that:</span> +</p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a) +it complies with the terms and conditions of this Agreement; and</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) +its license agreement:</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii) +effectively excludes on behalf of all Contributors all liability for damages, +including direct, indirect, special, incidental and consequential damages, such +as lost profits; </span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii) +states that any provisions which differ from this Agreement are offered by that +Contributor alone and not by any other party; and</span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p> + +<p><span style='font-size:10.0pt'>When the Program is made available in source +code form:</span> </p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a) +it must be made available under this Agreement; and </span></p> + +<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a +copy of this Agreement must be included with each copy of the Program. </span></p> + +<p><span style='font-size:10.0pt'>Contributors may not remove or alter any +copyright notices contained within the Program. </span></p> + +<p><span style='font-size:10.0pt'>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. </span></p> + +<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p> + +<p><span style='font-size:10.0pt'>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.</span> </p> + +<p><span style='font-size:10.0pt'>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.</span> </p> + +<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p> + +<p><span style='font-size:10.0pt'>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. </span></p> + +<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p> + +<p><span style='font-size:10.0pt'>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.</span> </p> + +<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p> + +<p><span style='font-size:10.0pt'>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.</span> </p> + +<p><span style='font-size:10.0pt'>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. </span></p> + +<p><span style='font-size:10.0pt'>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. </span></p> + +<p><span style='font-size:10.0pt'>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.</span> </p> + +<p><span style='font-size:10.0pt'>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.</span> </p> + +<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p> + +</div> + +</body> + +</html>
\ No newline at end of file diff --git a/incubation/org.eclipse.sirius.incubation.properties/feature.properties b/incubation/org.eclipse.sirius.incubation.properties/feature.properties new file mode 100644 index 0000000000..919630c974 --- /dev/null +++ b/incubation/org.eclipse.sirius.incubation.properties/feature.properties @@ -0,0 +1,21 @@ +# ==================================================================== +# Copyright (c) 2015 Obeo +# 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: +# Obeo - initial API and implementation +# ==================================================================== +featureName = Sirius Properties View - Incubation +providerName = Eclipse Modeling Project +copyright=\ +Copyright (c) 2015 Obeo 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\ + Obeo - initial API and implementation\n diff --git a/incubation/org.eclipse.sirius.incubation.properties/feature.xml b/incubation/org.eclipse.sirius.incubation.properties/feature.xml new file mode 100644 index 0000000000..ce80325c5d --- /dev/null +++ b/incubation/org.eclipse.sirius.incubation.properties/feature.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2015 Obeo + 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: + Obeo - Initial API and implementation +--> +<feature + id="org.eclipse.sirius.incubation.properties" + label="%featureName" + version="4.0.0.qualifier" + provider-name="%providerName" + license-feature="org.eclipse.license" + license-feature-version="0.0.0"> + + <description url="http://www.eclipse.org/sirius"> + Sirius support for property views definitions, not yet ready for production. APIs may break and behavior may change at any point without notice, use at your own risk. + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <plugin + id="org.eclipse.sirius.properties" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.sirius.properties.edit" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.sirius.editor.properties" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.sirius.ui.properties" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/incubation/org.eclipse.sirius.incubation.properties/pom.xml b/incubation/org.eclipse.sirius.incubation.properties/pom.xml new file mode 100644 index 0000000000..1ccb4b9aea --- /dev/null +++ b/incubation/org.eclipse.sirius.incubation.properties/pom.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2015 Obeo + 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: + Obeo - Initial API and implementation +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.sirius</groupId> + <artifactId>sirius-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath> + </parent> + + <artifactId>org.eclipse.sirius.incubation.properties</artifactId> + <packaging>eclipse-feature</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-source-feature-plugin</artifactId> + <version>${tycho-extras-version}</version> + <executions> + <execution> + <id>source-feature</id> + <phase>package</phase> + <goals> + <goal>source-feature</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attached-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> diff --git a/incubation/org.eclipse.sirius.incubation.update/category.xml b/incubation/org.eclipse.sirius.incubation.update/category.xml index b228522d11..7b23ea9479 100644 --- a/incubation/org.eclipse.sirius.incubation.update/category.xml +++ b/incubation/org.eclipse.sirius.incubation.update/category.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <site> <description url="http://www.eclipse.org/sirius"> - Sirius Incubation + Sirius Incubation Features </description> <feature id="org.eclipse.sirius.incubation" version="0.0.0"> <category name="Sirius Incubation"/> @@ -9,5 +9,17 @@ <feature id="org.eclipse.sirius.incubation.source" version="0.0.0"> <category name="Sirius Incubation"/> </feature> + <feature id="org.eclipse.sirius.incubation.interpreter" version="0.0.0"> + <category name="Sirius Incubation"/> + </feature> + <feature id="org.eclipse.sirius.incubation.interpreter.source" version="0.0.0"> + <category name="Sirius Incubation"/> + </feature> + <feature id="org.eclipse.sirius.incubation.properties" version="0.0.0"> + <category name="Sirius Incubation"/> + </feature> + <feature id="org.eclipse.sirius.incubation.properties.source" version="0.0.0"> + <category name="Sirius Incubation"/> + </feature> <category-def name="Sirius Incubation" label="Sirius Incubation"/> </site> diff --git a/incubation/org.eclipse.sirius.incubation/feature.xml b/incubation/org.eclipse.sirius.incubation/feature.xml index f88e323bd2..ef08111b3f 100644 --- a/incubation/org.eclipse.sirius.incubation/feature.xml +++ b/incubation/org.eclipse.sirius.incubation/feature.xml @@ -18,7 +18,7 @@ license-feature-version="0.0.0"> <description url="http://www.eclipse.org/sirius"> - Sirius incubation (work in progress) plug-ins, not yet ready for production. + Sirius incubation (work in progress) features, not yet ready for production. APIs may break and behavior may change at any point without notice, use at your own risk. </description> <copyright> @@ -29,32 +29,12 @@ %license </license> - <plugin - id="org.eclipse.sirius.common.interpreter" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + <includes + id="org.eclipse.sirius.incubation.properties" + version="0.0.0"/> - <plugin - id="org.eclipse.sirius.properties" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.sirius.properties.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.sirius.editor.properties" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + <includes + id="org.eclipse.sirius.incubation.interpreter" + version="0.0.0"/> </feature> diff --git a/incubation/org.eclipse.sirius.ui.properties/pom.xml b/incubation/org.eclipse.sirius.ui.properties/pom.xml new file mode 100644 index 0000000000..c945b9c2e0 --- /dev/null +++ b/incubation/org.eclipse.sirius.ui.properties/pom.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2007, 2013 THALES GLOBAL SERVICES + 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: + Obeo - Initial API and implementation +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.sirius</groupId> + <artifactId>sirius-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath> + </parent> + + <artifactId>org.eclipse.sirius.ui.properties</artifactId> + <packaging>eclipse-plugin</packaging> + <version>1.0.0-SNAPSHOT</version> + +</project> diff --git a/packaging/org.eclipse.sirius.parent/pom.xml b/packaging/org.eclipse.sirius.parent/pom.xml index ba0838c907..219ded73da 100644 --- a/packaging/org.eclipse.sirius.parent/pom.xml +++ b/packaging/org.eclipse.sirius.parent/pom.xml @@ -343,8 +343,11 @@ <module>../../incubation/org.eclipse.sirius.properties</module> <module>../../incubation/org.eclipse.sirius.properties.edit</module> <module>../../incubation/org.eclipse.sirius.editor.properties</module> + <module>../../incubation/org.eclipse.sirius.ui.properties</module> <!-- features --> <module>../../incubation/org.eclipse.sirius.incubation</module> + <module>../../incubation/org.eclipse.sirius.incubation.interpreter</module> + <module>../../incubation/org.eclipse.sirius.incubation.properties</module> <!-- update sites --> <module>../../incubation/org.eclipse.sirius.incubation.update</module> </modules> diff --git a/releng/org.eclipse.sirius.targets/modules/eef-ng.tpd b/releng/org.eclipse.sirius.targets/modules/eef-ng.tpd new file mode 100644 index 0000000000..08e78cb7d2 --- /dev/null +++ b/releng/org.eclipse.sirius.targets/modules/eef-ng.tpd @@ -0,0 +1,9 @@ +target "EEF NG" + +location Sirius-Incubation-Nightly "http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/" { + org.eclipse.sirius.common.interpreter +} + +location EEF-NG-Latest "http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon" { + org.eclipse.eef.sdk.feature.feature.group lazy +} diff --git a/releng/org.eclipse.sirius.targets/sirius_canary.target b/releng/org.eclipse.sirius.targets/sirius_canary.target index fe9c288d74..df104b3479 100644 --- a/releng/org.eclipse.sirius.targets/sirius_canary.target +++ b/releng/org.eclipse.sirius.targets/sirius_canary.target @@ -1,16 +1,24 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="sirius_canary" sequenceNumber="1449505852"> +<target name="sirius_canary" sequenceNumber="1449666269"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.license.feature.group" version="0.0.0"/> <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.platform.ide" version="4.6.0.I20151207-0800"/> - <unit id="org.eclipse.platform.sdk" version="4.6.0.I20151207-0800"/> - <unit id="org.eclipse.sdk.ide" version="4.6.0.I20151207-0800"/> + <unit id="org.eclipse.sirius.common.interpreter" version="4.0.0.201512091104"/> + <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/> + <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.platform.ide" version="4.6.0.I20151208-0800"/> + <unit id="org.eclipse.platform.sdk" version="4.6.0.I20151208-0800"/> + <unit id="org.eclipse.sdk.ide" version="4.6.0.I20151208-0800"/> <repository id="Eclipse-Neon-Integration" location="http://download.eclipse.org/eclipse/updates/4.6-I-builds"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> diff --git a/releng/org.eclipse.sirius.targets/sirius_canary.targetplatform b/releng/org.eclipse.sirius.targets/sirius_canary.targetplatform index ed610d40fa..068bc4fd7e 100644 --- a/releng/org.eclipse.sirius.targets/sirius_canary.targetplatform +++ b/releng/org.eclipse.sirius.targets/sirius_canary.targetplatform @@ -1,6 +1,7 @@ target "sirius_canary" include "modules/shared-license.tpd" +include "modules/eef-ng.tpd" with source, requirements diff --git a/releng/org.eclipse.sirius.targets/sirius_juno.target b/releng/org.eclipse.sirius.targets/sirius_juno.target index 8e94090816..e6f46d1554 100644 --- a/releng/org.eclipse.sirius.targets/sirius_juno.target +++ b/releng/org.eclipse.sirius.targets/sirius_juno.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="sirius_juno" sequenceNumber="1449506029"> +<target name="sirius_juno" sequenceNumber="1449666346"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.0.201505291308"/> @@ -35,6 +35,14 @@ <repository id="Acceleo-3.6" location="http://download.eclipse.org/acceleo/updates/releases/3.6/R201510121214/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.sirius.common.interpreter" version="4.0.0.201512091104"/> + <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/> + <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="com.google.guava" version="15.0.0.v201403281430"/> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/> <unit id="org.easymock" version="2.4.0.v20090202-0900"/> diff --git a/releng/org.eclipse.sirius.targets/sirius_juno.targetplatform b/releng/org.eclipse.sirius.targets/sirius_juno.targetplatform index d3531e47b8..43317c5dda 100644 --- a/releng/org.eclipse.sirius.targets/sirius_juno.targetplatform +++ b/releng/org.eclipse.sirius.targets/sirius_juno.targetplatform @@ -8,6 +8,7 @@ include "modules/swtbot-2.1.tpd" include "modules/xtext-2.3.tpd" include "modules/shared-license.tpd" include "modules/aql-3.6.tpd" +include "modules/eef-ng.tpd" with source, requirements diff --git a/releng/org.eclipse.sirius.targets/sirius_kepler.targetplatform b/releng/org.eclipse.sirius.targets/sirius_kepler.targetplatform index 29ebd410a8..161f8a0509 100644 --- a/releng/org.eclipse.sirius.targets/sirius_kepler.targetplatform +++ b/releng/org.eclipse.sirius.targets/sirius_kepler.targetplatform @@ -8,6 +8,7 @@ include "modules/swtbot-2.1.tpd" include "modules/xtext-2.4.tpd" include "modules/shared-license.tpd" include "modules/aql-3.6.tpd" +include "modules/eef-ng.tpd" with source, requirements diff --git a/releng/org.eclipse.sirius.targets/sirius_luna.target b/releng/org.eclipse.sirius.targets/sirius_luna.target index 4acb2fe7a7..94c7cb3fd4 100644 --- a/releng/org.eclipse.sirius.targets/sirius_luna.target +++ b/releng/org.eclipse.sirius.targets/sirius_luna.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="sirius_luna" sequenceNumber="1449506059"> +<target name="sirius_luna" sequenceNumber="1449666601"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.0.201505291308"/> @@ -35,6 +35,14 @@ <repository id="Acceleo-3.6" location="http://download.eclipse.org/acceleo/updates/releases/3.6/R201510121214/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.sirius.common.interpreter" version="4.0.0.201512091104"/> + <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/> + <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="com.google.guava" version="15.0.0.v201403281430"/> <unit id="com.ibm.icu" version="52.1.1.v201501240615"/> <unit id="org.eclipse.draw2d.sdk.feature.group" version="3.9.101.201408150207"/> diff --git a/releng/org.eclipse.sirius.targets/sirius_luna.targetplatform b/releng/org.eclipse.sirius.targets/sirius_luna.targetplatform index 2230c10565..20e1e3fe4c 100644 --- a/releng/org.eclipse.sirius.targets/sirius_luna.targetplatform +++ b/releng/org.eclipse.sirius.targets/sirius_luna.targetplatform @@ -6,6 +6,7 @@ include "modules/swtbot-2.1.tpd" include "modules/shared-license.tpd" include "modules/aql-3.6.tpd" include "modules/acceleo-3.6.tpd" +include "modules/eef-ng.tpd" with source, requirements diff --git a/releng/org.eclipse.sirius.targets/sirius_mars.target b/releng/org.eclipse.sirius.targets/sirius_mars.target index 456c8ec2ea..a4da80ceda 100644 --- a/releng/org.eclipse.sirius.targets/sirius_mars.target +++ b/releng/org.eclipse.sirius.targets/sirius_mars.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="sirius_mars" sequenceNumber="1449506066"> +<target name="sirius_mars" sequenceNumber="1449666652"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/> @@ -31,6 +31,14 @@ <repository id="Acceleo-3.6" location="http://download.eclipse.org/acceleo/updates/releases/3.6/R201510121214/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.sirius.common.interpreter" version="4.0.0.201512091104"/> + <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/> + <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="com.google.guava" version="15.0.0.v201403281430"/> <unit id="com.ibm.icu" version="54.1.1.v201501272100"/> <unit id="org.eclipse.draw2d.sdk.feature.group" version="3.10.1.201508170204"/> diff --git a/releng/org.eclipse.sirius.targets/sirius_mars.targetplatform b/releng/org.eclipse.sirius.targets/sirius_mars.targetplatform index 05f4da3458..db7be8b406 100644 --- a/releng/org.eclipse.sirius.targets/sirius_mars.targetplatform +++ b/releng/org.eclipse.sirius.targets/sirius_mars.targetplatform @@ -5,6 +5,7 @@ include "modules/swtbot-2.1.tpd" include "modules/shared-license.tpd" include "modules/aql-3.6.tpd" include "modules/acceleo-3.6.tpd" +include "modules/eef-ng.tpd" with source, requirements diff --git a/releng/org.eclipse.sirius.targets/sirius_neon.target b/releng/org.eclipse.sirius.targets/sirius_neon.target index 8bde014ced..20fc2c86a9 100644 --- a/releng/org.eclipse.sirius.targets/sirius_neon.target +++ b/releng/org.eclipse.sirius.targets/sirius_neon.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="sirius_neon" sequenceNumber="1449506076"> +<target name="sirius_neon" sequenceNumber="1449666664"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/> @@ -31,6 +31,14 @@ <repository id="Acceleo-3.6" location="http://download.eclipse.org/acceleo/updates/releases/3.6/R201510121214/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.sirius.common.interpreter" version="4.0.0.201512091104"/> + <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/> + <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="com.google.guava" version="0.0.0"/> <unit id="com.ibm.icu" version="0.0.0"/> <unit id="org.eclipse.draw2d.sdk.feature.group" version="0.0.0"/> diff --git a/releng/org.eclipse.sirius.targets/sirius_neon.targetplatform b/releng/org.eclipse.sirius.targets/sirius_neon.targetplatform index c9f9bc1ee4..2706a25620 100644 --- a/releng/org.eclipse.sirius.targets/sirius_neon.targetplatform +++ b/releng/org.eclipse.sirius.targets/sirius_neon.targetplatform @@ -5,32 +5,33 @@ include "modules/swtbot-2.1.tpd" include "modules/shared-license.tpd" include "modules/aql-3.6.tpd" include "modules/acceleo-3.6.tpd" +include "modules/eef-ng.tpd" with source, requirements location Eclipse-Neon "http://download.eclipse.org/releases/neon" { - com.google.guava lazy - com.ibm.icu lazy - org.eclipse.draw2d.sdk.feature.group lazy - org.eclipse.emf.common.feature.group lazy - org.eclipse.emf.compare.feature.group lazy - org.eclipse.emf.ecore.feature.group lazy - org.eclipse.emf.edit.feature.group lazy - org.eclipse.emf.eef.runtime lazy - org.eclipse.emf.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.emf.transaction.feature.group lazy - org.eclipse.emf.transaction.sdk.feature.group lazy - org.eclipse.emf.validation.sdk.feature.group lazy - org.eclipse.emf.workspace.feature.group lazy - org.eclipse.equinox.sdk.feature.group lazy - org.eclipse.gef.feature.group lazy - org.eclipse.gef.sdk.feature.group lazy - org.eclipse.gmf.runtime.notation.sdk.feature.group lazy - org.eclipse.gmf.runtime.sdk.feature.group lazy - org.eclipse.ocl.all.feature.group lazy - org.eclipse.ocl.core.sdk.feature.group lazy - org.eclipse.platform.feature.group lazy - org.eclipse.sdk.feature.group lazy - org.eclipse.xtext.sdk.feature.group lazy + com.google.guava lazy + com.ibm.icu lazy + org.eclipse.draw2d.sdk.feature.group lazy + org.eclipse.emf.common.feature.group lazy + org.eclipse.emf.compare.feature.group lazy + org.eclipse.emf.ecore.feature.group lazy + org.eclipse.emf.edit.feature.group lazy + org.eclipse.emf.eef.runtime lazy + org.eclipse.emf.feature.group lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.emf.transaction.feature.group lazy + org.eclipse.emf.transaction.sdk.feature.group lazy + org.eclipse.emf.validation.sdk.feature.group lazy + org.eclipse.emf.workspace.feature.group lazy + org.eclipse.equinox.sdk.feature.group lazy + org.eclipse.gef.feature.group lazy + org.eclipse.gef.sdk.feature.group lazy + org.eclipse.gmf.runtime.notation.sdk.feature.group lazy + org.eclipse.gmf.runtime.sdk.feature.group lazy + org.eclipse.ocl.all.feature.group lazy + org.eclipse.ocl.core.sdk.feature.group lazy + org.eclipse.platform.feature.group lazy + org.eclipse.sdk.feature.group lazy + org.eclipse.xtext.sdk.feature.group lazy } diff --git a/releng/org.eclipse.sirius.targets/sirius_staging.target b/releng/org.eclipse.sirius.targets/sirius_staging.target index 950c0213e4..b76e0dd1ff 100644 --- a/releng/org.eclipse.sirius.targets/sirius_staging.target +++ b/releng/org.eclipse.sirius.targets/sirius_staging.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="sirius_staging" sequenceNumber="1448615847"> +<target name="sirius_staging" sequenceNumber="1449666670"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/> @@ -24,6 +24,14 @@ <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.sirius.common.interpreter" version="4.0.0.201512091104"/> + <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/> + <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="com.google.guava" version="0.0.0"/> <unit id="com.ibm.icu" version="0.0.0"/> <unit id="org.eclipse.draw2d.sdk.feature.group" version="0.0.0"/> diff --git a/releng/org.eclipse.sirius.targets/sirius_staging.targetplatform b/releng/org.eclipse.sirius.targets/sirius_staging.targetplatform index fb8f0f3b60..d2036c0511 100644 --- a/releng/org.eclipse.sirius.targets/sirius_staging.targetplatform +++ b/releng/org.eclipse.sirius.targets/sirius_staging.targetplatform @@ -3,6 +3,7 @@ target "sirius_staging" include "modules/orbit.tpd" include "modules/swtbot-2.1.tpd" include "modules/shared-license.tpd" +include "modules/eef-ng.tpd" with source, requirements diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_canary.target b/releng/org.eclipse.sirius.targets/sirius_tests_canary.target index e29359a39b..f1c78b69e7 100644 --- a/releng/org.eclipse.sirius.targets/sirius_tests_canary.target +++ b/releng/org.eclipse.sirius.targets/sirius_tests_canary.target @@ -1,16 +1,24 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="sirius_tests_canary" sequenceNumber="1449506100"> +<target name="sirius_tests_canary" sequenceNumber="1449666673"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.license.feature.group" version="0.0.0"/> <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.platform.ide" version="4.6.0.I20151207-0800"/> - <unit id="org.eclipse.platform.sdk" version="4.6.0.I20151207-0800"/> - <unit id="org.eclipse.sdk.ide" version="4.6.0.I20151207-0800"/> + <unit id="org.eclipse.sirius.common.interpreter" version="4.0.0.201512091104"/> + <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/> + <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.platform.ide" version="4.6.0.I20151208-0800"/> + <unit id="org.eclipse.platform.sdk" version="4.6.0.I20151208-0800"/> + <unit id="org.eclipse.sdk.ide" version="4.6.0.I20151208-0800"/> <repository id="Eclipse-Neon-Integration" location="http://download.eclipse.org/eclipse/updates/4.6-I-builds"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_juno.target b/releng/org.eclipse.sirius.targets/sirius_tests_juno.target index 20e9818b9f..1e01bf5f81 100644 --- a/releng/org.eclipse.sirius.targets/sirius_tests_juno.target +++ b/releng/org.eclipse.sirius.targets/sirius_tests_juno.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="sirius_tests_juno" sequenceNumber="1449506104"> +<target name="sirius_tests_juno" sequenceNumber="1449666676"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.0.201505291308"/> @@ -35,6 +35,14 @@ <repository id="Acceleo-3.6" location="http://download.eclipse.org/acceleo/updates/releases/3.6/R201510121214/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.sirius.common.interpreter" version="4.0.0.201512091104"/> + <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/> + <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="com.google.guava" version="15.0.0.v201403281430"/> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/> <unit id="org.easymock" version="2.4.0.v20090202-0900"/> diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_kepler.target b/releng/org.eclipse.sirius.targets/sirius_tests_kepler.target index 33be7ccb17..ba54580e78 100644 --- a/releng/org.eclipse.sirius.targets/sirius_tests_kepler.target +++ b/releng/org.eclipse.sirius.targets/sirius_tests_kepler.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="sirius_tests_kepler" sequenceNumber="1449506108"> +<target name="sirius_tests_kepler" sequenceNumber="1449666685"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.0.201505291308"/> @@ -35,6 +35,14 @@ <repository id="Acceleo-3.6" location="http://download.eclipse.org/acceleo/updates/releases/3.6/R201510121214/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.sirius.common.interpreter" version="4.0.0.201512091104"/> + <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/> + <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="com.google.guava" version="15.0.0.v201403281430"/> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/> <unit id="org.easymock" version="2.4.0.v20090202-0900"/> diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_mars.target b/releng/org.eclipse.sirius.targets/sirius_tests_mars.target index b031738631..d0e2f1b3a7 100644 --- a/releng/org.eclipse.sirius.targets/sirius_tests_mars.target +++ b/releng/org.eclipse.sirius.targets/sirius_tests_mars.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="sirius_tests_mars" sequenceNumber="1449506115"> +<target name="sirius_tests_mars" sequenceNumber="1449666694"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/> @@ -31,6 +31,14 @@ <repository id="Acceleo-3.6" location="http://download.eclipse.org/acceleo/updates/releases/3.6/R201510121214/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.sirius.common.interpreter" version="4.0.0.201512091104"/> + <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/> + <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.sirius.query.legacy.feature.feature.group" version="0.0.0"/> <repository id="Sirius-Legacy" location="http://download.eclipse.org/sirius/updates/legacy/"/> </location> diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_neon.target b/releng/org.eclipse.sirius.targets/sirius_tests_neon.target index d0d9a643d4..e4af1ecb85 100644 --- a/releng/org.eclipse.sirius.targets/sirius_tests_neon.target +++ b/releng/org.eclipse.sirius.targets/sirius_tests_neon.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="sirius_tests_neon" sequenceNumber="1449506117"> +<target name="sirius_tests_neon" sequenceNumber="1449669682"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/> @@ -31,6 +31,14 @@ <repository id="Acceleo-3.6" location="http://download.eclipse.org/acceleo/updates/releases/3.6/R201510121214/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.sirius.common.interpreter" version="4.0.0.201512091302"/> + <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/> + <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.sirius.query.legacy.feature.feature.group" version="0.0.0"/> <repository id="Sirius-Legacy" location="http://download.eclipse.org/sirius/updates/legacy/"/> </location> diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_staging.target b/releng/org.eclipse.sirius.targets/sirius_tests_staging.target index 331818b334..c30f168bc6 100644 --- a/releng/org.eclipse.sirius.targets/sirius_tests_staging.target +++ b/releng/org.eclipse.sirius.targets/sirius_tests_staging.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="sirius_tests_staging" sequenceNumber="1448615871"> +<target name="sirius_tests_staging" sequenceNumber="1449666703"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/> @@ -24,6 +24,14 @@ <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.sirius.common.interpreter" version="4.0.0.201512091104"/> + <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/> + <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.sirius.query.legacy.feature.feature.group" version="0.0.0"/> <repository id="Sirius-Legacy" location="http://download.eclipse.org/sirius/updates/legacy/"/> </location> |