Merge branch 'master' of github.com:sleuthkit/autopsy

This commit is contained in:
Dick Fickling 2012-03-26 12:41:54 -04:00
commit 8130f948e8
4 changed files with 17 additions and 1 deletions

View File

@ -75,6 +75,13 @@ public final class IngestMessageTopComponent extends TopComponent implements Ing
return getDefault(); return getDefault();
} }
@Override
protected String preferredID() {
return PREFERRED_ID;
}
/** This method is called from within the constructor to /** This method is called from within the constructor to
* initialize the form. * initialize the form.
* WARNING: Do NOT modify this code. The content of this method is * WARNING: Do NOT modify this code. The content of this method is

View File

@ -202,6 +202,9 @@ public class ExtractedContentViewer implements DataContentViewer {
} catch (RuntimeException e) { } catch (RuntimeException e) {
logger.log(Level.INFO, "Could not get Solr Core", e); logger.log(Level.INFO, "Could not get Solr Core", e);
} }
catch (Exception e) {
logger.log(Level.INFO, "Could not get Solr Core", e);
}
if (solrCore == null) { if (solrCore == null) {
return false; return false;
} }

View File

@ -116,7 +116,7 @@ public class KeywordSearchListsXML {
urls.add(new Keyword("http://|https://|^www\\.", false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL)); urls.add(new Keyword("http://|https://|^www\\.", false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL));
//urls.add(new Keyword("((((ht|f)tp(s?))\\://)|www\\.)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,5})(\\:[0-9]+)*(/($|[a-zA-Z0-9\\.\\,\\;\\?\\'\\\\+&%\\$#\\=~_\\-]+))*", false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL)); //urls.add(new Keyword("((((ht|f)tp(s?))\\://)|www\\.)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,5})(\\:[0-9]+)*(/($|[a-zA-Z0-9\\.\\,\\;\\?\\'\\\\+&%\\$#\\=~_\\-]+))*", false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL));
urls.add(new Keyword("ssh://", false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL)); //urls.add(new Keyword("ssh://", false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL));
addList("Phone Numbers", phones, true, true); addList("Phone Numbers", phones, true, true);
addList("IP Addresses", ips, true, true); addList("IP Addresses", ips, true, true);

View File

@ -20,6 +20,10 @@ Autopsy requires the Java Runtime Environment (JRE) to be installed. A 32-bit ve
You can download Java from here: You can download Java from here:
http://java.com/en/download/index.jsp http://java.com/en/download/index.jsp
Before running Autopsy, you will have to install GStreamer and add the GStreamer 'lib' folder to the PATH environment variable
GStreamer builds for Windows are available at http://code.google.com/p/ossbuild/downloads/list
You should be able to simply open the Autopsy ZIP file and run the autopsy.exe program located in the 'bin' folder. You should be able to simply open the Autopsy ZIP file and run the autopsy.exe program located in the 'bin' folder.
@ -29,6 +33,8 @@ The primary development of Autopsy 3 has been done at Basis Technology. The foll
* Anthony Lawrence * Anthony Lawrence
* James Antonius * James Antonius
* Peter Martel * Peter Martel
* Adam Malinowski
* Dick Fickling
FEEDBACK FEEDBACK