Move Logger and AutopsyPropFile into new module, CoreUtils

This commit is contained in:
Dick Fickling 2012-01-06 16:29:42 -05:00
parent 5ab3a41926
commit 99390e0d91
82 changed files with 480 additions and 233 deletions

View File

@ -1,8 +1,8 @@
build.xml.data.CRC32=8710dca5
build.xml.data.CRC32=a2330d9e
build.xml.script.CRC32=601bc2ba
build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
build.xml.stylesheet.CRC32=a56c6a5b@2.47.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=8710dca5
nbproject/build-impl.xml.data.CRC32=a2330d9e
nbproject/build-impl.xml.script.CRC32=65e93a36
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1

View File

@ -105,6 +105,15 @@
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>0-1</release-version>
<specification-version>0.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
<build-prerequisite/>
@ -114,15 +123,6 @@
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.logging</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>0</release-version>
<specification-version>0.0</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
<test-dependencies>
<test-type>

View File

@ -40,7 +40,7 @@ import org.openide.util.NbBundle;
import org.openide.util.actions.CallableSystemAction;
import org.openide.util.actions.Presenter;
import org.openide.util.lookup.ServiceProvider;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
import org.sleuthkit.datamodel.Image;
import org.sleuthkit.datamodel.SleuthkitJNI.CaseDbHandle.AddImageProcess;

View File

@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<NonVisualComponents>

View File

@ -27,6 +27,7 @@ import javax.swing.event.DocumentEvent;
import javax.swing.filechooser.FileFilter;
import javax.swing.JFileChooser;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.event.DocumentListener;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
@ -102,6 +103,10 @@ final class AddImageVisualPanel1 extends JPanel implements DocumentListener {
return new String[0];
}
}
public JTextField getImagePathTextField() {
return this.imgPathTextField;
}
/**
* Gets the type of the image that's selected.

View File

@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.casemodule;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@ -29,6 +30,7 @@ import javax.swing.event.ChangeListener;
import org.openide.WizardDescriptor;
import org.openide.util.HelpCtx;
import org.openide.util.Lookup;
import org.sleuthkit.autopsy.coreutils.AutopsyPropFile;
/**
* The "Add Image" wizard panel1 handling the logic of selecting image file(s)
@ -42,6 +44,7 @@ class AddImageWizardPanel1 implements WizardDescriptor.Panel<WizardDescriptor>,
*/
private AddImageVisualPanel1 component;
private boolean isNextEnable = false;
private static final String PROP_LASTIMAGE = "LBL_LastImage_PATH";
/**
* Get the visual component for the panel. In this template, the component
@ -158,6 +161,9 @@ class AddImageWizardPanel1 implements WizardDescriptor.Panel<WizardDescriptor>,
*/
@Override
public void readSettings(WizardDescriptor settings) {
AddImageVisualPanel1 component = getComponent();
String lastImageDirectory = AutopsyPropFile.getInstance().getProperty(PROP_LASTIMAGE);
component.getImagePathTextField().setText(lastImageDirectory);
}
/**
@ -173,6 +179,9 @@ class AddImageWizardPanel1 implements WizardDescriptor.Panel<WizardDescriptor>,
public void storeSettings(WizardDescriptor settings) {
settings.putProperty(AddImageAction.IMGPATHS_PROP, getComponent().getImagePaths());
settings.putProperty(AddImageAction.TIMEZONE_PROP, getComponent().getSelectedTimezone()); // store the timezone
String firstImage = getComponent().getImagePaths()[0];
String firstImagePath = firstImage.substring(0, firstImage.lastIndexOf(File.separator)+1);
AutopsyPropFile.getInstance().setProperty(PROP_LASTIMAGE, firstImagePath);
}

View File

@ -37,8 +37,8 @@ import javax.swing.event.ChangeListener;
import org.openide.WizardDescriptor;
import org.openide.util.HelpCtx;
import org.openide.util.Lookup;
import org.sleuthkit.autopsy.coreutils.Log;
import org.sleuthkit.autopsy.hashdatabase.HashDbSettings;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.datamodel.SleuthkitCase;
import org.sleuthkit.datamodel.SleuthkitJNI.CaseDbHandle.AddImageProcess;
import org.sleuthkit.datamodel.TskException;
@ -230,7 +230,7 @@ class AddImageWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
this.knownBadPath = null;
try {
HashDbSettings hashDbs = Autopsy.getHashDbSettings();
HashDbSettings hashDbs = HashDbSettings.getHashDbSettings();
this.NSRLPath = hashDbs.getNSRLDatabasePath();
this.knownBadPath = hashDbs.getKnownBadDatabasePath();
} catch (IOException ex) {

View File

@ -1,70 +0,0 @@
/*
* Autopsy Forensic Browser
*
* Copyright 2011 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.sleuthkit.autopsy.casemodule;
import java.io.File;
import java.io.IOException;
import org.sleuthkit.autopsy.hashdatabase.HashDbSettings;
import org.sleuthkit.datamodel.SleuthkitJNI;
/**
* Class to consolidate application-wide settings.
*/
public class Autopsy {
private final static String propFilePath = System.getProperty("netbeans.user") + File.separator + "autopsy.properties";
private static boolean verboseLogging = false;
/**
* Gets the property file where the user properties such as Recent Cases
* and selected Hash Databases are stored.
* @return A new file handle
*/
public static File getPropertyFile() {
return new File(propFilePath);
}
/**
* Get the hash database settings as read from the property file.
* @return A new hash database settings object.
* @throws IOException if the property file can't be found
*/
public static HashDbSettings getHashDbSettings() throws IOException {
return new HashDbSettings(getPropertyFile());
}
/**
* Activate verbose logging for Sleuth Kit
*/
public static void startVerboseLogging() {
verboseLogging = true;
String logPath = System.getProperty("netbeans.user") + File.separator + "sleuthkit.txt";
SleuthkitJNI.startVerboseLogging(logPath);
}
/**
* Checks if verbose logging has been enabled.
* @return true if verbose logging has been enabled.
*/
public static boolean verboseLoggingIsSet() {
return verboseLogging;
}
}

