diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index 32fd5a84d2..be975ecead 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -24,5 +24,8 @@
+
+
+
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index a7956b7e24..d614fdbd3e 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -1,24 +1,3 @@
-file.reference.commons-lang-2.4.jar=release/modules/ext/commons-lang-2.4.jar
-file.reference.commons-logging-1.1.1.jar=release/modules/ext/commons-logging-1.1.1.jar
-file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar
-file.reference.gson-1.4.jar=release/modules/ext/gson-1.4.jar
-file.reference.gstreamer-java-1.5.jar=release/modules/ext/gstreamer-java-1.5.jar
-file.reference.guava-11.0.2.jar=release/modules/ext/guava-11.0.2.jar
-file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.jar
-file.reference.jcalendarbutton-1.4.6.jar=release/modules/ext/jcalendarbutton-1.4.6.jar
-file.reference.jna-3.4.0.jar=release/modules/ext/jna-3.4.0.jar
-file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar
-file.reference.poi-3.8.jar=release/modules/ext/poi-3.8.jar
-file.reference.poi-excelant-3.8.jar=release/modules/ext/poi-excelant-3.8.jar
-file.reference.poi-ooxml-3.8.jar=release/modules/ext/poi-ooxml-3.8.jar
-file.reference.poi-ooxml-schemas-3.8.jar=release/modules/ext/poi-ooxml-schemas-3.8.jar
-file.reference.poi-scratchpad-3.8.jar=release/modules/ext/poi-scratchpad-3.8.jar
-file.reference.reflections-0.9.8.jar=release/modules/ext/reflections-0.9.8.jar
-file.reference.servlet-api-2.5.jar=release/modules/ext/servlet-api-2.5.jar
-file.reference.slf4j-api-1.6.1.jar=release/modules/ext/slf4j-api-1.6.1.jar
-file.reference.slf4j-simple-1.6.1.jar=release/modules/ext/slf4j-simple-1.6.1.jar
-file.reference.xml-apis-1.0.b2.jar=release/modules/ext/xml-apis-1.0.b2.jar
-file.reference.xmlbeans-2.3.0.jar=release/modules/ext/xmlbeans-2.3.0.jar
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
nbm.needs.restart=true
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 0000747c84..627f63d065 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -16,6 +16,10 @@
+ com.apple.concurrent
+ com.apple.eawt
+ com.apple.eawt.event
+ com.apple.eio
com.google.common.annotations
com.google.common.base
com.google.common.base.internal
@@ -31,9 +35,26 @@
com.google.gson
com.google.gson.annotations
com.google.gson.reflect
+ com.sun.activation.registries
+ com.sun.activation.viewers
com.sun.jna
+ com.sun.jna.platform
+ com.sun.jna.platform.dnd
+ com.sun.jna.platform.mac
+ com.sun.jna.platform.unix
+ com.sun.jna.platform.win32
+ com.sun.jna.platform.wince
com.sun.jna.ptr
com.sun.jna.win32
+ com.sun.mail.auth
+ com.sun.mail.handlers
+ com.sun.mail.iap
+ com.sun.mail.imap
+ com.sun.mail.imap.protocol
+ com.sun.mail.pop3
+ com.sun.mail.smtp
+ com.sun.mail.util
+ com.sun.mail.util.logging
javassist
javassist.bytecode
javassist.bytecode.analysis
@@ -51,17 +72,93 @@
javassist.tools.web
javassist.util
javassist.util.proxy
+ javax.activation
javax.annotation
javax.annotation.concurrent
javax.annotation.meta
+ javax.annotation.security
+ javax.ejb
+ javax.ejb.spi
+ javax.enterprise.deploy.model
+ javax.enterprise.deploy.model.exceptions
+ javax.enterprise.deploy.shared
+ javax.enterprise.deploy.shared.factories
+ javax.enterprise.deploy.spi
+ javax.enterprise.deploy.spi.exceptions
+ javax.enterprise.deploy.spi.factories
+ javax.enterprise.deploy.spi.status
+ javax.interceptor
+ javax.jms
+ javax.jws
+ javax.jws.soap
+ javax.mail
+ javax.mail.event
+ javax.mail.internet
+ javax.mail.search
+ javax.mail.util
+ javax.management.j2ee
+ javax.management.j2ee.statistics
+ javax.persistence
+ javax.persistence.spi
+ javax.resource
+ javax.resource.cci
+ javax.resource.spi
+ javax.resource.spi.endpoint
+ javax.resource.spi.security
+ javax.resource.spi.work
+ javax.security.jacc
javax.servlet
javax.servlet.http
+ javax.transaction
+ javax.transaction.xa
+ javax.xml
+ javax.xml.bind
+ javax.xml.bind.annotation
+ javax.xml.bind.annotation.adapters
+ javax.xml.bind.attachment
+ javax.xml.bind.helpers
+ javax.xml.bind.util
+ javax.xml.namespace
javax.xml.parsers
+ javax.xml.registry
+ javax.xml.registry.infomodel
+ javax.xml.rpc
+ javax.xml.rpc.encoding
+ javax.xml.rpc.handler
+ javax.xml.rpc.handler.soap
+ javax.xml.rpc.holders
+ javax.xml.rpc.server
+ javax.xml.rpc.soap
+ javax.xml.soap
+ javax.xml.stream
+ javax.xml.stream.events
+ javax.xml.stream.util
javax.xml.transform
javax.xml.transform.dom
javax.xml.transform.sax
javax.xml.transform.stream
+ javax.xml.ws
+ javax.xml.ws.handler
+ javax.xml.ws.handler.soap
+ javax.xml.ws.http
+ javax.xml.ws.soap
+ javax.xml.ws.spi
net.sourceforge.jcalendarbutton
+ org.apache.avalon.framework
+ org.apache.avalon.framework.activity
+ org.apache.avalon.framework.component
+ org.apache.avalon.framework.configuration
+ org.apache.avalon.framework.container
+ org.apache.avalon.framework.context
+ org.apache.avalon.framework.logger
+ org.apache.avalon.framework.parameters
+ org.apache.avalon.framework.service
+ org.apache.avalon.framework.thread
+ org.apache.commons.codec
+ org.apache.commons.codec.binary
+ org.apache.commons.codec.digest
+ org.apache.commons.codec.language
+ org.apache.commons.codec.net
org.apache.commons.lang
org.apache.commons.lang.builder
org.apache.commons.lang.enums
@@ -72,6 +169,39 @@
org.apache.commons.lang.time
org.apache.commons.logging
org.apache.commons.logging.impl
+ org.apache.geronimo.mail.handlers
+ org.apache.geronimo.mail.util
+ org.apache.log
+ org.apache.log.filter
+ org.apache.log.format
+ org.apache.log.output
+ org.apache.log.output.db
+ org.apache.log.output.io
+ org.apache.log.output.io.rotate
+ org.apache.log.output.jms
+ org.apache.log.output.net
+ org.apache.log.util
+ org.apache.log4j
+ org.apache.log4j.chainsaw
+ org.apache.log4j.config
+ org.apache.log4j.helpers
+ org.apache.log4j.jdbc
+ org.apache.log4j.jmx
+ org.apache.log4j.lf5
+ org.apache.log4j.lf5.util
+ org.apache.log4j.lf5.viewer
+ org.apache.log4j.lf5.viewer.categoryexplorer
+ org.apache.log4j.lf5.viewer.configure
+ org.apache.log4j.net
+ org.apache.log4j.nt
+ org.apache.log4j.or
+ org.apache.log4j.or.jms
+ org.apache.log4j.or.sax
+ org.apache.log4j.pattern
+ org.apache.log4j.rewrite
+ org.apache.log4j.spi
+ org.apache.log4j.varia
+ org.apache.log4j.xml
org.apache.poi
org.apache.poi.common.usermodel
org.apache.poi.ddf
@@ -202,6 +332,66 @@
org.apache.poi.xwpf.extractor
org.apache.poi.xwpf.model
org.apache.poi.xwpf.usermodel
+ org.apache.tools.ant
+ org.apache.tools.ant.dispatch
+ org.apache.tools.ant.filters
+ org.apache.tools.ant.filters.util
+ org.apache.tools.ant.helper
+ org.apache.tools.ant.input
+ org.apache.tools.ant.launch
+ org.apache.tools.ant.listener
+ org.apache.tools.ant.loader
+ org.apache.tools.ant.property
+ org.apache.tools.ant.taskdefs
+ org.apache.tools.ant.taskdefs.compilers
+ org.apache.tools.ant.taskdefs.condition
+ org.apache.tools.ant.taskdefs.cvslib
+ org.apache.tools.ant.taskdefs.email
+ org.apache.tools.ant.taskdefs.optional
+ org.apache.tools.ant.taskdefs.optional.ccm
+ org.apache.tools.ant.taskdefs.optional.clearcase
+ org.apache.tools.ant.taskdefs.optional.depend
+ org.apache.tools.ant.taskdefs.optional.depend.constantpool
+ org.apache.tools.ant.taskdefs.optional.ejb
+ org.apache.tools.ant.taskdefs.optional.extension
+ org.apache.tools.ant.taskdefs.optional.extension.resolvers
+ org.apache.tools.ant.taskdefs.optional.i18n
+ org.apache.tools.ant.taskdefs.optional.j2ee
+ org.apache.tools.ant.taskdefs.optional.javacc
+ org.apache.tools.ant.taskdefs.optional.javah
+ org.apache.tools.ant.taskdefs.optional.jlink
+ org.apache.tools.ant.taskdefs.optional.jsp
+ org.apache.tools.ant.taskdefs.optional.jsp.compilers
+ org.apache.tools.ant.taskdefs.optional.native2ascii
+ org.apache.tools.ant.taskdefs.optional.net
+ org.apache.tools.ant.taskdefs.optional.pvcs
+ org.apache.tools.ant.taskdefs.optional.script
+ org.apache.tools.ant.taskdefs.optional.sos
+ org.apache.tools.ant.taskdefs.optional.testing
+ org.apache.tools.ant.taskdefs.optional.unix
+ org.apache.tools.ant.taskdefs.optional.vss
+ org.apache.tools.ant.taskdefs.optional.windows
+ org.apache.tools.ant.taskdefs.rmic
+ org.apache.tools.ant.types
+ org.apache.tools.ant.types.mappers
+ org.apache.tools.ant.types.optional
+ org.apache.tools.ant.types.optional.depend
+ org.apache.tools.ant.types.resources
+ org.apache.tools.ant.types.resources.comparators
+ org.apache.tools.ant.types.resources.selectors
+ org.apache.tools.ant.types.selectors
+ org.apache.tools.ant.types.selectors.modifiedselector
+ org.apache.tools.ant.types.spi
+ org.apache.tools.ant.util
+ org.apache.tools.ant.util.depend
+ org.apache.tools.ant.util.facade
+ org.apache.tools.ant.util.java15
+ org.apache.tools.ant.util.optional
+ org.apache.tools.ant.util.regexp
+ org.apache.tools.bzip2
+ org.apache.tools.mail
+ org.apache.tools.tar
+ org.apache.tools.zip
org.apache.xmlbeans
org.apache.xmlbeans.impl.common
org.apache.xmlbeans.impl.config
@@ -281,14 +471,19 @@
org.gstreamer.swing
org.gstreamer.swt
org.gstreamer.swt.overlay
+ org.hyperic.jni
+ org.hyperic.sigar
+ org.hyperic.sigar.cmd
+ org.hyperic.sigar.jmx
+ org.hyperic.sigar.pager
+ org.hyperic.sigar.ptql
+ org.hyperic.sigar.shell
+ org.hyperic.sigar.test
+ org.hyperic.sigar.util
+ org.hyperic.sigar.vmware
+ org.hyperic.sigar.win32
+ org.hyperic.sigar.win32.test
org.jbundle.thin.base.screen.jcalendarbutton
- org.jdom
- org.jdom.adapters
- org.jdom.filter
- org.jdom.input
- org.jdom.output
- org.jdom.transform
- org.jdom.xpath
org.openxmlformats.schemas.drawingml.x2006.chart
org.openxmlformats.schemas.drawingml.x2006.chart.impl
org.openxmlformats.schemas.drawingml.x2006.main
@@ -348,21 +543,13 @@
schemasMicrosoftComVml
schemasMicrosoftComVml.impl
-
- ext/javassist-3.12.1.GA.jar
- release/modules/ext/javassist-3.12.1.GA.jar
-
ext/jsr305-1.3.9.jar
release/modules/ext/jsr305-1.3.9.jar
- ext/jcalendarbutton-1.4.6.jar
- release/modules/ext/jcalendarbutton-1.4.6.jar
-
-
- ext/xml-apis-1.0.b2.jar
- release/modules/ext/xml-apis-1.0.b2.jar
+ ext/javaee-api-5.0-2.jar
+ release/modules/ext/javaee-api-5.0-2.jar
ext/commons-logging-1.1.1.jar
@@ -372,10 +559,6 @@
ext/slf4j-simple-1.6.1.jar
release/modules/ext/slf4j-simple-1.6.1.jar
-
- ext/gson-1.4.jar
- release/modules/ext/gson-1.4.jar
-
ext/commons-lang-2.4.jar
release/modules/ext/commons-lang-2.4.jar
@@ -385,36 +568,32 @@
release/modules/ext/gstreamer-java-1.5.jar
- ext/poi-ooxml-3.8.jar
- release/modules/ext/poi-ooxml-3.8.jar
+ ext/log4j-1.2.17.jar
+ release/modules/ext/log4j-1.2.17.jar
- ext/servlet-api-2.5.jar
- release/modules/ext/servlet-api-2.5.jar
+ ext/poi-ooxml-3.8.jar
+ release/modules/ext/poi-ooxml-3.8.jar
ext/slf4j-api-1.6.1.jar
release/modules/ext/slf4j-api-1.6.1.jar
- ext/poi-3.8.jar
- release/modules/ext/poi-3.8.jar
+ ext/activation-1.1.jar
+ release/modules/ext/activation-1.1.jar
- ext/dom4j-1.6.1.jar
- release/modules/ext/dom4j-1.6.1.jar
+ ext/platform-3.4.0.jar
+ release/modules/ext/platform-3.4.0.jar
- ext/poi-scratchpad-3.8.jar
- release/modules/ext/poi-scratchpad-3.8.jar
+ ext/ant-1.8.2.jar
+ release/modules/ext/ant-1.8.2.jar
- ext/poi-ooxml-schemas-3.8.jar
- release/modules/ext/poi-ooxml-schemas-3.8.jar
-
-
- ext/guava-11.0.2.jar
- release/modules/ext/guava-11.0.2.jar
+ ext/stax-api-1.0.1.jar
+ release/modules/ext/stax-api-1.0.1.jar
ext/xmlbeans-2.3.0.jar
@@ -424,14 +603,86 @@
ext/reflections-0.9.8.jar
release/modules/ext/reflections-0.9.8.jar
-
- ext/poi-excelant-3.8.jar
- release/modules/ext/poi-excelant-3.8.jar
-
ext/jna-3.4.0.jar
release/modules/ext/jna-3.4.0.jar
+
+ ext/avalon-framework-4.1.3.jar
+ release/modules/ext/avalon-framework-4.1.3.jar
+
+
+ ext/ant-launcher-1.8.2.jar
+ release/modules/ext/ant-launcher-1.8.2.jar
+
+
+ ext/javassist-3.12.1.GA.jar
+ release/modules/ext/javassist-3.12.1.GA.jar
+
+
+ ext/jcalendarbutton-1.4.6.jar
+ release/modules/ext/jcalendarbutton-1.4.6.jar
+
+
+ ext/mail-1.4.3.jar
+ release/modules/ext/mail-1.4.3.jar
+
+
+ ext/xml-apis-1.0.b2.jar
+ release/modules/ext/xml-apis-1.0.b2.jar
+
+
+ ext/geronimo-jms_1.1_spec-1.0.jar
+ release/modules/ext/geronimo-jms_1.1_spec-1.0.jar
+
+
+ ext/AppleJavaExtensions-1.4.jar
+ release/modules/ext/AppleJavaExtensions-1.4.jar
+
+
+ ext/sigar-1.6.4.jar
+ release/modules/ext/sigar-1.6.4.jar
+
+
+ ext/gson-1.4.jar
+ release/modules/ext/gson-1.4.jar
+
+
+ ext/servlet-api-2.5.jar
+ release/modules/ext/servlet-api-2.5.jar
+
+
+ ext/poi-3.8.jar
+ release/modules/ext/poi-3.8.jar
+
+
+ ext/poi-scratchpad-3.8.jar
+ release/modules/ext/poi-scratchpad-3.8.jar
+
+
+ ext/dom4j-1.6.1.jar
+ release/modules/ext/dom4j-1.6.1.jar
+
+
+ ext/commons-codec-1.5.jar
+ release/modules/ext/commons-codec-1.5.jar
+
+
+ ext/poi-ooxml-schemas-3.8.jar
+ release/modules/ext/poi-ooxml-schemas-3.8.jar
+
+
+ ext/logkit-1.0.1.jar
+ release/modules/ext/logkit-1.0.1.jar
+
+
+ ext/guava-11.0.2.jar
+ release/modules/ext/guava-11.0.2.jar
+
+
+ ext/poi-excelant-3.8.jar
+ release/modules/ext/poi-excelant-3.8.jar
+
diff --git a/README.txt b/README.txt
index f9fe72f1a5..7dbcaab563 100644
--- a/README.txt
+++ b/README.txt
@@ -89,7 +89,7 @@ Jericho for extracting content from HTML files
- Web page: http://jerichohtml.sourceforge.net/
- License: http://www.gnu.org/copyleft/lesser.html
-Advanced installer 9.0 (Freeware)
+Advanced installer 9 (Freeware)
(not embedded in Autopsy, but used to generate Autopsy installer.)
- Web page: http://www.advancedinstaller.com/
@@ -100,3 +100,7 @@ Metadata Extractor 2.6.2 for extracting Exif metadata
Reflections 0.9.8 for ingest module loading
- Web page: http://code.google.com/p/reflections
- License: http://en.wikipedia.org/wiki/WTFPL
+
+Sigar for process monitoring
+- Web page: http://support.hyperic.com/display/SIGAR/Home
+- License: http://support.hyperic.com/display/SIGAR/Home#Home-license
\ No newline at end of file