Merge branch 'master' of ssh://git.eclipse.org/gitroot/emf-store/org.eclipse.emf.emfstore.releng
diff --git a/emfstore-parent/pom.xml b/emfstore-parent/pom.xml
index a75c7ff..0981a5d 100644
--- a/emfstore-parent/pom.xml
+++ b/emfstore-parent/pom.xml
@@ -141,8 +141,19 @@
     <module>../../org.eclipse.emf.emfstore.other/org.eclipse.emf.emfstore.server.backchannel</module>
     <module>../../org.eclipse.emf.emfstore.core/org.eclipse.emf.emfstore.modelmutator</module>
 
+    <!-- Fuzzy -->
+    <module>../org.eclipse.emf.emfstore.fuzzy.feature</module>
+    <module>../org.eclipse.emf.emfstore.fuzzy.test.feature</module>
+	<module>../../org.eclipse.emf.emfstore.other/org.eclipse.emf.emfstore.fuzzy</module>
+	<module>../../org.eclipse.emf.emfstore.other/org.eclipse.emf.emfstore.fuzzy.emf</module>
+	<module>../../org.eclipse.emf.emfstore.other/org.eclipse.emf.emfstore.fuzzy.emf.edit</module>
+	<module>../../org.eclipse.emf.emfstore.other/org.eclipse.emf.emfstore.fuzzy.emf.editor</module>
+	<module>../../org.eclipse.emf.emfstore.other/org.eclipse.emf.emfstore.fuzzy.emf.example</module>
+	<module>../../org.eclipse.emf.emfstore.other/org.eclipse.emf.emfstore.fuzzy.emf.test</module>
+
     <!-- Testing -->
     <module>../../org.eclipse.emf.emfstore.core/org.eclipse.emf.emfstore.client.test</module>
+    
   </modules>
 
   <repositories>
diff --git a/org.eclipse.emf.emfstore.client.ui.errorreporting.feature/.project b/org.eclipse.emf.emfstore.client.ui.errorreporting.feature/.project
new file mode 100644
index 0000000..421dc0e
--- /dev/null
+++ b/org.eclipse.emf.emfstore.client.ui.errorreporting.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.emf.emfstore.client.ui.errorreporting.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/org.eclipse.emf.emfstore.client.ui.errorreporting.feature/build.properties b/org.eclipse.emf.emfstore.client.ui.errorreporting.feature/build.properties
new file mode 100644
index 0000000..82ab19c
--- /dev/null
+++ b/org.eclipse.emf.emfstore.client.ui.errorreporting.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml

diff --git a/org.eclipse.emf.emfstore.client.ui.errorreporting.feature/feature.xml b/org.eclipse.emf.emfstore.client.ui.errorreporting.feature/feature.xml
new file mode 100644
index 0000000..f9810b5
--- /dev/null
+++ b/org.eclipse.emf.emfstore.client.ui.errorreporting.feature/feature.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.emf.emfstore.client.ui.errorreporting.feature"

+      label="Error Reporting Support (Incubation)"

+      version="0.9.3.qualifier"

+      provider-name="Eclipse Modeling Project"

+      plugin="org.eclipse.emf.emfstore.branding">

+

+   <description url="http://www.example.com/description">

+      [Enter Feature Description here.]

+   </description>

+

+   <copyright url="http://www.example.com/copyright">

+      Copyright (c) 2008-2012 EclipseSource Muenchen GmbH.

+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="http://www.eclipse.org/legal/epl-v10.html">

+      Eclipse Public License - v 1.0

+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS

+ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE

+OF THIS AGREEMENT.

+1. DEFINITIONS

+&quot;Contribution&quot; means:

+a) in the case of the initial Contributor, the initial code and

+documentation distributed under this Agreement, and

+b) in the case of each subsequent Contributor:

+i) changes to the Program, and

+ii) additions to the Program;

+where such changes and/or additions to the Program originate

+from and are distributed by that particular Contributor. A Contribution

+&apos;originates&apos; from a Contributor if it was added to the Program

+by such Contributor itself or anyone acting on such Contributor&apos;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.

+&quot;Contributor&quot; means any person or entity that distributes the

+Program.

+&quot;Licensed Patents &quot; 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.

+&quot;Program&quot; means the Contributions distributed in accordance with

+this Agreement.

+&quot;Recipient&quot; means anyone who receives the Program under this

+Agreement, including all Contributors.

+2. GRANT OF RIGHTS

+a) Subject to the terms of this Agreement, each Contributor hereby

+grants Recipient a non-exclusive, worldwide, royalty-free copyright

+license to reproduce, prepare derivative works of, publicly display,

+publicly perform, distribute and sublicense the Contribution

+of such Contributor, if any, and such derivative works, in source

+code and object code form.

+b) Subject to the terms of this Agreement, each Contributor hereby

