1.1 --- a/java/sql-dk/nbproject/build-impl.xml Sun Apr 06 17:53:01 2014 +0200
1.2 +++ b/java/sql-dk/nbproject/build-impl.xml Sun Apr 06 17:53:36 2014 +0200
1.3 @@ -54,6 +54,7 @@
1.4 <property file="nbproject/project.properties"/>
1.5 </target>
1.6 <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
1.7 + <property name="platform.java" value="${java.home}/bin/java"/>
1.8 <available file="${manifest.file}" property="manifest.available"/>
1.9 <condition property="splashscreen.available">
1.10 <and>
1.11 @@ -71,16 +72,20 @@
1.12 </not>
1.13 </and>
1.14 </condition>
1.15 - <condition property="manifest.available+main.class">
1.16 + <condition property="profile.available">
1.17 <and>
1.18 - <isset property="manifest.available"/>
1.19 - <isset property="main.class.available"/>
1.20 + <isset property="javac.profile"/>
1.21 + <length length="0" string="${javac.profile}" when="greater"/>
1.22 + <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
1.23 </and>
1.24 </condition>
1.25 <condition property="do.archive">
1.26 - <not>
1.27 - <istrue value="${jar.archive.disabled}"/>
1.28 - </not>
1.29 + <or>
1.30 + <not>
1.31 + <istrue value="${jar.archive.disabled}"/>
1.32 + </not>
1.33 + <istrue value="${not.archive.disabled}"/>
1.34 + </or>
1.35 </condition>
1.36 <condition property="do.mkdist">
1.37 <and>
1.38 @@ -91,12 +96,6 @@
1.39 </not>
1.40 </and>
1.41 </condition>
1.42 - <condition property="manifest.available+main.class+mkdist.available">
1.43 - <and>
1.44 - <istrue value="${manifest.available+main.class}"/>
1.45 - <isset property="do.mkdist"/>
1.46 - </and>
1.47 - </condition>
1.48 <condition property="do.archive+manifest.available">
1.49 <and>
1.50 <isset property="manifest.available"/>
1.51 @@ -115,24 +114,12 @@
1.52 <istrue value="${do.archive}"/>
1.53 </and>
1.54 </condition>
1.55 - <condition property="do.archive+manifest.available+main.class">
1.56 + <condition property="do.archive+profile.available">
1.57 <and>
1.58 - <istrue value="${manifest.available+main.class}"/>
1.59 + <isset property="profile.available"/>
1.60 <istrue value="${do.archive}"/>
1.61 </and>
1.62 </condition>
1.63 - <condition property="manifest.available-mkdist.available">
1.64 - <or>
1.65 - <istrue value="${manifest.available}"/>
1.66 - <isset property="do.mkdist"/>
1.67 - </or>
1.68 - </condition>
1.69 - <condition property="manifest.available+main.class-mkdist.available">
1.70 - <or>
1.71 - <istrue value="${manifest.available+main.class}"/>
1.72 - <isset property="do.mkdist"/>
1.73 - </or>
1.74 - </condition>
1.75 <condition property="have.tests">
1.76 <or>
1.77 <available file="${test.src.dir}"/>
1.78 @@ -187,7 +174,15 @@
1.79 </condition>
1.80 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
1.81 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
1.82 - <length length="0" string="${endorsed.classpath}" when="greater"/>
1.83 + <and>
1.84 + <isset property="endorsed.classpath"/>
1.85 + <not>
1.86 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
1.87 + </not>
1.88 + </and>
1.89 + </condition>
1.90 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
1.91 + <isset property="profile.available"/>
1.92 </condition>
1.93 <condition else="false" property="jdkBug6558476">
1.94 <and>
1.95 @@ -277,6 +272,7 @@
1.96 <path path="@{classpath}"/>
1.97 </classpath>
1.98 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
1.99 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
1.100 <compilerarg line="${javac.compilerargs}"/>
1.101 <compilerarg value="-processorpath"/>
1.102 <compilerarg path="@{processorpath}:${empty.dir}"/>
1.103 @@ -316,6 +312,7 @@
1.104 <path path="@{classpath}"/>
1.105 </classpath>
1.106 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
1.107 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
1.108 <compilerarg line="${javac.compilerargs}"/>
1.109 <customize/>
1.110 </javac>
1.111 @@ -448,7 +445,7 @@
1.112 </fileset>
1.113 </union>
1.114 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
1.115 - <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="sql-dk" testname="TestNG tests" workingDir="${work.dir}">
1.116 + <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="sql-dk" testname="TestNG tests" workingDir="${work.dir}">
1.117 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
1.118 <propertyset>
1.119 <propertyref prefix="test-sys-prop."/>
1.120 @@ -839,8 +836,8 @@
1.121 </chainedmapper>
1.122 </pathconvert>
1.123 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
1.124 - <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
1.125 - <fileset dir="${build.classes.dir}"/>
1.126 + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
1.127 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
1.128 <manifest>
1.129 <attribute name="Class-Path" value="${jar.classpath}"/>
1.130 <customize/>
1.131 @@ -852,7 +849,7 @@
1.132 <target name="-init-presetdef-jar">
1.133 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
1.134 <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
1.135 - <j2seproject1:fileset dir="${build.classes.dir}"/>
1.136 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
1.137 </jar>
1.138 </presetdef>
1.139 </target>
1.140 @@ -969,41 +966,25 @@
1.141 <!-- Empty placeholder for easier customization. -->
1.142 <!-- You can override this target in the ../build.xml file. -->
1.143 </target>
1.144 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
1.145 - <j2seproject1:jar/>
1.146 - </target>
1.147 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
1.148 - <j2seproject1:jar manifest="${manifest.file}"/>
1.149 - </target>
1.150 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
1.151 - <j2seproject1:jar manifest="${manifest.file}">
1.152 - <j2seproject1:manifest>
1.153 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
1.154 - </j2seproject1:manifest>
1.155 - </j2seproject1:jar>
1.156 - <echo level="info">To run this application from the command line without Ant, try:</echo>
1.157 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1.158 - <property location="${dist.jar}" name="dist.jar.resolved"/>
1.159 - <pathconvert property="run.classpath.with.dist.jar">
1.160 - <path path="${run.classpath}"/>
1.161 - <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
1.162 - </pathconvert>
1.163 - <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
1.164 - </target>
1.165 - <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
1.166 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
1.167 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1.168 <touch file="${tmp.manifest.file}" verbose="false"/>
1.169 </target>
1.170 - <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
1.171 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
1.172 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1.173 <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
1.174 </target>
1.175 - <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
1.176 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
1.177 <manifest file="${tmp.manifest.file}" mode="update">
1.178 <attribute name="Main-Class" value="${main.class}"/>
1.179 </manifest>
1.180 </target>
1.181 - <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
1.182 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
1.183 + <manifest file="${tmp.manifest.file}" mode="update">
1.184 + <attribute name="Profile" value="${javac.profile}"/>
1.185 + </manifest>
1.186 + </target>
1.187 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
1.188 <basename file="${application.splash}" property="splashscreen.basename"/>
1.189 <mkdir dir="${build.classes.dir}/META-INF"/>
1.190 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
1.191 @@ -1011,23 +992,41 @@
1.192 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
1.193 </manifest>
1.194 </target>
1.195 - <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
1.196 + <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
1.197 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
1.198 <echo level="info">To run this application from the command line without Ant, try:</echo>
1.199 <property location="${dist.jar}" name="dist.jar.resolved"/>
1.200 <echo level="info">java -jar "${dist.jar.resolved}"</echo>
1.201 </target>
1.202 - <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
1.203 + <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
1.204 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
1.205 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1.206 + <property location="${dist.jar}" name="dist.jar.resolved"/>
1.207 + <pathconvert property="run.classpath.with.dist.jar">
1.208 + <path path="${run.classpath}"/>
1.209 + <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
1.210 + </pathconvert>
1.211 + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
1.212 + <isset property="main.class.available"/>
1.213 + </condition>
1.214 + <condition else="debug" property="jar.usage.level" value="info">
1.215 + <isset property="main.class.available"/>
1.216 + </condition>
1.217 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
1.218 + </target>
1.219 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
1.220 <delete>
1.221 <fileset file="${tmp.manifest.file}"/>
1.222 </delete>
1.223 </target>
1.224 - <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
1.225 + <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
1.226 + <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
1.227 <target name="-post-jar">
1.228 <!-- Empty placeholder for easier customization. -->
1.229 <!-- You can override this target in the ../build.xml file. -->
1.230 </target>
1.231 - <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
1.232 + <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
1.233 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
1.234 <!--
1.235 =================
1.236 EXECUTION SECTION
1.237 @@ -1206,14 +1205,17 @@
1.238 </not>
1.239 </and>
1.240 </condition>
1.241 - <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}">
1.242 + <condition else="" property="bug5101868workaround" value="*.java">
1.243 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
1.244 + </condition>
1.245 + <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${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}">
1.246 <classpath>
1.247 <path path="${javac.classpath}"/>
1.248 </classpath>
1.249 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
1.250 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
1.251 <filename name="**/*.java"/>
1.252 </fileset>
1.253 - <fileset dir="${src.data.dir}" excludes="*.java,${excludes}" includes="${includes}">
1.254 + <fileset dir="${src.data.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
1.255 <filename name="**/*.java"/>
1.256 </fileset>
1.257 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
1.258 @@ -1290,7 +1292,7 @@
1.259 <mkdir dir="${build.test.results.dir}"/>
1.260 </target>
1.261 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
1.262 - <j2seproject3:test testincludes="**/*Test.java"/>
1.263 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
1.264 </target>
1.265 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
1.266 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
2.1 --- a/java/sql-dk/nbproject/genfiles.properties Sun Apr 06 17:53:01 2014 +0200
2.2 +++ b/java/sql-dk/nbproject/genfiles.properties Sun Apr 06 17:53:36 2014 +0200
2.3 @@ -4,5 +4,5 @@
2.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
2.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
2.6 nbproject/build-impl.xml.data.CRC32=b51b939b
2.7 -nbproject/build-impl.xml.script.CRC32=53c1d5ab
2.8 -nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46
2.9 +nbproject/build-impl.xml.script.CRC32=a82494d4
2.10 +nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48