(no commit message)

diff --git a/fluidbook/tools/fwstk/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar b/fluidbook/tools/fwstk/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
new file mode 100644 (file)
index 0000000..1c0f597
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar differ

diff --git a/fluidbook/tools/fwstk/lib/avalon-framework-4.1.4.jar b/fluidbook/tools/fwstk/lib/avalon-framework-4.1.4.jar
new file mode 100644 (file)
index 0000000..0abf0b9
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/avalon-framework-4.1.4.jar differ

diff --git a/fluidbook/tools/fwstk/lib/bcmail-jdk16-146.jar b/fluidbook/tools/fwstk/lib/bcmail-jdk16-146.jar
new file mode 100644 (file)
index 0000000..6bd6765
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/bcmail-jdk16-146.jar differ

diff --git a/fluidbook/tools/fwstk/lib/bcprov-jdk16-146.jar b/fluidbook/tools/fwstk/lib/bcprov-jdk16-146.jar
new file mode 100644 (file)
index 0000000..27d3481
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/bcprov-jdk16-146.jar differ

diff --git a/fluidbook/tools/fwstk/lib/commons-logging-1.1.1.jar b/fluidbook/tools/fwstk/lib/commons-logging-1.1.1.jar
new file mode 100644 (file)
index 0000000..8758a96
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/commons-logging-1.1.1.jar differ

diff --git a/fluidbook/tools/fwstk/lib/fontbox-1.6.0.jar b/fluidbook/tools/fwstk/lib/fontbox-1.6.0.jar
new file mode 100644 (file)
index 0000000..c3492fc
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/fontbox-1.6.0.jar differ

diff --git a/fluidbook/tools/fwstk/lib/jempbox-1.6.0.jar b/fluidbook/tools/fwstk/lib/jempbox-1.6.0.jar
new file mode 100644 (file)
index 0000000..5ca6d7a
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/jempbox-1.6.0.jar differ

diff --git a/fluidbook/tools/fwstk/lib/nblibraries.properties b/fluidbook/tools/fwstk/lib/nblibraries.properties
new file mode 100644 (file)
index 0000000..790344a
--- /dev/null
+++ b/fluidbook/tools/fwstk/lib/nblibraries.properties
@@ -0,0 +1,2 @@
+libs.CopyLibs.classpath=\\r
+    ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar\r

diff --git a/fluidbook/tools/fwstk/lib/pdfbox-1.6.0.jar b/fluidbook/tools/fwstk/lib/pdfbox-1.6.0.jar
new file mode 100644 (file)
index 0000000..75efe03
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/pdfbox-1.6.0.jar differ

diff --git a/fluidbook/tools/fwstk/nbproject/build-impl.xml b/fluidbook/tools/fwstk/nbproject/build-impl.xml
index e0ac685fb6800f33c5c90589ea5efb5e1626b010..7ca68e01bf4b83590d2b69d3bb32fe3cc3f7de95 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/build-impl.xml
+++ b/fluidbook/tools/fwstk/nbproject/build-impl.xml
@@ -42,18 +42,80 @@ is divided into following sections:
         <property file="nbproject/private/configs/${config}.properties"/>\r
         <property file="nbproject/private/private.properties"/>\r
     </target>\r
