From d7659dec9c405897127447a701db46338f497079 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Wed, 20 Jun 2012 17:03:42 -0400
Subject: [PATCH 1/5] TSK-527 Automate netbeans RCP platform build fixes #1

---
 Case/nbproject/project.xml | 10 +---------
 build.xml                  | 27 +++++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/Case/nbproject/project.xml b/Case/nbproject/project.xml
index ed0e258923..d264d97853 100644
--- a/Case/nbproject/project.xml
+++ b/Case/nbproject/project.xml
@@ -6,15 +6,7 @@
             <code-name-base>org.sleuthkit.autopsy.casemodule</code-name-base>
             <suite-component/>
             <module-dependencies>
-                <dependency>
-                    <code-name-base>org.jdesktop.beansbinding</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.11.1.121</specification-version>
-                    </run-dependency>
-                </dependency>
+                
                 <dependency>
                     <code-name-base>org.netbeans.modules.settings</code-name-base>
                     <build-prerequisite/>
diff --git a/build.xml b/build.xml
index 41d3041beb..2de7558e1d 100644
--- a/build.xml
+++ b/build.xml
@@ -4,9 +4,14 @@
 <!-- If you delete this file and reopen the project it will be recreated. -->
 <project name="Autopsy3" basedir=".">
     <description>Builds the module suite Autopsy3.</description>
+	
+	<!-- Netbeans RCP platform -->
+	<property name="netbeans-plat.version" value="7.0.1"/>
+	<property name="nbplatform.active.dir" value="${basedir}/thirdparty/netbeans-plat/${netbeans-plat.version}"/>
+	<property name="harness.dir" value="${nbplatform.active.dir}/harness"/>
+	
     <import file="nbproject/build-impl.xml"/>
 
-    
     <condition property="os.family" value="unix">  
         <os family="unix"/>  
     </condition>  
@@ -26,9 +31,27 @@
         </classpath>
     </taskdef>
 
+
+	<!-- Netbeans RCP platform download helper -->
+    <property name="netbeans-plat.dir"
+          value="${thirdparty.dir}/netbeans-plat/${netbeans-plat.version}"/>
+    <property name="bootstrap.url"
+          value="http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar"/>
+    <property name="netbeans.updatecenter.url"
+          value="http://updates.netbeans.org/netbeans/updates/${netbeans-plat.version}/uc/final/distribution/catalog.xml.gz"/>
+    <target name="download-netbeans-rcp" description="helper target to downloads netbeans platform">
+        <mkdir dir="${netbeans-plat.dir}/harness"/>
+        <get src="${bootstrap.url}" dest="${netbeans-plat.dir}/harness/tasks.jar" usetimestamp="true" verbose="true"/>
+        <taskdef name="autoupdate" classname="org.netbeans.nbbuild.AutoUpdate" classpath="${netbeans-plat.dir}/harness/tasks.jar"/>
+        <autoupdate installdir="${netbeans-plat.dir}" updatecenter="${netbeans.updatecenter.url}">
+            <modules includes=".*" clusters="harness[0-9]*"/>
+            <modules includes=".*" clusters="platform[0-9]*"/>
+        </autoupdate>
+    </target>
+
     <!-- This seems really bad to be hard coded, but I couldn't find a better solution -->
     <path id="jni-path">
-        <pathelement location="./build/cluster/modules/org-sleuthkit-datamodel.jar"/>
+        <pathelement location="${basedir}/build/cluster/modules/org-sleuthkit-datamodel.jar"/>
         <path refid="cluster.path.id" />
     </path>
 

From 924fb2f59f36491c331c2000d93984fdf82a3e7a Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Wed, 20 Jun 2012 17:32:20 -0400
Subject: [PATCH 2/5] update building.txt - we no longer require IDE

---
 BUILDING.txt | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 69a3dfd988..51249720cc 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -15,8 +15,9 @@ needed even if you have a 64-bit system).
 
 1b) Ensure that JDK_HOME is set to the root JDK directory. 
 
