Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Helleboid2012-07-24 14:44:18 +0000
committerMatthieu Helleboid2012-07-24 14:44:18 +0000
commit096d907263dc1723ce192b2008ec5ad0913eb8f6 (patch)
treef7040c5b1a6bc2016cb0a86ebf1ac2124cece124 /features
parent03f2c46bd36851636939abcdf4db7b61d884c2ed (diff)
downloadorg.eclipse.emf.diffmerge.core-096d907263dc1723ce192b2008ec5ad0913eb8f6.tar.gz
org.eclipse.emf.diffmerge.core-096d907263dc1723ce192b2008ec5ad0913eb8f6.tar.xz
org.eclipse.emf.diffmerge.core-096d907263dc1723ce192b2008ec5ad0913eb8f6.zip
Update SDK feature
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/category.xml3
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/feature.properties9
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml19
3 files changed, 15 insertions, 16 deletions
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/category.xml b/features/org.eclipse.emf.diffmerge.sdk.feature/category.xml
index 293b7c97..b7dcd87b 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/category.xml
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/category.xml
@@ -3,5 +3,8 @@
<feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.1.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.1.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.source.feature_0.1.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.source.feature" version="0.1.0.qualifier">
+ <category name="org.eclipse.emf.diffmerge.category"/>
+ </feature>
<category-def name="org.eclipse.emf.diffmerge.category" label="EMF Diff/Merge"/>
</site>
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.properties b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.properties
index 39e76fb4..33f25f03 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.properties
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.properties
@@ -8,15 +8,6 @@
# NLS_MESSAGEFORMAT_VAR
-# "featureName" property - name of the feature
-featureName=EMF Diff/Merge SDK Feature
-
-# "providerName" property - name of the company that provides the feature
-providerName = Thales Global Services S.A.S.
-
-# "description" property - description of the feature
-description=EMF Diff/Merge SDK Feature
-
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
licenseURL=license.html
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
index 518a4aec..10e067b9 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.emf.diffmerge.sdk.feature"
- label="%featureName"
+ label="EMF Diff/Merge SDK Feature"
version="0.1.0.qualifier"
- provider-name="%providerName">
+ provider-name="Thales Global Services S.A.S.">
<description>
- %description
+ EMF Diff/Merge SDK Feature
</description>
<copyright>
-Copyright (c) 2010-2012 Thales Global Services S.A.S.
-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) 2010-2012 Thales Global Services S.A.S.
+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>
@@ -21,6 +21,11 @@ http://www.eclipse.org/legal/epl-v10.html
%license
</license>
+ <includes
+ id="org.eclipse.emf.diffmerge.sdk.source.feature"
+ version="0.0.0"
+ />
+
<plugin
id="org.eclipse.emf.diffmerge"
download-size="0"

Back to the top