This commit was manufactured by cvs2svn to create tag 'HELIOS_SR1_RC4'.
diff --git a/features/org.eclipse.epp.allpackages.helios.feature/build.xml b/features/org.eclipse.epp.allpackages.helios.feature/build.xml
index de9de0a..bb1e9cf 100644
--- a/features/org.eclipse.epp.allpackages.helios.feature/build.xml
+++ b/features/org.eclipse.epp.allpackages.helios.feature/build.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<project name="project" default="build.site">
- <property name="director.url" value="http://www.eclipse.org/downloads/download.php?file=/tools/buckminster/products/director_1.0.0.r10307.zip&r=1" />
+ <property name="director.url" value="http://www.eclipse.org/downloads/download.php?file=/tools/buckminster/products/org.eclipse.equinox.p2.director.product_1.0.0.v20100203-1557.zip&r=1" />
<!--Property file containing overrides for the default properties
-->
@@ -8,7 +8,7 @@
<property file="${build.root}/build.properties" />
<property name="bm.headless.site" value="http://download.eclipse.org/tools/buckminster/headless-3.5/" />
<property name="helios.site" value="http://download.eclipse.org/releases/helios/" />
- <property name="staging.site" value="http://download.eclipse.org/releases/staging/" />
+ <property name="staging.site" value="http://download.eclipse.org/releases/maintenance/" />
<property name="platform.site" value="http://download.eclipse.org/eclipse/updates/3.6milestones/" />
<property name="buildtools" location="${build.root}/tools" />
<property name="workspace" location="${build.root}/workspace" />
@@ -114,7 +114,7 @@
</args>
</eclipse.launch>
<copy todir="${targetPlatformPath}/plugins">
- <fileset dir="/home/data/httpd/download.eclipse.org/releases/staging/aggregate/plugins">
+ <fileset dir="/home/data/httpd/download.eclipse.org/releases/maintenance/aggregate/plugins">
<include name="**/org.eclipse*intro*"/>
<include name="**/org.eclipse*capabilities*"/>
</fileset>
diff --git a/features/org.eclipse.epp.allpackages.helios.feature/epp.cquery b/features/org.eclipse.epp.allpackages.helios.feature/epp.cquery
index 0231196..c004ebe 100644
--- a/features/org.eclipse.epp.allpackages.helios.feature/epp.cquery
+++ b/features/org.eclipse.epp.allpackages.helios.feature/epp.cquery
@@ -6,4 +6,5 @@
<cq:property key="target.ws" value="*"/>
<cq:advisorNode namePattern="^org\.mortbay\.management$" allowCircularDependency="true"/>
<cq:advisorNode namePattern="^org\.eclipse\.ui$" componentType="osgi.bundle" allowCircularDependency="true"/>
+ <cq:advisorNode namePattern="^org\.eclipse\.epp.*" branchTagPath="HELIOS"/>
</cq:componentQuery>
diff --git a/features/org.eclipse.epp.allpackages.helios.feature/feature.xml b/features/org.eclipse.epp.allpackages.helios.feature/feature.xml
index 5aa5901..c76fda9 100644
--- a/features/org.eclipse.epp.allpackages.helios.feature/feature.xml
+++ b/features/org.eclipse.epp.allpackages.helios.feature/feature.xml
@@ -65,4 +65,8 @@
id="org.eclipse.epp.package.soa.feature"
version="0.0.0"/>
+ <includes
+ id="org.eclipse.epp.package.transition.feature"
+ version="0.0.0"/>
+
</feature>
diff --git a/features/org.eclipse.epp.allpackages.indigo.feature/build.xml b/features/org.eclipse.epp.allpackages.indigo.feature/build.xml
index 1d82a0d..00bd484 100644
--- a/features/org.eclipse.epp.allpackages.indigo.feature/build.xml
+++ b/features/org.eclipse.epp.allpackages.indigo.feature/build.xml
@@ -102,17 +102,6 @@
<arg value="${tp.mspec}" />
</args>
</eclipse.launch>
- <eclipse.launch app="buckminster">
- <args>
- <jvmarg value="-Dplatform.site=${platform.site}" />
- <jvmarg value="-Dindigo.site=${staging.site}" />
- <jvmarg value="-Declipse.p2.mirrors=false" />
- <arg value="-data" />
- <arg value="${workspace}" />
- <arg value="import"/>
- <arg value="${tp-mpc.mspec}" />
- </args>
- </eclipse.launch>
<copy todir="${targetPlatformPath}/plugins">
<fileset dir="/home/data/httpd/download.eclipse.org/releases/staging/aggregate/plugins">
<include name="**/org.eclipse*intro*"/>
diff --git a/features/org.eclipse.epp.allpackages.indigo.feature/feature.xml b/features/org.eclipse.epp.allpackages.indigo.feature/feature.xml
index 162cdda..2eb3870 100644
--- a/features/org.eclipse.epp.allpackages.indigo.feature/feature.xml
+++ b/features/org.eclipse.epp.allpackages.indigo.feature/feature.xml
@@ -17,9 +17,11 @@
[Enter License Description here.]
</license>
+<!--
<includes
id="org.eclipse.epp.package.cpp.feature"
version="0.0.0"/>
+-->
<includes
id="org.eclipse.epp.package.common.feature"
@@ -29,6 +31,7 @@
id="org.eclipse.epp.package.java.feature"
version="0.0.0"/>
+<!--
<includes
id="org.eclipse.epp.package.jee.feature"
version="0.0.0"/>
@@ -64,5 +67,6 @@
<includes
id="org.eclipse.epp.package.soa.feature"
version="0.0.0"/>
+-->
</feature>
diff --git a/features/org.eclipse.epp.allpackages.indigo.feature/org.eclipse.epp.allpackages.feature build.xml.launch b/features/org.eclipse.epp.allpackages.indigo.feature/org.eclipse.epp.allpackages.feature build.xml.launch
deleted file mode 100644
index 7dbc926..0000000
--- a/features/org.eclipse.epp.allpackages.indigo.feature/org.eclipse.epp.allpackages.feature build.xml.launch
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<stringAttribute key="bad_container_name" value="/org.eclipse.epp.allpackages.indigo.feature/s"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.epp.allpackages.indigo.feature/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.epp.allpackages.indigo.feature"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.mirrors=false"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk1.5.0_15"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
-<mapEntry key="platform.site" value="file:///home/data/httpd/download.eclipse.org/eclipse/updates/3.5milestones/I20090611-1540"/>
-<mapEntry key="eclipse.pdebuild.templates" value="/opt/eclipse/64/eclipse.3.5RC2/plugins/org.eclipse.pde.build_3.5.0.v20090527-1800/templates/"/>
-<mapEntry key="indigo.site" value="file:///home/data/httpd/download.eclipse.org/releases/indigo/"/>
-<mapEntry key="eclipse.pdebuild.scripts" value="/opt/eclipse/64/eclipse.3.5RC2/plugins/org.eclipse.pde.build_3.5.0.v20090527-1800/scripts/"/>
-<mapEntry key="staging.site" value="file:///home/data/httpd/download.eclipse.org/releases/staging/"/>
-<mapEntry key="build.root" value="/tmp/eppbuild"/>
-<mapEntry key="eclipse.pdebuild.home" value="/opt/eclipse/64/eclipse.3.5RC2/plugins/org.eclipse.pde.build_3.5.0.v20090527-1800/./"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="clean.workspace,build.site,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.epp.allpackages.indigo.feature/build.xml}"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/packages/org.eclipse.epp.package.common.feature/build.properties b/packages/org.eclipse.epp.package.common.feature/build.properties
index 7b9f14c..18f39b8 100644
--- a/packages/org.eclipse.epp.package.common.feature/build.properties
+++ b/packages/org.eclipse.epp.package.common.feature/build.properties
@@ -3,3 +3,5 @@
epl-v10.html,\
license.html,\
feature.properties
+
+
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.common.feature/feature.xml b/packages/org.eclipse.epp.package.common.feature/feature.xml
index f9308d2..59e8b2b 100644
--- a/packages/org.eclipse.epp.package.common.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.common.feature/feature.xml
@@ -31,4 +31,5 @@
version="0.0.0"
unpack="false"/>
+
</feature>
diff --git a/packages/org.eclipse.epp.package.common/icons/yoxos32.png b/packages/org.eclipse.epp.package.common/icons/yoxos32.png
index 9a8b200..011321b 100644
--- a/packages/org.eclipse.epp.package.common/icons/yoxos32.png
+++ b/packages/org.eclipse.epp.package.common/icons/yoxos32.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.common/plugin.xml b/packages/org.eclipse.epp.package.common/plugin.xml
index ede9bd3..7d61476 100644
--- a/packages/org.eclipse.epp.package.common/plugin.xml
+++ b/packages/org.eclipse.epp.package.common/plugin.xml
@@ -12,4 +12,5 @@
</catalog>
</extension>
+
</plugin>
diff --git a/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml b/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml
index 954a00d..08c56f4 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml
@@ -39,6 +39,6 @@
<rcp version="3.6.1" />
<!-- name, the name of the product, used in naming the created files. -->
- <product name="eclipse-cpp-helios-SR1-RC2" />
+ <product name="eclipse-cpp-helios-SR1-RC4" />
</configuration>
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.cpp.feature/feature.xml b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
index b3598ef..f829d15 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
@@ -50,4 +50,5 @@
install-size="0"
version="0.0.0"/>
+
</feature>
diff --git a/packages/org.eclipse.epp.package.cpp/plugin.xml b/packages/org.eclipse.epp.package.cpp/plugin.xml
index 0c76ab5..9b6504f 100644
--- a/packages/org.eclipse.epp.package.cpp/plugin.xml
+++ b/packages/org.eclipse.epp.package.cpp/plugin.xml
@@ -17,7 +17,7 @@
</property>
<property
name="aboutText"
- value="Eclipse IDE for C/C++ Developers