-1c) Download and install Netbeans IDE 7.0.1 (http://netbeans.org/)
-
+1c) Download and install Netbeans IDE (http://netbeans.org/)
+Note: IDE is no longer required just to build and run Autopsy,
+but it is a recommended IDE to use for development of Autopsy modules.
 
 2) Get Sleuth Kit Setup
 2a) Download and build the release version of Libewf2 (20120304 or later).  All you need is the dll file.  Note that you will get a launching error if you use libewf 1.
@@ -47,11 +48,18 @@ If you don't have gstreamer already, you can find a zipped gstreamer distributio
 
 
 4) Compile Autopsy
-4a) Start NetBean IDE and open the Autopsy project.
-
-4b) Choose to build the Autopsy project / module.  It is the highest
+4a) using Netbeans IDE:
+- Start NetBeans IDE and open the Autopsy project.
+- Choose to build the Autopsy project / module.  It is the highest
 level project that will then cause the other modules to be compiled.
 
+4b) without Netbeans IDE (requires JDK and ant >= 1.7.1):
+- from root directory of Autopsy source execute:
+ant build
+(to build Autopsy)
+ant run
+(to run Autopsy)
+
 
 BACKGROUND:
 Here are some notes to shed some light on what is going on during

From 3cd14f21f1883188126ec1206b9cb27570a184b3 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Thu, 21 Jun 2012 09:30:23 -0400
Subject: [PATCH 3/5] Fix formatting

---
 build.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 2de7558e1d..c641e8cd4b 100644
--- a/build.xml
+++ b/build.xml
@@ -4,11 +4,11 @@
 <!-- If you delete this file and reopen the project it will be recreated. -->
 <project name="Autopsy3" basedir=".">
     <description>Builds the module suite Autopsy3.</description>
-	
-	<!-- Netbeans RCP platform -->
-	<property name="netbeans-plat.version" value="7.0.1"/>
-	<property name="nbplatform.active.dir" value="${basedir}/thirdparty/netbeans-plat/${netbeans-plat.version}"/>
-	<property name="harness.dir" value="${nbplatform.active.dir}/harness"/>
+
+    <!-- Netbeans RCP platform -->
+    <property name="netbeans-plat.version" value="7.0.1"/>
+    <property name="nbplatform.active.dir" value="${basedir}/thirdparty/netbeans-plat/${netbeans-plat.version}"/>
+    <property name="harness.dir" value="${nbplatform.active.dir}/harness"/>
 	
     <import file="nbproject/build-impl.xml"/>
 
@@ -77,9 +77,7 @@
     <target name="getExternals" depends="findTSK,copyTSKLibsToRelease">
         <property environment="env"/>
         <copy file="${env.TSK_HOME}/bindings/java/dist/Tsk_DataModel.jar" tofile="${basedir}/DataModel/release/modules/ext/Tsk_DataModel.jar"/>
-		 <copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.7.2.jar" tofile="${basedir}/DataModel/release/modules/ext/sqlite-jdbc-3.7.2.jar"/>
-        <!--<copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.6.20-javadoc.jar" tofile="${basedir}/DataModel/release/modules/ext/sqlite-jdbc-3.6.20-javadoc.jar"/>
-        <copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.6.20-sources.jar" tofile="${basedir}/DataModel/release/modules/ext/sqlite-jdbc-3.6.20-sources.jar"/> -->
+        <copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.7.2.jar" tofile="${basedir}/DataModel/release/modules/ext/sqlite-jdbc-3.7.2.jar"/>
     </target>
 
     <!-- This target will create a custom ZIP file for us.  It first uses the general

From a36985b81ba3ed357a94da681b1365ae45154ab0 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Thu, 21 Jun 2012 09:37:37 -0400
Subject: [PATCH 4/5] Move netbeans harness out of version specific, it's
 needed earlier for bootstrap

---
 build.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index c641e8cd4b..185bf6d02f 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,8 @@
     <!-- Netbeans RCP platform -->
     <property name="netbeans-plat.version" value="7.0.1"/>
     <property name="nbplatform.active.dir" value="${basedir}/thirdparty/netbeans-plat/${netbeans-plat.version}"/>
-    <property name="harness.dir" value="${nbplatform.active.dir}/harness"/>
+    <!-- harness for bootstrapping -->
+    <property name="harness.dir" value="${basedir}/thirdparty/netbeans-plat/harness"/>
 	
     <import file="nbproject/build-impl.xml"/>
 
