Switch to Oracle appbundler for Mac build

build.xml

@@ -217,14 +217,35 @@
     </target>
     
     <target name="mac" depends="jar, prepare_webapp">
+        <mkdir dir="${mac.dir}"/>
+        
+	<taskdef name="bundleapp"
+             classname="com.oracle.appbundler.AppBundlerTask"   
+             classpath="lib/appbundler-1.0.jar" />
+
+        <bundleapp outputdirectory="${mac.dir}"
+            name="OpenRefine"
+            displayname="OpenRefine ${version}"
+            identifier="org.openrefine.refine.Refine"
+	    shortversion="${version}"
+            mainclassname="com.google.refine.Refine">
+            <classpath>
+		<include name="${build.dir}/${fullname}-server.jar" />
+                <exclude name="${server.lib.dir}/**/.svn" />
+                <include name="${server.lib.dir}/**/*.jar" />
+            </classpath>
+            <librarypath dir="${built.webapp.dir}/..">
+                <include name="${built.webapp.name}/**" />
+            </librarypath>
+        </bundleapp>
+
+<!--- Old jarbundler code
         <taskdef 
             name="jarbundler" 
             classname="net.sourceforge.jarbundler.JarBundler" 
             classpath="${jarbundler.dir}/jarbundler-2.2.0.jar" 
         />
         
-        <mkdir dir="${mac.dir}"/>
-        
         <jarbundler 
                 dir="${mac.dir}"
                 name="OpenRefine"
@@ -251,6 +272,7 @@
                 <include name="${built.webapp.name}/**" />
             </resourcefileset>
         </jarbundler>
+-->
     </target>
     
     <target name="windows" depends="jar, prepare_webapp">

refine

@@ -376,8 +376,11 @@ jarbundler_prepare() {
     tools_prepare
     
     JARBUNDLER_URL="http://www.informagen.com/JarBundler/dist/jarbundler.tar.gz"
-    JARBUNDLER_FILE=`echo $JARBUNDLER_URL | sed 's|.*/||'`
     JARBUNDLER_DIR="jarbundler-2.2.0"
+    JARBUNDLER_URL="http://java.net/projects/appbundler/downloads/download/appbundler-1.0.jar"
+    JARBUNDLER_DIR="jarbundler-1.0"
+    JARBUNDLER_FILE=`echo $JARBUNDLER_URL | sed 's|.*/||'`
+
 
     tool_download $JARBUNDLER_URL $JARBUNDLER_FILE $JARBUNDLER_DIR
 }