codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-06 02:24:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into zipmodule

Browse Source
This commit is contained in:
adam-m
2013-01-26 16:06:02 -05:00
parent e704d1cbf5 6c0c3554aa
commit a4a1c305aa
16 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Core/src/org/sleuthkit/autopsy/coreutils/Installer.java
View File

@@ -45,7 +45,6 @@ public class Installer extends ModuleInstall {
@Override
public void restored() {
//Logger.init();
autopsyLogger.log(Level.INFO, "Default charset: " + PlatformUtil.getDefaultPlatformCharset());
autopsyLogger.log(Level.INFO, "Default file encoding: " + PlatformUtil.getDefaultPlatformFileEncoding());

4
Core/src/org/sleuthkit/autopsy/directorytree/TagDialog.form
View File

@@ -3,7 +3,6 @@
<Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
</SyntheticProperties>
<Events>
<EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="closeDialog"/>
@@ -105,6 +104,9 @@
<ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="TagDialog.tagCombo.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new javax.swing.JComboBox&lt;String&gt;()"/>
</AuxValues>
</Component>
<Component class="javax.swing.JLabel" name="tagLabel">
<Properties>

6
Core/src/org/sleuthkit/autopsy/directorytree/TagDialog.java
View File

@@ -98,13 +98,13 @@ public class TagDialog extends javax.swing.JDialog {
if (tagNames != null) {
for (String tagName : tagNames) {
tagCombo.addItem(tagName);
tagCombo.<String>addItem(tagName);
if (tagName.equals(defaultTagName)) {
tagCombo.setSelectedItem(tagName);
}
}
} else {
tagCombo.addItem(defaultTagName);
tagCombo.<String>addItem(defaultTagName);
tagCombo.setSelectedItem(defaultTagName);
}
}
@@ -127,7 +127,7 @@ public class TagDialog extends javax.swing.JDialog {
okButton = new javax.swing.JButton();
cancelButton = new javax.swing.JButton();
tagCombo = new javax.swing.JComboBox();
tagCombo = new javax.swing.JComboBox<String>();
tagLabel = new javax.swing.JLabel();
commentLabel = new javax.swing.JLabel();
commentText = new javax.swing.JTextField();

3
Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form
View File

@@ -142,6 +142,9 @@
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="sortByComboBoxActionPerformed"/>
</Events>
<AuxValues>
<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new javax.swing.JComboBox&lt;String&gt;()"/>
</AuxValues>
</Component>
<Component class="javax.swing.JLabel" name="totalMessagesNameLabel">
<Properties>

4
Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
View File

@@ -108,7 +108,7 @@ class IngestMessagePanel extends javax.swing.JPanel {
messageTable = new javax.swing.JTable();
controlPanel = new javax.swing.JPanel();
sortByLabel = new javax.swing.JLabel();
sortByComboBox = new javax.swing.JComboBox();
sortByComboBox = new javax.swing.JComboBox<String>();
totalMessagesNameLabel = new javax.swing.JLabel();
totalMessagesNameVal = new javax.swing.JLabel();
totalUniqueMessagesNameLabel = new javax.swing.JLabel();
@@ -120,7 +120,7 @@ class IngestMessagePanel extends javax.swing.JPanel {
jScrollPane1.setOpaque(false);
messageTable.setBackground(new java.awt.Color(221, 221, 235));
messageTable.setFont(new java.awt.Font("Arial", 0, 10));
messageTable.setFont(new java.awt.Font("Arial", 0, 10)); // NOI18N
messageTable.setModel(tableModel);
messageTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
messageTable.setAutoscrolls(false);

4
Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java
View File

@@ -228,7 +228,7 @@ public final class IngestModuleLoader {
if (intfs.length != 0 && pType != null) {
//check if one of the module interfaces matches the pipeline type
boolean interfaceFound = false;
Class moduleMeta = ((IngestModuleMapping) pType).getIngestModuleInterface();
Class<?> moduleMeta = ((IngestModuleMapping) pType).getIngestModuleInterface();
String moduleIntNameCan = moduleMeta.getCanonicalName();
String[] moduleIntNameTok = moduleIntNameCan.split(" ");
String moduleIntName = moduleIntNameTok[moduleIntNameTok.length - 1];
@@ -1073,7 +1073,7 @@ interface IngestModuleMapping {
*
* @return ingest module interface meta type
*/
public Class getIngestModuleInterface();
public Class<?> getIngestModuleInterface();
}
/**

9
Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
View File

@@ -259,18 +259,17 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
}
}
private class ArtifactRenderer extends JCheckBox implements ListCellRenderer {
private class ArtifactRenderer extends JCheckBox implements ListCellRenderer<BlackboardArtifact.ARTIFACT_TYPE> {
@Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
public Component getListCellRendererComponent(JList list, BlackboardArtifact.ARTIFACT_TYPE value, int index, boolean isSelected, boolean cellHasFocus) {
if (value != null) {
BlackboardArtifact.ARTIFACT_TYPE type = (BlackboardArtifact.ARTIFACT_TYPE) value;
setEnabled(list.isEnabled());
setSelected(artifactStates.get(type));
setSelected(artifactStates.get(value));
setFont(list.getFont());
setBackground(list.getBackground());
setForeground(list.getForeground());
setText(type.getDisplayName());
setText(value.getDisplayName());
return this;
}
return new JLabel();

15
CoreLibs/build.xml
View File

@@ -6,7 +6,11 @@
<description>Builds, tests, and runs the project org.sleuthkit.autopsy.corelibs.</description>
<import file="nbproject/build-impl.xml"/>
<property name="ivy.install.version" value="2.1.0-rc2" />
<property name="thirdparty.dir" value="${basedir}/../thirdparty" />
<property name="lib.dir" value="release/modules/lib" />
<property name="ivy.install.version" value="2.3.0-rc2" />
<condition property="ivy.home" value="${env.IVY_HOME}">
<isset property="env.IVY_HOME" />
</condition>
@@ -34,7 +38,14 @@
uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
</target>
<target name="retrieve-deps" description="retrieve dependencies using ivy" depends="init-ivy">
<target name="build-native-libs" description="build native library dependencies">
<!-- sigar: note, matching jar is pulled with ivy -->
<mkdir dir="${lib.dir}"/>
<unzip src="${thirdparty.dir}/sigar/1.6.4/sigar-native.zip" dest="${lib.dir}"/>
</target>
<target name="retrieve-deps" description="retrieve dependencies using ivy" depends="init-ivy,build-native-libs">
<ivy:settings file="ivysettings.xml" />
<ivy:resolve/>
<ivy:retrieve sync="true" pattern="release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />

2
CoreLibs/ivy.xml
View File

@@ -25,7 +25,7 @@
<dependency conf="autopsy_core->*" org="org.apache.poi" name="poi-excelant" rev="3.8"/>
<dependency conf="autopsy_core->*" org="org.apache.poi" name="poi-scratchpad" rev="3.8"/>
<!-- process and system monitoring -->
<!-- process and system monitoring, note: matching native libs pulled from thirdparty -->
<dependency conf="autopsy_core->*" org="org.fusesource" name="sigar" rev="1.6.4" />
</dependencies>
</ivy-module>

2
KeywordSearch/build.xml
View File

@@ -7,7 +7,7 @@
<import file="nbproject/build-impl.xml"/>
<property name="ivy.install.version" value="2.1.0-rc2" />
<property name="ivy.install.version" value="2.3.0-rc2" />
<condition property="ivy.home" value="${env.IVY_HOME}">
<isset property="env.IVY_HOME" />
</condition>

2
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java
View File

@@ -349,7 +349,7 @@ class ExtractedContentPanel extends javax.swing.JPanel {
setPanelText(null, false);
for (MarkupSource ms : sources) {
sourceComboBox.addItem(ms);
sourceComboBox.<String>addItem(ms);
}
if (!sources.isEmpty()) {

6
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java
View File

@@ -18,7 +18,6 @@
*/
package org.sleuthkit.autopsy.keywordsearch;
import com.sun.corba.se.impl.util.Version;
import java.util.logging.Level;
import org.openide.modules.ModuleInstall;
import org.openide.windows.WindowManager;
@@ -26,6 +25,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.keywordsearch.Server.SolrServerNoPortException;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
import org.sleuthkit.autopsy.coreutils.Version;
/**
* Starts up the Solr server when the module is loaded, and stops it when the
@@ -186,7 +186,7 @@ public class Installer extends ModuleInstall {
@Override
public void run() {
final String msg = "Indexing server port " + curFailPort + " is not available. "
+ " Check if your security software does not block " + Version.PROJECT_NAME
+ " Check if your security software does not block " + Version.getName()
+ " and consider changing " + Server.PROPERTIES_CURRENT_SERVER_PORT + " in "
+ Server.PROPERTIES_FILE + " property file in the application user folder."
+ " Then try rebooting your system if another process was causing the conflict. ";
@@ -212,7 +212,7 @@ public class Installer extends ModuleInstall {
@Override
public void run() {
final String msg = "Indexing server port " + KeywordSearch.getServer().getCurrentSolrServerPort() + " is not available. "
+ " Check if your security software does not block " + Version.PROJECT_NAME
+ " Check if your security software does not block " + Version.getName()
+ " and consider changing " + Server.PROPERTIES_CURRENT_SERVER_PORT + " in "
+ Server.PROPERTIES_FILE + " property file in the application user folder."
+ " Then try rebooting your system if another process was causing the conflict. ";

3
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.form
View File

@@ -285,6 +285,9 @@
<ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchEditListPanel.selectorsCombo.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new javax.swing.JComboBox&lt;String&gt;()"/>
</AuxValues>
</Component>
<Component class="javax.swing.JButton" name="deleteWordButton">
<Properties>

6
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
View File

@@ -199,9 +199,9 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
//selectors
selectorsCombo.setEnabled(false);
for (BlackboardAttribute.ATTRIBUTE_TYPE type : BlackboardAttribute.ATTRIBUTE_TYPE.values()) {
selectorsCombo.addItem(type.getDisplayName());
selectorsCombo.<String>addItem(type.getDisplayName());
}
selectorsCombo.addItem("<none>");
selectorsCombo.<String>addItem("<none>");
selectorsCombo.setSelectedIndex(selectorsCombo.getItemCount() - 1);
}
@@ -295,7 +295,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
addWordButton = new javax.swing.JButton();
addWordField = new javax.swing.JTextField();
chRegex = new javax.swing.JCheckBox();
selectorsCombo = new javax.swing.JComboBox();
selectorsCombo = new javax.swing.JComboBox<String>();
deleteWordButton = new javax.swing.JButton();
ingestMessagesCheckbox = new javax.swing.JCheckBox();
keywordsLabel = new javax.swing.JLabel();

14
Testing/build.xml
View File

@@ -6,16 +6,9 @@
<description>Builds, tests, and runs the project org.sleuthkit.autopsy.testing.</description>
<import file="nbproject/build-impl.xml"/>
<target name="set-args">
<property name="img_path" value="C:\Users\dfickling\Desktop\test-data\64mb2.img"/>
<property name="known_bad_path" value="C:\Users\dfickling\Desktop\test-data\notable_files.txt"/>
<property name="nsrl_path" value="C:\Users\dfickling\Desktop\NSRLComplete.txt-md5.idx"/>
<property name="keyword_path" value="C:\Users\dfickling\Desktop\test-data\notable_words.xml"/>
<property name="gold_path" value="C:\Users\dfickling\Desktop\test-data\win7-ren.txt"/>
<property name="out_path" value="C:\Users\dfickling\Desktop\test-data"/>
</target>
<target name="check-args"> <!-- remove dependency on set-args to get from script -->
<target name="check-args">
<fail message="Missing required argument: img_path" unless="img_path"/>
<fail message="Missing required argument: gold_path" unless="gold_path"/>
<fail message="Missing required argument: out_path" unless="out_path"/>
@@ -48,7 +41,8 @@
<jvmarg line="${test.bootclasspath.prepend.args}"/>
<jvmarg line="${test.run.args}"/>
<!-- should be in sync with project.properties and build.xml of autopsy main project -->
<jvmarg line="-J-Xms24m -J-Xmx768m -J-XX:MaxPermSize=256M -J-Xverify:none"/>
<!-- disable for now, causes issues with Java 7 -->
<!-- <jvmarg line="-J-Xms24m -J-Xmx768m -J-XX:MaxPermSize=256M -J-Xverify:none"/> -->
<sysproperty key="img_path" value="${img_path}"/>
<sysproperty key="gold_path" value="${gold_path}"/>
<sysproperty key="out_path" value="${out_path}"/>

BIN
thirdparty/sigar/1.6.4/sigar-native.zip vendored Normal file
View File

Binary file not shown.