tidying classpath and fixing InstallAnywhere build

diff --git a/.classpath b/.classpath
index fe89cba..1838768 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -14,16 +14,13 @@
        <classpathentry kind="lib" path="lib/wsdl4j.jar"/>
        <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
        <classpathentry kind="lib" path="lib/xml-apis.jar"/>
-
        <classpathentry kind="lib" path="lib/castor-1.1-cycle-xml.jar" sourcepath="C:/Documents and Settings/JimP/workspace-3.3/castor/src/main/java"/>
        <classpathentry kind="lib" path="lib/JGoogleAnalytics_0.3.jar" sourcepath="/JGoogleAnalytics/src/main/java"/>
        <classpathentry kind="lib" path="lib/vamsas-client.jar"/>
-       <classpathentry kind="lib" path="lib/min-jaba-client.jar" sourcepath="/clustengine/datamodel"/>
        <classpathentry kind="lib" path="lib/Jmol-12.1.13.jar" sourcepath="/Jmol"/>
        <classpathentry kind="lib" path="appletlib/JmolApplet-12.1.13.jar"/>
        <classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
        <classpathentry kind="lib" path="lib/apache-mime4j-0.6.jar" sourcepath="G:/InstallsDir/Sources for Development/apache-mime4j-0.6-src.zip"/>
-       <classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
        <classpathentry kind="lib" path="lib/httpclient-4.0.3.jar">
                <attributes>
                        <attribute name="javadoc_location" value="file:/D:/InstallsDir/Sources for Development/httpconnect/httpcomponents-client-4.0.3/javadoc/"/>
@@ -40,7 +37,10 @@
                </attributes>
        </classpathentry>
        <classpathentry kind="lib" path="lib/miglayout-4.0-swing.jar"/>
+       <classpathentry kind="lib" path="lib/jswingreader-0.3.jar" sourcepath="/jswingreader"/>
+       <classpathentry kind="lib" path="lib/min-jaba-client.jar"/>
+       <classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin.jar"/>
-       <classpathentry exported="true" kind="var" path="GROOVY_ECLIPSE_HOME/groovy-all-1.0.jar"/>
+<!--   <classpathentry exported="true" kind="var" path="GROOVY_ECLIPSE_HOME/groovy-all-1.0.jar"/> -->
        <classpathentry kind="output" path="classes"/>
 </classpath>

diff --git a/lib/commons-logging.jar b/lib/commons-logging.jar
deleted file mode 100755 (executable)
index b99c937..0000000
Binary files a/lib/commons-logging.jar and /dev/null differ

diff --git a/utils/InstallAnywhere/Jalview.iap_xml b/utils/InstallAnywhere/Jalview.iap_xml
index 301814c..b36ebf6 100755 (executable)
--- a/utils/InstallAnywhere/Jalview.iap_xml
+++ b/utils/InstallAnywhere/Jalview.iap_xml
@@ -1410,6 +1410,52 @@ and any path to a file to save to the file]]></string>
                                                </object>
                                        </method>
                                        <method name="addElement">
+                                               <object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="aa3a5220b6bc1">
+                                                       <property name="belongsToUninstallPhase">
+                                                               <boolean>false</boolean>
+                                                       </property>
+                                                       <property name="rollbackEnabledCancel">
+                                                               <boolean>true</boolean>
+                                                       </property>
+                                                       <property name="rollbackEnabledError">
+                                                               <boolean>true</boolean>
+                                                       </property>
+                                                       <property name="unixPermissions">
+                                                               <string><![CDATA[664]]></string>
+                                                       </property>
+                                                       <property name="sourceName">
+                                                               <string><![CDATA[commons-codec-1.3.jar]]></string>
+                                                       </property>
+                                                       <property name="overrideUnixPermissions">
+                                                               <boolean>false</boolean>
+                                                       </property>
+                                                       <property name="sourcePath">
+                                                               <string><![CDATA[/homes/ws-dev1/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[commons-codec-1.3.jar]]></string>
+                                                       </property>
+                                                       <property name="fileSize">
+                                                               <long>88615</long>
+                                                       </property>
+                                                       <property name="macBinary">
+                                                               <boolean>false</boolean>
+                                                       </property>
+                                                       <property name="targetCheckKind">
+                                                               <int>0</int>
+                                                       </property>
+                                               </object>
+                                       </method>
+                                       <method name="addElement">
                                                <object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="aa3a5220b6bc">
                                                        <property name="belongsToUninstallPhase">
                                                                <boolean>false</boolean>
@@ -4111,6 +4157,7 @@ and any path to a file to read from that file]]></string>
                                                                                <object refID="8fbb17529b9d"/>
                                                                                <object refID="aa3a521fb6bc"/>
                                                                                <object refID="aa3a5220b6bc"/>
+                                                                               <object refID="aa3a5220b6bc1"/>
                                                                                <object class="com.zerog.ia.installer.actions.InstallDirectory" objectID="24485f85a670">
                                                                                        <property name="belongsToUninstallPhase">
                                                                                                <boolean>false</boolean>
@@ -4171,6 +4218,9 @@ and any path to a file to read from that file]]></string>
                                                                                                <object refID="8fbb17529b9c"/>
                                                                                                <object refID="8fbb17539b9c"/>
                                                                                                <object refID="8fbb17529b9d"/>
+                                                                                               <object refID="aa3a521fb6bc"/>
+                                                                                               <object refID="aa3a5220b6bc"/>
+                                                                                               <object refID="aa3a5220b6bc1"/>
                                                                                        </visualChildren>
                                                                                </object>
                                                                        </installChildren>