+grants Recipient a non-exclusive, worldwide, royalty-free patent

+license under Licensed Patents to make, use, sell, offer to sell,

+import and otherwise transfer the Contribution of such Contributor,

+if any, in source code and object code form. This patent license

+shall apply to the combination of the Contribution and the Program

+if, at the time the Contribution is added by the Contributor,

+such addition of the Contribution causes such combination to

+be covered by the Licensed Patents. The patent license shall

+not apply to any other combinations which include the Contribution.

+No hardware per se is licensed hereunder.

+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&apos;s responsibility to acquire

+that license before distributing the Program.

+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.

+3. REQUIREMENTS

+A Contributor may choose to distribute the Program in object

+code form under its own license agreement, provided that:

+a) it complies with the terms and conditions of this Agreement;

+and

+b) its license agreement:

+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;

+ii) effectively excludes on behalf of all Contributors all liability

+for damages, including direct, indirect, special, incidental

+and consequential damages, such as lost profits;

+iii) states that any provisions which differ from this Agreement

+are offered by that Contributor alone and not by any other party;

+and

+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.

+When the Program is made available in source code form:

+a) it must be made available under this Agreement; and

+b) a copy of this Agreement must be included with each copy of

+the Program.

+Contributors may not remove or alter any copyright notices contained

+within the Program.

+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.

+4. COMMERCIAL DISTRIBUTION

+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

+(&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify

+every other Contributor (&quot;Indemnified Contributor&quot;) against any

+losses, damages and costs (collectively &quot;Losses&quot;) 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.

+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&apos;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.

+5. NO WARRANTY

+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM

+IS PROVIDED ON AN &quot;AS IS&quot; 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.

+6. DISCLAIMER OF LIABILITY

+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.

+7. GENERAL

+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.

+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&apos;s patent(s),

+then such Recipient&apos;s rights granted under Section 2(b) shall

+terminate as of the date such litigation is filed.

+All Recipient&apos;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&apos;s rights under this Agreement terminate, Recipient

+agrees to cease use and distribution of the Program as soon as

+reasonably practicable. However, Recipient&apos;s obligations under

+this Agreement and any licenses granted by Recipient relating

+to the Program shall continue and survive.

+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.

+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.

+   </license>

+

+   <requires>

+      <import plugin="org.eclipse.ui"/>

+      <import plugin="org.eclipse.core.runtime"/>

+      <import plugin="org.eclipse.emf.emfstore.client" version="0.9.3" match="greaterOrEqual"/>

+      <import plugin="com.ibm.icu" version="4.4.2" match="greaterOrEqual"/>

+   </requires>

+

+   <plugin

+         id="org.eclipse.emf.emfstore.client.ui.errorreporting"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml b/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml
index 003402e..336d0a1 100644
--- a/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml
+++ b/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml
@@ -7,225 +7,230 @@
       plugin="org.eclipse.emf.emfstore.branding">

 

    <description url="http://emfstore.org">

-      This feature contains the fuzzy testing framework and the EMFDataProvider

+      This feature contains the fuzzy testing framework and the EMFDataProvider
 to use it for EMF Models.

    </description>

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2008-2011 Chair for Applied Software Engineering,

-Technische Universitaet Muenchen.

-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

+      Copyright (c) 2008-2011 Chair for Applied Software Engineering,
+Technische Universitaet Muenchen.
+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="http://www.eclipse.org/legal/epl-v10.html">

-      Eclipse Public License - v 1.0

-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS

-ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE

-OF THIS AGREEMENT.

-1. DEFINITIONS

-&quot;Contribution&quot; means:

-a) in the case of the initial Contributor, the initial code and

-documentation distributed under this Agreement, and

-b) in the case of each subsequent Contributor:

-i) changes to the Program, and

-ii) additions to the Program;

-where such changes and/or additions to the Program originate

-from and are distributed by that particular Contributor. A Contribution

-&apos;originates&apos; from a Contributor if it was added to the Program

-by such Contributor itself or anyone acting on such Contributor&apos;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.

-&quot;Contributor&quot; means any person or entity that distributes the

-Program.

-&quot;Licensed Patents &quot; 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.

-&quot;Program&quot; means the Contributions distributed in accordance with

-this Agreement.

-&quot;Recipient&quot; means anyone who receives the Program under this

-Agreement, including all Contributors.

-2. GRANT OF RIGHTS

-a) Subject to the terms of this Agreement, each Contributor hereby

-grants Recipient a non-exclusive, worldwide, royalty-free copyright

-license to reproduce, prepare derivative works of, publicly display,

-publicly perform, distribute and sublicense the Contribution

-of such Contributor, if any, and such derivative works, in source

-code and object code form.

-b) Subject to the terms of this Agreement, each Contributor hereby

-grants Recipient a non-exclusive, worldwide, royalty-free patent

