Added fix so libraries are copied and loaded correctly on unix platforms.

bindings/java/build-unix.xml

@@ -43,6 +43,7 @@
 		<property name="jni.dylib" location="${basedir}/jni/.libs/libtsk_jni.dylib" />
 		<property name="jni.jnilib" value="libtsk_jni.jnilib" />
         <copy file="${jni.dylib}" tofile="${x86_64}/mac/${jni.jnilib}"/>
+		<copy file="${jni.dylib}" tofile="${amd64}/mac/${jni.jnilib}"/>
     </target>
 
     <!-- Non-OS X -->
@@ -52,7 +53,13 @@
     </target>
 	
 	<target name="copyUnixLibs" depends="testTSKLibs" if="tsk_so.present">
-		<!-- does nothing for now -->
+		<property environment="env"/>
+		<property name="jni.so" location="${basedir}/jni/.libs/libtsk_jni.so" />
+		<copy file="${jni.so}" tofile="${x86_64}/unix/libtsk_jni.so"/>
+		<copy file="${jni.so}" tofile="${amd64}/unix/libtsk_jni.so"/>
+		<copy file="${jni.so}" tofile="${x86}/unix/libtsk_jni.so"/>
+		<copy file="${jni.so}" tofile="${i386}/unix/libtsk_jni.so"/>
+		<copy file="${jni.so}" tofile="${i586}/unix/libtsk_jni.so"/>
 	</target>
 
 	<target name="copyLibs" depends="copyUnixLibs,copyMacLibs" />

bindings/java/build.xml

@@ -46,15 +46,21 @@
 		<mkdir dir="${native-libs}" />
 		<mkdir dir="${amd64}" />
 		<mkdir dir="${amd64}/win" />
+		<mkdir dir="${amd64}/mac" />
+		<mkdir dir="${amd64}/unix" />
 	    <mkdir dir="${x86}" />
 		<mkdir dir="${x86}/win" />
+		<mkdir dir="${x86}/unix" />
 		<mkdir dir="${x86_64}" />
 		<mkdir dir="${x86_64}/win" />
 		<mkdir dir="${x86_64}/mac" />
+		<mkdir dir="${x86_64}/unix"/>
 		<mkdir dir="${i386}" />
 		<mkdir dir="${i386}/win" />
+		<mkdir dir="${i386}/unix"/>
 		<mkdir dir="${i586}" />
 		<mkdir dir="${i586}/win" />
+		<mkdir dir="${i586}/unix" />
 	</target>
   
 	<property name="ivy.install.version" value="2.3.0-rc2" />

bindings/java/src/org/sleuthkit/datamodel/LibraryUtils.java

@@ -106,9 +106,6 @@ public static void loadLibrary(Lib library) {
 		path.append(getPlatform());
 		
 		String libName = library.getLibName();
-		if(library == Lib.TSK_JNI && (isWindows() || isMac())) {
-			libName = "lib" + libName;
-		}
 		
 		path.append("/");
 		path.append(libName);