View File

@ -46,7 +46,7 @@ import org.openide.util.actions.CallableSystemAction;
import org.openide.util.actions.SystemAction;
import org.openide.windows.WindowManager;
import org.sleuthkit.autopsy.corecomponentinterfaces.CoreComponentControl;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
import org.sleuthkit.datamodel.*;
import org.sleuthkit.datamodel.SleuthkitJNI.CaseDbHandle.AddImageProcess;

View File

@ -31,7 +31,7 @@ import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.actions.CallableSystemAction;
import org.openide.util.actions.Presenter;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
/**
* The action to close the current Case. This class should be disabled on

View File

@ -32,7 +32,7 @@ import org.openide.NotifyDescriptor;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.actions.CallableSystemAction;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
/**
* The action to delete the current Case. This class should be disabled on

View File

@ -23,7 +23,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import org.openide.util.actions.SystemAction;
import org.openide.util.lookup.ServiceProvider;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
/**
* The action to create a new case. This action class is always enabled.

View File

@ -28,7 +28,8 @@ import java.util.logging.Logger;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
import org.openide.util.lookup.ServiceProvider;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.AutopsyPropFile;
import org.sleuthkit.autopsy.coreutils.Log;
/**
* The action to open a existing case. This class is always enabled.
@ -38,6 +39,8 @@ import org.sleuthkit.autopsy.logging.Log;
@ServiceProvider(service = CaseOpenAction.class)
public final class CaseOpenAction implements ActionListener {
private static final Logger logger = Logger.getLogger(CaseOpenAction.class.getName());
private static final String PROP_BASECASE = "LBL_BaseCase_PATH";
AutopsyPropFile AutopsyProperties = AutopsyPropFile.getInstance();
JFileChooser fc = new JFileChooser();
GeneralFilter autFilter = new GeneralFilter(new String[]{".aut"}, "AUTOPSY File (*.aut)", false);
@ -48,6 +51,8 @@ public final class CaseOpenAction implements ActionListener {
fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
fc.setMultiSelectionEnabled(false);
fc.addChoosableFileFilter(autFilter);
if(AutopsyProperties.getProperty(PROP_BASECASE) != null)
fc.setCurrentDirectory(new File(AutopsyProperties.getProperty(PROP_BASECASE)));
}
/**
@ -63,7 +68,8 @@ public final class CaseOpenAction implements ActionListener {
int retval = fc.showOpenDialog((Component) e.getSource());
if (retval == JFileChooser.APPROVE_OPTION) {
String path = fc.getSelectedFile().getPath();
String dirPath = fc.getSelectedFile().getParent();
AutopsyProperties.setProperty(PROP_BASECASE, dirPath.substring(0, dirPath.lastIndexOf(File.separator)));
// check if the file exists
if (!new File(path).exists()) {
JOptionPane.showMessageDialog(null, "Error: File doesn't exist.", "Error", JOptionPane.ERROR_MESSAGE);

View File

@ -31,7 +31,7 @@ import javax.swing.JFrame;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.actions.CallableSystemAction;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
/**
* The action to pop up the Case Properties Form window. By using this form,

View File

@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>

View File

@ -23,6 +23,7 @@ import java.awt.Component;
import java.io.File;
import javax.swing.JFileChooser;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
@ -71,6 +72,10 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener{
public String getCaseParentDir(){
return this.caseParentDirTextField.getText();
}
public JTextField getCaseParentDirTextField(){
return this.caseParentDirTextField;
}
/** This method is called from within the constructor to initialize the form.
* WARNING: Do NOT modify this code. The content of this method is always
@ -168,7 +173,7 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener{
// show the directory chooser where the case directory will be created
fc.setDragEnabled(false);
if(!caseParentDirTextField.getText().trim().equals("")){
fc.setSelectedFile(new File(caseParentDirTextField.getText()));
fc.setCurrentDirectory(new File(caseParentDirTextField.getText()));
}
fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
//fc.setSelectedFile(new File("C:\\Program Files\\"));

View File

@ -32,7 +32,7 @@ import org.openide.WizardDescriptor;
import org.openide.util.HelpCtx;
import org.openide.util.actions.CallableSystemAction;
import org.openide.util.actions.SystemAction;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
/**
* Action to open the New Case wizard.

View File

@ -33,6 +33,7 @@ import org.openide.NotifyDescriptor;
import org.openide.WizardDescriptor;
import org.openide.WizardValidationException;
import org.openide.util.HelpCtx;
import org.sleuthkit.autopsy.coreutils.AutopsyPropFile;
/**
* The "New Case" wizard panel with a component on it. This class represents
@ -49,6 +50,7 @@ class NewCaseWizardPanel1 implements WizardDescriptor.ValidatingPanel<WizardDesc
*/
private NewCaseVisualPanel1 component;
private Boolean isFinish = false;
private static final String PROP_BASECASE = "LBL_BaseCase_PATH";
/**
* Get the visual component for the panel. In this template, the component
@ -162,6 +164,9 @@ class NewCaseWizardPanel1 implements WizardDescriptor.ValidatingPanel<WizardDesc
*/
@Override
public void readSettings(WizardDescriptor settings) {
NewCaseVisualPanel1 component = getComponent();
String lastBaseDirectory = AutopsyPropFile.getInstance().getProperty(PROP_BASECASE);
component.getCaseParentDirTextField().setText(lastBaseDirectory);
}
/**
@ -177,6 +182,7 @@ class NewCaseWizardPanel1 implements WizardDescriptor.ValidatingPanel<WizardDesc
public void storeSettings(WizardDescriptor settings) {
settings.putProperty("caseName", getComponent().getCaseName());
settings.putProperty("caseParentDir", getComponent().getCaseParentDir());
AutopsyPropFile.getInstance().setProperty(PROP_BASECASE, getComponent().getCaseParentDir());
}
@Override

View File

@ -36,8 +36,9 @@ import javax.swing.JMenuItem;
import org.openide.util.HelpCtx;
import org.openide.util.actions.CallableSystemAction;
import org.openide.util.actions.Presenter;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
import org.openide.filesystems.FileUtil;
import org.sleuthkit.autopsy.coreutils.AutopsyPropFile;
/**
* The action in this class is to clear the list of "Recent Cases".
@ -51,7 +52,7 @@ public final class RecentCases extends CallableSystemAction implements Presenter
static final String PATH_PROP_KEY = "LBL_RecentCase_Path";
static final RecentCase BLANK_RECENTCASE = new RecentCase("", "");
// get the path of the case.properties file in the user directory
private final static String propFilePath = System.getProperty("netbeans.user") + File.separator + "autopsy.properties";
private final static String propFilePath = AutopsyPropFile.getPropertiesFilePath();
private final static RecentCases INSTANCE = new RecentCases();
@ -86,6 +87,7 @@ public final class RecentCases extends CallableSystemAction implements Presenter
// try to load all the recent cases from the properties file in the home directory
InputStream inputStream = new FileInputStream(propFilePath);
properties.load(inputStream);
inputStream.close();
} catch (Exception ignore) {
// if cannot load it, we create a new properties file without any data inside it
try {
@ -99,6 +101,7 @@ public final class RecentCases extends CallableSystemAction implements Presenter
output.createNewFile();
FileOutputStream fos = new FileOutputStream(output);
properties.store(fos, "");
fos.close();
} else {
// if the property file already exist, throw an error that says cannot load that file
Logger.getLogger(RecentCases.class.getName()).log(Level.WARNING, "Error: Could not load the property file.", new Exception("The properties file already exist and can't load that file."));

View File

@ -26,7 +26,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
/**
* This class is used to add the action to the recent case menu item. When the

View File

@ -20,7 +20,7 @@ package org.sleuthkit.autopsy.hashdatabase;
import java.io.File;
import java.util.logging.Level;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
import org.sleuthkit.datamodel.SleuthkitJNI;
import org.sleuthkit.datamodel.TskException;

View File

@ -30,8 +30,8 @@ import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.util.HelpCtx;
import org.openide.util.actions.CallableSystemAction;
import org.sleuthkit.autopsy.casemodule.Autopsy;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.AutopsyPropFile;
import org.sleuthkit.autopsy.coreutils.Log;
/**
* The HashDbMgmtAction opens the HashDbMgmtPanel in a dialog, and saves the
@ -48,7 +48,7 @@ class HashDbMgmtAction extends CallableSystemAction {
try {
// Load settings from the property file
HashDbSettings hashDatabaseSettings = new HashDbSettings(Autopsy.getPropertyFile());
HashDbSettings hashDatabaseSettings = new HashDbSettings(AutopsyPropFile.getPropertyFile());
// create the popUp window for it
final JFrame frame = new JFrame(ACTION_NAME);

View File

@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>
@ -20,7 +20,7 @@
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="databaseNameLabel" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" max="-2" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">

View File

@ -30,7 +30,7 @@ import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JFileChooser;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
import org.sleuthkit.datamodel.TskException;
/**

View File

@ -26,6 +26,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Properties;
import org.sleuthkit.autopsy.coreutils.AutopsyPropFile;
/**
* Loads and stores Hash Database settings from/to a property file
@ -110,6 +111,15 @@ public class HashDbSettings {
HashDb getNSRLDatabase() {
return this.NSRLDatabase;
}
/**
* Get the hash database settings as read from the property file.
* @return A new hash database settings object.
* @throws IOException if the property file can't be found
*/
public static HashDbSettings getHashDbSettings() throws IOException {
return new HashDbSettings(AutopsyPropFile.getPropertyFile());
}
/**
* Gets known bad database if there is one

View File

@ -1,8 +1,8 @@
build.xml.data.CRC32=8f8b60b5
build.xml.data.CRC32=f7f11023
build.xml.script.CRC32=d7506201
build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
build.xml.stylesheet.CRC32=a56c6a5b@2.47.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=8f8b60b5
nbproject/build-impl.xml.data.CRC32=f7f11023
nbproject/build-impl.xml.script.CRC32=c3845be2
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1

View File

@ -132,6 +132,15 @@
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>0-1</release-version>
<specification-version>0.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
<build-prerequisite/>
@ -141,15 +150,6 @@
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.logging</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>0-1</release-version>
<specification-version>0.0</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
<public-packages>
<package>org.sleuthkit.autopsy.corecomponents</package>

View File

@ -23,7 +23,7 @@ import org.openide.util.NbBundle;
import org.netbeans.core.actions.AboutAction;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
/**
* Action to open custom implementation of the "About" window from the Help menu.

View File

@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>

View File

@ -301,6 +301,8 @@ public class DataContentViewerHex extends javax.swing.JPanel implements DataCont
@Override
public void resetComponent() {
// clear / reset the fields
currentPage = 1;
currentOffset = 0;
this.dataSource = null;
currentPageLabel.setText("");
totalPageLabel.setText("");

View File

@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>

View File

@ -296,6 +296,8 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC
@Override
public void resetComponent() {
// clear / reset the fields
currentPage = 1;
currentOffset = 0;
this.dataSource = null;
currentPageLabel.setText("");
totalPageLabel.setText("");

View File

@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>
@ -20,7 +20,7 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="jScrollPane1" pref="602" max="32767" attributes="0"/>
<Component id="jScrollPane1" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
@ -35,7 +35,7 @@
<Component id="prevPageButton" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="nextPageButton" min="-2" pref="99" max="-2" attributes="0"/>
<EmptySpace pref="276" max="32767" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="filePathLabel" max="32767" attributes="0"/>

View File

@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>

View File

@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.corecomponents;
import java.awt.Cursor;
import java.awt.Window;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.MessageFormat;
@ -33,7 +34,7 @@ import javax.swing.event.HyperlinkListener;
import org.netbeans.core.actions.HTMLViewAction;
import org.openide.awt.HtmlBrowser;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.casemodule.Autopsy;
import org.sleuthkit.autopsy.coreutils.AutopsyPropFile;
import org.sleuthkit.datamodel.SleuthkitJNI;
/**
@ -43,6 +44,7 @@ class ProductInformationPanel extends JPanel implements HyperlinkListener {
private URL url = null;
private Icon about;
private boolean verboseLogging;
ProductInformationPanel() {
about = new ImageIcon(org.netbeans.core.startup.Splash.loadContent(true));
@ -54,7 +56,7 @@ class ProductInformationPanel extends JPanel implements HyperlinkListener {
description.addHyperlinkListener(this);
copyright.addHyperlinkListener(this);
copyright.setBackground(getBackground());
if (Autopsy.verboseLoggingIsSet()) {
if (verboseLoggingIsSet()) {
disableVerboseLoggingButton();
}
@ -174,7 +176,7 @@ private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:eve
}//GEN-LAST:event_jLabel1MouseClicked
private void activateVerboseLogging(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_activateVerboseLogging
Autopsy.startVerboseLogging();
startVerboseLogging();
disableVerboseLoggingButton();
}//GEN-LAST:event_activateVerboseLogging
// Variables declaration - do not modify//GEN-BEGIN:variables
@ -253,4 +255,22 @@ private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:eve
url = null;
}
}
/**
* Activate verbose logging for Sleuth Kit
*/
public void startVerboseLogging() {
verboseLogging = true;
String logPath = AutopsyPropFile.getUserDirPath() + File.separator + "sleuthkit.txt";
SleuthkitJNI.startVerboseLogging(logPath);
}
/**
* Checks if verbose logging has been enabled.
* @return true if verbose logging has been enabled.
*/
public boolean verboseLoggingIsSet() {
return verboseLogging;
}
}

