From 86c8b5e36c254030f2527fa1659dcc04ec8e8098 Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Mon, 27 Jan 2014 23:42:45 -0500
Subject: [PATCH] Removed xdock as suggested by  #379.

---
 NEWS.txt          | 1 +
 build-windows.xml | 4 ++--
 build.xml         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NEWS.txt b/NEWS.txt
index 3f4557a43c..0cba2a59f1 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -23,6 +23,7 @@ Improvements:
 - HTML text is better formatted
 - Report generation performance
 - HTML parser is skipped for files > 50MB. 
+- Removed xdock definitions -> some claim this helps with memory problems
 
 
 
diff --git a/build-windows.xml b/build-windows.xml
index 06cba8fa66..384f4e5918 100644
--- a/build-windows.xml
+++ b/build-windows.xml
@@ -151,7 +151,7 @@
         
         <!-- Update configuration file to include jre -->
         <property name="inst.property.file" value="${inst-path}/etc/${app.name}.conf" />
-        <property name="jvm.options" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx512m -J-XX:MaxPermSize=128M -J-Xverify:none -J-Xdock:name=${app.title}&quot;" />
+        <property name="jvm.options" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx512m -J-XX:MaxPermSize=128M -J-Xverify:none &quot;" />
         <propertyfile file="${inst.property.file}">
             <!-- Note: can be higher on 64 bit systems, should be in sync with project.properties -->
             <entry key="default_options" value="@JVM_OPTIONS" />
@@ -278,7 +278,7 @@
         <!-- Update configuration file to include jre -->
         <property name="inst.property.file" value="${inst-path}/etc/${app.name}.conf" />
         <!-- Sets max heap size to be ${jvm.max.mem} which is set in the run-ai-(32/64) target -->
-        <var name="jvm.args" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx${jvm.max.mem}m -J-XX:MaxPermSize=128M -J-Xverify:none -J-Xdock:name=${app.title}&quot;" />
+        <var name="jvm.args" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx${jvm.max.mem}m -J-XX:MaxPermSize=128M -J-Xverify:none &quot;" />
         <propertyfile file="${inst.property.file}">
             <!-- Note: can be higher on 64 bit systems, should be in sync with project.properties -->
             <entry key="default_options" value="@JVM_OPTIONS" />
diff --git a/build.xml b/build.xml
index bab5fbdfd2..5e1ab5df44 100644
--- a/build.xml
+++ b/build.xml
@@ -80,7 +80,7 @@
         </if>
         
         <property name="app.property.file" value="${zip-tmp}/${app.name}/etc/${app.name}.conf" />
-        <property name="jvm.options" value="&quot;--branding ${app.name} -J-Xms24m -J-XX:MaxPermSize=128M -J-Xverify:none -J-Xdock:name=${app.title}&quot;" />
+        <property name="jvm.options" value="&quot;--branding ${app.name} -J-Xms24m -J-XX:MaxPermSize=128M -J-Xverify:none &quot;" />
         <propertyfile file="${app.property.file}">
             <!-- Note: can be higher on 64 bit systems, should be in sync with project.properties -->
             <entry key="default_options" value="@JVM_OPTIONS" />