Update p2.inf and product branding
diff --git a/org.eclipse.ptp-product/ptp.p2.inf b/org.eclipse.ptp-product/ptp.p2.inf
index 12b2d61..1ff605b 100644
--- a/org.eclipse.ptp-product/ptp.p2.inf
+++ b/org.eclipse.ptp-product/ptp.p2.inf
@@ -23,5 +23,3 @@
properties.0.name = org.eclipse.equinox.p2.type.product
properties.0.value = true
-
-instructions.install = mkdir(path:${installFolder}/foo);
\ No newline at end of file
diff --git a/org.eclipse.ptp.rcp.sysmon-product/pom.xml b/org.eclipse.ptp.rcp.sysmon-product/pom.xml
index 9723bd2..e957e36 100644
--- a/org.eclipse.ptp.rcp.sysmon-product/pom.xml
+++ b/org.eclipse.ptp.rcp.sysmon-product/pom.xml
@@ -30,15 +30,15 @@
</goals>
<configuration>
<tasks>
- <copy file="${project.build.directory}/products/sysmon.product-linux.gtk.x86.tar.gz"
+ <copy file="${project.build.directory}/products/sysmon-linux.gtk.x86.tar.gz"
tofile="${ptp-install-dir}/sysmon-linux-gtk-x86-${unqualifiedVersion}.tar.gz"/>
- <copy file="${project.build.directory}/products/sysmon.product-linux.gtk.x86_64.tar.gz"
+ <copy file="${project.build.directory}/products/sysmon-linux.gtk.x86_64.tar.gz"
tofile="${ptp-install-dir}/sysmon-linux-gtk-x86_64-${unqualifiedVersion}.tar.gz"/>
- <copy file="${project.build.directory}/products/sysmon.product-win32.win32.x86.zip"
+ <copy file="${project.build.directory}/products/sysmon-win32.win32.x86.zip"
tofile="${ptp-install-dir}/sysmon-win32-x86-${unqualifiedVersion}.zip"/>
- <copy file="${project.build.directory}/products/sysmon.product-win32.win32.x86_64.zip"
+ <copy file="${project.build.directory}/products/sysmon-win32.win32.x86_64.zip"
tofile="${ptp-install-dir}/sysmon-win32-x86_64-${unqualifiedVersion}.zip"/>
- <copy file="${project.build.directory}/products/sysmon.product-macosx.cocoa.x86_64.tar.gz"
+ <copy file="${project.build.directory}/products/sysmon-macosx.cocoa.x86_64.tar.gz"
tofile="${ptp-install-dir}/sysmon-macosx-cocoa-x86_64-${unqualifiedVersion}.tar.gz"/>
</tasks>
</configuration>
@@ -73,12 +73,11 @@
</formats>
<products>
<product>
- <id>sysmon.product</id>
+ <id>sysmon</id>
<rootFolder>sysmon</rootFolder>
<rootFolders>
<macosx>SysMon.app</macosx>
</rootFolders>
- <!-- Required to pick up the sysmon.p2.inf file -->
</product>
</products>
</configuration>
diff --git a/org.eclipse.ptp.rcp.sysmon-product/sysmon.product b/org.eclipse.ptp.rcp.sysmon-product/sysmon.product
index d6c8703..2211d23 100644
--- a/org.eclipse.ptp.rcp.sysmon-product/sysmon.product
+++ b/org.eclipse.ptp.rcp.sysmon-product/sysmon.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="System Monitor" uid="sysmon.product" id="sysmon" application="org.eclipse.ptp.rcp.sysmon.application" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="System Monitor" uid="sysmon" id="sysmon.product" application="org.eclipse.ptp.rcp.sysmon.application" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/org.eclipse.ptp.rcp.sysmon/about.ini b/org.eclipse.ptp.rcp.sysmon/about.ini
new file mode 100644
index 0000000..bd639af
--- /dev/null
+++ b/org.eclipse.ptp.rcp.sysmon/about.ini
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%blurb
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=icons/icon_32.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
diff --git a/org.eclipse.ptp.rcp.sysmon/about.mappings b/org.eclipse.ptp.rcp.sysmon/about.mappings
new file mode 100644
index 0000000..bddaab4
--- /dev/null
+++ b/org.eclipse.ptp.rcp.sysmon/about.mappings
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
diff --git a/org.eclipse.ptp.rcp.sysmon/about.properties b/org.eclipse.ptp.rcp.sysmon/about.properties
new file mode 100644
index 0000000..c1cb542
--- /dev/null
+++ b/org.eclipse.ptp.rcp.sysmon/about.properties
@@ -0,0 +1,25 @@
+###############################################################################
+# Copyright (c) 2013 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
+###############################################################################
+
+# NLS_MESSAGEFORMAT_NONE
+# NLS_ENCODING=UTF-8
+
+blurb=SysMon - System Monitoring for Parallel Application Developers\n\
+\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright Eclipse contributors and others 2000, 2013. All rights reserved.\n\
+Visit http://www.eclipse.org/platform\n\
+\n\
+This product includes software developed by the\n\
+Apache Software Foundation http://www.apache.org/
+
diff --git a/org.eclipse.ptp.rcp.sysmon/plugin.properties b/org.eclipse.ptp.rcp.sysmon/plugin.properties
index 66e296c..ceca00e 100644
--- a/org.eclipse.ptp.rcp.sysmon/plugin.properties
+++ b/org.eclipse.ptp.rcp.sysmon/plugin.properties
@@ -10,6 +10,16 @@
pluginName=PTP Monitor RCP Application
pluginProvider=Eclipse PTP
+productName = System Monitoring for Parallel Application Developers
+aboutText = SysMon - System Monitoring for Parallel Application Developers\n\n\
+Version: Kepler Release\n\
+Build id: {0}\n\n\
+(c) Copyright Eclipse contributors and others 2000, 2013. All rights reserved.\n\
+Visit http://eclipse.org/\n\n\
+This product includes software developed by the\n\
+Apache Software Foundation http://apache.org/
+productIntroTitle = Welcome to System Monitoring for Parallel Application Developers
+
ParallelLaunchDelegate.name=Parallel Application
ParallelLaunchDelegate.desc=Run a parallel application
ResourcesLaunchTab.name=Resources
@@ -17,4 +27,4 @@
ArgumentsLaunchTab.name=Arguments
EnvironmentLaunchTab.name=Environment
SynchronizeLaunchTab.name=Synchronize
-CommonLaunchTab.name=Common
\ No newline at end of file
+CommonLaunchTab.name=Common
diff --git a/org.eclipse.ptp.rcp.sysmon/plugin.xml b/org.eclipse.ptp.rcp.sysmon/plugin.xml
index fa51ebf..e2f7027 100644
--- a/org.eclipse.ptp.rcp.sysmon/plugin.xml
+++ b/org.eclipse.ptp.rcp.sysmon/plugin.xml
@@ -76,6 +76,14 @@
value="System Monitor">
</property>
<property
+ name="aboutText"
+ value="%aboutText">
+ </property>
+ <property
+ name="introTitle"
+ value="%productIntroTitle">
+ </property>
+ <property
name="preferenceCustomization"
value="plugin_customization.ini">
</property>