-    <target depends="-pre-init,-init-private" name="-init-user">\r
+    <target name="-pre-init-libraries">\r
+        <property location=".\lib\nblibraries.properties" name="libraries.path"/>\r
+        <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>\r
+        <pathconvert dirsep="/" property="libraries.dir">\r
+            <path path="${libraries.dir.nativedirsep}"/>\r
+        </pathconvert>\r
+        <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/>\r
+        <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/>\r
+    </target>\r
+    <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries">\r
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties">\r
+            <filterchain>\r
+                <replacestring from="$${base}" to="${libraries.dir}"/>\r
+                <escapeunicode/>\r
+            </filterchain>\r
+        </loadproperties>\r
+    </target>\r
+    <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries">\r
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}">\r
+            <filterchain>\r
+                <replacestring from="$${base}" to="${libraries.dir}"/>\r
+                <escapeunicode/>\r
+            </filterchain>\r
+        </loadproperties>\r
+    </target>\r
+    <target depends="-pre-init,-init-private,-init-libraries" name="-init-user">\r
         <property file="${user.properties.file}"/>\r
         <!-- The two properties below are usually overridden -->\r
         <!-- by the active platform. Just a fallback. -->\r
         <property name="default.javac.source" value="1.4"/>\r
         <property name="default.javac.target" value="1.4"/>\r
     </target>\r
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">\r
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">\r
         <property file="nbproject/configs/${config}.properties"/>\r
         <property file="nbproject/project.properties"/>\r
     </target>\r
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">\r
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">\r
+        <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>\r
+        <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>\r
+        <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>\r
+        <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>\r
+        <condition property="platform.javac" value="${platform.home}/bin/javac">\r
+            <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>\r
+        </condition>\r
+        <property name="platform.javac" value="${platform.javac.tmp}"/>\r
+        <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>\r
+        <condition property="platform.java" value="${platform.home}/bin/java">\r
+            <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>\r
+        </condition>\r
+        <property name="platform.java" value="${platform.java.tmp}"/>\r
+        <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>\r
+        <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">\r
+            <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>\r
+        </condition>\r
+        <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>\r
+        <condition property="platform.invalid" value="true">\r
+            <or>\r
+                <contains string="${platform.javac}" substring="$${platforms."/>\r
+                <contains string="${platform.java}" substring="$${platforms."/>\r
+                <contains string="${platform.javadoc}" substring="$${platforms."/>\r
+            </or>\r
+        </condition>\r
+        <fail unless="platform.home">Must set platform.home</fail>\r
+        <fail unless="platform.bootcp">Must set platform.bootcp</fail>\r
+        <fail unless="platform.java">Must set platform.java</fail>\r
+        <fail unless="platform.javac">Must set platform.javac</fail>\r
+        <fail if="platform.invalid">\r
+ The J2SE Platform is not correctly set up.\r
+ Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. \r
+ Either open the project in the IDE and setup the Platform with the same name or add it manually.\r
+ For example like this:\r
+     ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file)\r
+  or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used) \r
+  </fail>\r
         <available file="${manifest.file}" property="manifest.available"/>\r
         <condition property="splashscreen.available">\r
             <and>\r
@@ -185,15 +247,6 @@ is divided into following sections:
         <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">\r
             <length length="0" string="${endorsed.classpath}" when="greater"/>\r
         </condition>\r
-        <condition else="false" property="jdkBug6558476">\r
-            <and>\r
-                <matches pattern="1\.[56]" string="${java.specification.version}"/>\r
-                <not>\r
-                    <os family="unix"/>\r
-                </not>\r
-            </and>\r
-        </condition>\r
-        <property name="javac.fork" value="${jdkBug6558476}"/>\r
         <property name="jar.index" value="false"/>\r
         <property name="jar.index.metainf" value="${jar.index}"/>\r
         <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>\r
@@ -202,7 +255,7 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->\r
         <!-- You can override this target in the ../build.xml file. -->\r
     </target>\r
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">\r
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">\r
         <fail unless="src.src.dir">Must set src.src.dir</fail>\r
         <fail unless="build.dir">Must set build.dir</fail>\r
         <fail unless="dist.dir">Must set dist.dir</fail>\r
@@ -239,7 +292,7 @@ is divided into following sections:
                 <property location="${build.dir}/empty" name="empty.dir"/>\r
                 <mkdir dir="${empty.dir}"/>\r
                 <mkdir dir="@{apgeneratedsrcdir}"/>\r
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">\r
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">\r
                     <src>\r
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
                             <include name="*"/>\r
@@ -278,7 +331,7 @@ is divided into following sections:
             <sequential>\r
                 <property location="${build.dir}/empty" name="empty.dir"/>\r
                 <mkdir dir="${empty.dir}"/>\r
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">\r
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">\r
                     <src>\r
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
                             <include name="*"/>\r
@@ -335,7 +388,7 @@ is divided into following sections:
             <attribute default="**" name="testincludes"/>\r
             <sequential>\r
                 <property name="junit.forkmode" value="perTest"/>\r
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">\r
                     <batchtest todir="${build.test.results.dir}"/>\r
                     <classpath>\r
                         <path path="${run.test.classpath}"/>\r
@@ -407,6 +460,9 @@ is divided into following sections:
                     <classpath>\r
                         <path path="@{classpath}"/>\r
                     </classpath>\r
+                    <bootclasspath>\r
+                        <path path="${platform.bootcp}"/>\r
+                    </bootclasspath>\r
                 </nbjpdastart>\r
             </sequential>\r
         </macrodef>\r
@@ -422,7 +478,9 @@ is divided into following sections:
         </macrodef>\r
     </target>\r
     <target name="-init-debug-args">\r
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>\r
+        <exec executable="${platform.java}" outputproperty="version-output">\r
+            <arg value="-version"/>\r
+        </exec>\r
         <condition property="have-jdk-older-than-1.4">\r
             <or>\r
                 <contains string="${version-output}" substring="java version &quot;1.0"/>\r
@@ -447,7 +505,7 @@ is divided into following sections:
             <attribute default="${debug.classpath}" name="classpath"/>\r
             <element name="customize" optional="true"/>\r
             <sequential>\r
-                <java classname="@{classname}" dir="${work.dir}" fork="true">\r
+                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">\r
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
                     <jvmarg line="${debug-args-line}"/>\r
                     <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>\r
