diff options
| author | Maurice Laveaux <m.laveaux@student.tue.nl> | 2014-05-07 12:31:49 +0200 |
|---|---|---|
| committer | Maurice Laveaux <m.laveaux@student.tue.nl> | 2014-05-07 12:31:49 +0200 |
| commit | 2f203acc7f28afce9e704cf27fd59d11e28ec2d5 (patch) | |
| tree | d89a422c041932d04d56b2152933dc21540454a7 /nbproject | |
| parent | 4386d1efcd0c423c2fa0e199e65e1c29792bf54c (diff) | |
| download | Datafiller-2f203acc7f28afce9e704cf27fd59d11e28ec2d5.tar.gz | |
Added classes to refactor the database code.
* DBConnection creates a persistent conn.
* DBQuery resolves and executes queries.
* QueryUtils creates sql query text.
Diffstat (limited to 'nbproject')
| -rw-r--r-- | nbproject/build-impl.xml | 18 | ||||
| -rw-r--r-- | nbproject/genfiles.properties | 4 | ||||
| -rw-r--r-- | nbproject/project.properties | 4 |
3 files changed, 16 insertions, 10 deletions
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index ef573dd..d88ddb4 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -80,9 +80,12 @@ is divided into following sections: </and> </condition> <condition property="do.archive"> - <not> - <istrue value="${jar.archive.disabled}"/> - </not> + <or> + <not> + <istrue value="${jar.archive.disabled}"/> + </not> + <istrue value="${not.archive.disabled}"/> + </or> </condition> <condition property="do.mkdist"> <and> @@ -1199,11 +1202,14 @@ is divided into following sections: </not> </and> </condition> - <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}"> + <condition else="" property="bug5101868workaround" value="*.java"> + <matches pattern="1\.[56](\..*)?" string="${java.version}"/> + </condition> + <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}"> <classpath> <path path="${javac.classpath}"/> </classpath> - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}"> + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> <filename name="**/*.java"/> </fileset> <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> @@ -1277,7 +1283,7 @@ is divided into following sections: <mkdir dir="${build.test.results.dir}"/> </target> <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> - <j2seproject3:test testincludes="**/*Test.java"/> + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/> </target> <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index e5a905b..229557a 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=8064a381@1.68.1.46 # 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=bae11919 -nbproject/build-impl.xml.script.CRC32=220d582d -nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46 +nbproject/build-impl.xml.script.CRC32=e529da7b +nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48 diff --git a/nbproject/project.properties b/nbproject/project.properties index 706ba09..a7c47fc 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -34,8 +34,8 @@ file.reference.postgresql-9.3-1101.jdbc41.jar=D:\\Downloads\\postgresql-9.3-1101 includes=** jar.compress=false javac.classpath=\ - ${file.reference.postgresql-9.3-1101.jdbc41.jar}:\ - ${file.reference.json.jar} + ${file.reference.json.jar}:\ + ${file.reference.postgresql-9.3-1101.jdbc41.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false |