Pick up the feature patch for the RCP feature as well as Eclipse4 RCP.
diff --git a/examples/featurePatch/org.eclipse.e4.rcp.r422.feature/feature.xml b/examples/featurePatch/org.eclipse.e4.rcp.r422.feature/feature.xml
index e11028a..33dd8ea 100644
--- a/examples/featurePatch/org.eclipse.e4.rcp.r422.feature/feature.xml
+++ b/examples/featurePatch/org.eclipse.e4.rcp.r422.feature/feature.xml
@@ -45,20 +45,6 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ui.workbench"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
<plugin
id="org.eclipse.swt"
download-size="0"
diff --git a/examples/featurePatch/org.eclipse.e4.ui.r422.update/category.xml b/examples/featurePatch/org.eclipse.e4.ui.r422.update/category.xml
index 84c7731..2165bb6 100644
--- a/examples/featurePatch/org.eclipse.e4.ui.r422.update/category.xml
+++ b/examples/featurePatch/org.eclipse.e4.ui.r422.update/category.xml
@@ -6,6 +6,12 @@
<feature url="features/org.eclipse.e4.rcp.r422.feature.source_1.0.0.qualifier.jar" id="org.eclipse.e4.rcp.r422.feature.source" version="1.0.0.qualifier">
<category name="org.eclipse.e4.ui.junoSR2.category"/>
</feature>
+ <feature url="features/org.eclipse.rcp.r422.feature_1.0.0.qualifier.jar" id="org.eclipse.rcp.r422.feature" version="1.0.0.qualifier">
+ <category name="org.eclipse.e4.ui.junoSR2.category"/>
+ </feature>
+ <feature url="features/org.eclipse.rcp.r422.feature.source_1.0.0.qualifier.jar" id="org.eclipse.rcp.r422.feature.source" version="1.0.0.qualifier">
+ <category name="org.eclipse.e4.ui.junoSR2.category"/>
+ </feature>
<category-def name="org.eclipse.e4.ui.junoSR2.category" label="Juno SR2 Patches"/>
</site>
diff --git a/examples/featurePatch/org.eclipse.e4.ui.r422.update/pom.xml b/examples/featurePatch/org.eclipse.e4.ui.r422.update/pom.xml
index 3282d32..3f7b777 100644
--- a/examples/featurePatch/org.eclipse.e4.ui.r422.update/pom.xml
+++ b/examples/featurePatch/org.eclipse.e4.ui.r422.update/pom.xml
@@ -28,6 +28,11 @@
<id>org.eclipse.e4.rcp</id>
<versionRange>1.1.2</versionRange>
</requirement>
+ <requirement>
+ <type>eclipse-feature</type>
+ <id>org.eclipse.rcp</id>
+ <versionRange>4.2.2</versionRange>
+ </requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
diff --git a/examples/featurePatch/org.eclipse.rcp.r422.feature/.project b/examples/featurePatch/org.eclipse.rcp.r422.feature/.project
new file mode 100644
index 0000000..eab3034
--- /dev/null
+++ b/examples/featurePatch/org.eclipse.rcp.r422.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.rcp.r422.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/examples/featurePatch/org.eclipse.rcp.r422.feature/build.properties b/examples/featurePatch/org.eclipse.rcp.r422.feature/build.properties
new file mode 100644
index 0000000..ed4385a
--- /dev/null
+++ b/examples/featurePatch/org.eclipse.rcp.r422.feature/build.properties
@@ -0,0 +1,15 @@
+############################################################################
+# Copyright (c) 2010 IBM 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:
+# IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes =\
+eclipse_update_120.jpg,\
+feature.xml,\
+feature.properties
+
diff --git a/examples/featurePatch/org.eclipse.rcp.r422.feature/eclipse_update_120.jpg b/examples/featurePatch/org.eclipse.rcp.r422.feature/eclipse_update_120.jpg
new file mode 100644
index 0000000..bfdf708
--- /dev/null
+++ b/examples/featurePatch/org.eclipse.rcp.r422.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/examples/featurePatch/org.eclipse.rcp.r422.feature/feature.properties b/examples/featurePatch/org.eclipse.rcp.r422.feature/feature.properties
new file mode 100644
index 0000000..d0c0bc5
--- /dev/null
+++ b/examples/featurePatch/org.eclipse.rcp.r422.feature/feature.properties
@@ -0,0 +1,39 @@
+###############################################################################
+# Copyright (c) 2012 IBM 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:
+# IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse RCP 4.2.2+ Patch
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "description" property - description of the feature
+description=The bundles required to patch Eclipse RCP 4.2.2
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2012 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
+
+
+########### end of license property ##########################################
diff --git a/examples/featurePatch/org.eclipse.rcp.r422.feature/feature.xml b/examples/featurePatch/org.eclipse.rcp.r422.feature/feature.xml
new file mode 100644
index 0000000..64eb934
--- /dev/null
+++ b/examples/featurePatch/org.eclipse.rcp.r422.feature/feature.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.rcp.r422.feature"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg"
+ license-feature="org.eclipse.license"
+ license-feature-version="1.0.0.qualifier">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.eclipse.rcp" version="4.2.2.v20130129-152330-7IARAABrMQkGSvMgQnUlz-DQz00h" patch="true"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.ui.workbench"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
+
diff --git a/examples/featurePatch/org.eclipse.rcp.r422.feature/pom.xml b/examples/featurePatch/org.eclipse.rcp.r422.feature/pom.xml
new file mode 100644
index 0000000..d95a500
--- /dev/null
+++ b/examples/featurePatch/org.eclipse.rcp.r422.feature/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2012 Eclipse Foundation.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ Igor Fedorenko - initial implementation
+-->
+
+<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>
+ <artifactId>eclipse.platform.ui.examples.featurePatch</artifactId>
+ <groupId>eclipse.platform.ui</groupId>
+ <version>4.2.2-SNAPSHOT</version>
+ </parent>
+ <groupId>org.eclipse.rcp.feature</groupId>
+ <artifactId>org.eclipse.rcp.r422.feature</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <id>source-feature</id>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <plugin id="org.eclipse.swt" />
+ <plugin id="org.eclipse.swt.gtk.linux.s390x" />
+ <plugin id="org.eclipse.swt.gtk.linux.s390" />
+ <plugin id="org.eclipse.swt.gtk.solaris.sparc" />
+ <plugin id="org.eclipse.swt.gtk.solaris.x86" />
+ <plugin id="org.eclipse.swt.gtk.linux.ppc64" />
+ <plugin id="org.eclipse.swt.cocoa.macosx" />
+ <plugin id="org.eclipse.swt.cocoa.macosx" />
+ <plugin id="org.eclipse.swt.gtk.aix.ppc" />
+ <plugin id="org.eclipse.swt.gtk.aix.ppc64" />
+ <plugin id="org.eclipse.swt.gtk.hpux.ia64_32" />
+ <plugin id="org.eclipse.swt.gtk.hpux.ia64" />
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <executions>
+ <execution>
+ <id>attached-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/examples/featurePatch/org.eclipse.rcp.r422.feature/sourceTemplateFeature/build.properties b/examples/featurePatch/org.eclipse.rcp.r422.feature/sourceTemplateFeature/build.properties
new file mode 100644
index 0000000..7c072cd
--- /dev/null
+++ b/examples/featurePatch/org.eclipse.rcp.r422.feature/sourceTemplateFeature/build.properties
@@ -0,0 +1,12 @@
+############################################################################
+# Copyright (c) 2010 IBM 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:
+# IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+ feature.properties
diff --git a/examples/featurePatch/org.eclipse.rcp.r422.feature/sourceTemplateFeature/eclipse_update_120.jpg b/examples/featurePatch/org.eclipse.rcp.r422.feature/sourceTemplateFeature/eclipse_update_120.jpg
new file mode 100644
index 0000000..bfdf708
--- /dev/null
+++ b/examples/featurePatch/org.eclipse.rcp.r422.feature/sourceTemplateFeature/eclipse_update_120.jpg
Binary files differ
diff --git a/examples/featurePatch/org.eclipse.rcp.r422.feature/sourceTemplateFeature/feature.properties b/examples/featurePatch/org.eclipse.rcp.r422.feature/sourceTemplateFeature/feature.properties
new file mode 100644
index 0000000..042bbd9
--- /dev/null
+++ b/examples/featurePatch/org.eclipse.rcp.r422.feature/sourceTemplateFeature/feature.properties
@@ -0,0 +1,39 @@
+###############################################################################
+# Copyright (c) 2012 IBM 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:
+# IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse RCP 4.2.2+ Patch Developer Resources
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "description" property - description of the feature
+description=The bundles required to patch Eclipse RCP 4.2.2
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2012 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
+
+
+########### end of license property ##########################################
diff --git a/examples/featurePatch/pom.xml b/examples/featurePatch/pom.xml
index c4c35b8..6a547de 100644
--- a/examples/featurePatch/pom.xml
+++ b/examples/featurePatch/pom.xml
@@ -44,6 +44,7 @@
<modules>
<module>org.eclipse.e4.rcp.r422.feature</module>
+ <module>org.eclipse.rcp.r422.feature</module>
<module>org.eclipse.e4.ui.r422.update</module>
</modules>