View File

@ -30,7 +30,7 @@ import javax.swing.ImageIcon;
import javax.swing.JFrame;
import org.openide.nodes.FilterNode;
import org.openide.nodes.Node;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.TskException;

View File

@ -2,7 +2,7 @@
<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="org.sleuthkit.autopsy.logging" default="netbeans" basedir=".">
<description>Builds, tests, and runs the project org.sleuthkit.autopsy.logging.</description>
<project name="org.sleuthkit.autopsy.coreutils" default="netbeans" basedir=".">
<description>Builds, tests, and runs the project org.sleuthkit.autopsy.coreutils.</description>
<import file="nbproject/build-impl.xml"/>
</project>

6
CoreUtils/manifest.mf Normal file
View File

@ -0,0 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.sleuthkit.autopsy.coreutils/0
OpenIDE-Module-Implementation-Version: 2
OpenIDE-Module-Install: org/sleuthkit/autopsy/coreutils/Installer.class
OpenIDE-Module-Layer: org/sleuthkit/autopsy/coreutils/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/coreutils/Bundle.properties

View File

@ -3,7 +3,7 @@
*** GENERATED FROM project.xml - DO NOT EDIT ***
*** EDIT ../build.xml INSTEAD ***
-->
<project name="org.sleuthkit.autopsy.logging-impl" basedir="..">
<project name="org.sleuthkit.autopsy.coreutils-impl" basedir="..">
<fail message="Please build using Ant 1.7.1 or higher.">
<condition>
<not>

