From 48e338d288b3f746b361702c03e7b999a818a8df Mon Sep 17 00:00:00 2001
From: rishwanth1995 <rishwanthsenthilkumar@hotmail.com>
Date: Fri, 19 Jan 2018 16:34:32 +0000
Subject: [PATCH] changed names of the jar files in autopsy core build

---
 Core/build.xml                    | 6 ++++--
 Core/nbproject/project.properties | 2 +-
 Core/nbproject/project.xml        | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Core/build.xml b/Core/build.xml
index c22d725cce..e75c217d15 100644
--- a/Core/build.xml
+++ b/Core/build.xml
@@ -17,6 +17,8 @@
             <fileset dir="{basedir}/../../InternalPythonModules"/>
         </copy>
     </target>
+	
+	<property name="VERSION" value="4.6.0"/>
     
     <target name="get-thirdparty-dependencies" description="get third-party dependencies"> 
         <!--Copy openCV dependencies to release-->
@@ -52,8 +54,8 @@
     
     <target name="getTSKJars" depends="findTSK">
         <property environment="env"/>
-        <copy file="${env.TSK_HOME}/bindings/java/dist/Tsk_DataModel_PostgreSQL.jar" 
-              tofile="${ext.dir}/Tsk_DataModel_PostgreSQL.jar"/>
+        <copy file="${env.TSK_HOME}/bindings/java/dist/sleuthkit-postgresql-${VERSION}.jar" 
+              tofile="${ext.dir}/sleuthkit-postgresql-${VERSION}.jar"/>
         <copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.8.11.jar"
               tofile="${ext.dir}/sqlite-jdbc-3.8.11.jar"/>
         <copy file="${env.TSK_HOME}/bindings/java/lib/postgresql-9.4.1211.jre7.jar" 
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index d98228ef4e..ee7a175733 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -18,7 +18,7 @@ file.reference.sqlite-jdbc-3.8.11.jar=release/modules/ext/sqlite-jdbc-3.8.11.jar
 file.reference.StixLib.jar=release/modules/ext/StixLib.jar
 file.reference.tika-core-1.14.jar=release/modules/ext/tika-core-1.14.jar
 file.reference.tika-parsers-1.14.jar=release/modules/ext/tika-parsers-1.14.jar
-file.reference.Tsk_DataModel_PostgreSQL.jar=release/modules/ext/Tsk_DataModel_PostgreSQL.jar
+file.reference.sleuthkit-postgresql-4.6.0.jar=release/modules/ext/sleuthkit-postgresql-4.6.0.jar
 file.reference.xmpcore-5.1.2.jar=release/modules/ext/xmpcore-5.1.2.jar
 file.reference.curator-client-2.8.0.jar=release/modules/ext/curator-client-2.8.0.jar
 file.reference.curator-framework-2.8.0.jar=release/modules/ext/curator-framework-2.8.0.jar
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 1663abca2b..a05219b32e 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -286,6 +286,7 @@
                     </test-dependency>
                 </test-type>
             </test-dependencies>
+			
             <public-packages>
                 <package>net.sf.sevenzipjbinding</package>
                 <package>net.sf.sevenzipjbinding.impl</package>
@@ -333,8 +334,8 @@
                 <binary-origin>release/modules/ext/tika-core-1.14.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/Tsk_DataModel_PostgreSQL.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/Tsk_DataModel_PostgreSQL.jar</binary-origin>
+                <runtime-relative-path>ext/sleuthkit-postgresql-4.6.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sleuthkit-postgresql-4.6.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/opencv-248.jar</runtime-relative-path>