Author: vmassol
Date: 2007-09-04 16:39:23 +0200 (Tue, 04 Sep 2007)
New Revision: 4711
Added:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/shortcutSpec_unix.xml
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution/src/assemble/application-no-database.xml
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution/src/assemble/application.xml
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_windows.xml
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/windows/pom.xml
Log:
XE-123: Add shortcuts on the desktop/menus when using the Installers
XE-124: Standalone versions do not have execute permissions set for unix sh
files
Merged from trunk (revs 4707, 4708 and 4710)
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution/src/assemble/application-no-database.xml
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution/src/assemble/application-no-database.xml
2007-09-04 14:35:23 UTC (rev 4710)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution/src/assemble/application-no-database.xml
2007-09-04 14:39:23 UTC (rev 4711)
@@ -38,6 +38,9 @@
<outputDirectory>webapps/xwiki</outputDirectory>
<unpack>true</unpack>
</dependencySet>
+ <!-- Copy sh files so that we can set their permissions. This is required
since the
+ Assembly plugin looses file permissions.
+ See http://jira.codehaus.org/browse/MASSEMBLY-238 -->
<dependencySet>
<!-- This shouldn't be required but there's a bug in version 2.2-beta-1
of the Assembly
plugin where the artifact name will be used instead of / if
outputFileNameMapping is
@@ -48,6 +51,29 @@
</includes>
<outputDirectory>/</outputDirectory>
<unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>**/*.sh</include>
+ </includes>
+ </unpackOptions>
+ <fileMode>755</fileMode>
</dependencySet>
+ <!-- Copy all other files (excluding sh files). See above for details. -->
+ <dependencySet>
+ <!-- This shouldn't be required but there's a bug in version 2.2-beta-1
of the Assembly
+ plugin where the artifact name will be used instead of / if
outputFileNameMapping is
+ not specified -->
+ <outputFileNameMapping></outputFileNameMapping>
+ <includes>
+ <include>com.xpn.xwiki.platform:xwiki-jetty-resources</include>
+ </includes>
+ <outputDirectory>/</outputDirectory>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/*.sh</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
</dependencySets>
</assembly>
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution/src/assemble/application.xml
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution/src/assemble/application.xml
2007-09-04 14:35:23 UTC (rev 4710)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution/src/assemble/application.xml
2007-09-04 14:39:23 UTC (rev 4711)
@@ -38,6 +38,9 @@
<outputDirectory>webapps/xwiki</outputDirectory>
<unpack>true</unpack>
</dependencySet>
+ <!-- Copy sh files so that we can set their permissions. This is required
since the
+ Assembly plugin looses file permissions.
+ See http://jira.codehaus.org/browse/MASSEMBLY-238 -->
<dependencySet>
<!-- This shouldn't be required but there's a bug in version 2.2-beta-1
of the Assembly
plugin where the artifact name will be used instead of / if
outputFileNameMapping is
@@ -48,13 +51,36 @@
</includes>
<outputDirectory>/</outputDirectory>
<unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>**/*.sh</include>
+ </includes>
+ </unpackOptions>
+ <fileMode>755</fileMode>
</dependencySet>
+ <!-- Copy all other files (excluding sh files). See above for details. -->
<dependencySet>
<!-- This shouldn't be required but there's a bug in version 2.2-beta-1
of the Assembly
plugin where the artifact name will be used instead of / if
outputFileNameMapping is
not specified -->
<outputFileNameMapping></outputFileNameMapping>
<includes>
+ <include>com.xpn.xwiki.platform:xwiki-jetty-resources</include>
+ </includes>
+ <outputDirectory>/</outputDirectory>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/*.sh</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <!-- This shouldn't be required but there's a bug in version 2.2-beta-1
of the Assembly
+ plugin where the artifact name will be used instead of / if
outputFileNameMapping is
+ not specified -->
+ <outputFileNameMapping></outputFileNameMapping>
+ <includes>
<include>com.xpn.xwiki.products:xwiki-enterprise-database</include>
</includes>
<outputDirectory>/database</outputDirectory>
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 14:35:23 UTC (rev 4710)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/pom.xml
2007-09-04 14:39:23 UTC (rev 4711)
@@ -148,5 +148,6 @@
<xwiki.border8.png>${project.build.directory}/classes/images/border8.png</xwiki.border8.png>
<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>
</properties>
</project>
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 14:35:23 UTC (rev 4710)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/install.xml
2007-09-04 14:39:23 UTC (rev 4711)
@@ -23,6 +23,7 @@
<res id="LicencePanel.licence" src="${xwiki.license}"/>
<res id="HTMLInfoPanel.info" src="${xwiki.readme}"/>
<res id="shortcutSpec.xml" src="${xwiki.shortcutSpec.windows}"/>
+ <res id="Unix_shortcutSpec.xml" src="${xwiki.shortcutSpec.unix}"/>
<res id="installer.langsel.img" src="${xwiki.png}" />
<res id="Installer.image.0" src="${xwiki.border1.png}" />
<res id="Installer.image.1" src="${xwiki.border2.png}" />
@@ -51,6 +52,10 @@
<file src="${xwiki.readme}" targetdir="$INSTALL_PATH"/>
<file src="${xwiki.license}" targetdir="$INSTALL_PATH"/>
<fileset dir="${xwiki.container}" targetdir="$INSTALL_PATH"
override="true"/>
+ <!-- Set execute permissions for .sh files -->
+ <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"/>
</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>
Copied:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/shortcutSpec_unix.xml
(from rev 4707,
xwiki-products/xwiki-enterprise/trunk/installers/generic/src/main/resources/shortcutSpec_unix.xml)
===================================================================
---
xwiki-products/xwiki-enterprise/trunk/installers/generic/src/main/resources/shortcutSpec_unix.xml
2007-09-03 15:59:53 UTC (rev 4707)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/shortcutSpec_unix.xml
2007-09-04 14:39:23 UTC (rev 4711)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?>
+<shortcuts>
+ <skipIfNotSupported/>
+ <programGroup defaultName="XWiki Enterprise" location="applications"/>
+ <shortcut
+ name="Start XWiki Enterprise"
+ programGroup="yes"
+ desktop="yes"
+ applications="no"
+ startMenu="yes"
+ startup="no"
+ target="$INSTALL_PATH/start_xwiki.sh"
+ commandLine="8080"
+ workingDirectory="$INSTALL_PATH"
+ description="Starts XWiki Enterprise"
+ type="Application"
+ encoding="UTF-8"
+ terminal="true"
+ KdeSubstUID="false"
+ initialState="normal"
+ categories=""
+ createForAll="true"/>
+ <shortcut
+ name="Stop XWiki Enterprise"
+ programGroup="yes"
+ desktop="yes"
+ applications="no"
+ startMenu="yes"
+ startup="no"
+ target="$INSTALL_PATH/stop_xwiki.sh"
+ commandLine=""
+ workingDirectory="$INSTALL_PATH"
+ description="Stops XWiki Enterprise"
+ type="Application"
+ encoding="UTF-8"
+ terminal="true"
+ KdeSubstUID="false"
+ initialState="normal"
+ categories=""
+ createForAll="true"/>
+ <!-- TODO: I'd like to use "My Wiki" (with a space) but it fails for some
reason if there's a space -->
+ <shortcut
+ name="MyWiki"
+ programGroup="yes"
+ desktop="no"
+ applications="no"
+ startMenu="yes"
+ startup="no"
+ target="firefox"
+ commandLine="http://localhost:8080/xwiki/bin/view/Main/";
+ workingDirectory=""
+ description="Go to the local XWiki installation home page"
+ type="Application"
+ encoding="UTF-8"
+ terminal="false"
+ url="http://localhost:8080/xwiki/bin/view/Main/";
+ KdeSubstUID="false"
+ initialState="normal"
+ categories=""
+ createForAll="true"/>
+ <shortcut
+ name="Documentation"
+ programGroup="yes"
+ desktop="no"
+ applications="no"
+ startMenu="yes"
+ startup="no"
+ target="firefox"
+ commandLine="http://xwiki.org";
+ workingDirectory=""
+ description="XWiki Documentation"
+ type="Application"
+ encoding="UTF-8"
+ terminal="false"
+ url="http://xwiki.org";
+ KdeSubstUID="false"
+ initialState="normal"
+ categories=""
+ createForAll="true"/>
+ <shortcut
+ name="Uninstall"
+ programGroup="yes"
+ desktop="no"
+ applications="no"
+ startMenu="yes"
+ startup="no"
+ target="java"
+ commandLine="-jar "$INSTALL_PATH/Uninstaller/uninstaller.jar""
+ initialState="noShow"
+ iconFile="trashcan_full"
+ iconIndex="0"
+ workingDirectory=""
+ type="Application"
+ encoding="UTF-8"
+ description="Uninstall XWiki"
+ createForAll="true"/>
+</shortcuts>
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 14:35:23 UTC (rev 4710)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/src/main/resources/shortcutSpec_windows.xml
2007-09-04 14:39:23 UTC (rev 4711)
@@ -18,4 +18,28 @@
programGroup="yes"
desktop="yes"
startMenu="no"/>
+ <shortcut name="My Wiki"
+ target="http://localhost:8080/xwiki/bin/view/Main/";
+ workingDirectory=""
+ description="Go to the local XWiki installation home page"
+ initialState="normal"
+ programGroup="yes"
+ desktop="no"
+ startMenu="no"/>
+ <shortcut name="Documentation"
+ target="http://xwiki.org";
+ workingDirectory=""
+ description="XWiki Documentation"
+ initialState="normal"
+ programGroup="yes"
+ desktop="no"
+ startMenu="no"/>
+ <shortcut name="Uninstall"
+ target="javaw"
+ commandLine="-jar "$INSTALL_PATH\Uninstaller\uninstaller.jar""
+ description="Uninstall XWiki"
+ initialState="normal"
+ programGroup="yes"
+ desktop="no"
+ startMenu="no"/>
</shortcuts>
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/windows/pom.xml
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/windows/pom.xml
2007-09-04 14:35:23 UTC (rev 4710)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/windows/pom.xml
2007-09-04 14:39:23 UTC (rev 4711)
@@ -94,7 +94,8 @@
</goals>
<configuration>
<tasks>
- <!-- Dependency plugin discards file permissions so we need to
set them back manually -->
+ <!-- Dependency plugin discards file permissions so we need to
set them back
+ manually. See http://jira.codehaus.org/browse/MDEP-109 -->
<chmod
file="${project.build.directory}/dependency/bin/windres" perm="ugo+rx" />
<chmod file="${project.build.directory}/dependency/bin/ld"
perm="ugo+rx" />
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