View File

@ -0,0 +1,8 @@
build.xml.data.CRC32=9654457e
build.xml.script.CRC32=b3e56256
build.xml.stylesheet.CRC32=a56c6a5b@2.47.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=9654457e
nbproject/build-impl.xml.script.CRC32=849ea2ba
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1

View File

@ -0,0 +1,99 @@
cluster.path=\
${nbplatform.active.dir}/java:\
${nbplatform.active.dir}/platform
disabled.modules=\
org.apache.tools.ant.module,\
org.netbeans.api.debugger.jpda,\
org.netbeans.api.java,\
org.netbeans.libs.cglib,\
org.netbeans.libs.javacapi,\
org.netbeans.libs.javacimpl,\
org.netbeans.libs.jsr223,\
org.netbeans.libs.springframework,\
org.netbeans.modules.ant.browsetask,\
org.netbeans.modules.ant.debugger,\
org.netbeans.modules.ant.freeform,\
org.netbeans.modules.ant.grammar,\
org.netbeans.modules.ant.kit,\
org.netbeans.modules.beans,\
org.netbeans.modules.classfile,\
org.netbeans.modules.dbschema,\
org.netbeans.modules.debugger.jpda,\
org.netbeans.modules.debugger.jpda.ant,\
org.netbeans.modules.debugger.jpda.projects,\
org.netbeans.modules.debugger.jpda.ui,\
org.netbeans.modules.form,\
org.netbeans.modules.form.j2ee,\
org.netbeans.modules.form.kit,\
org.netbeans.modules.hibernate,\
org.netbeans.modules.hibernatelib,\
org.netbeans.modules.hudson.ant,\
org.netbeans.modules.hudson.maven,\
org.netbeans.modules.i18n,\
org.netbeans.modules.i18n.form,\
org.netbeans.modules.j2ee.core.utilities,\
org.netbeans.modules.j2ee.eclipselink,\
org.netbeans.modules.j2ee.eclipselinkmodelgen,\
org.netbeans.modules.j2ee.jpa.refactoring,\
org.netbeans.modules.j2ee.jpa.verification,\
org.netbeans.modules.j2ee.metadata,\
org.netbeans.modules.j2ee.metadata.model.support,\
org.netbeans.modules.j2ee.persistence,\
org.netbeans.modules.j2ee.persistence.kit,\
org.netbeans.modules.j2ee.persistenceapi,\
org.netbeans.modules.j2ee.toplinklib,\
org.netbeans.modules.java.api.common,\
org.netbeans.modules.java.debug,\
org.netbeans.modules.java.editor,\
org.netbeans.modules.java.editor.lib,\
org.netbeans.modules.java.examples,\
org.netbeans.modules.java.freeform,\
org.netbeans.modules.java.guards,\
org.netbeans.modules.java.helpset,\
org.netbeans.modules.java.hints,\
org.netbeans.modules.java.hints.processor,\
org.netbeans.modules.java.j2seplatform,\
org.netbeans.modules.java.j2seproject,\
org.netbeans.modules.java.kit,\
org.netbeans.modules.java.lexer,\
org.netbeans.modules.java.navigation,\
org.netbeans.modules.java.platform,\
org.netbeans.modules.java.preprocessorbridge,\
org.netbeans.modules.java.project,\
org.netbeans.modules.java.source,\
org.netbeans.modules.java.source.ant,\
org.netbeans.modules.java.sourceui,\
org.netbeans.modules.javadoc,\
org.netbeans.modules.javawebstart,\
org.netbeans.modules.jellytools,\
org.netbeans.modules.jellytools.java,\
org.netbeans.modules.junit,\
org.netbeans.modules.maven,\
org.netbeans.modules.maven.coverage,\
org.netbeans.modules.maven.embedder,\
org.netbeans.modules.maven.grammar,\
org.netbeans.modules.maven.graph,\
org.netbeans.modules.maven.hints,\
org.netbeans.modules.maven.indexer,\
org.netbeans.modules.maven.junit,\
org.netbeans.modules.maven.kit,\
org.netbeans.modules.maven.model,\
org.netbeans.modules.maven.osgi,\
org.netbeans.modules.maven.persistence,\
org.netbeans.modules.maven.repository,\
org.netbeans.modules.maven.search,\
org.netbeans.modules.maven.spring,\
org.netbeans.modules.projectimport.eclipse.core,\
org.netbeans.modules.projectimport.eclipse.j2se,\
org.netbeans.modules.refactoring.java,\
org.netbeans.modules.spellchecker.bindings.java,\
org.netbeans.modules.spring.beans,\
org.netbeans.modules.swingapp,\
org.netbeans.modules.websvc.jaxws21,\
org.netbeans.modules.websvc.jaxws21api,\
org.netbeans.modules.websvc.saas.codegen.java,\
org.netbeans.modules.xml.jaxb,\
org.netbeans.modules.xml.tools.java,\
org.openide.compat,\
org.openide.util.enumerations
nbplatform.active=default

