Merge branch 'bug/JAL-2080_javaws_slow_291' into develop

diff --git a/build.xml b/build.xml
index 00fdf04..57cd9d2 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -421,13 +421,11 @@
         </information>
         <resources>
           <j2se version="${j2sev}" initial_heap_size="${inih}" max_heap_size="${maxh}" />
+          <jar main="true" href="jalview.jar"/>
           <fileset dir="${packageDir}">
-            <include name="jalview.jar" />
-          </fileset>
-          <fileset dir="${packageDir}">
+            <exclude name="jalview.jar" />
             <include name="*.jar" />
             <include name="*_*.jar" />
-            <exclude name="jalview.jar" />
             <exclude name="*jnilib.jar" />
           </fileset>
           <property name="jalview.version" value="${JALVIEW_VERSION}" />

diff --git a/lib/castor-1.1-cycle-xml.jar b/lib/castor-1.1-cycle-xml.jar
index 1cfc700..5070435 100644 (file)
Binary files a/lib/castor-1.1-cycle-xml.jar and b/lib/castor-1.1-cycle-xml.jar differ

diff --git a/lib/min-jabaws-client-2.1.0.jar b/lib/min-jabaws-client-2.1.0.jar
index 7ad030a..ea5a1f4 100644 (file)
Binary files a/lib/min-jabaws-client-2.1.0.jar and b/lib/min-jabaws-client-2.1.0.jar differ

diff --git a/lib/quaqua-filechooser-only-8.0.jar b/lib/quaqua-filechooser-only-8.0.jar
index 429fe77..182e0da 100644 (file)
Binary files a/lib/quaqua-filechooser-only-8.0.jar and b/lib/quaqua-filechooser-only-8.0.jar differ