Bug 493596 - [Welcome] Adopt Solstice theme for JEE package

- revise Oomph questionnaire text and icon
- include missed plugin.properties in build.properties

Change-Id: I8505ffdb4ee1ef3607d6763dc966a3e3490d9da7
Signed-off-by: Brian de Alwis <bsd@mt.ca>

7 files changed, 167 insertions, 2 deletions

diff --git a/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
index 37d76363..60b201fa 100644
--- a/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
@@ -8,3 +8,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app
 Eclipse-BundleShape: dir
+Bundle-Localization: plugin
diff --git a/packages/org.eclipse.epp.package.jee/build.properties b/packages/org.eclipse.epp.package.jee/build.properties
index 3d532c00..1a3f8dcf 100644
--- a/packages/org.eclipse.epp.package.jee/build.properties
+++ b/packages/org.eclipse.epp.package.jee/build.properties
@@ -12,5 +12,7 @@ bin.includes = META-INF/,\
                helpData.xml,\
                wtp_logo_2010.png,\
                wtp_logo_96.png,\
-               OSGI-INF/
+               OSGI-INF/,\
+               org.eclipse.ui.intro.universal.solstice/,\
+               plugin.properties
 
diff --git a/packages/org.eclipse.epp.package.jee/introData.xml b/packages/org.eclipse.epp.package.jee/introData.xml
new file mode 100644
index 00000000..fa1ad5df
--- /dev/null
+++ b/packages/org.eclipse.epp.package.jee/introData.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extensions>
+   <page id="overview">
+      <group path="page-content/bottom-left" default="true">
+         <extension id="org.eclipse.jdt" importance="low"/>
+         <extension id="org.eclipse.ui.workbench" importance="low"/>
+      </group>
+      <group path="page-content/bottom-right" default="true">
+         <extension id="org.eclipse.egit" importance="low"/>
+         <extension id="org.eclipse.m2e" importance="low"/>
+      </group>
+      <group path="page-content/top-left">
+         <extension id="org.eclipse.wtp" importance="low"/>
+      </group>
+      <group path="page-content/top-right">
+         <extension id="DTP_overviewExtension" importance="low"/>
+      </group>
+   </page>
+   <page id="whatsnew">
+      <group path="page-content/bottom-left" default="true">
+         <extension id="org.eclipse.jdt" importance="low"/>
+         <extension id="org.eclipse.ui.workbench" importance="low"/>
+      </group>
+      <group path="page-content/bottom-right" default="true">
+         <extension id="org.eclipse.egit" importance="low"/>
+         <extension id="org.eclipse.ui.workbench.news" importance="low"/>
+         <extension id="org.eclipse.ui.workbench.migration" importance="low"/>
+      </group>
+      <group path="page-content/top-left">
+         <extension id="org.eclipse.wtp" importance="low"/>
+      </group>
+      <group path="page-content/top-right">
+         <extension id="DTP_whatsnewExtension" importance="low"/>
+      </group>
+   </page>
+   <page id="tutorials">
+      <group path="page-content/bottom-left" default="true">
+         <extension id="org.eclipse.jdt" importance="low"/>
+      </group>
+      <group path="page-content/bottom-right" default="true">
+         <extension id="org.eclipse.egit" importance="low"/>
+      </group>
+      <group path="page-content/top-left">
+         <extension id="org.eclipse.wtp" importance="low"/>
+      </group>
+      <group path="page-content/top-right">
+         <extension id="DTP_tutorialsExtension" importance="low"/>
+      </group>
+   </page>
+   <page id="samples">
+      <group path="page-content/bottom-left" default="true">
+         <extension id="org.eclipse.jdt" importance="low"/>
+      </group>
+      <group path="page-content/bottom-right" default="true">
+      </group>
+   </page>
+   <page id="migrate">
+      <group path="page-content/bottom-left" default="true">
+         <extension id="org.eclipse.jdt" importance="low"/>
+      </group>
+      <group path="page-content/bottom-right" default="true">
+         <extension id="org.eclipse.platform" importance="low"/>
+      </group>
+   </page>
+</extensions>
diff --git a/packages/org.eclipse.epp.package.jee/org.eclipse.ui.intro.universal.solstice/intro-eclipse.png b/packages/org.eclipse.epp.package.jee/org.eclipse.ui.intro.universal.solstice/intro-eclipse.png
new file mode 100644
index 00000000..7e25dbb6
--- /dev/null
+++ b/packages/org.eclipse.epp.package.jee/org.eclipse.ui.intro.universal.solstice/intro-eclipse.png
diff --git a/packages/org.eclipse.epp.package.jee/plugin.properties b/packages/org.eclipse.epp.package.jee/plugin.properties
new file mode 100644
index 00000000..5a301d66
--- /dev/null
+++ b/packages/org.eclipse.epp.package.jee/plugin.properties
@@ -0,0 +1,29 @@
+###############################################################################
+# Copyright (c) 2000, 2016 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
+#     Manumitting Technologies Inc - Solstice theme support
+###############################################################################
+pluginName=Eclipse IDE for Eclipse Java Bundle
+providerName=Eclipse Packaging Project
+
+ql.cheatsheet.hw.description = A guided walkthrough to create the famous Hello World in Eclipse
+ql.cheatsheet.hw.label = Create a Hello World application
+ql.newFacetedProject.description = Create a new faceted Eclipse project
+ql.newFacetedProject.label = Create a new Faceted project
+ql.newStaticWebProject.description = Create a new Eclipse project for static web content
+ql.newStaticWebProject.label = Create a new static web content project
+ql.checkoutGitProject.description = Checkout Eclipse projects hosted in a Git repository
+ql.checkoutGitProject.label = Checkout projects from Git
+ql.importExistingProjects.description = Import existing Eclipse projects from the filesystem or archive
+ql.importExistingProjects.label = Import existing projects
+ql.openExistingFile.description = Open a file from the filesystem
+ql.openExistingFile.label = Open an existing file
+ql.setupQuestionnaire.label = Review IDE configuration settings
+ql.mpc.description = Enhance your IDE with additional plugins
+ql.mpc.label = Launch the Eclipse Marketplace
diff --git a/packages/org.eclipse.epp.package.jee/plugin.xml b/packages/org.eclipse.epp.package.jee/plugin.xml
index 2c3b2e0f..cebb9a22 100644
--- a/packages/org.eclipse.epp.package.jee/plugin.xml
+++ b/packages/org.eclipse.epp.package.jee/plugin.xml
@@ -71,4 +71,69 @@
       </product>
    </extension>
 
