Commit Graph
1100 Commits
Author SHA1 Message Date
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 30bb4ee6ae Merge remote-tracking branch 'upstream/develop' into mt-update
Conflicts:
	Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchIngestModule.java
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
2014-04-22 15:48:51 -04:00
Samuel H. Kenyon 2de09e1914 A few more thread-safety adjustments for summary posting 2014-04-22 15:45:09 -04:00
Nick Davis 7f87653414 KeywordSearch - Added NON-NLS tags to hardcoded strings not needing National Language Support. 2014-04-22 15:08:33 -04:00
Samuel H. Kenyon 6473ffb5b3 Fixed spelling mistake. 2014-04-22 14:13:20 -04:00
Samuel H. Kenyon 87de6bc968 KeywordSearchIngestModule: Added a null check to putIngestStatus() and removed the now-unnecessary init method for that 2014-04-22 12:01:40 -04:00
Richard Cordovano 08ebc3a5ae Catch exception in org.sleuthkit.autopsy.keywordsearch.Server.isRunning() 2014-04-22 10:40:02 -04:00
Samuel H. Kenyon 6f69bc461c Merge remote-tracking branch 'upstream/develop' into mt-update 2014-04-21 15:34:55 -04:00
Richard Cordovano 93108579b6 Merge pull request #637 from SynapticNulship/mt-3rdparty
thread-safety tweaks
2014-04-21 13:42:45 -04:00
Richard Cordovano ce3a18a5f7 Restored default disabling of some of the standard keyword lists 2014-04-21 13:23:08 -04:00
Samuel H. Kenyon ac4aae4ea5 Added some missing access specifiers in KeywordSearch. 2014-04-21 12:07:14 -04:00
Samuel H. Kenyon cf22aa75b8 Removed some unused imports. 2014-04-21 11:37:15 -04:00
Samuel H. Kenyon 376f82d3a7 clean up ingestStatus only if this is the last module for that job 2014-04-18 17:31:49 -04:00
Samuel H. Kenyon 2c7eeba6d5 cleanup() now only removes the ingest status for the current job. call cleanup() from shutDown(). 2014-04-18 16:30:15 -04:00
Samuel H. Kenyon f8e922928b init ingest status 2014-04-18 16:04:19 -04:00
Samuel H. Kenyon f6524b1c4a updated KeywordSearchIngestModule to keep track of ingest status per job, not all jobs combined together 2014-04-18 15:13:17 -04:00
Richard Cordovano 6b14e4a8a6 Merge pull request #616 from mrtizmo/ingest
Core - Ingest module - pulled static strings and removed unused strings.
2014-04-17 15:35:38 -04:00
Nick Davis 679c394a21 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into keywordSearch 2014-04-16 17:38:58 -04:00
Kay Bassi 86ca1bde3f Translation completed 2014-04-16 17:27:35 -04:00
Nick Davis 9860d5787b Pulled static strings.
Corrected Bundle references with missing Bundle entries.
2014-04-15 16:20:51 -04:00
Samuel H. Kenyon 49f24c0020 fixed some more non-thread-safe declarations in KeywordSearch module 2014-04-15 14:32:24 -04:00
Samuel H. Kenyon 4ce2cf5fe7 updated AbstractFile text extractor classes to be thread safe 2014-04-15 14:02:36 -04:00
Nick Davis 570b21c997 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into ingest 2014-04-15 11:35:45 -04:00
Samuel H. Kenyon 75ae517556 Merge remote-tracking branch 'upstream/develop' into ingester 2014-04-14 17:13:28 -04:00
Nick Davis 80f73fd6d7 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into keywordSearch 2014-04-14 16:47:57 -04:00
Kay Bassi e0cf1fd149 Translation completed 2014-04-14 12:55:24 -04:00
Kay Bassi 2994184513 One clarification to make 2014-04-14 12:30:15 -04:00
Samuel H. Kenyon 77cca50838 renamed ModuleReferenceCounter to IngestModuleReferenceCounter as requested, the class now removes entries once they decrement to zero, and removed static creation methods from sample classes 2014-04-11 14:55:30 -04:00
Nick Davis 6088b62b75 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into keywordSearch 2014-04-11 14:47:21 -04:00
Samuel H. Kenyon b5f3d65118 adjusted modules to use new class ModuleReferenceCounter 2014-04-11 13:20:02 -04:00
Samuel H. Kenyon d262d707b0 Merge remote-tracking branch 'upstream/develop' into ingester 2014-04-11 11:33:06 -04:00
Richard Cordovano 723828c98c Update sample modules to use ref counting form IngestModuleAdapter 2014-04-10 18:24:03 -04:00
Samuel H. Kenyon cb3055015f log message changes 2014-04-10 17:03:41 -04:00
Samuel H. Kenyon c11d571c3f removed lock around call to ingester.commit() 2014-04-10 13:56:49 -04:00
Nick Davis bb7a99ce2d Pulled static strings into Bundle.
Removed unused strings from Bundle.
2014-04-10 12:15:20 -04:00
Samuel H. Kenyon eb18e50bf4 Merge remote-tracking branch 'upstream/develop' into onemsg2 2014-04-09 17:36:08 -04:00
Samuel H. Kenyon e9f6226b47 Merge remote-tracking branch 'upstream/develop' into mtsearch2b 2014-04-09 15:54:51 -04:00
Richard Cordovano 257214f178 Merge pull request #593 from SynapticNulship/mt-search
Search concurrency
2014-04-09 15:44:20 -04:00
Samuel H. Kenyon b5d06e67ce simplify the loop in addKeywordListsToAllJobs() 2014-04-09 15:36:11 -04:00
Samuel H. Kenyon 0437977226 moved commit() up in stopJob() and removed some INFO logging 2014-04-09 15:30:45 -04:00
Samuel H. Kenyon 1e255f0979 SevenZipIngestModule: only check 7zip init once 2014-04-09 14:07:05 -04:00
Samuel H. Kenyon b0b9e8201c FileExtMismatchIngestModule: only send one final message 2014-04-09 13:32:58 -04:00
Richard Cordovano 5b25aa1edd Removed unused imports, TODO comment 2014-04-09 11:15:20 -04:00
Richard Cordovano a07153261e Changed ingest module lifecycle events to ingest job lifecycle events 2014-04-09 11:09:19 -04:00
Samuel H. Kenyon d8d03aeae1 KeywordSearch: check the server and existence of keywords only once per job 2014-04-09 11:00:36 -04:00
Samuel H. Kenyon 000a70a7d9 Just do one summary postMessage for KeywordSearch module. 2014-04-08 17:48:21 -04:00
Samuel H. Kenyon 42e83d3b23 ingestStatus is now static and shared between all threads 2014-04-08 17:42:30 -04:00
Samuel H. Kenyon 3a5e00a6bc Merge branch 'mt-search2' into onemsg2
Conflicts:
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
2014-04-08 17:38:04 -04:00
Samuel H. Kenyon ada3dd732b The renamed prop. 2014-04-08 16:49:51 -04:00
Samuel H. Kenyon e76573ee8a Adding the missing bundle properties to this branch since my pull request to develop is still waiting. 2014-04-08 16:42:01 -04:00