@@ -472,7 +530,7 @@ is divided into following sections:
             <attribute default="${run.classpath}" name="classpath"/>\r
             <element name="customize" optional="true"/>\r
             <sequential>\r
-                <java classname="@{classname}" dir="${work.dir}" fork="true">\r
+                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">\r
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>\r
                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>\r
@@ -548,7 +606,7 @@ is divided into following sections:
     <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">\r
         <property name="ap.cmd.line.internal" value=""/>\r
     </target>\r
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>\r
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>\r
     <!--\r
                 ===================\r
                 COMPILATION SECTION\r
@@ -655,7 +713,7 @@ is divided into following sections:
             <path path="${run.classpath}"/>\r
             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>\r
         </pathconvert>\r
-        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>\r
+        <echo level="info">${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>\r
     </target>\r
     <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">\r
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>\r
@@ -682,7 +740,7 @@ is divided into following sections:
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>\r
         <echo level="info">To run this application from the command line without Ant, try:</echo>\r
         <property location="${dist.jar}" name="dist.jar.resolved"/>\r
-        <echo level="info">java -jar "${dist.jar.resolved}"</echo>\r
+        <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>\r
     </target>\r
     <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">\r
         <delete>\r
@@ -832,7 +890,7 @@ is divided into following sections:
             -->\r
     <target depends="init" if="have.sources" name="-javadoc-build">\r
         <mkdir dir="${dist.javadoc.dir}"/>\r
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">\r
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">\r
             <classpath>\r
                 <path path="${javac.classpath}"/>\r
             </classpath>\r

diff --git a/fluidbook/tools/fwstk/nbproject/genfiles.properties b/fluidbook/tools/fwstk/nbproject/genfiles.properties
index 00af3e9f51cd07dd8e94266e641db7e69f2e7061..4731b76e4046620dff79db4c41873bbf6669707c 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/genfiles.properties
+++ b/fluidbook/tools/fwstk/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=5afba316\r
+build.xml.data.CRC32=1c2c8395\r
 build.xml.script.CRC32=ef618d2d\r
 build.xml.stylesheet.CRC32=28e38971@1.44.1.45\r
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.\r
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.\r
-nbproject/build-impl.xml.data.CRC32=5afba316\r
-nbproject/build-impl.xml.script.CRC32=f0904f14\r
+nbproject/build-impl.xml.data.CRC32=1c2c8395\r
+nbproject/build-impl.xml.script.CRC32=244b17d0\r
 nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45\r

diff --git a/fluidbook/tools/fwstk/nbproject/private/config.properties b/fluidbook/tools/fwstk/nbproject/private/config.properties
index a7cc321429951de5ef6f4fc558ce09f5159aa3fd..5aa2fea7bf417086c81ccabfe06cb2d78e4134e3 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/config.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/config.properties
@@ -1 +1 @@
-config=Extract_Layout\r
+config=Extract_Links\r

diff --git a/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Links.properties b/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Links.properties
index fc4404267e68f6915c46a29a9ae055eb4fc25ecc..509e7b93f75332bebaedcdc3fa74dbf4873bcf6e 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Links.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Links.properties
@@ -1 +1 @@
-application.args=--input C:\\Users\\Vincent\\Documents\\links\\document.pdf --extractLinks C:\\Users\\Vincent\\Documents\\links\\p%d.csv\r
+application.args=--input H:\\Documents\\fwstk\\links\\document.pdf --extractLinks H:\\Documents\\fwstk\\links\\p%d.csv\r

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.properties b/fluidbook/tools/fwstk/nbproject/private/private.properties
index 75eb4042cfe9916c9d015a70e633193825e04eb6..c85e5f3f2e1a01c3d61bf97f79be5499643ed027 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/private.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/private.properties
@@ -4,4 +4,4 @@ do.depend=false
 do.jar=true\r
 javac.debug=true\r
 javadoc.preview=true\r
-user.properties.file=C:\\Users\\Cube\\.netbeans\\7.0\\build.properties\r
+user.properties.file=C:\\Users\\Vincent\\.netbeans\\7.0\\build.properties\r

diff --git a/fluidbook/tools/fwstk/nbproject/project.properties b/fluidbook/tools/fwstk/nbproject/project.properties
index e1d9e82f1d2a10e18975226fe1f02854848a50e3..6f58e2ccf959a87c2cc2e84b8f22f6e15b25ccd3 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/project.properties
+++ b/fluidbook/tools/fwstk/nbproject/project.properties
@@ -26,15 +26,15 @@ dist.jar=${dist.dir}/fwstk.jar
 dist.javadoc.dir=${dist.dir}/javadoc\r
 endorsed.classpath=\r
 excludes=\r
-file.reference.avalon-framework-4.1.4.jar=H:\\Works\\Java\\jar\\avalon-framework-4.1.4.jar\r
-file.reference.bcmail-jdk16-146.jar=H:\\Works\\Java\\jar\\bcmail-jdk16-146.jar\r
-file.reference.bcprov-jdk16-146.jar=H:\\Works\\Java\\jar\\bcprov-jdk16-146.jar\r
-file.reference.commons-logging-1.1.1.jar=H:\\Works\\Java\\jar\\commons-logging-1.1.1.jar\r
-file.reference.fontbox-1.6.0.jar=H:\\Works\\Java\\jar\\fontbox-1.6.0.jar\r
-file.reference.FWSTK_Resources.jar=..\\FWSTK_Resources\\dist\\FWSTK_Resources.jar\r
+file.reference.avalon-framework-4.1.4.jar=lib/avalon-framework-4.1.4.jar\r
+file.reference.bcmail-jdk16-146.jar=lib/bcmail-jdk16-146.jar\r
+file.reference.bcprov-jdk16-146.jar=lib/bcprov-jdk16-146.jar\r
+file.reference.commons-logging-1.1.1.jar=lib/commons-logging-1.1.1.jar\r
+file.reference.fontbox-1.6.0.jar=lib/fontbox-1.6.0.jar\r
+file.reference.FWSTK_Resources.jar=../FWSTK_Resources/dist/FWSTK_Resources.jar\r
 file.reference.Java-resources=../../../../Java/resources\r
-file.reference.jempbox-1.6.0.jar=H:\\Works\\Java\\jar\\jempbox-1.6.0.jar\r
-file.reference.pdfbox-1.6.0.jar=H:\\Works\\Java\\jar\\pdfbox-1.6.0.jar\r
+file.reference.jempbox-1.6.0.jar=lib/jempbox-1.6.0.jar\r
+file.reference.pdfbox-1.6.0.jar=lib/pdfbox-1.6.0.jar\r
 file.reference.Works-Java=../../../../Java\r
 includes=**\r
 jar.archive.disabled=${jnlp.enabled}\r
@@ -85,7 +85,7 @@ main.class=com.fluidbook.fwstk.Main
 manifest.file=manifest.mf\r
 meta.inf.dir=${src.dir}/META-INF\r
 mkdist.disabled=false\r
-platform.active=default_platform\r
+platform.active=JDK_1.7\r
 run.classpath=\\r
     ${build.classes.dir}:\\r
     ${javac.classpath}\r

diff --git a/fluidbook/tools/fwstk/nbproject/project.xml b/fluidbook/tools/fwstk/nbproject/project.xml
index a70a3bf29431378f33d371fe067865f62a63519c..fecc0cd7d07d9657852452dd6430a314a7638dc6 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/project.xml
+++ b/fluidbook/tools/fwstk/nbproject/project.xml
@@ -4,10 +4,14 @@
     <configuration>\r
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">\r
             <name>fwstk</name>\r
+            <explicit-platform explicit-source-supported="true"/>\r
             <source-roots>\r
                 <root id="src.src.dir"/>\r
             </source-roots>\r
             <test-roots/>\r
         </data>\r
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">\r
+            <definitions>.\lib\nblibraries.properties</definitions>\r
+        </libraries>\r
     </configuration>\r
 </project>\r

diff --git a/inc/ws/Util/fontextractor/class.ws.pdf.font.php b/inc/ws/Util/fontextractor/class.ws.pdf.font.php
index f33251a41be67da9ccb28c5a541438e954a18eea..adf68bb641a1dcc814b2456b71eef9c505e3c1f0 100644 (file)
--- a/inc/ws/Util/fontextractor/class.ws.pdf.font.php
+++ b/inc/ws/Util/fontextractor/class.ws.pdf.font.php
@@ -102,13 +102,13 @@ class wsPDFFont {
                $fontforge->setArg(null, $font->italicAngle);
                $fontforge->setArg(null, $font->ascent);
                $fontforge->setArg(null, $font->descent);
-               if ($font->firstChar == 0 && $font->firstWidth == 500) {
-                       $fontforge->setArg(null, '-');
-                       $fontforge->setArg(null, '-');
-               } else {
-                       $fontforge->setArg(null, $font->firstChar);
-                       $fontforge->setArg(null, $font->firstWidth);
-               }
+               //if ($font->firstChar == 0 && $font->firstWidth == 500) {
+               $fontforge->setArg(null, '-');
+               $fontforge->setArg(null, '-');
+               //} else {
+               //      $fontforge->setArg(null, $font->firstChar);
+               //      $fontforge->setArg(null, $font->firstWidth);
+               //}
                $fontforge->execute();
                $this->addToLog($fontforge);
        }