-license under Licensed Patents to make, use, sell, offer to sell,

-import and otherwise transfer the Contribution of such Contributor,

-if any, in source code and object code form. This patent license

-shall apply to the combination of the Contribution and the Program

-if, at the time the Contribution is added by the Contributor,

-such addition of the Contribution causes such combination to

-be covered by the Licensed Patents. The patent license shall

-not apply to any other combinations which include the Contribution.

-No hardware per se is licensed hereunder.

-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&apos;s responsibility to acquire

-that license before distributing the Program.

-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.

-3. REQUIREMENTS

-A Contributor may choose to distribute the Program in object

-code form under its own license agreement, provided that:

-a) it complies with the terms and conditions of this Agreement;

-and

-b) its license agreement:

-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;

-ii) effectively excludes on behalf of all Contributors all liability

-for damages, including direct, indirect, special, incidental

-and consequential damages, such as lost profits;

-iii) states that any provisions which differ from this Agreement

-are offered by that Contributor alone and not by any other party;

-and

-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.

-When the Program is made available in source code form:

-a) it must be made available under this Agreement; and

-b) a copy of this Agreement must be included with each copy of

-the Program.

-Contributors may not remove or alter any copyright notices contained

-within the Program.

-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.

-4. COMMERCIAL DISTRIBUTION

-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

-(&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify

-every other Contributor (&quot;Indemnified Contributor&quot;) against any

-losses, damages and costs (collectively &quot;Losses&quot;) 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.

-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&apos;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.

-5. NO WARRANTY

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM

-IS PROVIDED ON AN &quot;AS IS&quot; 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.

-6. DISCLAIMER OF LIABILITY

-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.

-7. GENERAL

-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.

-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&apos;s patent(s),

-then such Recipient&apos;s rights granted under Section 2(b) shall

-terminate as of the date such litigation is filed.

-All Recipient&apos;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&apos;s rights under this Agreement terminate, Recipient

-agrees to cease use and distribution of the Program as soon as

-reasonably practicable. However, Recipient&apos;s obligations under

-this Agreement and any licenses granted by Recipient relating

-to the Program shall continue and survive.

-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.

-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

+      Eclipse Public License - v 1.0
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS
+ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE
+OF THIS AGREEMENT.
+1. DEFINITIONS
+&quot;Contribution&quot; means:
+a) in the case of the initial Contributor, the initial code and
+documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program originate
+from and are distributed by that particular Contributor. A Contribution
+&apos;originates&apos; from a Contributor if it was added to the Program
+by such Contributor itself or anyone acting on such Contributor&apos;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.
+&quot;Contributor&quot; means any person or entity that distributes the
+Program.
+&quot;Licensed Patents &quot; 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.
+&quot;Program&quot; means the Contributions distributed in accordance with
+this Agreement.
+&quot;Recipient&quot; means anyone who receives the Program under this
+Agreement, including all Contributors.
+2. GRANT OF RIGHTS
+a) Subject to the terms of this Agreement, each Contributor hereby
+grants Recipient a non-exclusive, worldwide, royalty-free copyright
+license to reproduce, prepare derivative works of, publicly display,
+publicly perform, distribute and sublicense the Contribution
+of such Contributor, if any, and such derivative works, in source
+code and object code form.
+b) Subject to the terms of this Agreement, each Contributor hereby
+grants Recipient a non-exclusive, worldwide, royalty-free patent
+license under Licensed Patents to make, use, sell, offer to sell,
+import and otherwise transfer the Contribution of such Contributor,
+if any, in source code and object code form. This patent license
+shall apply to the combination of the Contribution and the Program
+if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to
+be covered by the Licensed Patents. The patent license shall
+not apply to any other combinations which include the Contribution.
+No hardware per se is licensed hereunder.
+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&apos;s responsibility to acquire
+that license before distributing the Program.
+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.
+3. REQUIREMENTS
+A Contributor may choose to distribute the Program in object
+code form under its own license agreement, provided that:
+a) it complies with the terms and conditions of this Agreement;
+and
+b) its license agreement:
+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;
+ii) effectively excludes on behalf of all Contributors all liability
+for damages, including direct, indirect, special, incidental
+and consequential damages, such as lost profits;
+iii) states that any provisions which differ from this Agreement
+are offered by that Contributor alone and not by any other party;
+and
+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.
+When the Program is made available in source code form:
+a) it must be made available under this Agreement; and
+b) a copy of this Agreement must be included with each copy of
+the Program.
+Contributors may not remove or alter any copyright notices contained
+within the Program.
+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.
+4. COMMERCIAL DISTRIBUTION
+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
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify
+every other Contributor (&quot;Indemnified Contributor&quot;) against any
+losses, damages and costs (collectively &quot;Losses&quot;) 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.
+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&apos;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.
+5. NO WARRANTY
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM
+IS PROVIDED ON AN &quot;AS IS&quot; 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.
+6. DISCLAIMER OF LIABILITY
+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.
+7. GENERAL
+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.
+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&apos;s patent(s),
+then such Recipient&apos;s rights granted under Section 2(b) shall
+terminate as of the date such litigation is filed.
+All Recipient&apos;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&apos;s rights under this Agreement terminate, Recipient
+agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient&apos;s obligations under
+this Agreement and any licenses granted by Recipient relating
+to the Program shall continue and survive.
+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.
+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.

    </license>

 

    <requires>

       <import plugin="org.junit4" version="4.8.1" match="compatible"/>

