From: Jim Procter <jprocter@dundee.ac.uk>
Date: Tue, 2 Dec 2014 10:22:40 +0000 (+0000)
Subject: Merge branch 'JAL-1602_282_release' into Release_2_8_2_Branch
X-Git-Tag: Release_2_8_2~1^2~8
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=714a38b8552b9fafa9ef35fb9dd6b949b6871162;hp=358130e02a7172ab6df3d6260c13e493fe568d17;p=jalview.git

Merge branch 'JAL-1602_282_release' into Release_2_8_2_Branch
---

diff --git a/utils/InstallAnywhere/Jalview.iap_xml b/utils/InstallAnywhere/Jalview.iap_xml
index 3c40879..95ccfe5 100755
--- a/utils/InstallAnywhere/Jalview.iap_xml
+++ b/utils/InstallAnywhere/Jalview.iap_xml
@@ -2082,6 +2082,58 @@ and any path to a file to save to the file]]></string>
 							</property>
 						</object>
 					</method>
+					<method name="addElement">
+						<object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="1f46efeefab93">
+							<property name="belongsToUninstallPhase">
+								<boolean>false</boolean>
+							</property>
+							<property name="rollbackEnabledCancel">
+								<boolean>true</boolean>
+							</property>
+							<property name="rollbackEnabledError">
+								<boolean>true</boolean>
+							</property>
+							<property name="ruleExpression">
+								<string><![CDATA[]]></string>
+							</property>
+							<property name="unixPermissions">
+								<string><![CDATA[664]]></string>
+							</property>
+							<property name="sourceName">
+								<string><![CDATA[json-simple-1.1.jar]]></string>
+							</property>
+							<property name="overrideUnixPermissions">
+								<boolean>false</boolean>
+							</property>
+							<property name="sourcePath">
+								<string><![CDATA[/home/cruisecontrol/jalview/lib/]]></string>
+							</property>
+							<property name="shouldUninstall">
+								<boolean>true</boolean>
+							</property>
+							<property name="rollbackEnabledCancel">
+								<boolean>true</boolean>
+							</property>
+							<property name="rollbackEnabledError">
+								<boolean>true</boolean>
+							</property>
+							<property name="destinationName">
+								<string><![CDATA[json-simple-1.1.jar]]></string>
+							</property>
+							<property name="fileSize">
+								<long>382442</long>
+							</property>
+							<property name="macBinary">
+								<boolean>false</boolean>
+							</property>
+							<property name="targetCheckKind">
+								<int>0</int>
+							</property>
+							<property name="ruleExpression">
+								<string><![CDATA[]]></string>
+							</property>
+						</object>
+					</method>
 				</object>
 			</property>
 			<property name="rulesFailedMessage">
@@ -6451,6 +6503,9 @@ and any path to a file to read from that file]]></string>
 										<object refID="f44ca391ab9f"/>
 										<object refID="f44ca392ab9f"/>
 										<object refID="f44ca393ab9f"/>
+										<object refID="f46c2f42ab93"/>
+										<object refID="1f46cffffab93"/>
+										<object refID="1f46efeefab93"/>
 										<object class="com.zerog.ia.installer.actions.InstallFile" objectID="f44fc5b2aba1">
 											<property name="belongsToUninstallPhase">
 												<boolean>false</boolean>
@@ -6952,7 +7007,6 @@ and any path to a file to read from that file]]></string>
 												<int>0</int>
 											</property>
 										</object>
-										<object refID="f46c2f42ab93"/>
 										<object class="com.zerog.ia.installer.actions.InstallDirectory" objectID="24485f85a670">
 											<property name="belongsToUninstallPhase">
 												<boolean>false</boolean>
@@ -7027,6 +7081,7 @@ and any path to a file to read from that file]]></string>
 												<object refID="f44ca393ab9f"/>
 												<object refID="f46c2f42ab93"/>
 												<object refID="1f46cffffab93"/>
+												<object refID="1f46efeefab93"/>
 											</visualChildren>
 										</object>
 										<object class="com.zerog.ia.installer.actions.InstallDirectory" objectID="f44fc5d5aba1">