Version: Helios Release
Build id: {0}

(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
+ value="Eclipse IDE for C/C++ Developers

Version: Helios Service Release 1
Build id: {0}

(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
</property>
<property
name="startupProgressRect"
@@ -52,4 +52,5 @@
</introProductBinding>
</extension>
+
</plugin>
diff --git a/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml b/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml
index c00e44b..a450702 100644
--- a/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml
+++ b/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml
@@ -36,6 +36,6 @@
<rcp version="3.6.1" />
<!-- name, the name of the product, used in naming the created files. -->
- <product name="eclipse-java-helios-SR1-RC2" />
+ <product name="eclipse-java-helios-SR1-RC4" />
</configuration>
diff --git a/packages/org.eclipse.epp.package.java.feature/feature.xml b/packages/org.eclipse.epp.package.java.feature/feature.xml
index bdbc893..fbba6f3 100644
--- a/packages/org.eclipse.epp.package.java.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.java.feature/feature.xml
@@ -48,4 +48,5 @@
install-size="0"
version="0.0.0"/>
+
</feature>
diff --git a/packages/org.eclipse.epp.package.java/plugin.xml b/packages/org.eclipse.epp.package.java/plugin.xml
index 3d6340a..914cf25 100644
--- a/packages/org.eclipse.epp.package.java/plugin.xml
+++ b/packages/org.eclipse.epp.package.java/plugin.xml
@@ -26,7 +26,7 @@
</property>
<property
name="aboutText"
- value="Eclipse IDE for Java Developers

Version: Helios Release
Build id: {0}
(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
+ value="Eclipse IDE for Java Developers

Version: Helios Service Release 1
Build id: {0}
(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
</property>
<property
name="windowImages"
@@ -52,5 +52,6 @@
productId="org.eclipse.epp.package.java.product">
</introProductBinding>
</extension>
+
</plugin>
diff --git a/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_helios.xml b/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_helios.xml
index 9123750..0707515 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_helios.xml
+++ b/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_helios.xml
@@ -35,6 +35,6 @@
<rcp version="3.6.1" />
<!-- name, the name of the product, used in naming the created files. -->
- <product name="eclipse-javascript-helios-SR1-RC2" />
+ <product name="eclipse-javascript-helios-SR1-RC4" />
</configuration>
diff --git a/packages/org.eclipse.epp.package.javascript.feature/epp.product b/packages/org.eclipse.epp.package.javascript.feature/epp.product
index 56d1df1..09e3018 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/epp.product
+++ b/packages/org.eclipse.epp.package.javascript.feature/epp.product
@@ -38,7 +38,7 @@
</win>
</launcher>
- <intro introId="org.eclipse.wtp.epp.package.javascript.intro.intro"/>
+ <intro introId="org.eclipse.ui.intro.universal"/>
<vm>
<linux include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5</linux>
@@ -151,7 +151,7 @@
</license>
<plugins>
- <plugin id="org.eclipse.epp.package.jee"/>
+ <plugin id="org.eclipse.epp.package.javascript"/>
<plugin id="org.eclipse.wtp.epp.package.jee.intro" fragment=""/>
</plugins>
diff --git a/packages/org.eclipse.epp.package.javascript.feature/feature.xml b/packages/org.eclipse.epp.package.javascript.feature/feature.xml
index f11f1c7..5e3ef66 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.javascript.feature/feature.xml
@@ -46,4 +46,5 @@
install-size="0"
version="0.0.0"/>
+
</feature>
diff --git a/packages/org.eclipse.epp.package.javascript/build.properties b/packages/org.eclipse.epp.package.javascript/build.properties
index 9851936..4bacef2 100644
--- a/packages/org.eclipse.epp.package.javascript/build.properties
+++ b/packages/org.eclipse.epp.package.javascript/build.properties
@@ -11,3 +11,5 @@
javascript-ide_x48.png,\
OSGI-INF/l10n/,\
helpData.xml,\
+ intro-eclipse.png
+
diff --git a/packages/org.eclipse.epp.package.javascript/intro-eclipse.png b/packages/org.eclipse.epp.package.javascript/intro-eclipse.png
new file mode 100644
index 0000000..015e7fc
--- /dev/null
+++ b/packages/org.eclipse.epp.package.javascript/intro-eclipse.png
Binary files differ
diff --git a/packages/org.eclipse.epp.package.javascript/plugin.xml b/packages/org.eclipse.epp.package.javascript/plugin.xml
index d308002..9cb7c59 100644
--- a/packages/org.eclipse.epp.package.javascript/plugin.xml
+++ b/packages/org.eclipse.epp.package.javascript/plugin.xml
@@ -18,7 +18,7 @@
</property>
<property
name="aboutText"
- value="Eclipse IDE for JavaScript Web Developers.

Version: Helios Release
Build id: {0}

(c) Copyright Eclipse contributors and others 2005, 2010. All rights reserved.
Visit http://www.eclipse.org/webtools">
+ value="Eclipse IDE for JavaScript Web Developers.

Version: Helios Service Release 1
Build id: {0}

(c) Copyright Eclipse contributors and others 2005, 2010. All rights reserved.
Visit http://www.eclipse.org/webtools">
</property>
<property
name="startupProgressRect"
@@ -43,8 +43,27 @@
<property
name="buildIdLocation"
value="303,190">
+ </property>
+ <property
+ name="introBrandingImage"
+ value="product:intro-eclipse.png"/>
+ <property
+ name="introTitle"
+ value="Welcome to Eclipse IDE for JavaScript Developers">
+ </property>
+ <property
+ name="introBrandingImageText"
+ value="Eclipse Project">
</property>
</product>
</extension>
+ <extension
+ point="org.eclipse.ui.intro">
+ <introProductBinding
+ introId="org.eclipse.ui.intro.universal"
+ productId="org.eclipse.epp.package.javascript.product">
+ </introProductBinding>
+ </extension>
+
</plugin>
diff --git a/packages/org.eclipse.epp.package.javascript/plugin_customization.ini b/packages/org.eclipse.epp.package.javascript/plugin_customization.ini
index 78d364a..eeb59da 100644
--- a/packages/org.eclipse.epp.package.javascript/plugin_customization.ini
+++ b/packages/org.eclipse.epp.package.javascript/plugin_customization.ini
@@ -26,8 +26,7 @@
org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true
# Welcome theme to use
-# TODO do we want a JavaScript specific welcome screen
-#org.eclipse.ui.intro/INTRO_THEME = org.eclipse.wtp.epp.package.jee.intro
+org.eclipse.ui.intro/INTRO_THEME = org.eclipse.ui.intro.universal.circles
# Root page links to show in the Universal Welcome
org.eclipse.ui.intro.universal/INTRO_ROOT_PAGES = overview,tutorials,samples,whatsnew
diff --git a/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml b/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml
index d05be4b..a5c3382 100644
--- a/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml
@@ -43,6 +43,6 @@
<rcp version="3.6.1" />
<!-- name, the name of the product, used in naming the created files. -->
- <product name="eclipse-jee-helios-SR1-RC2" />
+ <product name="eclipse-jee-helios-SR1-RC4" />
</configuration>
diff --git a/packages/org.eclipse.epp.package.jee.feature/feature.xml b/packages/org.eclipse.epp.package.jee.feature/feature.xml
index ac2b8e2..8e7d408 100644
--- a/packages/org.eclipse.epp.package.jee.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/feature.xml
@@ -148,4 +148,5 @@
version="0.0.0"/>
-->
+
</feature>
diff --git a/packages/org.eclipse.epp.package.jee/plugin.xml b/packages/org.eclipse.epp.package.jee/plugin.xml
index eda0b3b..3f40af4 100644
--- a/packages/org.eclipse.epp.package.jee/plugin.xml
+++ b/packages/org.eclipse.epp.package.jee/plugin.xml
@@ -30,7 +30,7 @@
</property>
<property
name="aboutText"
- value="Eclipse Java EE IDE for Web Developers.

Version: Helios Release
Build id: {0}

(c) Copyright Eclipse contributors and others 2005, 2010. All rights reserved.
Visit http://www.eclipse.org/webtools">
+ value="Eclipse Java EE IDE for Web Developers.

Version: Helios Service Release 1
Build id: {0}

(c) Copyright Eclipse contributors and others 2005, 2010. All rights reserved.
Visit http://www.eclipse.org/webtools">
</property>
<property
name="startupProgressRect"
@@ -59,4 +59,5 @@
</product>
</extension>
+
</plugin>
diff --git a/packages/org.eclipse.epp.package.linuxtools.feature/eclipse_linuxtools_helios.xml b/packages/org.eclipse.epp.package.linuxtools.feature/eclipse_linuxtools_helios.xml
index 1e2ade3..5b5f6c0 100644
--- a/packages/org.eclipse.epp.package.linuxtools.feature/eclipse_linuxtools_helios.xml
+++ b/packages/org.eclipse.epp.package.linuxtools.feature/eclipse_linuxtools_helios.xml
@@ -42,6 +42,6 @@
<rcp version="3.6.1" />
<!-- name, the name of the product, used in naming the created files. -->
- <product name="eclipse-linuxtools-helios-SR1-RC2-incubation" />
+ <product name="eclipse-linuxtools-helios-SR1-RC4-incubation" />
</configuration>
diff --git a/packages/org.eclipse.epp.package.linuxtools.feature/feature.xml b/packages/org.eclipse.epp.package.linuxtools.feature/feature.xml
index dea8bec..c471b8a 100644
--- a/packages/org.eclipse.epp.package.linuxtools.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.linuxtools.feature/feature.xml
@@ -65,4 +65,5 @@
install-size="0"
version="0.0.0"/>
+
</feature>
diff --git a/packages/org.eclipse.epp.package.linuxtools/plugin.xml b/packages/org.eclipse.epp.package.linuxtools/plugin.xml
index 6eb9697..1921880 100644
--- a/packages/org.eclipse.epp.package.linuxtools/plugin.xml
+++ b/packages/org.eclipse.epp.package.linuxtools/plugin.xml
@@ -17,7 +17,7 @@
</property>
<property
name="aboutText"
- value="Eclipse IDE for C/C++ Linux Developers

Version: Helios Release
Build id: {0}

(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
+ value="Eclipse IDE for C/C++ Linux Developers

Version: Helios Service Release 1
Build id: {0}

(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
</property>
<property
name="startupProgressRect"
@@ -52,4 +52,5 @@
</introProductBinding>
</extension>
+
</plugin>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml b/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml
index 9378276..ada64c7 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml
@@ -89,6 +89,6 @@
<rcp version="3.6.1" />
<!-- name, the name of the product, used in naming the created files. -->
- <product name="eclipse-modeling-helios-SR1-RC2-incubation" />
+ <product name="eclipse-modeling-helios-SR1-RC4-incubation" />
</configuration>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/feature.xml b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
index 30d5fbb..4ff00d6 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
@@ -61,4 +61,5 @@
install-size="0"
version="0.0.0"/>
+
</feature>
diff --git a/packages/org.eclipse.epp.package.modeling/plugin.xml b/packages/org.eclipse.epp.package.modeling/plugin.xml
index 2b957c5..48c2982 100644
--- a/packages/org.eclipse.epp.package.modeling/plugin.xml
+++ b/packages/org.eclipse.epp.package.modeling/plugin.xml
@@ -17,7 +17,7 @@
</property>
<property
name="aboutText"
- value="Eclipse Modeling Tools

Version: Helios Release
Build id: {0}

(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
+ value="Eclipse Modeling Tools

Version: Helios Service Release 1
Build id: {0}

(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
</property>
<property
name="startupProgressRect"
@@ -52,4 +52,5 @@
</introProductBinding>
</extension>
+
</plugin>
diff --git a/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml b/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml
index 3288def..bf6fff8 100644
--- a/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml
+++ b/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml
@@ -54,7 +54,7 @@
<!--
name, name of the product, used in naming the created files.
-->
- <product name="eclipse-php-helios-SR1-RC2" />
+ <product name="eclipse-php-helios-SR1-RC4" />
</configuration>
diff --git a/packages/org.eclipse.epp.package.php.feature/feature.xml b/packages/org.eclipse.epp.package.php.feature/feature.xml
index 61cf97c..896e7f6 100644
--- a/packages/org.eclipse.epp.package.php.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.php.feature/feature.xml
@@ -51,4 +51,5 @@
install-size="0"
version="0.0.0"/>
+
</feature>
diff --git a/packages/org.eclipse.epp.package.php/plugin.xml b/packages/org.eclipse.epp.package.php/plugin.xml
index a64b3f7..4994833 100644
--- a/packages/org.eclipse.epp.package.php/plugin.xml
+++ b/packages/org.eclipse.epp.package.php/plugin.xml
@@ -17,7 +17,7 @@
</property>
<property
name="aboutText"
- value="Eclipse for PHP Developers

Version: Helios Release
Build id: {0}

(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
+ value="Eclipse for PHP Developers

Version: Helios Service Release 1
Build id: {0}

(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
</property>
<property
name="startupProgressRect"
@@ -52,4 +52,5 @@
</introProductBinding>
</extension>
+
</plugin>
diff --git a/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml b/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml
index 2cfad2f..11bfe3a 100644
--- a/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml
+++ b/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml
@@ -43,6 +43,6 @@
<rcp version="3.6.1" />
<!-- name, the name of the product, used in naming the created files. -->
- <product name="eclipse-pulsar-helios-SR1-RC2" />
+ <product name="eclipse-pulsar-helios-SR1-RC4" />
</configuration>
diff --git a/packages/org.eclipse.epp.package.pulsar.feature/feature.xml b/packages/org.eclipse.epp.package.pulsar.feature/feature.xml
index 6ba390b..ae5358e 100644
--- a/packages/org.eclipse.epp.package.pulsar.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.pulsar.feature/feature.xml
@@ -61,4 +61,5 @@
install-size="0"
version="0.0.0"/>
+
</feature>
diff --git a/packages/org.eclipse.epp.package.pulsar/plugin.xml b/packages/org.eclipse.epp.package.pulsar/plugin.xml
index 76b8b3b..1084bad 100644
--- a/packages/org.eclipse.epp.package.pulsar/plugin.xml
+++ b/packages/org.eclipse.epp.package.pulsar/plugin.xml
@@ -17,7 +17,7 @@
</property>
<property
name="aboutText"
- value="Pulsar for Mobile Developers.

Version: Helios Release
Build id: {0}

(c) Copyright Pulsar Committers and others. 2010. All rights reserved.
Visit http://www.eclipse.org/pulsar/">
+ value="Pulsar for Mobile Developers.

Version: Helios Service Release 1
Build id: {0}

(c) Copyright Pulsar Committers and others. 2010. All rights reserved.
Visit http://www.eclipse.org/pulsar/">
</property>
<property
name="startupProgressRect"
@@ -52,4 +52,5 @@
</introProductBinding>
</extension>
+
</plugin>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml b/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml
index 8f6905a..aec8708 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml
@@ -38,6 +38,6 @@
<rcp version="3.6.1" />
<!-- name, the name of the product, used in naming the created files. -->
- <product name="eclipse-rcp-helios-SR1-RC2" />
+ <product name="eclipse-rcp-helios-SR1-RC4" />
</configuration>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/feature.xml b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
index 77b2847..e6782ab 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
@@ -43,8 +43,6 @@
<import feature="org.eclipse.platform.source"/>
<import feature="org.eclipse.rap.tooling"/>
<import feature="org.eclipse.epp.package.common.feature"/>
- <!--
- -->
</requires>
<plugin
@@ -53,4 +51,5 @@
install-size="0"
version="0.0.0"/>
+
</feature>
diff --git a/packages/org.eclipse.epp.package.rcp/plugin.xml b/packages/org.eclipse.epp.package.rcp/plugin.xml
index 84eb825..a6b8242 100644
--- a/packages/org.eclipse.epp.package.rcp/plugin.xml
+++ b/packages/org.eclipse.epp.package.rcp/plugin.xml
@@ -17,7 +17,7 @@
</property>
<property
name="aboutText"
- value="Eclipse for RCP and RAP Developers

Version: Helios Release
Build id: {0}

(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
+ value="Eclipse for RCP and RAP Developers

Version: Helios Service Release 1
Build id: {0}

(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
</property>
<property
name="startupProgressRect"
@@ -52,4 +52,5 @@
</introProductBinding>
</extension>
+
</plugin>
diff --git a/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml b/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml
index 1c12cb3..f09ff09 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml
@@ -43,6 +43,6 @@
<rcp version="3.6.1" />
<!-- name, the name of the product, used in naming the created files. -->
- <product name="eclipse-reporting-helios-SR1-RC2" />
+ <product name="eclipse-reporting-helios-SR1-RC4" />
</configuration>
diff --git a/packages/org.eclipse.epp.package.reporting.feature/feature.xml b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
index 4c14b4d..21728d3 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
@@ -85,4 +85,5 @@
install-size="0"
version="0.0.0"/>
+
</feature>
diff --git a/packages/org.eclipse.epp.package.reporting/plugin.xml b/packages/org.eclipse.epp.package.reporting/plugin.xml
index 50d7a51..a6a8743 100644
--- a/packages/org.eclipse.epp.package.reporting/plugin.xml
+++ b/packages/org.eclipse.epp.package.reporting/plugin.xml
@@ -17,7 +17,7 @@
</property>
<property
name="aboutText"
- value="Eclipse IDE for Java and Report Developers

Version: Helios Release
Build id: {0}

(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
+ value="Eclipse IDE for Java and Report Developers

Version: Helios Service Release 1
Build id: {0}

(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
</property>
<property
name="startupProgressRect"
@@ -51,5 +51,6 @@
productId="org.eclipse.epp.package.reporting.product">
</introProductBinding>
</extension>
+
</plugin>
diff --git a/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml b/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml
index 54e1e3d..20d2287 100644
--- a/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml
+++ b/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml
@@ -38,6 +38,6 @@
<rcp version="3.6.1" />
<!-- name, the name of the product, used in naming the created files. -->
- <product name="eclipse-soa-helios-SR1-RC2-incubation" />
+ <product name="eclipse-soa-helios-SR1-RC4-incubation" />
</configuration>
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.soa.feature/feature.xml b/packages/org.eclipse.epp.package.soa.feature/feature.xml
index 52fba67..12ab556 100644
--- a/packages/org.eclipse.epp.package.soa.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.soa.feature/feature.xml
@@ -57,4 +57,5 @@
install-size="0"
version="0.0.0"/>
+
</feature>
diff --git a/packages/org.eclipse.epp.package.soa/plugin.xml b/packages/org.eclipse.epp.package.soa/plugin.xml
index 5cbdc13..5f75fb9 100644
--- a/packages/org.eclipse.epp.package.soa/plugin.xml
+++ b/packages/org.eclipse.epp.package.soa/plugin.xml
@@ -17,7 +17,7 @@
</property>
<property
name="aboutText"
- value="Eclipse IDE for SOA Developers

Version: Helios Release
Build id: {0}

(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
+ value="Eclipse IDE for SOA Developers

Version: Helios Service Release 1
Build id: {0}

(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.
Visit http://eclipse.org/

This product includes software developed by the
Apache Software Foundation http://apache.org/">
</property>
<property
name="startupProgressRect"
@@ -51,5 +51,6 @@
productId="org.eclipse.epp.package.soa.product">
</introProductBinding>
</extension>
+
</plugin>
diff --git a/packages/org.eclipse.epp.package.transition.feature/.project b/packages/org.eclipse.epp.package.transition.feature/.project
new file mode 100644
index 0000000..c710ce2
--- /dev/null
+++ b/packages/org.eclipse.epp.package.transition.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.epp.package.transition.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/packages/org.eclipse.epp.package.transition.feature/build.properties b/packages/org.eclipse.epp.package.transition.feature/build.properties
new file mode 100644
index 0000000..39b0777
--- /dev/null
+++ b/packages/org.eclipse.epp.package.transition.feature/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+ epl-v10.html,\
+ feature.properties,\
+ license.html
diff --git a/packages/org.eclipse.epp.package.transition.feature/epl-v10.html b/packages/org.eclipse.epp.package.transition.feature/epl-v10.html
new file mode 100644
index 0000000..3998fce
--- /dev/null
+++ b/packages/org.eclipse.epp.package.transition.feature/epl-v10.html
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+ body {
+ size: 8.5in 11.0in;
+ margin: 0.25in 0.5in 0.25in 0.5in;
+ tab-interval: 0.5in;
+ }
+ p {
+ margin-left: auto;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+ p.list {
+ margin-left: 0.5in;
+ margin-top: 0.05em;
+ margin-bottom: 0.05em;
+ }
+ </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>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.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>"Contribution" means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">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.</p>
+
+<p>"Contributor" means any person or entity that distributes
+the Program.</p>
+
+<p>"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.</p>
+
+<p>"Program" means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">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.</p>
+
+<p class="list">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.</p>
+
+<p class="list">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.</p>
+
+<p class="list">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.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">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;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">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.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>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.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>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.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>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.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.transition.feature/feature.properties b/packages/org.eclipse.epp.package.transition.feature/feature.properties
new file mode 100644
index 0000000..751dbe9
--- /dev/null
+++ b/packages/org.eclipse.epp.package.transition.feature/feature.properties
@@ -0,0 +1,130 @@
+# "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 14, 2010\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\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ 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\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - 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\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - 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\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ 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/packages/org.eclipse.epp.package.transition.feature/feature.xml b/packages/org.eclipse.epp.package.transition.feature/feature.xml
new file mode 100644
index 0000000..db8cd6c
--- /dev/null
+++ b/packages/org.eclipse.epp.package.transition.feature/feature.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.epp.package.transition.feature"
+ label="EPP Transition Package Feature"
+ version="1.3.1.qualifier"
+ provider-name="Eclipse.org - EPP">
+
+ <description>
+ This feature is a collection of dependencies that were causing
+problems with the update from the Helios release to the service release.
+ </description>
+
+ <license url="license.html">
+ %license
+ </license>
+
+ <url>
+ <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+ <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
+ </url>
+
+ <requires>
+ <import plugin="org.slf4j.api"/>
+ </requires>
+
+
+</feature>
diff --git a/packages/org.eclipse.epp.package.transition.feature/license.html b/packages/org.eclipse.epp.package.transition.feature/license.html
new file mode 100644
index 0000000..c184ca3
--- /dev/null
+++ b/packages/org.eclipse.epp.package.transition.feature/license.html
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!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>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 14, 2010</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>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>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</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>
diff --git a/releng/org.eclipse.epp.config/packages_map.txt b/releng/org.eclipse.epp.config/packages_map.txt
index b575d43..02aea7d 100644
--- a/releng/org.eclipse.epp.config/packages_map.txt
+++ b/releng/org.eclipse.epp.config/packages_map.txt
@@ -1,43 +1,43 @@
# EPP package definitions
-# name, [CVS], repository string, path to file, version [HEAD], EPP local filename
+# name, [CVS], repository string, path to file, version [HELIOS], EPP local filename
# package definitions provided by EPP
## 1st: EPP package definition
## 2nd: feature.xml renamed
-cpp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml,HEAD,cpp.xml
-cpp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.cpp.feature/feature.xml,HEAD,cpp.feature.xml
+cpp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml,HELIOS,cpp.xml
+cpp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.cpp.feature/feature.xml,HELIOS,cpp.feature.xml
-java,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml,HEAD,java.xml
-java,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.java.feature/feature.xml,HEAD,java.feature.xml
+java,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml,HELIOS,java.xml
+java,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.java.feature/feature.xml,HELIOS,java.feature.xml
-javascript,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_helios.xml,HEAD,javascript.xml
-javascript,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.javascript.feature/feature.xml,HEAD,javascript.feature.xml
+javascript,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_helios.xml,HELIOS,javascript.xml
+javascript,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.javascript.feature/feature.xml,HELIOS,javascript.feature.xml
-jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml,HEAD,jee.xml
-jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.jee.feature/feature.xml,HEAD,jee.feature.xml
+jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml,HELIOS,jee.xml
+jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.jee.feature/feature.xml,HELIOS,jee.feature.xml
-linuxtools,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.linuxtools.feature/eclipse_linuxtools_helios.xml,HEAD,linuxtools.xml
-linuxtools,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.linuxtools.feature/feature.xml,HEAD,linuxtools.feature.xml
+linuxtools,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.linuxtools.feature/eclipse_linuxtools_helios.xml,HELIOS,linuxtools.xml
+linuxtools,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.linuxtools.feature/feature.xml,HELIOS,linuxtools.feature.xml
-modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml,HEAD,modeling.xml
-modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.modeling.feature/feature.xml,HEAD,modeling.feature.xml
+modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml,HELIOS,modeling.xml
+modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.modeling.feature/feature.xml,HELIOS,modeling.feature.xml
-php,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml,HEAD,php.xml
-php,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.php.feature/feature.xml,HEAD,php.feature.xml
+php,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml,HELIOS,php.xml
+php,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.php.feature/feature.xml,HELIOS,php.feature.xml
-pulsar,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml,HEAD,pulsar.xml
-pulsar,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.pulsar.feature/feature.xml,HEAD,pulsar.feature.xml
+pulsar,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml,HELIOS,pulsar.xml
+pulsar,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.pulsar.feature/feature.xml,HELIOS,pulsar.feature.xml
-rcp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml,HEAD,rcp.xml
-rcp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.rcp.feature/feature.xml,HEAD,rcp.feature.xml
+rcp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml,HELIOS,rcp.xml
+rcp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.rcp.feature/feature.xml,HELIOS,rcp.feature.xml
-reporting,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml,HEAD,reporting.xml
-reporting,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.reporting.feature/feature.xml,HEAD,reporting.feature.xml
+reporting,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml,HELIOS,reporting.xml
+reporting,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.reporting.feature/feature.xml,HELIOS,reporting.feature.xml
-soa,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml,HEAD,soa.xml
-soa,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.soa.feature/feature.xml,HEAD,soa.feature.xml
+soa,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml,HELIOS,soa.xml
+soa,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.soa.feature/feature.xml,HELIOS,soa.feature.xml
## special case - we provide a dummy epp config file for the SDK
-sdk,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_sdk_helios.xml,HEAD,sdk.xml
-#where to get the SDK feature? sdk,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_sdk_helios.xml,HEAD,eclipse_sdk_360.xml
+sdk,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_sdk_helios.xml,HELIOS,sdk.xml
+#where to get the SDK feature? sdk,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_sdk_helios.xml,HELIOS,eclipse_sdk_360.xml
diff --git a/releng/org.eclipse.epp.config/startEPP36.sh b/releng/org.eclipse.epp.config/startEPP36.sh
index 93b19bd..b8e59d6 100644
--- a/releng/org.eclipse.epp.config/startEPP36.sh
+++ b/releng/org.eclipse.epp.config/startEPP36.sh
@@ -15,7 +15,7 @@
then
BASE_URL=${FILESYSTEM_BASE}
ECLIPSE="/shared/technology/epp/epp_build/36/eclipse/eclipse"
- JRE="/opt/ibm/java2-ppc-50/bin/java"
+ JRE="/shared/common/jdk-1.5.0-22.x86_64/bin/java"
else
BASE_URL=${HTTP_BASE}
ECLIPSE="eclipse"
@@ -26,7 +26,7 @@
# variables to adjust
BASE_DIR=/shared/technology/epp/epp_build/36
-RELEASE_NAME="-helios-SR1-RC2"
+RELEASE_NAME="-helios-SR1-RC4"
# variables
START_TIME=`date -u +%Y%m%d-%H%M`
@@ -138,14 +138,13 @@
-profile ${PACKAGE} \
-flavor tooling \
-profileproperties org.eclipse.update.install.features=true \
- -bundlepool ${PACKAGE_BUILD_DIR}/eclipse \
-purgeHistory \
-p2.os ${OSes[$index]} \
-p2.ws ${WSes[$index]} \
-p2.arch ${ARCHes[$index]} \
-roaming \
-vm ${JRE} \
- -vmargs -Declipse.p2.mirrors=false -Declipse.p2.data.area=${PACKAGE_BUILD_DIR}/eclipse/p2 \
+ -vmargs -Declipse.p2.mirrors=false \
2>&1 >${DOWNLOAD_DIR}/${PACKAGE}_${EXTENSION}.log
if [ $? = "0" ]; then
cd ${PACKAGE_BUILD_DIR}