-      <import plugin="org.eclipse.emf.emfstore.client"/>

       <import plugin="org.eclipse.emf.emfstore.modelmutator"/>

-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>

-      <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>

+      <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="compatible"/>

+      <import plugin="org.eclipse.emf.ecore.edit" version="2.5.0" match="compatible"/>

+      <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="compatible"/>

+      <import plugin="org.eclipse.core.runtime" version="3.7.0" match="compatible"/>

+      <import plugin="org.eclipse.emf.edit"/>

+      <import plugin="org.eclipse.core.resources"/>

+      <import plugin="org.eclipse.emf.edit.ui"/>

+      <import plugin="org.eclipse.ui.ide"/>

    </requires>

 

    <plugin

@@ -243,13 +248,6 @@
          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.emfstore.branding"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

          id="org.eclipse.emf.emfstore.fuzzy.emf.edit"

          download-size="0"

          install-size="0"

diff --git a/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml b/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml
new file mode 100644
index 0000000..e860ab4
--- /dev/null
+++ b/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.emf.emfstore</groupId>
+    <artifactId>emfstore-parent</artifactId>
+    <version>0.9.3-SNAPSHOT</version>
+    <relativePath>../emfstore-parent/</relativePath>
+  </parent>
+  <groupId>org.eclipse.emf.emfstore</groupId>
+  <artifactId>org.eclipse.emf.emfstore.fuzzy.feature</artifactId>
+  <version>0.9.3-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/org.eclipse.emf.emfstore.fuzzy.test.feature/.project b/org.eclipse.emf.emfstore.fuzzy.test.feature/.project
new file mode 100644
index 0000000..ea145f8
--- /dev/null
+++ b/org.eclipse.emf.emfstore.fuzzy.test.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emf.emfstore.fuzzy.test.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/org.eclipse.emf.emfstore.fuzzy.test.feature/build.properties b/org.eclipse.emf.emfstore.fuzzy.test.feature/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/org.eclipse.emf.emfstore.fuzzy.test.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml b/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml
new file mode 100644
index 0000000..a76d287
--- /dev/null
+++ b/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.emf.emfstore.fuzzy.test.feature"
+      label="EMFStore Fuzzy Tests (Incubation)"
+      version="0.9.3.qualifier"
+      provider-name="Eclipse Modeling Project">
+
+   <description url="http://www.example.com/description">
+      This feature contains the integration plugins for EMFStore with fuzzy testing.
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <requires>
+      <import plugin="org.eclipse.emf.emfstore.fuzzy.emf"/>
+      <import plugin="org.eclipse.emf.emfstore.client.test"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.emf.emfstore.fuzzy.emf.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml b/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml
new file mode 100644
index 0000000..ce6f4e5
--- /dev/null
+++ b/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.emf.emfstore</groupId>
+    <artifactId>emfstore-parent</artifactId>
+    <version>0.9.3-SNAPSHOT</version>
+    <relativePath>../emfstore-parent/</relativePath>
+  </parent>
+  <groupId>org.eclipse.emf.emfstore</groupId>
+  <artifactId>org.eclipse.emf.emfstore.fuzzy.test.feature</artifactId>
+  <version>0.9.3-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml b/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml
index c4687f1..29e1434 100644
--- a/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml
+++ b/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.emfstore.migration.edapt.feature"

       label="EMFStore Edapt Migration (Incubation)"

-      version="0.8.9.qualifier"

+      version="0.9.3.qualifier"

       provider-name="Eclipse Modeling Project">

 

    <description url="http://emfstore.org">

diff --git a/org.eclipse.emf.emfstore.server.feature/feature.xml b/org.eclipse.emf.emfstore.server.feature/feature.xml
index ea9fda4..167341c 100644
--- a/org.eclipse.emf.emfstore.server.feature/feature.xml
+++ b/org.eclipse.emf.emfstore.server.feature/feature.xml
@@ -231,7 +231,8 @@
          id="org.eclipse.emf.emfstore.server"

          download-size="0"

          install-size="0"

-         version="0.0.0"/>

+         version="0.0.0"

+         unpack="false"/>

 

    <plugin

          id="org.eclipse.emf.emfstore.branding"