From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 15 Jul 2014 09:40:21 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5e62c974430ced38ec0ac4f588e967b1e909b8bc;p=cubeextranet.git

---

diff --git a/fluidbook/tools/fwstk/lib/fontbox-1.8.6.jar b/fluidbook/tools/fwstk/lib/fontbox-1.8.6.jar
new file mode 100644
index 000000000..1b0608704
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/fontbox-1.8.6.jar differ
diff --git a/fluidbook/tools/fwstk/lib/jempbox-1.8.6.jar b/fluidbook/tools/fwstk/lib/jempbox-1.8.6.jar
new file mode 100644
index 000000000..e3109dcae
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/jempbox-1.8.6.jar differ
diff --git a/fluidbook/tools/fwstk/lib/pdfbox-1.8.6.jar b/fluidbook/tools/fwstk/lib/pdfbox-1.8.6.jar
new file mode 100644
index 000000000..495dfdb53
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/pdfbox-1.8.6.jar differ
diff --git a/fluidbook/tools/fwstk/nbproject/private/private.properties b/fluidbook/tools/fwstk/nbproject/private/private.properties
index 01b77c475..9b00e008f 100644
--- a/fluidbook/tools/fwstk/nbproject/private/private.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/private.properties
@@ -5,4 +5,4 @@ do.jar=true
 file.reference.icu4j-50_1.jar=H:\\Works\\Java\\jar\\icu4j-4_6_1.jar
 javac.debug=true
 javadoc.preview=true
-user.properties.file=H:\\Applications\\Roaming\\Netbeans\\8.0RC1\\user\\build.properties
+user.properties.file=H:\\Applications\\Roaming\\Netbeans\\8.0\\user\\build.properties
diff --git a/fluidbook/tools/fwstk/nbproject/project.properties b/fluidbook/tools/fwstk/nbproject/project.properties
index 72c2ca212..cb40c280a 100644
--- a/fluidbook/tools/fwstk/nbproject/project.properties
+++ b/fluidbook/tools/fwstk/nbproject/project.properties
@@ -32,12 +32,12 @@ file.reference.bcmail-jdk16-146.jar=lib/bcmail-jdk16-146.jar
 file.reference.bcprov-jdk16-146.jar=lib/bcprov-jdk16-146.jar
 file.reference.commons-io-2.4.jar=lib\\commons-io-2.4.jar
 file.reference.commons-logging-1.1.1.jar=lib/commons-logging-1.1.1.jar
-file.reference.fontbox-1.8.2.jar=lib\\fontbox-1.8.2.jar
+file.reference.fontbox-1.8.6.jar=lib\\fontbox-1.8.6.jar
 file.reference.FWSTK_Resources.jar=../FWSTK_Resources/dist/FWSTK_Resources.jar
 file.reference.icu4j-50_1.jar=H:\\Works\\Java\\jar\\icu4j-50_1.jar
 file.reference.Java-resources=../../../../Java/resources
-file.reference.jempbox-1.8.2.jar=lib\\jempbox-1.8.2.jar
-file.reference.pdfbox-1.8.2.jar=lib\\pdfbox-1.8.2.jar
+file.reference.jempbox-1.8.6.jar=lib\\jempbox-1.8.6.jar
+file.reference.pdfbox-1.8.6.jar=lib\\pdfbox-1.8.6.jar
 file.reference.Works-Java=../../../../Java
 includes=**
 jar.archive.disabled=${jnlp.enabled}
@@ -51,9 +51,9 @@ javac.classpath=\
     ${file.reference.FWSTK_Resources.jar}:\
     ${file.reference.icu4j-50_1.jar}:\
     ${file.reference.commons-io-2.4.jar}:\
-    ${file.reference.fontbox-1.8.2.jar}:\
-    ${file.reference.jempbox-1.8.2.jar}:\
-    ${file.reference.pdfbox-1.8.2.jar}
+    ${file.reference.fontbox-1.8.6.jar}:\
+    ${file.reference.jempbox-1.8.6.jar}:\
+    ${file.reference.pdfbox-1.8.6.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -87,6 +87,10 @@ jnlp.signing=
 jnlp.signing.alias=
 jnlp.signing.keystore=
 main.class=com.fluidbook.fwstk.Main
+# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed
+manifest.custom.codebase=
+# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)
+manifest.custom.permissions=
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
@@ -97,7 +101,7 @@ run.classpath=\
 # Space-separated list of JVM arguments used when running the project
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
 # or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
+run.jvmargs=-Xmx2048m
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
diff --git a/fluidbook/tools/fwstk/src/cube/util/StringUtil.java b/fluidbook/tools/fwstk/src/cube/util/StringUtil.java
index cbb00b848..c8cbfa4bd 100644
--- a/fluidbook/tools/fwstk/src/cube/util/StringUtil.java
+++ b/fluidbook/tools/fwstk/src/cube/util/StringUtil.java
@@ -1,5 +1,6 @@
 package cube.util;
 
+import cube.util.AsciiUtils;
 import java.util.HashMap;
 
 public class StringUtil {