+   <extension
+         point="org.eclipse.ui.intro">
+      <introProductBinding
+            introId="org.eclipse.ui.intro.universal"
+            productId="org.eclipse.epp.package.jee.product">
+      </introProductBinding>
+   </extension>
+
+   <extension
+         point="org.eclipse.ui.intro.quicklinks">
+      <command
+            id="org.eclipse.ui.newWizard(newWizardId=org.eclipse.wst.common.project.facet.ui.BasicFacetedProjectWizard)"
+            description="%ql.newFacetedProject.description"
+            label="%ql.newFacetedProject.label"
+            importance="medium"
+            resolution="launchbar">
+      </command>
+      <command
+            id="org.eclipse.ui.newWizard(newWizardId=org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard)"
+            description="%ql.newStaticWebProject.description"
+            label="%ql.newStaticWebProject.label"
+            importance="medium"
+            resolution="launchbar">
+      </command>
+      <command
+            id="org.eclipse.ui.file.import(importWizardId=org.eclipse.egit.ui.internal.clone.GitCloneWizard)"
+            description="%ql.checkoutGitProject.description"
+            icon="platform:/plugin/org.eclipse.ui.intro.universal/themes/solstice/graphics/icons/ctool/egit-checkout.png"
+            label="%ql.checkoutGitProject.label"
+            importance="medium"
+            resolution="launchbar">
+      </command>
+      <command
+            id="org.eclipse.ui.file.import(importWizardId=org.eclipse.ui.wizards.import.ExternalProject)"
+            description="%ql.importExistingProjects.description"
+            icon="platform:/plugin/org.eclipse.ui.intro.universal/themes/solstice/graphics/icons/ctool/import-existing-project.png"
+            label="%ql.importExistingProjects.label"
+            resolution="launchbar">
+      </command>
+      <command
+            id="org.eclipse.ui.edit.text.openLocalFile"
+            description="%ql.openExistingFile.description"
+            icon="platform:/plugin/org.eclipse.ui.intro.universal/themes/solstice/graphics/icons/ctool/open-file.png"
+            importance="low"
+            label="%ql.openExistingFile.label"
+            resolution="launchbar">
+      </command>
+      <command
+            id="org.eclipse.oomph.setup.ui.questionnaire"
+            importance="high"
+            icon="platform:/plugin/org.eclipse.ui.intro.universal/themes/solstice/graphics/icons/ctool/settings.png"
+            label="%ql.setupQuestionnaire.label">
+      </command>
+      <override
+            command="org.eclipse.ui.newWizard*"
+            icon="platform:/plugin/org.eclipse.ui.intro.universal/themes/solstice/graphics/icons/ctool/new-project.png"
+            theme="org.eclipse.ui.intro.universal.solstice">
+      </override>
+      <command
+            id="org.eclipse.epp.mpc.ui.command.showMarketplaceWizard"
+            label="%ql.mpc.label"
+            description="%ql.mpc.description"
+            icon="platform:/plugin/org.eclipse.epp.mpc.ui/intro/css/marketplace.png">
+      </command>
+   </extension>
 </plugin>
diff --git a/packages/org.eclipse.epp.package.jee/plugin_customization.ini b/packages/org.eclipse.epp.package.jee/plugin_customization.ini
index add39aac..fb69eed8 100644
--- a/packages/org.eclipse.epp.package.jee/plugin_customization.ini
+++ b/packages/org.eclipse.epp.package.jee/plugin_customization.ini
@@ -36,10 +36,13 @@ org.eclipse.ui.ide/unassociatedEditorStrategy=org.eclipse.epp.internal.mpc.ui.as
 # Intro-related preferences (since 3.2)
 
 # Welcome theme to use
-org.eclipse.ui.intro/INTRO_THEME = org.eclipse.ui.intro.universal.slate
+org.eclipse.ui.intro/INTRO_THEME = org.eclipse.ui.intro.universal.solstice
 
 # Root page links to show in the Universal Welcome
 org.eclipse.ui.intro.universal/INTRO_ROOT_PAGES = overview,tutorials,samples,whatsnew
+# Use quadrant root page with quicklinks
+org.eclipse.ui.intro/INTRO_START_PAGE = qroot
+org.eclipse.ui.intro/INTRO_HOME_PAGE = qroot
 
 # Initial page layout of the Universal Welcome
 org.eclipse.ui.intro.universal/INTRO_DATA = product:introData.xml