Rename installed application to "Corda DemoBench". (#547)

* CORDA-368: Install DemoBench as "Corda DemoBench".
* CORDA-368: Fix RPM packaging.
* CORDA-368: Update changelog and release notes for DemoBench's new installation name.

docs/source/changelog.rst

@@ -12,6 +12,8 @@ UNRELEASED
     * Added ``CompositeSignature`` and ``CompositeSignatureData`` as part of enabling ``java.security`` classes to work with
       composite keys and signatures.
 
+    * DemoBench is now installed as ``Corda DemoBench`` instead of ``DemoBench``.
+
 Milestone 10.0
 --------------
 

docs/source/release-notes.rst

@@ -12,6 +12,8 @@ composite key signatures. This will form the underlying basis of future work to
 formats to enable interoperability with other systems, as well as enabling the use of composite signatures on X.509
 certificates to prove association between transaction keys and identity keys.
 
+We have updated DemoBench so that it is installed as "Corda DemoBench" for both Windows and MacOSX. The original version was installed as just "DemoBench", and so will not be overwritten automatically by the new version.
+
 Milestone 10
 ------------
 

tools/demobench/build.gradle

@@ -169,7 +169,7 @@ task javapackage(dependsOn: 'distZip') {
         )
 
         ant.deploy(nativeBundles: packageType, outdir: pkg_outDir, outfile: 'DemoBench', verbose: 'true') {
-            application(name: 'DemoBench', version: pkg_version, mainClass: mainClassName)
+            application(name: 'Corda DemoBench', version: pkg_version, mainClass: mainClassName)
             info(title: 'Corda DemoBench', vendor: 'R3', description: 'A sales and educational tool for demonstrating Corda.')
             resources {
                 fileset(dir: "$dist_source/lib", type: 'jar') {
@@ -190,9 +190,6 @@ task javapackage(dependsOn: 'distZip') {
                 }
             }
 
-            // This is specific to the MacOSX packager.
-            bundleArgument(arg: 'mac.CFBundleName', value: 'Corda DemoBench')
-
             platform {
                 property(name: 'java.util.logging.config.class', value: 'net.corda.demobench.config.LoggingConfig')
                 property(name: 'org.jboss.logging.provider', value: 'slf4j')

tools/demobench/package/linux/CordaDemoBench.spec

@@ -1,12 +1,13 @@
-Summary: DemoBench
-Name: demobench
+Summary: Corda DemoBench
+Name: corda-demobench
 Version: @pkg_version@
 Release: 1
 License: Unknown
 Vendor: Unknown
 Prefix: /opt
-Provides: demobench
+Provides: corda-demobench
 Requires: ld-linux.so.2 libX11.so.6 libXext.so.6 libXi.so.6 libXrender.so.1 libXtst.so.6 libasound.so.2 libc.so.6 libdl.so.2 libgcc_s.so.1 libm.so.6 libpthread.so.0 libthread_db.so.1
+Obsoletes: demobench
 Autoprov: 0
 Autoreq: 0
 
@@ -21,7 +22,7 @@ Autoreq: 0
 %define _javaHome %{getenv:JAVA_HOME}
 
 %description
-DemoBench
+Corda DemoBench
 
 %prep
 
@@ -30,40 +31,40 @@ DemoBench
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/opt
-cp -r %{_sourcedir}/DemoBench %{buildroot}/opt
-mkdir -p %{buildroot}/opt/DemoBench/runtime/bin
-cp %{_javaHome}/bin/java %{buildroot}/opt/DemoBench/runtime/bin
+cp -r %{_sourcedir}/CordaDemoBench %{buildroot}/opt
+mkdir -p %{buildroot}/opt/CordaDemoBench/runtime/bin
+cp %{_javaHome}/bin/java %{buildroot}/opt/CordaDemoBench/runtime/bin
 
 %files
 
-/opt/DemoBench
+/opt/CordaDemoBench
 
 %post
 
 
-xdg-desktop-menu install --novendor /opt/DemoBench/DemoBench.desktop
+xdg-desktop-menu install --novendor /opt/CordaDemoBench/CordaDemoBench.desktop
 
 if [ "false" = "true" ]; then
-    cp /opt/DemoBench/demobench.init /etc/init.d/demobench
-    if [ -x "/etc/init.d/demobench" ]; then
-        /sbin/chkconfig --add demobench
+    cp /opt/CordaDemoBench/corda-demobench.init /etc/init.d/corda-demobench
+    if [ -x "/etc/init.d/corda-demobench" ]; then
+        /sbin/chkconfig --add corda-demobench
         if [ "false" = "true" ]; then
-            /etc/init.d/demobench start
+            /etc/init.d/corda-demobench start
         fi
     fi
 fi
 
 %preun
 
-xdg-desktop-menu uninstall --novendor /opt/DemoBench/DemoBench.desktop
+xdg-desktop-menu uninstall --novendor /opt/CordaDemoBench/CordaDemoBench.desktop
 
 if [ "false" = "true" ]; then
-    if [ -x "/etc/init.d/demobench" ]; then
+    if [ -x "/etc/init.d/corda-demobench" ]; then
         if [ "true" = "true" ]; then
-            /etc/init.d/demobench stop
+            /etc/init.d/corda-demobench stop
         fi
-        /sbin/chkconfig --del demobench
-        rm -f /etc/init.d/demobench
+        /sbin/chkconfig --del corda-demobench
+        rm -f /etc/init.d/corda-demobench
     fi
 fi
 

tools/demobench/package/macosx/Corda DemoBench-post-image.sh

@@ -9,14 +9,14 @@ function signApplication() {
 
     # Resign the embedded JRE because we have included "bin/java"
     # after javapackager had already signed the JRE installation.
-    if ! (codesign --force --sign "$IDENTITY" --verbose $APPDIR/Contents/PlugIns/Java.runtime); then
+    if ! (codesign --force --sign "$IDENTITY" --verbose "$APPDIR/Contents/PlugIns/Java.runtime"); then
         echo "**** Failed to resign the embedded JVM"
         return 1
     fi
 }
 
 # Switch to folder containing application.
-cd ../images/image-*/DemoBench.app
+cd ../images/image-*/Corda\ DemoBench.app
 
 INSTALL_HOME=Contents/PlugIns/Java.runtime/Contents/Home/jre/bin
 if (mkdir -p $INSTALL_HOME); then
@@ -27,7 +27,7 @@ fi
 cd ..
 
 # Sign the application using a 'Developer ID Application' key on our keychain.
-if ! (signApplication DemoBench.app "Developer ID Application: "); then
+if ! (signApplication "Corda DemoBench.app" "Developer ID Application: "); then
     echo "**** Failed to sign the application - ABORT SIGNING"
 fi
 

tools/demobench/package/windows/Corda DemoBench-post-image.wsf

@@ -10,7 +10,7 @@
 
         var oFSO = new ActiveXObject("Scripting.FileSystemObject");
         var oFolder = oFSO.getFolder(".");
-        var to = oFolder.path + "\\DemoBench\\runtime\\bin";
+        var to = oFolder.path + "\\Corda DemoBench\\runtime\\bin";
         if (!oFSO.FolderExists(to)) {
           oFSO.CreateFolder(to);
         }