move Bootstrapping Ivy into its own script. move pasco and rr to thirdparty and copy to release on build

CoreLibs/build.xml

@@ -5,19 +5,11 @@
 <project name="org.sleuthkit.autopsy.corelibs" default="netbeans" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
     <description>Builds, tests, and runs the project org.sleuthkit.autopsy.corelibs.</description>
     <import file="nbproject/build-impl.xml"/>
+    <import file="../BootstrapIvy.xml"/>
     
     <property name="thirdparty.dir" value="${basedir}/../thirdparty" />
     <property name="lib.dir" value="release/modules/lib" />
     
-    
-    <property name="ivy.install.version" value="2.3.0-rc2" />
-    <condition property="ivy.home" value="${env.IVY_HOME}">
-        <isset property="env.IVY_HOME" />
-    </condition>
-    <property name="ivy.home" value="${user.home}/.ant" />
-    <property name="ivy.jar.dir" value="${ivy.home}/lib" />
-    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
-    
     <condition property="os.family" value="unix">  
         <os family="unix"/>  
     </condition> 
@@ -29,25 +21,6 @@
     </condition>  
     <import file="build-${os.family}.xml"/> 
 
-    <target name="download-ivy" unless="offline">
-        <available file="${ivy.jar.file}" property="ivy.available"/>
-        <antcall target="-download-ivy" />
-    </target>
-    
-    <target name="-download-ivy" unless="ivy.available">
-        <mkdir dir="${ivy.jar.dir}"/>
-        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" 
-             dest="${ivy.jar.file}" usetimestamp="true"/>
-    </target>
-
-    <!-- init-ivy will bootstrap Ivy if the user doesn't have it already -->
-    <target name="init-ivy" depends="download-ivy" unless="ivy.lib.path">
-        <path id="ivy.lib.path">
-            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
-        </path>
-        <taskdef resource="org/apache/ivy/ant/antlib.xml"
-                 uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
-    </target>
         
     <target name="retrieve-deps" description="retrieve dependencies using ivy" depends="init-ivy,build-native-libs">
         <ivy:settings file="ivysettings.xml" />
@@ -55,7 +28,7 @@
         <ivy:retrieve sync="false" pattern="release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />    
     </target>
     
-    <target name="init" depends="basic-init,files-init,build-init,-javac-init,init-ivy,retrieve-deps">
+    <target name="init" depends="basic-init,files-init,build-init,-javac-init,retrieve-deps">
         <!-- overrode depends attribute -->
         
     </target>

RecentActivity/build.xml

@@ -5,40 +5,27 @@
 <project name="org.sleuthkit.autopsy.recentactivity" default="netbeans" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
     <description>Builds, tests, and runs the project org.sleuthkit.autopsy.recentactivity.</description>
     <import file="nbproject/build-impl.xml"/>
+    <import file="../BootstrapIvy.xml"/>
     
-    
-    <property name="ivy.install.version" value="2.3.0-rc2" />
-    <condition property="ivy.home" value="${env.IVY_HOME}">
-        <isset property="env.IVY_HOME" />
-    </condition>
-    <property name="ivy.home" value="${user.home}/.ant" />
-    <property name="ivy.jar.dir" value="${ivy.home}/lib" />
-    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
-
-    <target name="download-ivy" unless="offline">
-        <available file="${ivy.jar.file}" property="ivy.available"/>
-        <antcall target="-download-ivy" />
-    </target>
-    
-    <target name="-download-ivy" unless="ivy.available">
-        <mkdir dir="${ivy.jar.dir}"/>
-        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" 
-             dest="${ivy.jar.file}" usetimestamp="true"/>
-    </target>
-
-    <!-- init-ivy will bootstrap Ivy if the user doesn't have it already -->
-    <target name="init-ivy" depends="download-ivy" unless="ivy.lib.path">
-        <path id="ivy.lib.path">
-            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
-        </path>
-        <taskdef resource="org/apache/ivy/ant/antlib.xml"
-                 uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
-    </target>
     <property name="release.dir" value="${basedir}/release"/>
+    
+    <target name="get-thirdparty-tools" >
+        <copy todir="${basedir}/release/pasco2">
+            <fileset dir="${basedir}/../thirdparty/pasco2/lib/" />
+        </copy>
+        <copy todir="${basedir}/release/rr">
+            <fileset dir="${basedir}/../thirdparty/rr/" />
+        </copy>
+        <copy todir="${basedir}/release/rr-full" >
+            <fileset dir="${basedir}/../thirdparty/rr-full/" />
+        </copy>
+    </target>
+    
     <target name="init" depends="basic-init,files-init,build-init,-javac-init,init-ivy">
         <!-- fetch all the dependencies from Ivy and stick them in the right places -->
         <ivy:resolve/>
         <ivy:retrieve conf="recent-activity" sync="true" pattern="${release.dir}/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />
+        <antcall target="get-thirdparty-tools"/>
     </target>
     
     <target name="clean" depends="projectized-common.clean">

thirdparty/rr-full/plugins/all

@@ -1,6 +1,6 @@
-# 20120528 *ALL* Plugins that apply on any HIVES, alphabetical order
+# 20120528 *ALL* Plugins that apply on any HIVES, alphabetical order
-baseline
+baseline
-findexes
+findexes
-regtime
+regtime
-rlo
+rlo
 del