git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bb6cfc1)
JAL-1333 log4j/slf additional jars
authorj.procter@dundee.ac.uk <jprocter@jims-mbp-2.home>
Tue, 22 Jul 2014 19:32:14 +0000 (20:32 +0100)
committerj.procter@dundee.ac.uk <jprocter@jims-mbp-2.home>
Tue, 22 Jul 2014 19:32:14 +0000 (20:32 +0100)
utils/InstallAnywhere/Jalview.iap_xml patch | blob | history

diff --git a/utils/InstallAnywhere/Jalview.iap_xml b/utils/InstallAnywhere/Jalview.iap_xml
index c14336b..bca0b25 100755 (executable)
--- a/utils/InstallAnywhere/Jalview.iap_xml
+++ b/utils/InstallAnywhere/Jalview.iap_xml
@@ -1008,7 +1008,7 @@ and any path to a file to save to the file]]></string>
                                                                <string><![CDATA[664]]></string>
                                                        </property>
                                                        <property name="sourceName">
-                                                               <string><![CDATA[log4j-1.2.8.jar]]></string>
+                                                               <string><![CDATA[slf-api-1.7.7.jar]]></string>
                                                        </property>
                                                        <property name="overrideUnixPermissions">
                                                                <boolean>false</boolean>
@@ -1026,7 +1026,7 @@ and any path to a file to save to the file]]></string>
                                                                <boolean>true</boolean>
                                                        </property>
                                                        <property name="destinationName">
-                                                               <string><![CDATA[log4j-1.2.8.jar]]></string>
+                                                               <string><![CDATA[slf-api-1.7.7.jar]]></string>
                                                        </property>
                                                        <property name="fileSize">
                                                                <long>348699</long>
@@ -1042,6 +1042,110 @@ 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="244ffffaa672">
+              <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[log4j-to-slf4j-2.0-rc2.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[log4j-to-slf4j-2.0-rc2.jar]]></string>
+              </property>
+              <property name="fileSize">
+                <long>348699</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>
+          <method name="addElement">
+            <object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="244f00faa672">
+              <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[slf4j-log4j12-1.7.7.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[slf4j-log4j12-1.7.7.jar]]></string>
+              </property>
+              <property name="fileSize">
+                <long>348699</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>
                                        <method name="addElement">
                                                <object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="88d4aff3b0c6">
                                                        <property name="belongsToUninstallPhase">
@@ -6029,6 +6133,8 @@ and any path to a file to read from that file]]></string>
                                                                                <object refID="24485f8aa671"/>
                                                                                <object refID="24485f89a672"/>
                                                                                <object refID="24485f8aa672"/>
+                    <object refID="244ffffaa672"/>
+                    <object refID="244f00faa672"/>
                                                                                <object refID="24485f8ba672"/>
                                                                                <object refID="24485f8aa673"/>
                                                                                <object refID="24485f8ba673"/>
@@ -6763,6 +6869,8 @@ and any path to a file to read from that file]]></string>
                                                                                                <object refID="24485f8aa671"/>
                                                                                                <object refID="24485f89a672"/>
                                                                                                <object refID="24485f8aa672"/>
+                        <object refID="244ffffaa672"/>
+                        <object refID="244f00faa672"/>
                                                                                                <object refID="24485f8ba672"/>
                                                                                                <object refID="24485f8aa673"/>
                                                                                                <object refID="24485f8ba673"/>