(no commit message)

diff --git a/fluidbook/tools/fwstk/nbproject/build-impl.xml b/fluidbook/tools/fwstk/nbproject/build-impl.xml
index d8914e78eebadde48b8d634ed036dd998417bd43..411d992874094ddc0088c502c7a565eba6f3395f 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/build-impl.xml
+++ b/fluidbook/tools/fwstk/nbproject/build-impl.xml
@@ -140,8 +140,6 @@ is divided into following sections:
             <or>\r
                 <available file="${src.src.dir}"/>\r
                 <available file="${src.project_resources.dir}"/>\r
-                <available file="${src.Java.dir}"/>\r
-                <available file="${src.resources.dir}"/>\r
             </or>\r
         </condition>\r
         <condition property="netbeans.home+have.tests">\r
@@ -208,8 +206,6 @@ is divided into following sections:
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">\r
         <fail unless="src.src.dir">Must set src.src.dir</fail>\r
         <fail unless="src.project_resources.dir">Must set src.project_resources.dir</fail>\r
-        <fail unless="src.Java.dir">Must set src.Java.dir</fail>\r
-        <fail unless="src.resources.dir">Must set src.resources.dir</fail>\r
         <fail unless="build.dir">Must set build.dir</fail>\r
         <fail unless="dist.dir">Must set dist.dir</fail>\r
         <fail unless="build.classes.dir">Must set build.classes.dir</fail>\r
@@ -230,7 +226,7 @@ is divided into following sections:
     </target>\r
     <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">\r
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-            <attribute default="${src.src.dir}:${src.project_resources.dir}:${src.Java.dir}:${src.resources.dir}" name="srcdir"/>\r
+            <attribute default="${src.src.dir}:${src.project_resources.dir}" name="srcdir"/>\r
             <attribute default="${build.classes.dir}" name="destdir"/>\r
             <attribute default="${javac.classpath}" name="classpath"/>\r
             <attribute default="${javac.processorpath}" name="processorpath"/>\r
@@ -270,7 +266,7 @@ is divided into following sections:
     </target>\r
     <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">\r
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-            <attribute default="${src.src.dir}:${src.project_resources.dir}:${src.Java.dir}:${src.resources.dir}" name="srcdir"/>\r
+            <attribute default="${src.src.dir}:${src.project_resources.dir}" name="srcdir"/>\r
             <attribute default="${build.classes.dir}" name="destdir"/>\r
             <attribute default="${javac.classpath}" name="classpath"/>\r
             <attribute default="${javac.processorpath}" name="processorpath"/>\r
@@ -302,7 +298,7 @@ is divided into following sections:
     </target>\r
     <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">\r
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">\r
-            <attribute default="${src.src.dir}:${src.project_resources.dir}:${src.Java.dir}:${src.resources.dir}" name="srcdir"/>\r
+            <attribute default="${src.src.dir}:${src.project_resources.dir}" name="srcdir"/>\r
             <attribute default="${build.classes.dir}" name="destdir"/>\r
             <attribute default="${javac.classpath}" name="classpath"/>\r
             <sequential>\r
@@ -596,15 +592,13 @@ is divided into following sections:
                 <include name="*"/>\r
             </dirset>\r
         </pathconvert>\r
-        <j2seproject3:depend srcdir="${src.src.dir}:${src.project_resources.dir}:${src.Java.dir}:${src.resources.dir}:${build.generated.subdirs}"/>\r
+        <j2seproject3:depend srcdir="${src.src.dir}:${src.project_resources.dir}:${build.generated.subdirs}"/>\r
     </target>\r
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">\r
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>\r
         <copy todir="${build.classes.dir}">\r
             <fileset dir="${src.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>\r
             <fileset dir="${src.project_resources.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>\r
-            <fileset dir="${src.Java.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>\r
-            <fileset dir="${src.resources.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>\r
         </copy>\r
     </target>\r
     <target if="has.persistence.xml" name="-copy-persistence-xml">\r
@@ -625,7 +619,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">\r
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>\r
         <j2seproject3:force-recompile/>\r
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.src.dir}:${src.project_resources.dir}:${src.Java.dir}:${src.resources.dir}"/>\r
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.src.dir}:${src.project_resources.dir}"/>\r
     </target>\r
     <target name="-post-compile-single">\r
         <!-- Empty placeholder for easier customization. -->\r
@@ -851,12 +845,6 @@ is divided into following sections:
             <fileset dir="${src.project_resources.dir}" excludes="*.java,${excludes}" includes="${includes}">\r
                 <filename name="**/*.java"/>\r
             </fileset>\r
