diff --git a/.gitignore b/.gitignore
index 4891f63d71e86ea23dd40f84eb83d342d5455e91..61ae2c2de857a166748c3d962905c256f7dcbd2a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
/bindings/java/nbproject/nbjdk.properties
/bindings/java/nbproject/jdk.xml
/bindings/java/nbproject/nbjdk.xml
+/bindings/java/libts*
# Windows build folders
/win32/Debug_NoLibs/
diff --git a/bindings/java/build-unix.xml b/bindings/java/build-unix.xml
index 45a15b8c39133504ce792c33acd1a60a7caf484a..d9f4abbb1653dedf9600cb73bfab1c6b43ae5335 100644
--- a/bindings/java/build-unix.xml
+++ b/bindings/java/build-unix.xml
@@ -21,8 +21,18 @@
<sysproperty key="types" value="${test-types}"/>
</java>
</target>
- <target name="depender">
- <available file="/usr/local/lib/libtsk_jni.a" property="pres"/>
+ <target name="depender"
+ depends="depender1"
+ unless="present">
+ <copy file="./jni/.libs/libtsk_jni.la" tofile="./libtsk_jni.la"/>
+ <copy file="./jni/.libs/libtsk_jni.0.0.0.dylib" tofile="./libtsk_jni.0.0.0.dylib"/>
+ <copy file="./jni/.libs/libtsk_jni.0.dylib" tofile="./libtsk_jni.0.dylib"/>
+ <copy file="./jni/.libs/libtsk_jni.a" tofile="./libtsk_jni.a"/>
+ <copy file="./jni/.libs/libtsk_jni.dylib" tofile="./libtsk_jni.dylib"/>
+ </target>
+ <target name="depender1">
+ <available file="./jni/.libs/libtsk_jni.a" property="pres"/>
<fail unless="pres" message="Run make install on The Sleuthkit."/>
+ <available file="./libtsk_jni.dylib" property="present"/>
</target>
</project>
\ No newline at end of file
diff --git a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal.txt b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal.txt
index 7b3b54a98d43a76391080ad73d873a2254778618..e4e5a4b6997add265f6998a9d184c96c112265b5 100644
--- a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal.txt
+++ b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\nps-2009-canon2-gen5.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_nps-2009-canon2-gen5.raw getParent 1] VolumeSystem [ blockSize 512 imgOffset 0 type 1]
AbstractContent [ objId 0000000003 name vol1 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol1 getParent 2] Volume [ addr 1 desc Unallocated flags 2 length 51 start 0]
AbstractContent [ objId 0000000004 name vol2 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol2 getParent 2] Volume [ addr 2 desc DOS FAT16 (0x04) flags 1 length 60749 start 51]
diff --git a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal_Sorted.txt b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal_Sorted.txt
index 7b3b54a98d43a76391080ad73d873a2254778618..e4e5a4b6997add265f6998a9d184c96c112265b5 100644
--- a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal_Sorted.txt
+++ b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal_Sorted.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\nps-2009-canon2-gen5.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_nps-2009-canon2-gen5.raw getParent 1] VolumeSystem [ blockSize 512 imgOffset 0 type 1]
AbstractContent [ objId 0000000003 name vol1 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol1 getParent 2] Volume [ addr 1 desc Unallocated flags 2 length 51 start 0]
AbstractContent [ objId 0000000004 name vol2 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol2 getParent 2] Volume [ addr 2 desc DOS FAT16 (0x04) flags 1 length 60749 start 51]
diff --git a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal.txt b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal.txt
index 910598df82f0bc300847629dd450ff3f5cde11c8..ad13600c5d7865413a775c0065c9bc4a7d954e66 100644
--- a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal.txt
+++ b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\nps-2009-canon2-gen5.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_nps-2009-canon2-gen5.raw getParent 1] VolumeSystem [ blockSize 512 imgOffset 0 type 1]
AbstractContent [ objId 0000000003 name vol1 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol1 getParent 2] Volume [ addr 1 desc Unallocated flags 2 length 51 start 0]
AbstractContent [ objId 0000000069 name Unalloc_3_0_26112 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol1/Unalloc_3_0_26112 getParent 3] AbstractFile [ type UNALLOC_BLOCKS isDir false isFile true isRoot false isVirtual true] LayoutFile [ ]
diff --git a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal_Sorted.txt b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal_Sorted.txt
index 7b3b54a98d43a76391080ad73d873a2254778618..e4e5a4b6997add265f6998a9d184c96c112265b5 100644
--- a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal_Sorted.txt
+++ b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal_Sorted.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\nps-2009-canon2-gen5.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_nps-2009-canon2-gen5.raw getParent 1] VolumeSystem [ blockSize 512 imgOffset 0 type 1]
AbstractContent [ objId 0000000003 name vol1 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol1 getParent 2] Volume [ addr 1 desc Unallocated flags 2 length 51 start 0]
AbstractContent [ objId 0000000004 name vol2 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol2 getParent 2] Volume [ addr 2 desc DOS FAT16 (0x04) flags 1 length 60749 start 51]
diff --git a/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal.txt b/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal.txt
index 133674d62f612b04ce6e859ca1f3488f1fe66ba5..81c8b510aa5de5f714351f78f53c6d930acbca99 100644
--- a/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal.txt
+++ b/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\ntfs1-gen2.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_ntfs1-gen2.raw getParent 1] FileSystem [ blockCount 1008895 blockSize 512 firstInum 0 fsType TSK_FS_TYPE_NTFS imgOffset 0 lastInum 96 rootInum 5 ]
AbstractContent [ objId 0000000003 name getUniquePath /img_ntfs1-gen2.raw/ getParent 2] AbstractFile [ type FS isDir true isFile false isRoot true isVirtual false] FsContent [ crtime 1230763442 mtime 1231191948 atime 1231271053 attrId 6 dirFlag Allocated dirType DIR fsObjId 2 gid 0 metaAddr 5 metaFlags [Allocated, Used] metaType d modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 56 uid 48 uniquePath /img_ntfs1-gen2.raw/] Directory [ ]
AbstractContent [ objId 0000000004 name $AttrDef getUniquePath /img_ntfs1-gen2.raw/$AttrDef getParent 3] AbstractFile [ type FS isDir false isFile true isRoot false isVirtual false] FsContent [ crtime 1230763442 mtime 1230763442 atime 1230763442 attrId 4 dirFlag Allocated dirType REG fsObjId 2 gid 0 metaAddr 4 metaFlags [Allocated, Used] metaType r modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 2560 uid 48 uniquePath /img_ntfs1-gen2.raw/$AttrDef] File [ ] md5=d9d282989870954e69117c3fa4888929
diff --git a/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal_Sorted.txt b/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal_Sorted.txt
index 133674d62f612b04ce6e859ca1f3488f1fe66ba5..81c8b510aa5de5f714351f78f53c6d930acbca99 100644
--- a/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal_Sorted.txt
+++ b/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal_Sorted.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\ntfs1-gen2.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_ntfs1-gen2.raw getParent 1] FileSystem [ blockCount 1008895 blockSize 512 firstInum 0 fsType TSK_FS_TYPE_NTFS imgOffset 0 lastInum 96 rootInum 5 ]
AbstractContent [ objId 0000000003 name getUniquePath /img_ntfs1-gen2.raw/ getParent 2] AbstractFile [ type FS isDir true isFile false isRoot true isVirtual false] FsContent [ crtime 1230763442 mtime 1231191948 atime 1231271053 attrId 6 dirFlag Allocated dirType DIR fsObjId 2 gid 0 metaAddr 5 metaFlags [Allocated, Used] metaType d modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 56 uid 48 uniquePath /img_ntfs1-gen2.raw/] Directory [ ]
AbstractContent [ objId 0000000004 name $AttrDef getUniquePath /img_ntfs1-gen2.raw/$AttrDef getParent 3] AbstractFile [ type FS isDir false isFile true isRoot false isVirtual false] FsContent [ crtime 1230763442 mtime 1230763442 atime 1230763442 attrId 4 dirFlag Allocated dirType REG fsObjId 2 gid 0 metaAddr 4 metaFlags [Allocated, Used] metaType r modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 2560 uid 48 uniquePath /img_ntfs1-gen2.raw/$AttrDef] File [ ] md5=d9d282989870954e69117c3fa4888929
diff --git a/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal.txt b/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal.txt
index 2b2e6b390bd76db3f8638de8fd1f3c2b863d3f4f..519c0b7d53662ab506b28896aef2cefb47d1b586 100644
--- a/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal.txt
+++ b/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\ntfs1-gen2.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_ntfs1-gen2.raw getParent 1] FileSystem [ blockCount 1008895 blockSize 512 firstInum 0 fsType TSK_FS_TYPE_NTFS imgOffset 0 lastInum 96 rootInum 5 ]
AbstractContent [ objId 0000000003 name getUniquePath /img_ntfs1-gen2.raw/ getParent 2] AbstractFile [ type FS isDir true isFile false isRoot true isVirtual false] FsContent [ crtime 1230763442 mtime 1231191948 atime 1231271053 attrId 6 dirFlag Allocated dirType DIR fsObjId 2 gid 0 metaAddr 5 metaFlags [Allocated, Used] metaType d modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 56 uid 48 uniquePath /img_ntfs1-gen2.raw/] Directory [ ]
AbstractContent [ objId 0000000004 name $AttrDef getUniquePath /img_ntfs1-gen2.raw/$AttrDef getParent 3] AbstractFile [ type FS isDir false isFile true isRoot false isVirtual false] FsContent [ crtime 1230763442 mtime 1230763442 atime 1230763442 attrId 4 dirFlag Allocated dirType REG fsObjId 2 gid 0 metaAddr 4 metaFlags [Allocated, Used] metaType r modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 2560 uid 48 uniquePath /img_ntfs1-gen2.raw/$AttrDef] File [ ] md5=d9d282989870954e69117c3fa4888929
diff --git a/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal_Sorted.txt b/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal_Sorted.txt
index 133674d62f612b04ce6e859ca1f3488f1fe66ba5..81c8b510aa5de5f714351f78f53c6d930acbca99 100644
--- a/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal_Sorted.txt
+++ b/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal_Sorted.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\ntfs1-gen2.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_ntfs1-gen2.raw getParent 1] FileSystem [ blockCount 1008895 blockSize 512 firstInum 0 fsType TSK_FS_TYPE_NTFS imgOffset 0 lastInum 96 rootInum 5 ]
AbstractContent [ objId 0000000003 name getUniquePath /img_ntfs1-gen2.raw/ getParent 2] AbstractFile [ type FS isDir true isFile false isRoot true isVirtual false] FsContent [ crtime 1230763442 mtime 1231191948 atime 1231271053 attrId 6 dirFlag Allocated dirType DIR fsObjId 2 gid 0 metaAddr 5 metaFlags [Allocated, Used] metaType d modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 56 uid 48 uniquePath /img_ntfs1-gen2.raw/] Directory [ ]
AbstractContent [ objId 0000000004 name $AttrDef getUniquePath /img_ntfs1-gen2.raw/$AttrDef getParent 3] AbstractFile [ type FS isDir false isFile true isRoot false isVirtual false] FsContent [ crtime 1230763442 mtime 1230763442 atime 1230763442 attrId 4 dirFlag Allocated dirType REG fsObjId 2 gid 0 metaAddr 4 metaFlags [Allocated, Used] metaType r modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 2560 uid 48 uniquePath /img_ntfs1-gen2.raw/$AttrDef] File [ ] md5=d9d282989870954e69117c3fa4888929
diff --git a/bindings/java/test/org/sleuthkit/datamodel/SequentialTraversal.java b/bindings/java/test/org/sleuthkit/datamodel/SequentialTraversal.java
index dd2b60756580f11a337ffc40607c6852be1124cc..0827f18530daed2360e27c4f65cfc95f7956d2c4 100644
--- a/bindings/java/test/org/sleuthkit/datamodel/SequentialTraversal.java
+++ b/bindings/java/test/org/sleuthkit/datamodel/SequentialTraversal.java
@@ -94,7 +94,7 @@ public FileWriter traverse(SleuthkitCase sk, String path) {
Content c;
try {
while ((c = sk.getContentById(x)) != null) {
- reslt.append(((AbstractContent) c).toString(false));
+ reslt.append(((AbstractContent) c).toString(false).replaceAll("paths \\[([A-z]:)?.+?\\]", ""));
if (c instanceof File) {
DataModelTestSuite.readContent(c, reslt, exFile);
}
diff --git a/bindings/java/test/org/sleuthkit/datamodel/TopDownTraversal.java b/bindings/java/test/org/sleuthkit/datamodel/TopDownTraversal.java
index cbdcc35c8c061e6343d19864eada0b26529bdfc0..ff43ba3aef02ccb99fd0b32446213508f4fd0602 100644
--- a/bindings/java/test/org/sleuthkit/datamodel/TopDownTraversal.java
+++ b/bindings/java/test/org/sleuthkit/datamodel/TopDownTraversal.java
@@ -119,7 +119,7 @@ public FileWriter traverse(SleuthkitCase sk, String path) {
private void topDownDF(List<Content> lc, List<Long> lp, Appendable reslt, Appendable levs) {
for (Content c : lc) {
try {
- reslt.append(((AbstractContent) c).toString(false));
+ reslt.append(((AbstractContent) c).toString(false).replaceAll("paths \\[([A-z]:)?.+?\\]", ""));
} catch (IOException ex) {
logg.log(Level.SEVERE, "Failed to Traverse", ex);
}