Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2016-06-20 13:34:00 +0000
committerOlivier Constant2016-06-20 13:34:00 +0000
commit92cdfaf5c55650439595e8b50d50b96d3ac4afa8 (patch)
tree3d0fe763c1efb668ff91a720da4caa3aef28fc83
parentc775839252b03409128c6b33a941753072b86ece (diff)
downloadorg.eclipse.emf.diffmerge.core-92cdfaf5c55650439595e8b50d50b96d3ac4afa8.tar.gz
org.eclipse.emf.diffmerge.core-92cdfaf5c55650439595e8b50d50b96d3ac4afa8.tar.xz
org.eclipse.emf.diffmerge.core-92cdfaf5c55650439595e8b50d50b96d3ac4afa8.zip
Removed Perforce connector
Change-Id: Ia06fcdb468b8c566b3d4d4a0168537afc0c3f0d7 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
-rw-r--r--features/org.eclipse.emf.diffmerge.perforce.feature/.project17
-rw-r--r--features/org.eclipse.emf.diffmerge.perforce.feature/build.properties16
-rw-r--r--features/org.eclipse.emf.diffmerge.perforce.feature/category.xml16
-rw-r--r--features/org.eclipse.emf.diffmerge.perforce.feature/eclipse_update_120.jpgbin21695 -> 0 bytes
-rw-r--r--features/org.eclipse.emf.diffmerge.perforce.feature/epl-v10.html297
-rw-r--r--features/org.eclipse.emf.diffmerge.perforce.feature/feature.properties140
-rw-r--r--features/org.eclipse.emf.diffmerge.perforce.feature/feature.xml39
-rw-r--r--features/org.eclipse.emf.diffmerge.perforce.feature/license.html106
-rw-r--r--features/org.eclipse.emf.diffmerge.perforce.feature/rootfiles/epl-v10.html297
-rw-r--r--features/org.eclipse.emf.diffmerge.perforce.feature/rootfiles/notice.html106
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/.classpath7
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/.project28
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/.settings/org.eclipse.jdt.core.prefs11
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/.settings/org.eclipse.jdt.ui.prefs5
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/META-INF/MANIFEST.MF20
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/about.html26
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/build.properties15
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/plugin.xml24
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/EMFDiffMergePerforceConnectorPlugin.java68
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/Messages.java40
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/ext/PerforceHistoryURIConverter.java178
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/ext/PerforceRemoteScopeDefinitionFactory.java198
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/ext/PerforceRevisionScopeDefinitionFactory.java126
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/messages.properties14
25 files changed, 0 insertions, 1803 deletions
diff --git a/features/org.eclipse.emf.diffmerge.perforce.feature/.project b/features/org.eclipse.emf.diffmerge.perforce.feature/.project
deleted file mode 100644
index d636c954..00000000
--- a/features/org.eclipse.emf.diffmerge.perforce.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.perforce.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.emf.diffmerge.perforce.feature/build.properties b/features/org.eclipse.emf.diffmerge.perforce.feature/build.properties
deleted file mode 100644
index fee41f19..00000000
--- a/features/org.eclipse.emf.diffmerge.perforce.feature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2016 Thales Global Services S.A.S. 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
-###############################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-bin.includes = feature.*,\
- epl-v10.html,\
- license.html,\
- eclipse_update_120.jpg
-src.includes = epl-v10.html,\
- license.html
-root=rootfiles
diff --git a/features/org.eclipse.emf.diffmerge.perforce.feature/category.xml b/features/org.eclipse.emf.diffmerge.perforce.feature/category.xml
deleted file mode 100644
index a8f7247d..00000000
--- a/features/org.eclipse.emf.diffmerge.perforce.feature/category.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.6.0.qualifier">
- <category name="org.eclipse.emf.diffmerge.perforce.category"/>
- </feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.source.feature" version="0.6.0.qualifier">
- <category name="org.eclipse.emf.diffmerge.perforce.category"/>
- </feature>
- <feature url="features/org.eclipse.emf.diffmerge.perforce.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.perforce.feature" version="0.6.0.qualifier">
- <category name="org.eclipse.emf.diffmerge.perforce.category"/>
- </feature>
- <feature url="features/org.eclipse.emf.diffmerge.perforce.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.perforce.source.feature" version="0.6.0.qualifier">
- <category name="org.eclipse.emf.diffmerge.perforce.category"/>
- </feature>
- <category-def name="org.eclipse.emf.diffmerge.perforce.category" label="EMF Diff/Merge (Incubation)"/>
-</site>
diff --git a/features/org.eclipse.emf.diffmerge.perforce.feature/eclipse_update_120.jpg b/features/org.eclipse.emf.diffmerge.perforce.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708a..00000000
--- a/features/org.eclipse.emf.diffmerge.perforce.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.emf.diffmerge.perforce.feature/epl-v10.html b/features/org.eclipse.emf.diffmerge.perforce.feature/epl-v10.html
deleted file mode 100644
index 8f9c78c0..00000000
--- a/features/org.eclipse.emf.diffmerge.perforce.feature/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- 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;
- }
-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;
- }
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
-
- }
-@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 style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"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: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">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: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">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: 10pt;">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: 10pt;">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: 10pt;">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"></p>
-
-</div>
-
-</body></html> \ No newline at end of file
diff --git a/features/org.eclipse.emf.diffmerge.perforce.feature/feature.properties b/features/org.eclipse.emf.diffmerge.perforce.feature/feature.properties
deleted file mode 100644
index d001a683..00000000
--- a/features/org.eclipse.emf.diffmerge.perforce.feature/feature.properties
+++ /dev/null
@@ -1,140 +0,0 @@
-###############################################################################
-# Copyright (c) 2016 Thales Global Services S.A.S. 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
-###############################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-
-# "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 ##########################################
diff --git a/features/org.eclipse.emf.diffmerge.perforce.feature/feature.xml b/features/org.eclipse.emf.diffmerge.perforce.feature/feature.xml
deleted file mode 100644
index 2152409c..00000000
--- a/features/org.eclipse.emf.diffmerge.perforce.feature/feature.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.emf.diffmerge.perforce.feature"
- label="EMF Diff/Merge Perforce Integration Feature (Incubation)"
- version="0.6.0.qualifier"
- provider-name="Eclipse Modeling Project">
-
- <description>
- An integration of EMF Diff/Merge with Perforce.
- </description>
-
- <copyright>
- Copyright (c) 2016 Thales Global Services S.A.S. 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
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.emf.diffmerge.perforce.source.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.diffmerge.sdk.feature"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.emf.diffmerge.connector.perforce"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.emf.diffmerge.perforce.feature/license.html b/features/org.eclipse.emf.diffmerge.perforce.feature/license.html
deleted file mode 100644
index 95ad95e7..00000000
--- a/features/org.eclipse.emf.diffmerge.perforce.feature/license.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<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> \ No newline at end of file
diff --git a/features/org.eclipse.emf.diffmerge.perforce.feature/rootfiles/epl-v10.html b/features/org.eclipse.emf.diffmerge.perforce.feature/rootfiles/epl-v10.html
deleted file mode 100644
index 8f9c78c0..00000000
--- a/features/org.eclipse.emf.diffmerge.perforce.feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office"><head>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="File-List" href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.emf/org.eclipse.emf/features/org.eclipse.emf.ecore-feature/rootfiles/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- 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;
- }
-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;
- }
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
-
- }
-@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 style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"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: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">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: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">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: 10pt;">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: 10pt;">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: 10pt;">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"></p>
-
-</div>
-
-</body></html> \ No newline at end of file
diff --git a/features/org.eclipse.emf.diffmerge.perforce.feature/rootfiles/notice.html b/features/org.eclipse.emf.diffmerge.perforce.feature/rootfiles/notice.html
deleted file mode 100644
index 95ad95e7..00000000
--- a/features/org.eclipse.emf.diffmerge.perforce.feature/rootfiles/notice.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<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> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/.classpath b/plugins/org.eclipse.emf.diffmerge.connector.perforce/.classpath
deleted file mode 100644
index 2d1a4302..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/.project b/plugins/org.eclipse.emf.diffmerge.connector.perforce/.project
deleted file mode 100644
index 0d9e5ff5..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.connector.perforce</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</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.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.diffmerge.connector.perforce/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2d840114..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=_p
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=_
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=__
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.diffmerge.connector.perforce/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 7922d45f..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.connector.perforce/META-INF/MANIFEST.MF
deleted file mode 100644
index 5ca9669f..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.diffmerge.connector.perforce;singleton:=true
-Bundle-Version: 0.6.0.qualifier
-Bundle-Localization: plugin
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.emf.diffmerge.connector.perforce.EMFDiffMergePerforceConnectorPlugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.team.core,
- org.eclipse.team.ui,
- org.eclipse.emf.diffmerge.ui.gmf,
- org.eclipse.emf.diffmerge.connector.core,
- com.perforce.team.core;bundle-version="2013.1.788968",
- com.perforce.team.ui;bundle-version="2013.1.788968"
-Export-Package: org.eclipse.emf.diffmerge.connector.perforce,
- org.eclipse.emf.diffmerge.connector.perforce.ext
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/about.html b/plugins/org.eclipse.emf.diffmerge.connector.perforce/about.html
deleted file mode 100644
index 7e766fe1..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/about.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/build.properties b/plugins/org.eclipse.emf.diffmerge.connector.perforce/build.properties
deleted file mode 100644
index 6f76a7e1..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2015-2016 Intel 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
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- about.html
-src.includes = about.html
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/plugin.properties b/plugins/org.eclipse.emf.diffmerge.connector.perforce/plugin.properties
deleted file mode 100644
index e4abc9f5..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/plugin.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-###############################################################################
-# Copyright (c) 2015-2016 Intel 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
-###############################################################################
-pluginName = EMF Diff/Merge Perforce Connector Plug-In (Incubation)
-providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/plugin.xml b/plugins/org.eclipse.emf.diffmerge.connector.perforce/plugin.xml
deleted file mode 100644
index 2e566d55..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<!--
- Copyright (c) 2015-2016 Intel 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:
- Stephane Bouchet (Intel Corporation) - initial API and implementation
--->
-<plugin>
- <extension point="org.eclipse.emf.diffmerge.ui.modelComparisonContext">
- <scopeDefinition
- factory="org.eclipse.emf.diffmerge.connector.perforce.ext.PerforceRemoteScopeDefinitionFactory">
- </scopeDefinition>
- </extension>
- <extension point="org.eclipse.emf.diffmerge.ui.modelComparisonContext">
- <scopeDefinition
- factory="org.eclipse.emf.diffmerge.connector.perforce.ext.PerforceRevisionScopeDefinitionFactory">
- </scopeDefinition>
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/EMFDiffMergePerforceConnectorPlugin.java b/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/EMFDiffMergePerforceConnectorPlugin.java
deleted file mode 100644
index 5321da8f..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/EMFDiffMergePerforceConnectorPlugin.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015-2016 Intel 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:
- * Stephane Bouchet (Intel Corporation) - initial API and implementation
- * Olivier Constant (Thales Global Services) - tight integration
- *******************************************************************************/
-package org.eclipse.emf.diffmerge.connector.perforce;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * The activator class for this plug-in.
- */
-public class EMFDiffMergePerforceConnectorPlugin extends AbstractUIPlugin {
-
- /** The shared instance */
- private static EMFDiffMergePerforceConnectorPlugin __plugin;
-
-
- /**
- * Constructor
- */
- public EMFDiffMergePerforceConnectorPlugin() {
- // Nothing needed
- }
-
- /**
- * Return the ID of this plug-in according to MANIFEST.MF
- * @return a non-null string
- */
- public String getPluginId() {
- return getBundle().getSymbolicName();
- }
-
- /**
- * Return the shared instance of this activator
- * @return a non-null object
- */
- public static EMFDiffMergePerforceConnectorPlugin getDefault() {
- return __plugin;
- }
-
- /**
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context_p) throws Exception {
- super.start(context_p);
- __plugin = this;
- }
-
- /**
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context_p) throws Exception {
- __plugin = null;
- super.stop(context_p);
- }
-
-}
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/Messages.java b/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/Messages.java
deleted file mode 100644
index 1b0ebe6d..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/Messages.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015-2016 Intel 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:
- * Stephane Bouchet (Intel Corporation) - initial API and implementation
- * Olivier Constant (Thales Global Services) - tight integration
- *******************************************************************************/
-package org.eclipse.emf.diffmerge.connector.perforce;
-
-import org.eclipse.osgi.util.NLS;
-
-
-/**
- * String management.
- */
-@SuppressWarnings("javadoc")
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.emf.diffmerge.connector.perforce.messages"; //$NON-NLS-1$
- public static String PerforceHistoryURIConverter_CannotFindRes;
- public static String PerforceHistoryURIConverter_CannotLoadChangelist;
- public static String PerforceHistoryURIConverter_CannotLoadRevision;
- public static String PerforceHistoryURIConverter_RemoteFile;
-
- public static String PerforceRevisionScopeDefinitionFactory_CannotLoadChangelist;
- public static String PerforceRevisionScopeDefinitionFactory_RemoteLabel;
- public static String PerforceStreamScopeDefinitionFactory_CannotLoadChangelist;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- // Nothing needed
- }
-}
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/ext/PerforceHistoryURIConverter.java b/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/ext/PerforceHistoryURIConverter.java
deleted file mode 100644
index be9d10fd..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/ext/PerforceHistoryURIConverter.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015-2016 Intel 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:
- * Stephane Bouchet (Intel Corporation) - initial API and implementation
- * Olivier Constant (Thales Global Services) - tight integration
- *******************************************************************************/
-package org.eclipse.emf.diffmerge.connector.perforce.ext;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.diffmerge.connector.perforce.EMFDiffMergePerforceConnectorPlugin;
-import org.eclipse.emf.diffmerge.connector.perforce.Messages;
-import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
-
-import com.perforce.p4java.core.IChangelistSummary;
-import com.perforce.p4java.core.file.FileSpecBuilder;
-import com.perforce.p4java.core.file.IFileSpec;
-import com.perforce.p4java.exception.P4JavaException;
-import com.perforce.team.core.ConnectionParameters;
-import com.perforce.team.core.PerforceTeamProvider;
-import com.perforce.team.core.p4java.IP4Connection;
-import com.perforce.team.core.p4java.IP4Resource;
-import com.perforce.team.core.p4java.P4Workspace;
-
-
-/**
- * A URI Converter for file revisions in the Perforce history.
- */
-public class PerforceHistoryURIConverter extends ExtensibleURIConverterImpl {
-
- /** The Perforce hash symbol */
- public static final String PERFORCE_HASH = "#"; //$NON-NLS-1$
-
- /** The "Depot File" Perforce revision label */
- public static final String DEPOT_FILE_REVISION_LABEL = "Depot File"; //$NON-NLS-1$
-
- /** The non-null Eclipse resource */
- private final IResource _resource;
-
- /** The optional Perforce changelist */
- private IChangelistSummary _changelist;
-
- /** The optional Perforce revision label */
- private String _revision;
-
-
- /**
- * Constructor
- * @param resource_p a non-null Eclipse resource
- * @param changelist_p an optional Perforce changelist summary
- */
- public PerforceHistoryURIConverter(IResource resource_p, IChangelistSummary changelist_p) {
- _resource = resource_p;
- _changelist = changelist_p;
- _revision = null;
- }
-
- /**
- * Constructor
- * @param resource_p a non-null Eclipse resource
- * @param revision_p an optional Perforce revision label
- */
- public PerforceHistoryURIConverter(IResource resource_p, String revision_p) {
- _resource = resource_p;
- _changelist = null;
- _revision = revision_p;
- }
-
- /**
- * Constructor
- * @param resource_p a non-null Eclipse resource
- */
- public PerforceHistoryURIConverter(IResource resource_p) {
- _resource = resource_p;
- _changelist = null;
- _revision = null;
- }
-
- /**
- * The related model needs to be on the same changeList. If not, get the closest by date.
- * @see org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl#createInputStream(org.eclipse.emf.common.util.URI,
- * java.util.Map)
- */
- @Override
- public InputStream createInputStream(URI uri_p, Map<?, ?> options_p) throws IOException {
- if (_resource != null && _resource.exists()) {
- try {
- ConnectionParameters params = PerforceTeamProvider.getPerforceProvider(_resource).getProjectProperties(false);
- IP4Connection connection = P4Workspace.getWorkspace().getConnection(params);
- IP4Resource p4Res = connection.getResource(getModelResource(uri_p));
- if (p4Res != null) {
- List<IFileSpec> fileSpecList = getFileSpecList(p4Res);
- if (fileSpecList != null) {
- InputStream content = connection.getServer().getFileContents(fileSpecList, false, true);
- if (content != null)
- return content;
- }
- String message;
- if (_revision != null)
- message = String.format(
- Messages.PerforceHistoryURIConverter_CannotLoadRevision, uri_p.path(), _revision);
- else
- message = String.format(
- Messages.PerforceHistoryURIConverter_CannotLoadChangelist,
- uri_p.path(), String.valueOf(_changelist.getId()));
- EMFDiffMergePerforceConnectorPlugin.getDefault().getLog().log(new Status(
- IStatus.ERROR, EMFDiffMergePerforceConnectorPlugin.getDefault().getPluginId(), message));
- } else {
- EMFDiffMergePerforceConnectorPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
- EMFDiffMergePerforceConnectorPlugin.getDefault().getPluginId(),
- String.format(Messages.PerforceHistoryURIConverter_CannotFindRes, uri_p.path())));
- }
- } catch (CoreException e) {
- throw new IOException(e.getMessage(), e);
- } catch (P4JavaException e) {
- throw new IOException(e.getMessage(), e);
- }
- }
- return super.createInputStream(uri_p, options_p);
- }
-
- /**
- * Return the list of file specs that correspond to the given Perforce resource
- * @param p4Res_p a non-null object
- * @return a potentially null list
- */
- protected List<IFileSpec> getFileSpecList(IP4Resource p4Res_p) {
- if (_revision == null && _changelist == null) {
- return FileSpecBuilder.makeFileSpecList(p4Res_p.getRemotePath() + PERFORCE_HASH + IFileSpec.HEAD_REVISION_STRING);
- } else if (_revision != null) {
- String revSpec = PERFORCE_HASH + IFileSpec.NONE_REVISION_STRING;
- if (_revision.startsWith(Messages.PerforceHistoryURIConverter_RemoteFile))
- revSpec = _revision.substring(_revision.indexOf(PERFORCE_HASH.charAt(0)), _revision.indexOf(')'));
- else if (_revision.startsWith(PERFORCE_HASH))
- revSpec = _revision;
- else if (DEPOT_FILE_REVISION_LABEL.equals(_revision))
- revSpec = PERFORCE_HASH + IFileSpec.HEAD_REVISION_STRING;
- return FileSpecBuilder.makeFileSpecList(p4Res_p.getRemotePath() + revSpec);
- } else if (_changelist != null) {
- return FileSpecBuilder.makeFileSpecList(p4Res_p.getRemotePath() + '@' + _changelist.getId());
- }
- return null;
- }
-
- /**
- * Return the Eclipse resource that corresponds to the given URI
- * @param uri_p a non-null URI
- * @return a potentially null object
- */
- protected IResource getModelResource(URI uri_p) {
- IResource result;
- if (uri_p.isPlatform()) {
- result = ResourcesPlugin.getWorkspace().getRoot().getFile(
- new Path(uri_p.toPlatformString(true)));
- } else {
- IPath fullPath = _resource.getFullPath().removeLastSegments(1).append(uri_p.toString());
- result = ResourcesPlugin.getWorkspace().getRoot().getFile(fullPath);
- }
- return result;
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/ext/PerforceRemoteScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/ext/PerforceRemoteScopeDefinitionFactory.java
deleted file mode 100644
index 3e29bce4..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/ext/PerforceRemoteScopeDefinitionFactory.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015-2016 Intel 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:
- * Stephane Bouchet (Intel Corporation) - initial API and implementation
- * Olivier Constant (Thales Global Services) - tight integration
- *******************************************************************************/
-package org.eclipse.emf.diffmerge.connector.perforce.ext;
-
-import static org.eclipse.emf.diffmerge.connector.perforce.ext.PerforceHistoryURIConverter.DEPOT_FILE_REVISION_LABEL;
-import static org.eclipse.emf.diffmerge.connector.perforce.ext.PerforceHistoryURIConverter.PERFORCE_HASH;
-
-import java.io.InputStream;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.diffmerge.connector.core.ext.AbstractURIConvertingScopeDefinitionFactory;
-import org.eclipse.emf.diffmerge.connector.perforce.EMFDiffMergePerforceConnectorPlugin;
-import org.eclipse.emf.diffmerge.connector.perforce.Messages;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.PlatformUI;
-
-import com.perforce.p4java.core.IChangelistSummary;
-import com.perforce.p4java.core.file.FileSpecBuilder;
-import com.perforce.p4java.core.file.IFileSpec;
-import com.perforce.p4java.exception.P4JavaException;
-import com.perforce.p4java.impl.mapbased.server.Server;
-import com.perforce.p4java.option.server.GetChangelistsOptions;
-import com.perforce.team.core.ConnectionParameters;
-import com.perforce.team.core.PerforceTeamProvider;
-import com.perforce.team.core.p4java.IP4Connection;
-import com.perforce.team.core.p4java.IP4Resource;
-import com.perforce.team.core.p4java.P4Workspace;
-import com.perforce.team.ui.editor.P4CompareNode;
-
-
-/**
- * A scopes definition factory for remote Perforce files.
- */
-public class PerforceRemoteScopeDefinitionFactory extends AbstractURIConvertingScopeDefinitionFactory {
-
- /** The "double slash" constant */
- protected static final String DOUBLE_SLASH = "//"; //$NON-NLS-1$
-
- /**
- * @see org.eclipse.emf.diffmerge.ui.specification.ext.URIScopeDefinitionFactory#convertToURI(java.lang.Object)
- */
- @Override
- protected URI convertToURI(Object entrypoint_p) {
- return toFileURI(((P4CompareNode)entrypoint_p).getName());
- }
-
- /**
- * @see org.eclipse.emf.diffmerge.ui.specification.ext.URIScopeDefinitionFactory#getLabelFor(java.lang.Object)
- */
- @Override
- protected String getLabelFor(Object entrypoint_p) {
- String result;
- String label = ((P4CompareNode) entrypoint_p).getLabel();
- if (label.indexOf(DOUBLE_SLASH) != -1) {
- result = ((P4CompareNode) entrypoint_p).getName() + " [" //$NON-NLS-1$
- + label.substring(label.indexOf(PERFORCE_HASH.charAt(0)),
- label.indexOf(DOUBLE_SLASH) - 3) + "]"; //$NON-NLS-1$
- } else {
- result = ((P4CompareNode) entrypoint_p).getName() + " [" + label + "]"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- return result;
- }
-
- /**
- * Return a URIConverter for the given Perforce compare node
- * @param node_p a non-null object
- * @return a potentially null object
- * @throws NoSuchFieldException
- * @throws SecurityException
- * @throws IllegalArgumentException
- * @throws IllegalAccessException
- */
- protected URIConverter getNodeURIConverter(P4CompareNode node_p)
- throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
- // Cannot have a direct link between the p4CompareNode and the IResource.
- // Need to parse all known connections and depots.
- String nodeLabel = node_p.getLabel();
- if (nodeLabel.indexOf(DOUBLE_SLASH) != -1) {
- for (IP4Connection conn : P4Workspace.getWorkspace().getConnections()) {
- IP4Resource ip4Resource = conn.getResource(
- nodeLabel.substring(nodeLabel.indexOf(DOUBLE_SLASH),
- nodeLabel.length()) + DOUBLE_SLASH + node_p.getName());
- if (ip4Resource.isFile()) {
- IResource res = ResourcesPlugin.getWorkspace().getRoot()
- .getFileForLocation(new Path(ip4Resource.getLocalPath()));
- return new PerforceHistoryURIConverter(res,
- nodeLabel.substring(nodeLabel.indexOf(PERFORCE_HASH.charAt(0)),
- nodeLabel.indexOf(DOUBLE_SLASH) - 3));
- }
- }
- }
- if (PlatformUI.isWorkbenchRunning() && PlatformUI.getWorkbench().getActiveWorkbenchWindow() != null) {
- ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService()
- .getSelection();
- if (selection instanceof IStructuredSelection) {
- Object element = ((IStructuredSelection) selection).getFirstElement();
- if (element instanceof IAdaptable) {
- @SuppressWarnings("cast") // Compatibility with older versions of Eclipse
- IResource res = (IResource) ((IAdaptable) element).getAdapter(IResource.class);
- if (DEPOT_FILE_REVISION_LABEL.equals(nodeLabel)) {
- return new PerforceHistoryURIConverter(res,
- DEPOT_FILE_REVISION_LABEL);
- } else if (nodeLabel.indexOf(PERFORCE_HASH) != -1) {
- try {
- ConnectionParameters params = PerforceTeamProvider.getPerforceProvider(res)
- .getProjectProperties(false);
- IP4Connection connection = P4Workspace.getWorkspace().getConnection(params);
- String revision = nodeLabel.substring(nodeLabel.indexOf(PERFORCE_HASH), nodeLabel.length() - 1);
- List<IFileSpec> fileSpecList = FileSpecBuilder
- .makeFileSpecList(res.getLocation() + revision);
- GetChangelistsOptions opts = new GetChangelistsOptions();
- opts.setMaxMostRecent(1);
- if (connection.getServer() instanceof Server && !((Server) connection.getServer())
- .getChangelists(fileSpecList, opts).isEmpty()) {
- IChangelistSummary changeList = ((Server) connection.getServer())
- .getChangelists(fileSpecList, opts).get(0);
- return new PerforceHistoryURIConverter(res, changeList);
- }
- EMFDiffMergePerforceConnectorPlugin.getDefault().getLog().log(new Status(
- IStatus.ERROR, EMFDiffMergePerforceConnectorPlugin.getDefault().getPluginId(),
- Messages.PerforceStreamScopeDefinitionFactory_CannotLoadChangelist + res));
- } catch (CoreException e) {
- EMFDiffMergePerforceConnectorPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
- EMFDiffMergePerforceConnectorPlugin.getDefault().getPluginId(), e.getMessage(), e));
- } catch (P4JavaException e) {
- EMFDiffMergePerforceConnectorPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
- EMFDiffMergePerforceConnectorPlugin.getDefault().getPluginId(), e.getMessage(), e));
- }
- }
- }
- }
- }
- return URIConverter.INSTANCE;
- }
-
- /**
- * @see org.eclipse.emf.diffmerge.connector.core.ext.AbstractURIConvertingScopeDefinitionFactory#getStream(java.lang.Object)
- */
- @Override
- protected InputStream getStream(Object entrypoint_p) throws CoreException {
- InputStream result;
- if (entrypoint_p instanceof P4CompareNode) {
- try {
- result = ((P4CompareNode)entrypoint_p).getContents();
- } catch (CoreException e) {
- EMFDiffMergePerforceConnectorPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
- EMFDiffMergePerforceConnectorPlugin.getDefault().getPluginId(), e.getMessage(), e));
- result = null;
- }
- } else {
- result = super.getStream(entrypoint_p);
- }
- return result;
- }
-
- /**
- * @see org.eclipse.emf.diffmerge.connector.core.ext.AbstractURIConvertingScopeDefinitionFactory#getURIConverter(java.lang.Object)
- */
- @Override
- protected URIConverter getURIConverter(Object entrypoint_p) {
- URIConverter result = null;
- try {
- result = getNodeURIConverter((P4CompareNode)entrypoint_p);
- } catch (Exception e) {
- EMFDiffMergePerforceConnectorPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
- EMFDiffMergePerforceConnectorPlugin.getDefault().getPluginId(), e.getMessage(), e));
- }
- return result;
- }
-
- /**
- * @see org.eclipse.emf.diffmerge.ui.specification.ext.URIScopeDefinitionFactory#isApplicableTo(java.lang.Object)
- */
- @Override
- public boolean isApplicableTo(Object entrypoint_p) {
- return entrypoint_p instanceof P4CompareNode;
- }
-
-}
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/ext/PerforceRevisionScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/ext/PerforceRevisionScopeDefinitionFactory.java
deleted file mode 100644
index 432cd85b..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/ext/PerforceRevisionScopeDefinitionFactory.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015-2016 Intel 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:
- * Stephane Bouchet (Intel Corporation) - initial API and implementation
- * Olivier Constant (Thales Global Services) - tight integration
- *******************************************************************************/
-package org.eclipse.emf.diffmerge.connector.perforce.ext;
-
-import static org.eclipse.emf.diffmerge.connector.perforce.ext.PerforceHistoryURIConverter.PERFORCE_HASH;
-
-import java.util.List;
-
-import org.eclipse.compare.ITypedElement;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.diffmerge.connector.core.ext.AbstractRevisionScopeDefinitionFactory;
-import org.eclipse.emf.diffmerge.connector.perforce.EMFDiffMergePerforceConnectorPlugin;
-import org.eclipse.emf.diffmerge.connector.perforce.Messages;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.team.core.history.IFileRevision;
-import org.eclipse.team.core.variants.IResourceVariant;
-
-import com.perforce.p4java.core.IChangelistSummary;
-import com.perforce.p4java.core.file.FileSpecBuilder;
-import com.perforce.p4java.core.file.IFileSpec;
-import com.perforce.p4java.exception.P4JavaException;
-import com.perforce.p4java.impl.mapbased.server.Server;
-import com.perforce.p4java.option.server.GetChangelistsOptions;
-import com.perforce.team.core.ConnectionParameters;
-import com.perforce.team.core.PerforceTeamProvider;
-import com.perforce.team.core.p4java.IP4Connection;
-import com.perforce.team.core.p4java.P4Workspace;
-import com.perforce.team.core.p4java.synchronize.PerforceSyncFile;
-
-
-/**
- * A scope definition factory for file revisions in Perforce history.
- */
-public class PerforceRevisionScopeDefinitionFactory extends AbstractRevisionScopeDefinitionFactory {
-
- /**
- * @see org.eclipse.emf.diffmerge.connector.core.ext.AbstractRevisionScopeDefinitionFactory#getLabelForRevision(org.eclipse.team.core.history.IFileRevision, org.eclipse.compare.ITypedElement)
- */
- @Override
- protected String getLabelForRevision(IFileRevision revision_p, ITypedElement entrypoint_p) {
- String result = null;
- IResourceVariant variant = getVariant(revision_p);
- if (variant instanceof PerforceSyncFile)
- result = String.format(Messages.PerforceRevisionScopeDefinitionFactory_RemoteLabel,
- variant.getName(), variant.getContentIdentifier());
- else
- result = super.getLabelForRevision(revision_p, entrypoint_p);
- return result;
- }
-
- /**
- * @see org.eclipse.emf.diffmerge.connector.core.ext.AbstractRevisionScopeDefinitionFactory#getURIConverterForRevision(org.eclipse.team.core.history.IFileRevision)
- */
- @Override
- protected URIConverter getURIConverterForRevision(IFileRevision revision_p)
- throws CoreException {
- URIConverter result = null;
- IResourceVariant variant = getVariant(revision_p);
- if (variant instanceof PerforceSyncFile) {
- try {
- String localPath = ((PerforceSyncFile) variant).getFile().getLocalPath();
- IResource res = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(localPath));
- ConnectionParameters params = PerforceTeamProvider.getPerforceProvider(res).getProjectProperties(false);
- IP4Connection connection = P4Workspace.getWorkspace().getConnection(params);
- String revisionSpec = variant.getContentIdentifier();
- if (!revisionSpec.startsWith(PERFORCE_HASH) && revisionSpec.lastIndexOf(PERFORCE_HASH) != -1)
- revisionSpec = revisionSpec.substring(revisionSpec.lastIndexOf(PERFORCE_HASH), revisionSpec.length());
- List<IFileSpec> fileSpecList = FileSpecBuilder
- .makeFileSpecList(((PerforceSyncFile) variant).getFile().getRemotePath() + revisionSpec);
- GetChangelistsOptions opts = new GetChangelistsOptions();
- opts.setMaxMostRecent(1);
- if (connection.getServer() instanceof Server
- && !((Server) connection.getServer()).getChangelists(fileSpecList, opts).isEmpty()) {
- IChangelistSummary changeList = ((Server) connection.getServer()).getChangelists(fileSpecList, opts)
- .get(0);
- result = new PerforceHistoryURIConverter(res, changeList);
- } else {
- EMFDiffMergePerforceConnectorPlugin.getDefault().getLog()
- .log(new Status(IStatus.ERROR, EMFDiffMergePerforceConnectorPlugin.getDefault().getPluginId(),
- Messages.PerforceRevisionScopeDefinitionFactory_CannotLoadChangelist + res));
- }
- } catch (P4JavaException e) {
- EMFDiffMergePerforceConnectorPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
- EMFDiffMergePerforceConnectorPlugin.getDefault().getPluginId(), e.getMessage(), e));
- }
- }
- return result;
- }
-
- /**
- * @see org.eclipse.emf.diffmerge.connector.core.ext.AbstractRevisionScopeDefinitionFactory#getURIForRevision(org.eclipse.team.core.history.IFileRevision)
- */
- @Override
- protected URI getURIForRevision(IFileRevision revision_p)
- throws CoreException {
- URI result = null;
- IResourceVariant variant = getVariant(revision_p);
- if (variant instanceof PerforceSyncFile)
- result = URI.createURI(((PerforceSyncFile) variant).getFile().getRemotePath());
- return result;
- }
-
- /**
- * @see org.eclipse.emf.diffmerge.connector.core.ext.AbstractRevisionScopeDefinitionFactory#isApplicableToRevision(org.eclipse.team.core.history.IFileRevision, org.eclipse.compare.ITypedElement)
- */
- @Override
- protected boolean isApplicableToRevision(IFileRevision revision_p, ITypedElement entrypoint_p) {
- return getVariant(revision_p) instanceof PerforceSyncFile;
- }
-
-}
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/messages.properties b/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/messages.properties
deleted file mode 100644
index d625bab3..00000000
--- a/plugins/org.eclipse.emf.diffmerge.connector.perforce/src/org/eclipse/emf/diffmerge/connector/perforce/messages.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2015-2016 Intel 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
-###############################################################################
-PerforceHistoryURIConverter_CannotFindRes=Cannot find IResource at: %s
-PerforceHistoryURIConverter_CannotLoadChangelist=Cannot load IResource (%1$s) from ChangeList id:%2$s
-PerforceHistoryURIConverter_CannotLoadRevision=Cannot load IResource (%1$s) from Revision: %2$s
-PerforceHistoryURIConverter_RemoteFile=Remote File
-PerforceRevisionScopeDefinitionFactory_CannotLoadChangelist=Cannot load changeList for resource:
-PerforceRevisionScopeDefinitionFactory_RemoteLabel=%1$s [Remote File %2$s]
-PerforceStreamScopeDefinitionFactory_CannotLoadChangelist=Cannot load changeList for resource:

Back to the top