-            <fileset dir="${src.Java.dir}" excludes="*.java,${excludes}" includes="${includes}">\r
-                <filename name="**/*.java"/>\r
-            </fileset>\r
-            <fileset dir="${src.resources.dir}" excludes="*.java,${excludes}" includes="${includes}">\r
-                <filename name="**/*.java"/>\r
-            </fileset>\r
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">\r
                 <include name="**/*.java"/>\r
                 <exclude name="*.java"/>\r
@@ -869,12 +857,6 @@ is divided into following sections:
             <fileset dir="${src.project_resources.dir}" excludes="${excludes}" includes="${includes}">\r
                 <filename name="**/doc-files/**"/>\r
             </fileset>\r
-            <fileset dir="${src.Java.dir}" excludes="${excludes}" includes="${includes}">\r
-                <filename name="**/doc-files/**"/>\r
-            </fileset>\r
-            <fileset dir="${src.resources.dir}" excludes="${excludes}" includes="${includes}">\r
-                <filename name="**/doc-files/**"/>\r
-            </fileset>\r
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">\r
                 <include name="**/doc-files/**"/>\r
             </fileset>\r

diff --git a/fluidbook/tools/fwstk/nbproject/configs/Extract_Layout.properties b/fluidbook/tools/fwstk/nbproject/configs/Extract_Layout.properties
new file mode 100644 (file)
index 0000000..5dfe007
--- /dev/null
+++ b/fluidbook/tools/fwstk/nbproject/configs/Extract_Layout.properties
@@ -0,0 +1 @@
+$label=Extract Layout\r

diff --git a/fluidbook/tools/fwstk/nbproject/genfiles.properties b/fluidbook/tools/fwstk/nbproject/genfiles.properties
index 678bc95501ebce0a0eb51cacbde8b2907ee1d4a1..71f868a2bb879f11ca90db77d713a093d9d8d358 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/genfiles.properties
+++ b/fluidbook/tools/fwstk/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=e2012a3a\r
+build.xml.data.CRC32=befce983\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=e2012a3a\r
-nbproject/build-impl.xml.script.CRC32=7f407dc3\r
+nbproject/build-impl.xml.data.CRC32=befce983\r
+nbproject/build-impl.xml.script.CRC32=97822e3a\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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a7cc321429951de5ef6f4fc558ce09f5159aa3fd 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/config.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/config.properties
@@ -0,0 +1 @@
+config=Extract_Layout\r

diff --git a/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Layout.properties b/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Layout.properties
new file mode 100644 (file)
index 0000000..a2d8bcd
--- /dev/null
+++ b/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Layout.properties
@@ -0,0 +1 @@
+application.args=--input C:\\Users\\Vincent\\Documents\\layout\\document.pdf --layout C:\\Users\\Vincent\\Documents\\layout\\p%d.layout\r

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.properties b/fluidbook/tools/fwstk/nbproject/private/private.properties
index 2635b604aba73fae6512bf4c31368bd3c18708a5..a13f1010af2f8a6bb2e32598be51b160ca46e878 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/private.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/private.properties
@@ -1,3 +1,4 @@
+application.args=--input C:\\Users\\Vincent\\Documents\\layout --layout C:\\Users\\Vincent\\Documents\\layout\\p%d.layout\r
 compile.on.save=true\r
 do.depend=false\r
 do.jar=true\r

diff --git a/fluidbook/tools/fwstk/nbproject/project.properties b/fluidbook/tools/fwstk/nbproject/project.properties
index 4a865c05a8c40c1ddfc2bb3e9f71454c739d0cbb..1c7a8d3c7530168f04f8f900635fed631ea4eb1b 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/project.properties
+++ b/fluidbook/tools/fwstk/nbproject/project.properties
@@ -81,7 +81,5 @@ run.test.classpath=\
     ${javac.test.classpath}:\\r
     ${build.test.classes.dir}\r
 source.encoding=UTF-8\r
-src.Java.dir=${file.reference.Works-Java}\r
 src.project_resources.dir=project_resources\r
-src.resources.dir=${file.reference.Java-resources}\r
 src.src.dir=src\r

diff --git a/fluidbook/tools/fwstk/nbproject/project.xml b/fluidbook/tools/fwstk/nbproject/project.xml
index 557702c4ee18fffa9094037ff92fbfdb4623b325..ea59076133ff405f6161f2dc686bb6484cdc67f8 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/project.xml
+++ b/fluidbook/tools/fwstk/nbproject/project.xml
@@ -7,8 +7,6 @@
             <source-roots>\r
                 <root id="src.src.dir"/>\r
                 <root id="src.project_resources.dir"/>\r
-                <root id="src.Java.dir"/>\r
-                <root id="src.resources.dir"/>\r
             </source-roots>\r
             <test-roots/>\r
         </data>\r