1.1 --- a/java/alt2xml-out-xpath/nbproject/build-impl.xml Mon Jun 16 21:23:04 2014 +0200
1.2 +++ b/java/alt2xml-out-xpath/nbproject/build-impl.xml Mon Jun 16 22:03:57 2014 +0200
1.3 @@ -127,6 +127,7 @@
1.4 </condition>
1.5 <condition property="have.sources">
1.6 <or>
1.7 + <available file="${src.config.dir}"/>
1.8 <available file="${src.dir}"/>
1.9 </or>
1.10 </condition>
1.11 @@ -223,6 +224,7 @@
1.12 <!-- You can override this target in the ../build.xml file. -->
1.13 </target>
1.14 <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
1.15 + <fail unless="src.config.dir">Must set src.config.dir</fail>
1.16 <fail unless="src.dir">Must set src.dir</fail>
1.17 <fail unless="test.src.dir">Must set test.src.dir</fail>
1.18 <fail unless="build.dir">Must set build.dir</fail>
1.19 @@ -245,7 +247,7 @@
1.20 </target>
1.21 <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
1.22 <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
1.23 - <attribute default="${src.dir}" name="srcdir"/>
1.24 + <attribute default="${src.config.dir}:${src.dir}" name="srcdir"/>
1.25 <attribute default="${build.classes.dir}" name="destdir"/>
1.26 <attribute default="${javac.classpath}" name="classpath"/>
1.27 <attribute default="${javac.processorpath}" name="processorpath"/>
1.28 @@ -286,7 +288,7 @@
1.29 </target>
1.30 <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
1.31 <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
1.32 - <attribute default="${src.dir}" name="srcdir"/>
1.33 + <attribute default="${src.config.dir}:${src.dir}" name="srcdir"/>
1.34 <attribute default="${build.classes.dir}" name="destdir"/>
1.35 <attribute default="${javac.classpath}" name="classpath"/>
1.36 <attribute default="${javac.processorpath}" name="processorpath"/>
1.37 @@ -319,7 +321,7 @@
1.38 </target>
1.39 <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
1.40 <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
1.41 - <attribute default="${src.dir}" name="srcdir"/>
1.42 + <attribute default="${src.config.dir}:${src.dir}" name="srcdir"/>
1.43 <attribute default="${build.classes.dir}" name="destdir"/>
1.44 <attribute default="${javac.classpath}" name="classpath"/>
1.45 <sequential>
1.46 @@ -917,11 +919,12 @@
1.47 <include name="*"/>
1.48 </dirset>
1.49 </pathconvert>
1.50 - <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
1.51 + <j2seproject3:depend srcdir="${src.config.dir}:${src.dir}:${build.generated.subdirs}"/>
1.52 </target>
1.53 <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
1.54 <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
1.55 <copy todir="${build.classes.dir}">
1.56 + <fileset dir="${src.config.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.57 <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.58 </copy>
1.59 </target>
1.60 @@ -943,7 +946,7 @@
1.61 <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
1.62 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
1.63 <j2seproject3:force-recompile/>
1.64 - <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
1.65 + <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.config.dir}:${src.dir}"/>
1.66 </target>
1.67 <target name="-post-compile-single">
1.68 <!-- Empty placeholder for easier customization. -->
1.69 @@ -1209,6 +1212,9 @@
1.70 <classpath>
1.71 <path path="${javac.classpath}"/>
1.72 </classpath>
1.73 + <fileset dir="${src.config.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
1.74 + <filename name="**/*.java"/>
1.75 + </fileset>
1.76 <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
1.77 <filename name="**/*.java"/>
1.78 </fileset>
1.79 @@ -1219,6 +1225,9 @@
1.80 <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
1.81 </javadoc>
1.82 <copy todir="${dist.javadoc.dir}">
1.83 + <fileset dir="${src.config.dir}" excludes="${excludes}" includes="${includes}">
1.84 + <filename name="**/doc-files/**"/>
1.85 + </fileset>
1.86 <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
1.87 <filename name="**/doc-files/**"/>
1.88 </fileset>
2.1 --- a/java/alt2xml-out-xpath/nbproject/genfiles.properties Mon Jun 16 21:23:04 2014 +0200
2.2 +++ b/java/alt2xml-out-xpath/nbproject/genfiles.properties Mon Jun 16 22:03:57 2014 +0200
2.3 @@ -1,8 +1,8 @@
2.4 -build.xml.data.CRC32=551ec7ee
2.5 +build.xml.data.CRC32=01b9f7b0
2.6 build.xml.script.CRC32=a84b87c3
2.7 build.xml.stylesheet.CRC32=8064a381@1.74.2.48
2.8 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
2.9 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
2.10 -nbproject/build-impl.xml.data.CRC32=551ec7ee
2.11 -nbproject/build-impl.xml.script.CRC32=5b5733f2
2.12 +nbproject/build-impl.xml.data.CRC32=01b9f7b0
2.13 +nbproject/build-impl.xml.script.CRC32=9e677625
2.14 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
3.1 --- a/java/alt2xml-out-xpath/nbproject/project.properties Mon Jun 16 21:23:04 2014 +0200
3.2 +++ b/java/alt2xml-out-xpath/nbproject/project.properties Mon Jun 16 22:03:57 2014 +0200
3.3 @@ -1,9 +1,10 @@
3.4 annotation.processing.enabled=true
3.5 annotation.processing.enabled.in.editor=false
3.6 -annotation.processing.processor.options=
3.7 annotation.processing.processors.list=
3.8 annotation.processing.run.all.processors=true
3.9 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
3.10 +application.title=alt2xml-out-xpath
3.11 +application.vendor=fiki
3.12 build.classes.dir=${build.dir}/classes
3.13 build.classes.excludes=**/*.java,**/*.form
3.14 # This directory is removed when the project is cleaned:
3.15 @@ -26,6 +27,7 @@
3.16 dist.dir=dist
3.17 dist.jar=${dist.dir}/alt2xml-out-xpath.jar
3.18 dist.javadoc.dir=${dist.dir}/javadoc
3.19 +endorsed.classpath=
3.20 excludes=
3.21 includes=**
3.22 jar.compress=false
3.23 @@ -67,5 +69,6 @@
3.24 ${javac.test.classpath}:\
3.25 ${build.test.classes.dir}
3.26 source.encoding=UTF-8
3.27 +src.config.dir=config
3.28 src.dir=src
3.29 test.src.dir=test
4.1 --- a/java/alt2xml-out-xpath/nbproject/project.xml Mon Jun 16 21:23:04 2014 +0200
4.2 +++ b/java/alt2xml-out-xpath/nbproject/project.xml Mon Jun 16 22:03:57 2014 +0200
4.3 @@ -5,6 +5,7 @@
4.4 <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
4.5 <name>alt2xml-out-xpath</name>
4.6 <source-roots>
4.7 + <root id="src.config.dir" name="Config"/>
4.8 <root id="src.dir"/>
4.9 </source-roots>
4.10 <test-roots>
5.1 --- a/java/alt2xml-out-xslt/nbproject/build-impl.xml Mon Jun 16 21:23:04 2014 +0200
5.2 +++ b/java/alt2xml-out-xslt/nbproject/build-impl.xml Mon Jun 16 22:03:57 2014 +0200
5.3 @@ -128,6 +128,7 @@
5.4 <condition property="have.sources">
5.5 <or>
5.6 <available file="${src.dir}"/>
5.7 + <available file="${src.config.dir}"/>
5.8 </or>
5.9 </condition>
5.10 <condition property="netbeans.home+have.tests">
5.11 @@ -224,6 +225,7 @@
5.12 </target>
5.13 <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
5.14 <fail unless="src.dir">Must set src.dir</fail>
5.15 + <fail unless="src.config.dir">Must set src.config.dir</fail>
5.16 <fail unless="test.src.dir">Must set test.src.dir</fail>
5.17 <fail unless="build.dir">Must set build.dir</fail>
5.18 <fail unless="dist.dir">Must set dist.dir</fail>
5.19 @@ -245,7 +247,7 @@
5.20 </target>
5.21 <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
5.22 <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
5.23 - <attribute default="${src.dir}" name="srcdir"/>
5.24 + <attribute default="${src.dir}:${src.config.dir}" name="srcdir"/>
5.25 <attribute default="${build.classes.dir}" name="destdir"/>
5.26 <attribute default="${javac.classpath}" name="classpath"/>
5.27 <attribute default="${javac.processorpath}" name="processorpath"/>
5.28 @@ -286,7 +288,7 @@
5.29 </target>
5.30 <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
5.31 <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
5.32 - <attribute default="${src.dir}" name="srcdir"/>
5.33 + <attribute default="${src.dir}:${src.config.dir}" name="srcdir"/>
5.34 <attribute default="${build.classes.dir}" name="destdir"/>
5.35 <attribute default="${javac.classpath}" name="classpath"/>
5.36 <attribute default="${javac.processorpath}" name="processorpath"/>
5.37 @@ -319,7 +321,7 @@
5.38 </target>
5.39 <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
5.40 <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
5.41 - <attribute default="${src.dir}" name="srcdir"/>
5.42 + <attribute default="${src.dir}:${src.config.dir}" name="srcdir"/>
5.43 <attribute default="${build.classes.dir}" name="destdir"/>
5.44 <attribute default="${javac.classpath}" name="classpath"/>
5.45 <sequential>
5.46 @@ -917,12 +919,13 @@
5.47 <include name="*"/>
5.48 </dirset>
5.49 </pathconvert>
5.50 - <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
5.51 + <j2seproject3:depend srcdir="${src.dir}:${src.config.dir}:${build.generated.subdirs}"/>
5.52 </target>
5.53 <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
5.54 <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
5.55 <copy todir="${build.classes.dir}">
5.56 <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
5.57 + <fileset dir="${src.config.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
5.58 </copy>
5.59 </target>
5.60 <target if="has.persistence.xml" name="-copy-persistence-xml">
5.61 @@ -943,7 +946,7 @@
5.62 <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
5.63 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
5.64 <j2seproject3:force-recompile/>
5.65 - <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
5.66 + <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}:${src.config.dir}"/>
5.67 </target>
5.68 <target name="-post-compile-single">
5.69 <!-- Empty placeholder for easier customization. -->
5.70 @@ -1212,6 +1215,9 @@
5.71 <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
5.72 <filename name="**/*.java"/>
5.73 </fileset>
5.74 + <fileset dir="${src.config.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
5.75 + <filename name="**/*.java"/>
5.76 + </fileset>
5.77 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
5.78 <include name="**/*.java"/>
5.79 <exclude name="*.java"/>
5.80 @@ -1222,6 +1228,9 @@
5.81 <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
5.82 <filename name="**/doc-files/**"/>
5.83 </fileset>
5.84 + <fileset dir="${src.config.dir}" excludes="${excludes}" includes="${includes}">
5.85 + <filename name="**/doc-files/**"/>
5.86 + </fileset>
5.87 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
5.88 <include name="**/doc-files/**"/>
5.89 </fileset>
6.1 --- a/java/alt2xml-out-xslt/nbproject/genfiles.properties Mon Jun 16 21:23:04 2014 +0200
6.2 +++ b/java/alt2xml-out-xslt/nbproject/genfiles.properties Mon Jun 16 22:03:57 2014 +0200
6.3 @@ -1,8 +1,8 @@
6.4 -build.xml.data.CRC32=3085b5e5
6.5 +build.xml.data.CRC32=d092df7a
6.6 build.xml.script.CRC32=f8a73b6d
6.7 build.xml.stylesheet.CRC32=8064a381@1.74.2.48
6.8 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
6.9 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6.10 -nbproject/build-impl.xml.data.CRC32=3085b5e5
6.11 -nbproject/build-impl.xml.script.CRC32=474ceb26
6.12 +nbproject/build-impl.xml.data.CRC32=d092df7a
6.13 +nbproject/build-impl.xml.script.CRC32=395aa85c
6.14 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
7.1 --- a/java/alt2xml-out-xslt/nbproject/project.properties Mon Jun 16 21:23:04 2014 +0200
7.2 +++ b/java/alt2xml-out-xslt/nbproject/project.properties Mon Jun 16 22:03:57 2014 +0200
7.3 @@ -1,9 +1,10 @@
7.4 annotation.processing.enabled=true
7.5 annotation.processing.enabled.in.editor=false
7.6 -annotation.processing.processor.options=
7.7 annotation.processing.processors.list=
7.8 annotation.processing.run.all.processors=true
7.9 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
7.10 +application.title=alt2xml-out-xslt
7.11 +application.vendor=fiki
7.12 build.classes.dir=${build.dir}/classes
7.13 build.classes.excludes=**/*.java,**/*.form
7.14 # This directory is removed when the project is cleaned:
7.15 @@ -26,6 +27,7 @@
7.16 dist.dir=dist
7.17 dist.jar=${dist.dir}/alt2xml-out-xslt.jar
7.18 dist.javadoc.dir=${dist.dir}/javadoc
7.19 +endorsed.classpath=
7.20 excludes=
7.21 includes=**
7.22 jar.compress=false
7.23 @@ -67,5 +69,6 @@
7.24 ${javac.test.classpath}:\
7.25 ${build.test.classes.dir}
7.26 source.encoding=UTF-8
7.27 +src.config.dir=config
7.28 src.dir=src
7.29 test.src.dir=test
8.1 --- a/java/alt2xml-out-xslt/nbproject/project.xml Mon Jun 16 21:23:04 2014 +0200
8.2 +++ b/java/alt2xml-out-xslt/nbproject/project.xml Mon Jun 16 22:03:57 2014 +0200
8.3 @@ -6,6 +6,7 @@
8.4 <name>alt2xml-out-xslt</name>
8.5 <source-roots>
8.6 <root id="src.dir"/>
8.7 + <root id="src.config.dir" name="Config"/>
8.8 </source-roots>
8.9 <test-roots>
8.10 <root id="test.src.dir"/>