Pull up fix for CONNECTORS-1451 from trunk
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/release-2.8-branch@1806910 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 0be8185..53b37bd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,12 +3,18 @@
======================= Release 2.8.1 =====================
+CONNECTORS-1451: Tika extractor was causing some out-of-memory
+events to occur for simple crawls, so I increased the default memory
+allocated in the examples to 512M.
+(Karl Wright)
+
CONNECTORS-1450: Tika extractor cannot process MS Office files due
to a dependency problem. The dependency issue is that poi-ooxml-schemas
is apparently accessed via reflection, and the class lookup does not
apparently use the current classloader, but rather some other classloader.
This requires the entire poi* set of jars, and all dependencies, to be
included in ManifoldCF's core jar list.
+(Karl Wright)
======================= Release 2.8 =====================
diff --git a/framework/scripts-combined/combined-options.env.unix b/framework/scripts-combined/combined-options.env.unix
index 2cc4ce8..39b11c2 100644
--- a/framework/scripts-combined/combined-options.env.unix
+++ b/framework/scripts-combined/combined-options.env.unix
@@ -1,5 +1,5 @@
--Xms256m
--Xmx256m
+-Xms512m
+-Xmx512m
-Dorg.apache.manifoldcf.configfile=./properties.xml
-Dorg.apache.manifoldcf.jettyshutdowntoken=secret_token
-cp
diff --git a/framework/scripts-combined/combined-options.env.win b/framework/scripts-combined/combined-options.env.win
index 9100059..8bc8d1e 100644
--- a/framework/scripts-combined/combined-options.env.win
+++ b/framework/scripts-combined/combined-options.env.win
@@ -1,5 +1,5 @@
--Xms256m
--Xmx256m
+-Xms512m
+-Xmx512m
-Dorg.apache.manifoldcf.configfile=.\properties.xml
-Dorg.apache.manifoldcf.jettyshutdowntoken=secret_token
-cp
diff --git a/framework/scripts-start/start-options.env.unix b/framework/scripts-start/start-options.env.unix
index 2cc4ce8..39b11c2 100644
--- a/framework/scripts-start/start-options.env.unix
+++ b/framework/scripts-start/start-options.env.unix
@@ -1,5 +1,5 @@
--Xms256m
--Xmx256m
+-Xms512m
+-Xmx512m
-Dorg.apache.manifoldcf.configfile=./properties.xml
-Dorg.apache.manifoldcf.jettyshutdowntoken=secret_token
-cp
diff --git a/framework/scripts-start/start-options.env.win b/framework/scripts-start/start-options.env.win
index 9100059..8bc8d1e 100644
--- a/framework/scripts-start/start-options.env.win
+++ b/framework/scripts-start/start-options.env.win
@@ -1,5 +1,5 @@
--Xms256m
--Xmx256m
+-Xms512m
+-Xmx512m
-Dorg.apache.manifoldcf.configfile=.\properties.xml
-Dorg.apache.manifoldcf.jettyshutdowntoken=secret_token
-cp
diff --git a/framework/scripts/options.env.unix b/framework/scripts/options.env.unix
index 7f62b17..5b395e4 100644
--- a/framework/scripts/options.env.unix
+++ b/framework/scripts/options.env.unix
@@ -1,5 +1,5 @@
--Xms256m
--Xmx256m
+-Xms512m
+-Xmx512m
-Dorg.apache.manifoldcf.configfile=./properties.xml
-cp
.:
diff --git a/framework/scripts/options.env.win b/framework/scripts/options.env.win
index b496b67..e035abf 100644
--- a/framework/scripts/options.env.win
+++ b/framework/scripts/options.env.win
@@ -1,5 +1,5 @@
--Xms256m
--Xmx256m
+-Xms512m
+-Xmx512m
-Dorg.apache.manifoldcf.configfile=.\properties.xml
-cp
.;
