Merge branch 'digitalpreservation' of github.com:taverna/taverna-commandline-product into digitalpreservation
diff --git a/pom.xml b/pom.xml
index 9c5dda5..6cd261a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<!-- ##### For each branch, change ${edition} below -->
<artifactId>taverna-commandline-${edition}</artifactId>
- <name>Taverna command line utility [${edition}]</name>
+ <name>Taverna Command Line Tool Digital Preservation</name>
<properties>
<edition>digitalpreservation</edition>
<!-- ######## -->
@@ -1806,6 +1806,7 @@
<variables>
<srcDir>${project.build.directory}/dist</srcDir>
<edition>${edition}</edition>
+ <product-name>${project.name} ${project.version}</product-name>
</variables>
</configuration>
</execution>
diff --git a/src/main/install4j/taverna-commandline.install4j b/src/main/install4j/taverna-commandline.install4j
index d62e046..5e6ccee 100644
--- a/src/main/install4j/taverna-commandline.install4j
+++ b/src/main/install4j/taverna-commandline.install4j
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<install4j version="5.1.8" transformSequenceNumber="4">
<directoryPresets config="../../../target/taverna-workbench-dist/taverna.sh" />
- <application name="Taverna Commandline ${compiler:edition}" distributionSourceDir="" applicationId="9999-0604-4578-2443" mediaDir="../../../target/media" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-${compiler:sys.platform}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="false" shortName="taverna-commandline-${compiler:edition}" publisher="myGrid" publisherWeb="http://www.taverna.org.uk/" version="2.5-SNAPSHOT" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="false" macSignature="????" installerName="" javaMinVersion="1.7" javaMaxVersion="" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
+ <application name="${compiler:product-name}" distributionSourceDir="" applicationId="9999-0604-4578-2443" mediaDir="../../../target/media" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-${compiler:sys.platform}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="false" shortName="taverna-commandline-${compiler:edition}" publisher="myGrid" publisherWeb="http://www.taverna.org.uk/" version="2.5-SNAPSHOT" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="false" macSignature="????" installerName="" javaMinVersion="1.7" javaMaxVersion="" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
<languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
<principalLanguage id="en" customLocalizationFile="" />
<additionalLanguages />
@@ -284,7 +284,7 @@
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.actions.desktop.RegisterAddRemoveAction">
<void property="itemName">
- <string>${compiler:sys.fullName} ${compiler:sys.version}</string>
+ <string>${compiler:sys.fullName}</string>
</void>
</object>
</java>