View File

@ -3,7 +3,7 @@
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
<code-name-base>org.sleuthkit.autopsy.logging</code-name-base>
<code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
<suite-component/>
<module-dependencies>
<dependency>
@ -20,7 +20,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.23.1</specification-version>
<specification-version>7.39.1</specification-version>
</run-dependency>
</dependency>
<dependency>
@ -28,7 +28,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.15.1</specification-version>
<specification-version>7.23.1</specification-version>
</run-dependency>
</dependency>
<dependency>
@ -36,7 +36,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.17.2</specification-version>
<specification-version>7.27.1</specification-version>
</run-dependency>
</dependency>
<dependency>
@ -44,7 +44,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>8.6.2</specification-version>
<specification-version>8.19.1</specification-version>
</run-dependency>
</dependency>
<dependency>
@ -52,12 +52,12 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>8.3.1</specification-version>
<specification-version>8.11.1</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
<public-packages>
<package>org.sleuthkit.autopsy.logging</package>
<package>org.sleuthkit.autopsy.coreutils</package>
</public-packages>
</data>
</configuration>

View File

@ -17,7 +17,7 @@
* limitations under the License.
*/
package org.sleuthkit.autopsy.logging;
package org.sleuthkit.autopsy.coreutils;
import java.awt.Component;
import java.util.logging.Filter;

