Commit Graph
6176 Commits
Author SHA1 Message Date
Samuel H. Kenyon 9b41503fb8 re-enabled swingworker cancel handling in the blackboard writing loop 2014-04-29 16:21:04 -04:00
Samuel H. Kenyon b448a6075c added logging to QueryResults 2014-04-29 15:48:11 -04:00
Samuel H. Kenyon f6634fbd3b writeAllHitsToBlackBoard() can now optionally make calls to writeInboxMessage() 2014-04-29 15:24:04 -04:00
Samuel H. Kenyon 1dd46a1ee8 extracted inbox code out of SearchRunner into QueryResults.writeInboxMessage() 2014-04-29 15:10:19 -04:00
Samuel H. Kenyon 68241c1244 move fireModuleDataEvent call into QueryResults 2014-04-29 14:56:54 -04:00
Samuel H. Kenyon 63e2713431 move writeAllHitsToBlackBoard() into QueryResults 2014-04-29 14:46:09 -04:00
Samuel H. Kenyon 55abbd5f04 extracted blackboard writing out of KeywordSearchResultFactory and into QueryRequest 2014-04-25 18:14:49 -04:00
Samuel H. Kenyon 3f676cd203 minor cleanup 2014-04-25 17:47:47 -04:00
Samuel H. Kenyon d2315fd653 Merge remote-tracking branch 'upstream/develop' into keyword-refactor 2014-04-25 16:14:22 -04:00
Richard Cordovano 45ac9090a5 Merge pull request #692 from rcordovano/remove_rjctodo_comments
Remove old RJCTODO comments
2014-04-25 12:53:22 -04:00
Richard Cordovano 71d5e7bf2a Merge pull request #691 from alexjacks92/JenkinsExitCodes
Exit codes for use with jenkins
2014-04-25 12:52:47 -04:00
Richard Cordovano 0384c498bc Merge pull request #690 from alexjacks92/develop
Diff ordering fix.
2014-04-25 12:51:51 -04:00
Richard Cordovano 52b67953c8 Remove old RJCTODO comments 2014-04-25 12:51:07 -04:00
alexjacks92 7451fd9fef Clean up attachments regardless of success or failure. 2014-04-25 11:17:18 -04:00
alexjacks92 1facc62c3e Diff ordering fix. 2014-04-25 11:14:15 -04:00
alexjacks92 480cb68855 Merge remote-tracking branch 'upstream/develop' into JenkinsExitCodes 2014-04-25 09:59:48 -04:00
Richard Cordovano 7c2ef3d686 Merge pull request #689 from rcordovano/ingest_mgr_synch_changes
Remove unused import in IngestManager
2014-04-25 09:59:23 -04:00
Richard Cordovano bc337f2ec1 Remove unused import in IngestManager 2014-04-25 09:55:56 -04:00
Samuel H. Kenyon 765ad9b16a removed deprecated String mapping from QueryResults and replaced with Keyword mapping 2014-04-24 17:32:43 -04:00
Richard Cordovano da151664c5 Merge pull request #688 from rcordovano/develop
Reduced method level synchronization in IngestManager
2014-04-24 16:51:20 -04:00
Richard Cordovano b264d5979a Merge pull request #2 from rcordovano/ingest_mgr_synch_changes
Reduce method level synchronization in IngestManager
2014-04-24 16:48:36 -04:00
Richard Cordovano f1cfe85dd3 Reduce method level synchronization in IngestManager 2014-04-24 14:40:52 -04:00
alexjacks92 f2476de2db Exiting regression test with exit code 1 on failed tests. 2014-04-24 13:23:16 -04:00
Samuel H. Kenyon 744e60961e Merge remote-tracking branch 'upstream/keywordsearch-refactor' into keyword-refactor 2014-04-24 11:55:40 -04:00
Richard Cordovano e223d25bb5 Merge pull request #687 from rcordovano/serialize_ingest_module_settings
Serialize ingest module settings
2014-04-24 10:39:09 -04:00
Richard Cordovano 04e2a16daf Remove obsolete TODO comment from IngestJobLauncher 2014-04-24 10:35:55 -04:00
Richard Cordovano 18a2e7b42f Fix comment spelling error in HashLookupModuleFactory 2014-04-24 10:32:51 -04:00
Richard Cordovano 5addef20b4 Remove obsolete HashDbManager always calc hashes code (is ingest job setting) 2014-04-24 10:27:29 -04:00
Richard Cordovano 97032953a3 Make hash lookup job settings panel use settings for always calc hashes 2014-04-24 10:14:20 -04:00
Richard Cordovano 56f5d0cf9f Merge remote-tracking branch 'upstream/develop' into serialize_ingest_module_settings 2014-04-24 09:26:13 -04:00
Richard Cordovano 71212a4813 Replace Java lib object stream with NetBeans object streams for ingest module settings serialization 2014-04-24 09:25:39 -04:00
Richard Cordovano 34e8f960e5 Merge pull request #686 from SynapticNulship/unfreeze
Improve ingestJobs concurrency
2014-04-24 09:24:08 -04:00
Brian Carrier 460d92e67f Fixed file type panel, which was too wide 2014-04-24 00:19:03 -04:00
Brian Carrier 2e826b8cff Added image extensions to each other 2014-04-24 00:18:15 -04:00
Brian Carrier 514a7f00a6 resolved conflicts 2014-04-23 20:55:44 -04:00
Samuel H. Kenyon 008e4ddbe9 remove unnecessary declare/assignment break 2014-04-23 17:26:45 -04:00
Samuel H. Kenyon f8ce131626 Merge remote-tracking branch 'upstream/develop' into unfreeze 2014-04-23 17:22:15 -04:00
Samuel H. Kenyon fbe7eaf364 converted ingestJobs into a ConcurrentHashMap 2014-04-23 17:21:17 -04:00
Samuel H. Kenyon dcfd2f276d ingestJobs now has its own lock (itself); ingestTasks still uses this for locking 2014-04-23 16:10:49 -04:00
Richard Cordovano 0da3ca9071 Merge pull request #685 from SynapticNulship/reportbug
Fix SQLITE_ERROR exceptions seen in the log when generating reports.
2014-04-23 15:34:57 -04:00
Samuel H. Kenyon d4afaefe92 added method comment 2014-04-23 15:17:49 -04:00
Samuel H. Kenyon 420eee58c6 Changed query for tags associated with this artifact to match the actual DB schema, and extracted that to a method 2014-04-23 15:13:40 -04:00
Richard Cordovano 8b9742ea91 Merge pull request #683 from SynapticNulship/mt-update
thread-safety updates for ingest module summary posting
2014-04-23 13:07:57 -04:00
Richard Cordovano d8e590be04 Merge pull request #684 from mrtizmo/keywordsearch-ja
Keywordsearch - additional Japanese translations
2014-04-23 13:01:47 -04:00
Richard Cordovano cfa4ad20d0 Merge pull request #682 from alexjacks92/dbClosing
Database connections will be closed before exiting methods.
2014-04-23 13:01:21 -04:00
Nick Davis cfcdccd6f8 Resolve merge conflict. 2014-04-23 12:51:37 -04:00
Samuel H. Kenyon 9bbfaecece prevent netbeans assigned value is never used warning (although it's innocuous in this case) 2014-04-23 11:59:59 -04:00
Samuel H. Kenyon b30c63ec36 Merge remote-tracking branch 'upstream/develop' into mt-update
Conflicts:
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
2014-04-23 11:55:34 -04:00
Samuel H. Kenyon d1861b77ba HashDbIngestModule: slight optimization for totals access (reduce number of lock acquisitions) 2014-04-23 11:50:40 -04:00
Samuel H. Kenyon f300ca7ef0 synchronize access to the totals map 2014-04-23 11:48:50 -04:00