From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 16 Aug 2011 15:25:22 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=02cee0e051ee857272ddf19d656f25859e5d4515;p=cubeextranet.git

---

diff --git a/fluidbook/tools/fwstk/nbproject/build-impl.xml b/fluidbook/tools/fwstk/nbproject/build-impl.xml
index d8914e78e..411d99287 100644
--- 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>
                 <available file="${src.src.dir}"/>
                 <available file="${src.project_resources.dir}"/>
-                <available file="${src.Java.dir}"/>
-                <available file="${src.resources.dir}"/>
             </or>
         </condition>
         <condition property="netbeans.home+have.tests">
@@ -208,8 +206,6 @@ is divided into following sections:
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
         <fail unless="src.src.dir">Must set src.src.dir</fail>
         <fail unless="src.project_resources.dir">Must set src.project_resources.dir</fail>
-        <fail unless="src.Java.dir">Must set src.Java.dir</fail>
-        <fail unless="src.resources.dir">Must set src.resources.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
         <fail unless="dist.dir">Must set dist.dir</fail>
         <fail unless="build.classes.dir">Must set build.classes.dir</fail>
@@ -230,7 +226,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src.dir}:${src.project_resources.dir}:${src.Java.dir}:${src.resources.dir}" name="srcdir"/>
+            <attribute default="${src.src.dir}:${src.project_resources.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -270,7 +266,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src.dir}:${src.project_resources.dir}:${src.Java.dir}:${src.resources.dir}" name="srcdir"/>
+            <attribute default="${src.src.dir}:${src.project_resources.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -302,7 +298,7 @@ is divided into following sections:
     </target>
     <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src.dir}:${src.project_resources.dir}:${src.Java.dir}:${src.resources.dir}" name="srcdir"/>
+            <attribute default="${src.src.dir}:${src.project_resources.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -596,15 +592,13 @@ is divided into following sections:
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.src.dir}:${src.project_resources.dir}:${src.Java.dir}:${src.resources.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.src.dir}:${src.project_resources.dir}:${build.generated.subdirs}"/>
     </target>
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
         <copy todir="${build.classes.dir}">
             <fileset dir="${src.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.project_resources.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${src.Java.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${src.resources.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target if="has.persistence.xml" name="-copy-persistence-xml">
@@ -625,7 +619,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <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}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.src.dir}:${src.project_resources.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -851,12 +845,6 @@ is divided into following sections:
             <fileset dir="${src.project_resources.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.Java.dir}" excludes="*.java,${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${src.resources.dir}" excludes="*.java,${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
                 <include name="**/*.java"/>
                 <exclude name="*.java"/>
@@ -869,12 +857,6 @@ is divided into following sections:
             <fileset dir="${src.project_resources.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
-            <fileset dir="${src.Java.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${src.resources.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
                 <include name="**/doc-files/**"/>
             </fileset>
diff --git a/fluidbook/tools/fwstk/nbproject/configs/Extract_Layout.properties b/fluidbook/tools/fwstk/nbproject/configs/Extract_Layout.properties
new file mode 100644
index 000000000..5dfe00737
--- /dev/null
+++ b/fluidbook/tools/fwstk/nbproject/configs/Extract_Layout.properties
@@ -0,0 +1 @@
+$label=Extract Layout
diff --git a/fluidbook/tools/fwstk/nbproject/genfiles.properties b/fluidbook/tools/fwstk/nbproject/genfiles.properties
index 678bc9550..71f868a2b 100644
--- a/fluidbook/tools/fwstk/nbproject/genfiles.properties
+++ b/fluidbook/tools/fwstk/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=e2012a3a
+build.xml.data.CRC32=befce983
 build.xml.script.CRC32=ef618d2d
 build.xml.stylesheet.CRC32=28e38971@1.44.1.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=e2012a3a
-nbproject/build-impl.xml.script.CRC32=7f407dc3
+nbproject/build-impl.xml.data.CRC32=befce983
+nbproject/build-impl.xml.script.CRC32=97822e3a
 nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
diff --git a/fluidbook/tools/fwstk/nbproject/private/config.properties b/fluidbook/tools/fwstk/nbproject/private/config.properties
index e69de29bb..a7cc32142 100644
--- a/fluidbook/tools/fwstk/nbproject/private/config.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/config.properties
@@ -0,0 +1 @@
+config=Extract_Layout
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
index 000000000..a2d8bcded
--- /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
diff --git a/fluidbook/tools/fwstk/nbproject/private/private.properties b/fluidbook/tools/fwstk/nbproject/private/private.properties
index 2635b604a..a13f1010a 100644
--- 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
 compile.on.save=true
 do.depend=false
 do.jar=true
diff --git a/fluidbook/tools/fwstk/nbproject/project.properties b/fluidbook/tools/fwstk/nbproject/project.properties
index 4a865c05a..1c7a8d3c7 100644
--- a/fluidbook/tools/fwstk/nbproject/project.properties
+++ b/fluidbook/tools/fwstk/nbproject/project.properties
@@ -81,7 +81,5 @@ run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
 source.encoding=UTF-8
-src.Java.dir=${file.reference.Works-Java}
 src.project_resources.dir=project_resources
-src.resources.dir=${file.reference.Java-resources}
 src.src.dir=src
diff --git a/fluidbook/tools/fwstk/nbproject/project.xml b/fluidbook/tools/fwstk/nbproject/project.xml
index 557702c4e..ea5907613 100644
--- a/fluidbook/tools/fwstk/nbproject/project.xml
+++ b/fluidbook/tools/fwstk/nbproject/project.xml
@@ -7,8 +7,6 @@
             <source-roots>
                 <root id="src.src.dir"/>
                 <root id="src.project_resources.dir"/>
-                <root id="src.Java.dir"/>
-                <root id="src.resources.dir"/>
             </source-roots>
             <test-roots/>
         </data>