diff options
| author | Markus Knauer | 2010-11-11 16:30:10 +0000 |
|---|---|---|
| committer | Markus Knauer | 2010-11-11 16:30:10 +0000 |
| commit | fd415b86d4481fd902bccd32d44f755fbf211f6a (patch) | |
| tree | e959e85d9dd839d19af11c89be2717eb8e9f4cbf /packages | |
| parent | 6094dd6f47a9370e57df948fa2df71fde67c8e74 (diff) | |
| download | org.eclipse.epp.packages-fd415b86d4481fd902bccd32d44f755fbf211f6a.tar.gz org.eclipse.epp.packages-fd415b86d4481fd902bccd32d44f755fbf211f6a.tar.xz org.eclipse.epp.packages-fd415b86d4481fd902bccd32d44f755fbf211f6a.zip | |
* all: updates from Helios SR1 copied to HEAD
* javascript: new intro taken from Helios SR1
* common: new icon from Helios SR1
Diffstat (limited to 'packages')
18 files changed, 36 insertions, 15 deletions
diff --git a/packages/org.eclipse.epp.package.common.feature/feature.xml b/packages/org.eclipse.epp.package.common.feature/feature.xml index 52071528..6af4d696 100644 --- a/packages/org.eclipse.epp.package.common.feature/feature.xml +++ b/packages/org.eclipse.epp.package.common.feature/feature.xml @@ -21,6 +21,7 @@ to all EPP packages and general configurations. <requires> <import feature="org.eclipse.epp.usagedata.feature"/> + <import feature="org.eclipse.epp.mpc"/> </requires> <plugin diff --git a/packages/org.eclipse.epp.package.common/icons/yoxos32.png b/packages/org.eclipse.epp.package.common/icons/yoxos32.png Binary files differindex 9a8b2008..011321b2 100644 --- a/packages/org.eclipse.epp.package.common/icons/yoxos32.png +++ b/packages/org.eclipse.epp.package.common/icons/yoxos32.png 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 338d04c3..3043dcba 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.7.0" /> <!-- name, the name of the product, used in naming the created files. --> - <product name="eclipse-cpp-indigo-SR1-RC2" /> + <product name="eclipse-cpp-indigo-M3" /> </configuration>
\ No newline at end of file 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 87202f96..71b52c14 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.7.0" /> <!-- name, the name of the product, used in naming the created files. --> - <product name="eclipse-java-indigo-SR1-RC2" /> + <product name="eclipse-java-indigo-M3" /> </configuration> 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 d263f5d2..63190494 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.7.0" />
<!-- name, the name of the product, used in naming the created files. -->
- <product name="eclipse-javascript-indigo-SR1-RC2" />
+ <product name="eclipse-javascript-indigo-M3" />
</configuration>
diff --git a/packages/org.eclipse.epp.package.javascript.feature/epp.product b/packages/org.eclipse.epp.package.javascript.feature/epp.product index 606fe75c..9bd06147 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 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t </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/build.properties b/packages/org.eclipse.epp.package.javascript/build.properties index 98519368..4bacef21 100644 --- a/packages/org.eclipse.epp.package.javascript/build.properties +++ b/packages/org.eclipse.epp.package.javascript/build.properties @@ -11,3 +11,5 @@ bin.includes = META-INF/,\ 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 Binary files differnew file mode 100644 index 00000000..015e7fc6 --- /dev/null +++ b/packages/org.eclipse.epp.package.javascript/intro-eclipse.png diff --git a/packages/org.eclipse.epp.package.javascript/plugin.xml b/packages/org.eclipse.epp.package.javascript/plugin.xml index ba494485..166f2d44 100644 --- a/packages/org.eclipse.epp.package.javascript/plugin.xml +++ b/packages/org.eclipse.epp.package.javascript/plugin.xml @@ -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 78d364a0..eeb59da4 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/DOCK_PERSPECTIVE_BAR=topRight 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 6e570afd..f994308d 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.7.0" /> <!-- name, the name of the product, used in naming the created files. --> - <product name="eclipse-jee-indigo-SR1-RC2" /> + <product name="eclipse-jee-indigo-M3" /> </configuration> 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 2ddfeec3..881c60a8 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.7.0" /> <!-- name, the name of the product, used in naming the created files. --> - <product name="eclipse-linuxtools-indigo-SR1-RC2-incubation" /> + <product name="eclipse-linuxtools-indigo-M3-incubation" /> </configuration> 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 48aca165..8bc83b1a 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.7.0" /> <!-- name, the name of the product, used in naming the created files. --> - <product name="eclipse-modeling-indigo-SR1-RC2-incubation" /> + <product name="eclipse-modeling-indigo-M3-incubation" /> </configuration> 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 0559e406..f5b369fe 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-indigo-SR1-RC2" /> + <product name="eclipse-php-indigo-M3" /> </configuration> 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 1b34c4a7..cee8d01a 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.7.0" /> <!-- name, the name of the product, used in naming the created files. --> - <product name="eclipse-pulsar-indigo-SR1-RC2" /> + <product name="eclipse-pulsar-indigo-M3" /> </configuration> 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 b669f93f..a076ab2d 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.7.0" /> <!-- name, the name of the product, used in naming the created files. --> - <product name="eclipse-rcp-indigo-SR1-RC2" /> + <product name="eclipse-rcp-indigo-M3" /> </configuration> 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 dc50f6d4..529c6ce9 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.7.0" /> <!-- name, the name of the product, used in naming the created files. --> - <product name="eclipse-reporting-indigo-SR1-RC2" /> + <product name="eclipse-reporting-indigo-M3" /> </configuration> 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 56550d92..12eccbca 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.7.0" /> <!-- name, the name of the product, used in naming the created files. --> - <product name="eclipse-soa-indigo-SR1-RC2-incubation" /> + <product name="eclipse-soa-indigo-M3-incubation" /> </configuration>
\ No newline at end of file |