View File

@ -0,0 +1,132 @@
/*
* Autopsy Forensic Browser
*
* Copyright 2011 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.sleuthkit.autopsy.coreutils;
import java.io.*;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
* This class contains the framework to read, add, update, and remove
* from the properties file located at %USERDIR%/autopsy.properties
*
* @author dfickling
*/
public class AutopsyPropFile {
// The directory where the properties file is lcoated
private final static String userDirPath = System.getProperty("netbeans.user");
private final static String propFilePath = userDirPath + File.separator + "autopsy.properties";
// The AutopsyPropFile singleton
private static final AutopsyPropFile INSTANCE = new AutopsyPropFile();
private Properties properties;
/**
* Get the instance of the AutopsyPropFile singleton
*/
public static AutopsyPropFile getInstance(){
return INSTANCE;
}
/** the constructor */
private AutopsyPropFile() {
properties = new Properties();
try {
// try to load all the properties from the properties file in the home directory
InputStream inputStream = new FileInputStream(propFilePath);
properties.load(inputStream);
inputStream.close();
} catch (Exception ignore) {
// if cannot load it, we create a new properties file without any data inside it
try {
// create the directory and property file to store it
File output = new File(propFilePath);
if (!output.exists()) {
File parent = new File(output.getParent());
if (!parent.exists()) {
parent.mkdirs();
}
output.createNewFile();
FileOutputStream fos = new FileOutputStream(output);
properties.store(fos, "");
fos.close();
} else {
// if the property file already exist, throw an error that says cannot load that file
Logger.getLogger(AutopsyPropFile.class.getName()).log(Level.WARNING, "Error: Could not load the property file.", new Exception("The properties file already exist and can't load that file."));
}
} catch (IOException ex2) {
Logger.getLogger(AutopsyPropFile.class.getName()).log(Level.WARNING, "Error: Could not create the property file.", ex2);
}
}
}
private void storeProperties() throws IOException {
FileOutputStream fos = new FileOutputStream(new File(propFilePath));
properties.store(fos, "");
fos.close();
}
/**
* Gets the properties file paths.
*
* @return propertyPath
*/
public static String getPropertiesFilePath() {
return propFilePath;
}
public void setProperty(String key, String val){
properties.setProperty(key, val);
try {
storeProperties();
} catch (Exception ex) {
Logger.getLogger(AutopsyPropFile.class.getName()).log(Level.WARNING, "Error: Could not update the properties file.", ex);
}
}
public String getProperty(String key){
return properties.getProperty(key);
}
public void removeProperty(String key){
properties.setProperty(key, "");
try {
storeProperties();
} catch (Exception ex) {
Logger.getLogger(AutopsyPropFile.class.getName()).log(Level.WARNING, "Error: Could not update the properties file.", ex);
}
}
/**
* Gets the property file where the user properties such as Recent Cases
* and selected Hash Databases are stored.
* @return A new file handle
*/
public static File getPropertyFile() {
return new File(propFilePath);
}
public static File getUserDirPath() {
return new File(userDirPath);
}
}

View File

@ -0,0 +1 @@
OpenIDE-Module-Name=CoreUtils

View File

@ -17,7 +17,7 @@
* limitations under the License.
*/
package org.sleuthkit.autopsy.logging;
package org.sleuthkit.autopsy.coreutils;
import java.io.IOException;
import java.util.logging.FileHandler;

View File

@ -17,7 +17,7 @@
* limitations under the License.
*/
package org.sleuthkit.autopsy.logging;
package org.sleuthkit.autopsy.coreutils;
import java.util.logging.Level;
import java.util.logging.Logger;

View File

Before

Width:  |  Height:  |  Size: 980 B

After

Width:  |  Height:  |  Size: 980 B

View File

@ -17,7 +17,7 @@
* limitations under the License.
*/
package org.sleuthkit.autopsy.logging;
package org.sleuthkit.autopsy.coreutils;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

View File

