Author: vmassol
Date: 2007-09-04 21:35:23 +0200 (Tue, 04 Sep 2007)
New Revision: 4713
Added:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/images/xe.ico
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/images/xe.png
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/windows/src/main/resources/xe.ico
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/pom.xml
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/install.xml
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/shortcutSpec_unix.xml
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/shortcutSpec_windows.xml
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/windows/src/main/resources/launch4j.xml
Log:
XE-123: Add shortcuts on the desktop/menus when using the Installers
* Added icons for shortcuts
* Note: it's not working for the start and stop menu shortcuts on unix and I
have no idea why...
XE-125: Add an icon for the exe generated by the Windows installer
Merged from trunk (rev 4712)
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/pom.xml
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/pom.xml
2007-09-04 19:31:28 UTC (rev 4712)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/pom.xml
2007-09-04 19:35:23 UTC (rev 4713)
@@ -149,5 +149,7 @@
<xwiki.core.png>${project.build.directory}/classes/images/core.png</xwiki.core.png>
<xwiki.shortcutSpec.windows>${project.build.directory}/classes/shortcutSpec_windows.xml</xwiki.shortcutSpec.windows>
<xwiki.shortcutSpec.unix>${project.build.directory}/classes/shortcutSpec_unix.xml</xwiki.shortcutSpec.unix>
+
<xwiki.shortcut.icon.unix>${project.build.directory}/classes/images/xe.png</xwiki.shortcut.icon.unix>
+
<xwiki.shortcut.icon.windows>${project.build.directory}/classes/images/xe.ico</xwiki.shortcut.icon.windows>
</properties>
</project>
Copied:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/images/xe.ico
(from rev 4712,
xwiki-products/xwiki-enterprise/trunk/installers/generic/src/main/resources/images/xe.ico)
Property changes on:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/images/xe.ico
___________________________________________________________________
Name: svn:mime-type
+ image/x-icon
Copied:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/images/xe.png
(from rev 4712,
xwiki-products/xwiki-enterprise/trunk/installers/generic/src/main/resources/images/xe.png)
Property changes on:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/images/xe.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/install.xml
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/install.xml
2007-09-04 19:31:28 UTC (rev 4712)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/install.xml
2007-09-04 19:35:23 UTC (rev 4713)
@@ -56,6 +56,9 @@
<executable targetfile="$INSTALL_PATH/start_xwiki.sh" stage="never"/>
<executable targetfile="$INSTALL_PATH/stop_xwiki.sh" stage="never"/>
<executable targetfile="$INSTALL_PATH/start_xwiki_debug.sh"
stage="never"/>
+ <!-- Image used as a shortcut icon on unix and windows -->
+ <file src="${xwiki.shortcut.icon.unix}" targetdir="$INSTALL_PATH"
os="unix"/>
+ <file src="${xwiki.shortcut.icon.windows}" targetdir="$INSTALL_PATH"
os="windows"/>
</pack>
<pack name="Default Wiki" required="no">
<description>A set of default Wiki pages. If you don't install this
you'll get an empty Wiki. To be used when upgrading an existing XWiki
installation so that your current pages are kept and not
overwritten.</description>
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/shortcutSpec_unix.xml
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/shortcutSpec_unix.xml
2007-09-04 19:31:28 UTC (rev 4712)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/shortcutSpec_unix.xml
2007-09-04 19:35:23 UTC (rev 4713)
@@ -10,6 +10,8 @@
startMenu="yes"
startup="no"
target="$INSTALL_PATH/start_xwiki.sh"
+ iconFile="$INSTALL_PATH/xe.png"
+ iconIndex="0"
commandLine="8080"
workingDirectory="$INSTALL_PATH"
description="Starts XWiki Enterprise"
@@ -28,6 +30,8 @@
startMenu="yes"
startup="no"
target="$INSTALL_PATH/stop_xwiki.sh"
+ iconFile="$INSTALL_PATH/xe.png"
+ iconIndex="0"
commandLine=""
workingDirectory="$INSTALL_PATH"
description="Stops XWiki Enterprise"
@@ -47,6 +51,8 @@
startMenu="yes"
startup="no"
target="firefox"
+ iconFile="$INSTALL_PATH/xe.png"
+ iconIndex="0"
commandLine="http://localhost:8080/xwiki/bin/view/Main/";
workingDirectory=""
description="Go to the local XWiki installation home page"
@@ -66,6 +72,8 @@
startMenu="yes"
startup="no"
target="firefox"
+ iconFile="$INSTALL_PATH/xe.png"
+ iconIndex="0"
commandLine="http://xwiki.org";
workingDirectory=""
description="XWiki Documentation"
@@ -87,7 +95,7 @@
target="java"
commandLine="-jar "$INSTALL_PATH/Uninstaller/uninstaller.jar""
initialState="noShow"
- iconFile="trashcan_full"
+ iconFile="$INSTALL_PATH/xe.png"
iconIndex="0"
workingDirectory=""
type="Application"
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/shortcutSpec_windows.xml
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/shortcutSpec_windows.xml
2007-09-04 19:31:28 UTC (rev 4712)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/shortcutSpec_windows.xml
2007-09-04 19:35:23 UTC (rev 4713)
@@ -4,6 +4,8 @@
<programGroup defaultName="XWiki Enterprise" location="applications"/>
<shortcut name="Start XWiki Enterprise"
target="$INSTALL_PATH\start_xwiki.bat"
+ iconFile="$INSTALL_PATH\xe.ico"
+ iconIndex="0"
workingDirectory="$INSTALL_PATH"
description="Start XWiki"
initialState="normal"
@@ -12,6 +14,8 @@
startMenu="no"/>
<shortcut name="Stop XWiki Enterprise"
target="$INSTALL_PATH\stop_xwiki.bat"
+ iconFile="$INSTALL_PATH\xe.ico"
+ iconIndex="0"
workingDirectory="$INSTALL_PATH"
description="Stop XWiki"
initialState="normal"
@@ -20,6 +24,8 @@
startMenu="no"/>
<shortcut name="My Wiki"
target="http://localhost:8080/xwiki/bin/view/Main/";
+ iconFile="$INSTALL_PATH\xe.ico"
+ iconIndex="0"
workingDirectory=""
description="Go to the local XWiki installation home page"
initialState="normal"
@@ -28,6 +34,8 @@
startMenu="no"/>
<shortcut name="Documentation"
target="http://xwiki.org";
+ iconFile="$INSTALL_PATH\xe.ico"
+ iconIndex="0"
workingDirectory=""
description="XWiki Documentation"
initialState="normal"
@@ -36,6 +44,8 @@
startMenu="no"/>
<shortcut name="Uninstall"
target="javaw"
+ iconFile="$INSTALL_PATH\xe.ico"
+ iconIndex="0"
commandLine="-jar "$INSTALL_PATH\Uninstaller\uninstaller.jar""
description="Uninstall XWiki"
initialState="normal"
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/windows/src/main/resources/launch4j.xml
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/windows/src/main/resources/launch4j.xml
2007-09-04 19:31:28 UTC (rev 4712)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/windows/src/main/resources/launch4j.xml
2007-09-04 19:35:23 UTC (rev 4713)
@@ -4,8 +4,7 @@
<outfile>${project.build.directory}/${pom.artifactId}-${pom.version}.exe</outfile>
<errTitle>XWiki Windows Installer</errTitle>
<customProcName>true</customProcName>
- <!-- Waiting for an icon from Laurent Lunati -->
- <!-- icon>icon.ico</icon-->
+ <icon>${project.build.directory}/classes/xe.ico</icon>
<jre>
<minVersion>1.5.0</minVersion>
</jre>
Copied:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/windows/src/main/resources/xe.ico
(from rev 4712,
xwiki-products/xwiki-enterprise/trunk/installers/windows/src/main/resources/xe.ico)
Property changes on:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/windows/src/main/resources/xe.ico
___________________________________________________________________
Name: svn:mime-type
+ image/x-icon
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