@@ -32,7 +33,7 @@
     </taskdef>
 
 
-	<!-- Netbeans RCP platform download helper -->
+    <!-- Netbeans RCP platform download helper -->
     <property name="netbeans-plat.dir"
           value="${thirdparty.dir}/netbeans-plat/${netbeans-plat.version}"/>
     <property name="bootstrap.url"

From 9a47ef3eea2ed4612176fcc5e5167f21a4dd739c Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Thu, 21 Jun 2012 11:09:30 -0400
Subject: [PATCH 5/5] Improved netbeans harness/platform build

---
 .gitignore                    |  2 ++
 build.xml                     | 23 -----------------------
 nbproject/platform.properties |  7 ++++++-
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7762f76ff2..d9c0f8b180 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ genfiles.properties
 /Testing/script/output/
 /Testing/script/gold/
 *~
+/netbeans-plat
+
diff --git a/build.xml b/build.xml
index 185bf6d02f..df5ecb3218 100644
--- a/build.xml
+++ b/build.xml
@@ -4,12 +4,6 @@
 <!-- If you delete this file and reopen the project it will be recreated. -->
 <project name="Autopsy3" basedir=".">
     <description>Builds the module suite Autopsy3.</description>
-
-    <!-- Netbeans RCP platform -->
-    <property name="netbeans-plat.version" value="7.0.1"/>
-    <property name="nbplatform.active.dir" value="${basedir}/thirdparty/netbeans-plat/${netbeans-plat.version}"/>
-    <!-- harness for bootstrapping -->
-    <property name="harness.dir" value="${basedir}/thirdparty/netbeans-plat/harness"/>
 	
     <import file="nbproject/build-impl.xml"/>
 
@@ -33,23 +27,6 @@
     </taskdef>
 
 
-    <!-- Netbeans RCP platform download helper -->
-    <property name="netbeans-plat.dir"
-          value="${thirdparty.dir}/netbeans-plat/${netbeans-plat.version}"/>
-    <property name="bootstrap.url"
-          value="http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar"/>
-    <property name="netbeans.updatecenter.url"
-          value="http://updates.netbeans.org/netbeans/updates/${netbeans-plat.version}/uc/final/distribution/catalog.xml.gz"/>
-    <target name="download-netbeans-rcp" description="helper target to downloads netbeans platform">
-        <mkdir dir="${netbeans-plat.dir}/harness"/>
-        <get src="${bootstrap.url}" dest="${netbeans-plat.dir}/harness/tasks.jar" usetimestamp="true" verbose="true"/>
-        <taskdef name="autoupdate" classname="org.netbeans.nbbuild.AutoUpdate" classpath="${netbeans-plat.dir}/harness/tasks.jar"/>
-        <autoupdate installdir="${netbeans-plat.dir}" updatecenter="${netbeans.updatecenter.url}">
-            <modules includes=".*" clusters="harness[0-9]*"/>
-            <modules includes=".*" clusters="platform[0-9]*"/>
-        </autoupdate>
-    </target>
-
     <!-- This seems really bad to be hard coded, but I couldn't find a better solution -->
     <path id="jni-path">
         <pathelement location="${basedir}/build/cluster/modules/org-sleuthkit-datamodel.jar"/>
diff --git a/nbproject/platform.properties b/nbproject/platform.properties
index 95295edd72..e48c78a74c 100644
--- a/nbproject/platform.properties
+++ b/nbproject/platform.properties
@@ -1,3 +1,9 @@
+netbeans-plat-version=7.0.1
+suite.dir=${basedir}
+nbplatform.active.dir=${suite.dir}/netbeans-plat/${netbeans-plat-version}
+harness.dir=${nbplatform.active.dir}/harness
+bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
+autoupdate.catalog.url=http://updates.netbeans.org/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz
 cluster.path=\
     ${nbplatform.active.dir}/harness:\
     ${nbplatform.active.dir}/java:\
@@ -97,4 +103,3 @@ disabled.modules=\
     org.netbeans.modules.xml.tools.java,\
     org.openide.compat,\
     org.openide.util.enumerations
-nbplatform.active=default