@ -18,7 +18,7 @@
*/
package org.sleuthkit.autopsy.logging;
package org.sleuthkit.autopsy.coreutils;
import java.text.DateFormat;
import java.util.Date;

View File

@ -3,6 +3,6 @@ build.xml.script.CRC32=3bd58878
build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=c861ba34
nbproject/build-impl.xml.data.CRC32=d5d42932
nbproject/build-impl.xml.script.CRC32=b0a13adb
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1

View File

@ -47,7 +47,7 @@
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.logging</code-name-base>
<code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>

View File

@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.ContentVisitor;
import org.sleuthkit.datamodel.Directory;

View File

@ -1,8 +1,8 @@
build.xml.data.CRC32=db477856
build.xml.data.CRC32=f54ab67d
build.xml.script.CRC32=6ec7becb
build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
build.xml.stylesheet.CRC32=a56c6a5b@2.47.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=db477856
nbproject/build-impl.xml.data.CRC32=f54ab67d
nbproject/build-impl.xml.script.CRC32=8c5007a7
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1

View File

@ -107,7 +107,7 @@
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
<code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
@ -116,7 +116,7 @@
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.logging</code-name-base>
<code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>

View File

@ -27,7 +27,7 @@ import org.openide.util.actions.Presenter;
import org.sleuthkit.autopsy.corecomponents.DataContentTopComponent;
import org.sleuthkit.autopsy.corecomponents.DataContentViewerHex;
import org.sleuthkit.autopsy.corecomponents.DataContentViewerString;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
/**
* The actions to change between the "Hex View" and "String View".

View File

@ -24,7 +24,7 @@ import org.openide.explorer.ExplorerManager;
import org.openide.explorer.view.BeanTreeView;
import org.openide.nodes.Children;
import org.openide.nodes.Node;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
/**
*

View File

@ -28,7 +28,7 @@ import javax.swing.AbstractAction;
import org.openide.nodes.Node;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.datamodel.ContentUtils;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
/**
* Extracts a File object to a temporary file in the case directory, and then

View File

@ -27,7 +27,7 @@ import javax.swing.JOptionPane;
import org.openide.nodes.Node;
import org.sleuthkit.autopsy.datamodel.ContentUtils;
import org.sleuthkit.autopsy.datamodel.ContentUtils.ExtractFscContentVisitor;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.ContentVisitor;
import org.sleuthkit.datamodel.Directory;

View File

@ -28,7 +28,7 @@ import org.openide.windows.WindowManager;
import org.sleuthkit.autopsy.datamodel.DataConversion;
import org.sleuthkit.autopsy.corecomponents.DataContentTopComponent;
import org.sleuthkit.autopsy.datamodel.ContentUtils;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
import org.sleuthkit.datamodel.Content;
/**

View File

@ -35,7 +35,7 @@ import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JTable;
import javax.swing.table.DefaultTableModel;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.ContentVisitor;
import org.sleuthkit.datamodel.FileSystem;

View File

@ -1,8 +1,8 @@
build.xml.data.CRC32=efa3ed67
build.xml.data.CRC32=ad8ce357
build.xml.script.CRC32=c0009852
build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
build.xml.stylesheet.CRC32=a56c6a5b@2.47.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=efa3ed67
nbproject/build-impl.xml.data.CRC32=ad8ce357
nbproject/build-impl.xml.script.CRC32=2e520747
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1

View File

@ -98,6 +98,15 @@
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>0-1</release-version>
<specification-version>0.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
<build-prerequisite/>
@ -116,15 +125,6 @@
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.logging</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>0-1</release-version>
<specification-version>0.0</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
<public-packages>
<package>org.sleuthkit.autopsy.filesearch</package>

View File

@ -31,7 +31,7 @@ import org.openide.nodes.Node;
import org.openide.nodes.NodeOp;
import org.openide.windows.TopComponent;
import org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent;
import org.sleuthkit.autopsy.logging.Log;
import org.sleuthkit.autopsy.coreutils.Log;
/**

View File

@ -3,6 +3,6 @@ build.xml.script.CRC32=87b97b04
build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=b3ac9d8f
nbproject/build-impl.xml.data.CRC32=957d4757
nbproject/build-impl.xml.script.CRC32=fe1f48d2
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1

View File

@ -99,6 +99,15 @@
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>0-1</release-version>
<specification-version>0.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
<build-prerequisite/>

View File

@ -1,7 +0,0 @@
Manifest-Version: 1.0
OpenIDE-Module: org.sleuthkit.autopsy.logging/0
OpenIDE-Module-Implementation-Version: 2
OpenIDE-Module-Install: org/sleuthkit/autopsy/logging/Installer.class
OpenIDE-Module-Layer: org/sleuthkit/autopsy/logging/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/logging/Bundle.properties

View File

@ -1,8 +0,0 @@
build.xml.data.CRC32=cacaba65
build.xml.script.CRC32=5960e63f
build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=cacaba65
nbproject/build-impl.xml.script.CRC32=db164ed0
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2

View File

@ -1,7 +0,0 @@
cluster.path=\
${nbplatform.active.dir}/platform
disabled.modules=\
org.netbeans.libs.jsr223,\
org.openide.compat,\
org.openide.util.enumerations
nbplatform.active=default

View File

@ -1 +0,0 @@
user.properties.file=C:\\Users\\pmartel\\.netbeans\\6.9\\build.properties

View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1">
<file>
<url>src/org/sleuthkit/autopsy/logging/Installer.java</url>
<line>62</line>
</file>
</editor-bookmarks>
</project-private>

View File

@ -1,2 +0,0 @@
CTL_TestLogger=Test log
OpenIDE-Module-Name=Logging

View File

@ -1,8 +1,8 @@
build.xml.data.CRC32=77b5c2dd
build.xml.data.CRC32=540a1acf
build.xml.script.CRC32=46209f11
build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
build.xml.stylesheet.CRC32=a56c6a5b@2.47.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=77b5c2dd
nbproject/build-impl.xml.data.CRC32=540a1acf
nbproject/build-impl.xml.script.CRC32=cb422238
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1

View File

@ -99,15 +99,6 @@
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.logging</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>0-1</release-version>
<specification-version>0.0</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
<public-packages>
<package>org.sleuthkit.autopsy.menuactions</package>

View File

@ -38,10 +38,11 @@
</not>
</condition>
</fail>
<fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly.">
<ant antfile="nbproject/platform.xml"/>
<fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly. ${line.separator}You may instead download the harness and platform: -Dbootstrap.url=.../tasks.jar -Dautoupdate.catalog.url=.../updates.xml">
<condition>
<not>
<available type="dir" file="${harness.dir}"/>
<available file="${harness.dir}/suite.xml"/>
</not>
</condition>
</fail>

View File

@ -4,5 +4,8 @@ build.xml.stylesheet.CRC32=eaf9f76a@1.42.2
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=2e7964b0
nbproject/build-impl.xml.script.CRC32=14b0b78d
nbproject/build-impl.xml.stylesheet.CRC32=183e6ef3@1.42.2
nbproject/build-impl.xml.script.CRC32=b72261eb
nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.47.1
nbproject/platform.xml.data.CRC32=2e7964b0
nbproject/platform.xml.script.CRC32=db9e1f43
nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.47.1

View File

@ -88,7 +88,6 @@ disabled.modules=\
org.netbeans.modules.refactoring.java,\
org.netbeans.modules.spellchecker.bindings.java,\
org.netbeans.modules.spring.beans,\
org.netbeans.modules.swingapp,\
org.netbeans.modules.websvc.jaxws21,\
org.netbeans.modules.websvc.jaxws21api,\
org.netbeans.modules.websvc.saas.codegen.java,\

34
nbproject/platform.xml Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="platform" default="download" basedir="..">
<condition property="download.required">
<and>
<not>
<available file="${harness.dir}/suite.xml"/>
</not>
<isset property="bootstrap.url"/>
<isset property="autoupdate.catalog.url"/>
</and>
</condition>
<target name="download" if="download.required">
<mkdir dir="${harness.dir}"/>
<pathconvert pathsep="|" property="download.clusters">
<mapper type="flatten"/>
<path path="${cluster.path}"/>
</pathconvert>
<property name="disabled.modules" value=""/>
<pathconvert property="module.includes" pathsep="">
<mapper type="glob" from="${basedir}${file.separator}*" to="(?!\Q*\E)"/>
<path>
<filelist files="${disabled.modules}" dir="."/>
</path>
</pathconvert>
<echo message="Downloading clusters ${download.clusters}"/>
<property name="tasks.jar" location="${java.io.tmpdir}/tasks.jar"/>
<get src="${bootstrap.url}" dest="${tasks.jar}" usetimestamp="true" verbose="true"/>
<taskdef name="autoupdate" classname="org.netbeans.nbbuild.AutoUpdate" classpath="${tasks.jar}"/>
<autoupdate installdir="${nbplatform.active.dir}" updatecenter="${autoupdate.catalog.url}">
<modules includes="${module.includes}.*" clusters="${download.clusters}"/>
<modules includes="org[.]netbeans[.]modules[.]apisupport[.]harness" clusters="harness"/>
</autoupdate>
</target>
</project>

View File

@ -16,15 +16,15 @@ modules=\
${project.org.sleuthkit.autopsy.corecomponents}:\
${project.org.sleuthkit.autopsy.filesearch}:\
${project.org.sleuthkit.autopsy.datamodel}:\
${project.org.sleuthkit.autopsy.logging}:\
${project.org.sleuthkit.autopsy.casemodule}:\
${project.org.sleuthkit.autopsy.keywordsearch}
${project.org.sleuthkit.autopsy.keywordsearch}:\
${project.org.sleuthkit.autopsy.coreutils}
project.org.sleuthkit.autopsy.casemodule=Case
project.org.sleuthkit.autopsy.corecomponentinterfaces=CoreComponentInterfaces
project.org.sleuthkit.autopsy.corecomponents=CoreComponents
project.org.sleuthkit.autopsy.coreutils=CoreUtils
project.org.sleuthkit.autopsy.directorytree=DirectoryTree
project.org.sleuthkit.autopsy.filesearch=FileSearch
project.org.sleuthkit.autopsy.keywordsearch=KeywordSearch
project.org.sleuthkit.autopsy.logging=Logging
project.org.sleuthkit.autopsy.menuactions=MenuActions
project.org.sleuthkit.autopsy.datamodel=DataModel