Initial merge of core modules - it does build.

Pull core deps. jars from Maven using ivy.
Simplify dependencies.
TODO: add to classpath jars that should be, fix javahelp, merge layer.xml, disable some netbeans modules, merge Installer.java

.gitignore

@@ -3,27 +3,21 @@
 /*/build/
 */nbproject/private/*
 /nbproject/private/*
-/DataModel/release/modules/lib/libewf.dll
-/DataModel/release/modules/ext/Tsk_DataModel.jar
-/DataModel/release/modules/ext/sqlite-jdbc-3.6.20.jar
-/DataModel/release/modules/lib/libewf.dll
-/DataModel/release/modules/lib/libtsk_jni.dll
-/DataModel/release/modules/lib/zlib1.dll
+/Core/release/modules/lib/
+/Core/release/modules/ext/
+/Core/src/org/sleuthkit/autopsy/coreutils/Version.properties
 /KeywordSearch/release/modules/ext/
 /KeywordSearch/release/solr/lib/
 /KeywordSearch/release/solr/solr/lib/
 /KeywordSearch/release/solr/start.jar
 /KeywordSearch/release/solr/webapps/solr.war
 /Ingest/release/modules/ext/
-/DataModel/release/modules/ext/sqlite-jdbc-3.7.2.jar
-/DataModel/release/modules/lib/zlib.dll
 /branding_spear
 /installer_spear
 Bundle_*.properties
 genfiles.properties
 /branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
 /branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
-/CoreUtils/src/org/sleuthkit/autopsy/coreutils/Version.properties
 /Testing/script/input/
 /Testing/script/output/
 /Testing/script/gold/

Core/build.xml

@@ -2,7 +2,61 @@
 <!-- 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.core" default="netbeans" basedir=".">
+<project name="org.sleuthkit.autopsy.core" default="netbeans" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
     <description>Builds, tests, and runs the project org.sleuthkit.autopsy.core.</description>
     <import file="nbproject/build-impl.xml"/>
+    
+    <!-- TODO move iby setup to global project build.xml and reuse the target in modules -->
+     
+    <property name="ivy.install.version" value="2.1.0-rc2" />
+    <condition property="ivy.home" value="${env.IVY_HOME}">
+        <isset property="env.IVY_HOME" />
+    </condition>
+    <property name="ivy.home" value="${user.home}/.ant" />
+    <property name="ivy.jar.dir" value="${ivy.home}/lib" />
+    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+
+    <target name="download-ivy" unless="offline">
+        <mkdir dir="${ivy.jar.dir}"/>
+        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" 
+         dest="${ivy.jar.file}" usetimestamp="true"/>
+    </target>
+
+    <!-- init-ivy will bootstrap Ivy if the user doesn't have it already -->
+    <target name="init-ivy" depends="download-ivy">
+        <path id="ivy.lib.path">
+            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+        </path>
+        <taskdef resource="org/apache/ivy/ant/antlib.xml"
+             uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+    </target>
+
+    <!-- Verify that the TSK_HOME env variable is set -->
+    <target name="findTSK">
+        <property environment="env"/>
+        <condition property="tskFound">
+            <isset property="env.TSK_HOME"/>
+        </condition>
+        <fail unless="tskFound" message="TSK_HOME must be set as an environment variable."/>
+        <echo> TSK_HOME: ${env.TSK_HOME}</echo>
+    </target>  
+    
+    <target name="getTSKJars" depends="findTSK">
+        <property environment="env"/>
+        <copy file="${env.TSK_HOME}/bindings/java/dist/Tsk_DataModel.jar" tofile="${basedir}/release/modules/ext/Tsk_DataModel.jar"/>
+        <copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.7.2.jar" tofile="${basedir}/release/modules/ext/sqlite-jdbc-3.7.2.jar"/>
+    </target>
+
+    <target name="init" depends="basic-init,files-init,build-init,-javac-init,init-ivy">
+        
+        <!-- clear & fetch all the dependencies from Ivy and stick them in the right places -->
+        <ivy:resolve/>
+        <ivy:retrieve conf="autopsy_core" sync="true" pattern="release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />
+        
+        <!-- get additional deps -->
+        <antcall target="getTSKJars" />
+        
+    </target>
+    
+ 
 </project>

Core/ivy.xml

@@ -0,0 +1,30 @@
+
+<ivy-module version="2.0">
+    <info organisation="org.sleuthkit.autopsy" module="core"/>
+    <configurations >
+        <!-- module dependencies -->
+        <conf name="autopsy_core"/>
+        
+    </configurations>
+    <dependencies>
+        <!-- for ingest -->
+        <dependency conf="autopsy_core->*" org="org.reflections" name="reflections" rev="0.9.8"/>
+        
+        <!-- for viewers -->
+        <dependency conf="autopsy_core->*" org="com.googlecode.gstreamer-java" name="gstreamer-java" rev="1.5"/>
+        
+         <!-- for file search -->
+        <dependency conf="autopsy_core->*" org="org.jbundle.thin.base.screen" name="jcalendarbutton" rev="1.4.6"/>
+        
+        <!-- commmon -->
+        <dependency conf="autopsy_core->*" org="commons-lang" name="commons-lang" rev="2.4"/>
+        <dependency conf="autopsy_core->*" org="commons-logging" name="commons-logging" rev="1.1.1"/>
+        <dependency conf="autopsy_core->*" org="log4j" name="log4j" rev="1.2.17"/>
+        
+        <!-- reporting -->
+      <dependency conf="autopsy_core->*" org="dom4j" name="dom4j" rev="1.6.1"/>
+       <!-- <dependency conf="autopsy_core->*" org="org.jdom" name="jdom" rev="1.1.3"/> -->
+        <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"/>
+    </dependencies>
+</ivy-module>

Core/manifest.mf

@@ -5,4 +5,5 @@ OpenIDE-Module-Layer: org/sleuthkit/autopsy/core/layer.xml
 OpenIDE-Module-Implementation-Version: 1
 OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
 AutoUpdate-Show-In-Client: true
+OpenIDE-Module-Install: org/sleuthkit/autopsy/corecomponents/Installer.class
 

Core/nbproject/project.properties

@@ -1,3 +1,15 @@
+file.reference.commons-lang-2.4.jar=release/modules/ext/commons-lang-2.4.jar
+file.reference.gstreamer-java-1.5.jar=release/modules/ext/gstreamer-java-1.5.jar
+file.reference.jcalendarbutton-1.4.6.jar=release/modules/ext/jcalendarbutton-1.4.6.jar
+file.reference.jdom-1.0.jar=release/modules/ext/jdom-1.0.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.sqlite-jdbc-3.7.2.jar=release/modules/ext/sqlite-jdbc-3.7.2.jar
+file.reference.Tsk_DataModel.jar=release/modules/ext/Tsk_DataModel.jar
 javac.source=1.6
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE-2.0.txt
@@ -5,3 +17,4 @@ nbm.homepage=http://www.sleuthkit.org/
 nbm.module.author=Brian Carrier
 nbm.needs.restart=true
 spec.version.base=1.0
+javahelp.hs=casemodule-helpset.xml

Core/nbproject/project.xml

@@ -6,6 +6,42 @@
             <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
             <suite-component/>
             <module-dependencies>
+                <dependency>
+                    <code-name-base>org.netbeans.api.progress</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.28.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.core</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>2</release-version>
+                        <implementation-version/>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.core.startup</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <implementation-version/>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.javahelp</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>2.27.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.settings</code-name-base>
                     <build-prerequisite/>
@@ -15,6 +51,38 @@
                         <specification-version>1.26.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.swing.outline</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.20.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.swing.plaf</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.25.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.swing.tabcontrol</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.36.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.actions</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.26.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.awt</code-name-base>
                     <build-prerequisite/>
@@ -31,6 +99,14 @@
                         <specification-version>7.15.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.explorer</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.45.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.filesystems</code-name-base>
                     <build-prerequisite/>
@@ -87,33 +163,6 @@
                         <specification-version>6.33.1</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponentinterfaces</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <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/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
             </module-dependencies>
             <test-dependencies>
                 <test-type>
@@ -126,7 +175,101 @@
             </test-dependencies>
             <public-packages>
                 <package>org.sleuthkit.autopsy.casemodule</package>
+                <package>org.sleuthkit.autopsy.corecomponentinterfaces</package>
+                <package>org.sleuthkit.autopsy.corecomponents</package>
+                <package>org.sleuthkit.autopsy.coreutils</package>
+                <package>org.sleuthkit.autopsy.datamodel</package>
+                <package>org.sleuthkit.autopsy.directorytree</package>
+                <package>org.sleuthkit.autopsy.filesearch</package>
+                <package>org.sleuthkit.autopsy.ingest</package>
+                <package>org.sleuthkit.autopsy.menuactions</package>
+                <package>org.sleuthkit.autopsy.report</package>
+                <package>org.sleuthkit.datamodel</package>
             </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/javassist-3.12.1.GA.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javassist-3.12.1.GA.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jdom-1.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jdom-1.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jsr305-1.3.9.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jsr305-1.3.9.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jcalendarbutton-1.4.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jcalendarbutton-1.4.6.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/xml-apis-1.0.b2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xml-apis-1.0.b2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/slf4j-simple-1.6.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-simple-1.6.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/gson-1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gson-1.4.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-lang-2.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-lang-2.4.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/gstreamer-java-1.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gstreamer-java-1.5.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-ooxml-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-ooxml-3.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/servlet-api-2.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/servlet-api-2.5.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sqlite-jdbc-3.7.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sqlite-jdbc-3.7.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/slf4j-api-1.6.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-api-1.6.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-3.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/dom4j-1.6.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/dom4j-1.6.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-scratchpad-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-scratchpad-3.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-ooxml-schemas-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-ooxml-schemas-3.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/guava-11.0.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/guava-11.0.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/Tsk_DataModel.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/Tsk_DataModel.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/reflections-0.9.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/reflections-0.9.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-excelant-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-excelant-3.8.jar</binary-origin>
+            </class-path-extension>
         </data>
     </configuration>
 </project>