diff options
author | Eike Stepper | 2013-03-19 11:35:48 +0000 |
---|---|---|
committer | Eike Stepper | 2013-03-19 11:35:48 +0000 |
commit | 1a7d7568c7699b02a944c5ac62c637f1f85017e9 (patch) | |
tree | 750854929ae0ad63feb461fbf66d68e38b798176 /features | |
parent | ac7fc9579e8ab4af50bf6c80151e8989cf31fb81 (diff) | |
download | cdo-1a7d7568c7699b02a944c5ac62c637f1f85017e9.tar.gz cdo-1a7d7568c7699b02a944c5ac62c637f1f85017e9.tar.xz cdo-1a7d7568c7699b02a944c5ac62c637f1f85017e9.zip |
[400926] Move plugins that depends on EMF Compare to an independent and
optional feature
https://bugs.eclipse.org/bugs/show_bug.cgi?id=400926
Diffstat (limited to 'features')
11 files changed, 119 insertions, 14 deletions
diff --git a/features/org.eclipse.emf.cdo-feature/feature.xml b/features/org.eclipse.emf.cdo-feature/feature.xml index e74219abd7..7937f53e90 100644 --- a/features/org.eclipse.emf.cdo-feature/feature.xml +++ b/features/org.eclipse.emf.cdo-feature/feature.xml @@ -154,13 +154,6 @@ unpack="false"/> <plugin - id="org.eclipse.emf.cdo.ui.compare" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.emf.cdo.ui.team" download-size="0" install-size="0" @@ -231,13 +224,6 @@ unpack="false"/> <plugin - id="org.eclipse.emf.cdo.compare" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.emf.cdo.ecore.retrofit" download-size="0" install-size="0" diff --git a/features/org.eclipse.emf.cdo.compare-feature/.project b/features/org.eclipse.emf.cdo.compare-feature/.project new file mode 100644 index 0000000000..8bbdabc721 --- /dev/null +++ b/features/org.eclipse.emf.cdo.compare-feature/.project @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.emf.cdo.compare-feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.emf.cdo.releng.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.emf.cdo.releng.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/org.eclipse.emf.cdo.compare-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/features/org.eclipse.emf.cdo.compare-feature/.settings/org.eclipse.ltk.core.refactoring.prefs new file mode 100644 index 0000000000..9b58a30859 --- /dev/null +++ b/features/org.eclipse.emf.cdo.compare-feature/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -0,0 +1,3 @@ +#Mon Jul 04 12:36:04 CEST 2011 +eclipse.preferences.version=1 +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/features/org.eclipse.emf.cdo.compare-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.emf.cdo.compare-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs new file mode 100644 index 0000000000..d573634502 --- /dev/null +++ b/features/org.eclipse.emf.cdo.compare-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs @@ -0,0 +1,4 @@ +#Thu Feb 04 10:06:10 CET 2010 +eclipse.preferences.version=1 +project.repository.kind=bugzilla +project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/features/org.eclipse.emf.cdo.compare-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.eclipse.emf.cdo.compare-feature/.settings/org.eclipse.mylyn.team.ui.prefs new file mode 100644 index 0000000000..4d86eb45ba --- /dev/null +++ b/features/org.eclipse.emf.cdo.compare-feature/.settings/org.eclipse.mylyn.team.ui.prefs @@ -0,0 +1,3 @@ +#Thu Feb 04 10:06:10 CET 2010 +commit.comment.template=[${task.id}] ${task.description} \r\n${task.url} +eclipse.preferences.version=1 diff --git a/features/org.eclipse.emf.cdo.compare-feature/build.properties b/features/org.eclipse.emf.cdo.compare-feature/build.properties new file mode 100644 index 0000000000..702432df1e --- /dev/null +++ b/features/org.eclipse.emf.cdo.compare-feature/build.properties @@ -0,0 +1,13 @@ +# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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: +# Eike Stepper - initial API and implementation + +# NLS_MESSAGEFORMAT_VAR + +bin.includes = feature.xml,\ + feature.properties diff --git a/features/org.eclipse.emf.cdo.compare-feature/feature.properties b/features/org.eclipse.emf.cdo.compare-feature/feature.properties new file mode 100644 index 0000000000..3478c30992 --- /dev/null +++ b/features/org.eclipse.emf.cdo.compare-feature/feature.properties @@ -0,0 +1,8 @@ +# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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 + +featureName = CDO Model Repository Client (Compare Integration) +description = Contains the core and user interface plugins of the CDO / EMF Compare integration. This feature is optional and requires EMF Compare 2.1 or higher. diff --git a/features/org.eclipse.emf.cdo.compare-feature/feature.xml b/features/org.eclipse.emf.cdo.compare-feature/feature.xml new file mode 100644 index 0000000000..f601f41712 --- /dev/null +++ b/features/org.eclipse.emf.cdo.compare-feature/feature.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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: + Eike Stepper - initial API and implementation +--> +<feature + id="org.eclipse.emf.cdo.compare" + label="%featureName" + version="4.2.0.qualifier" + provider-name="%providerName" + license-feature="org.eclipse.emf.cdo.license" + license-feature-version="0.0.0"> + + <description> + %description + </description> + + <copyright url="%copyrightURL"> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <url> + <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + </url> + + <plugin + id="org.eclipse.emf.cdo.compare" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.emf.cdo.ui.compare" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/features/org.eclipse.emf.cdo.sdk-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.sdk-feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..b9743bf086 --- /dev/null +++ b/features/org.eclipse.emf.cdo.sdk-feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/.project=UTF-8 diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml index 4d32fe2d4b..1787fe81a5 100644 --- a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml @@ -83,6 +83,10 @@ id="org.eclipse.emf.cdo.examples.installer" version="0.0.0"/> + <includes + id="org.eclipse.emf.cdo.compare.source" + version="0.0.0"/> + <plugin id="org.eclipse.emf.cdo.sdk" download-size="0" diff --git a/features/org.eclipse.emf.cdo.site-feature/feature.xml b/features/org.eclipse.emf.cdo.site-feature/feature.xml index 7778607571..312743a70c 100644 --- a/features/org.eclipse.emf.cdo.site-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.site-feature/feature.xml @@ -79,6 +79,10 @@ version="0.0.0"/> <includes + id="org.eclipse.emf.cdo.compare" + version="0.0.0"/> + + <includes id="org.eclipse.emf.cdo.server.hibernate" version="0.0.0"/> |