diff --git a/build.xml b/build.xml
index c79bb4eb7a45789b10cafb529077945a197bd441..6f3c8b61d2a66aafbd0e88a1d9b8b21745fbae0c 100644
--- a/build.xml
+++ b/build.xml
@@ -24,7 +24,7 @@
<property name="javadoc.additionalparam" value=""/>
<property name="javadoc.author" value="Don Brutzman brutzman@nps.edu"/>
- <property name="javadoc.dir" value="dist/javadoc"/>
+ <property name="javadoc.dir" value="${dist.javadoc.dir}"/>
<property name="javadoc.encoding" value="ISO-8859-1"/>
<property name="javadoc.copyright" value="Copyright ©1995-2021 held by the authors, <a href='https://www.www.nps.edu'>Naval Postgraduate School (NPS)</a> under an <a href='../license.html'>open-source license</a> and free for any use. <a href='mailto:brutzman@nps.edu?subject=open-dis7%20feedback'>Feedback</a> is welcome."/>
<property name="javadoc.noindex" value="false"/>
@@ -69,10 +69,9 @@
</delete>
</target>
- <target name="clean" description="clean assets created by this project">
- <mkdir dir="dist" description="ensure necessary directory present"/>
+ <target name="clean" depends="init" description="clean assets created by this project">
<delete verbose="true">
- <fileset dir="dist">
+ <fileset dir="${dist.dir}">
<include name="open-dis7-pdus-classes.jar"/>
<include name="open-dis7-pdus-source.jar"/>
<include name="open-dis7-pdus-javadoc.jar"/>
@@ -85,11 +84,9 @@
<exclude name="README.md"/>
</fileset>
</delete>
- <delete dir="dist/javadoc" description="get rid of all prior files"/>
- <mkdir dir="dist/javadoc" description="restore directory"/>
- <mkdir dir="build/classes" description="ensure necessary directory present"/>
+ <delete dir="${dist.javadoc.dir}" description="get rid of all prior files"/>
<delete verbose="false" includeemptydirs="false">
- <fileset dir="build/classes" includes="**/*"/>
+ <fileset dir="${build.classes.dir}" includes="**/*"/>
</delete>
</target>
@@ -108,8 +105,8 @@
</target>
<target name="view.javadoc.local" description="view local package javadoc in web browser (Netbeans only)">
- <echo message="view local javadoc in dist/javadoc subdirectory"/>
- <nbbrowse file="dist/javadoc/index.html" />
+ <echo message="view local javadoc in ${dist.javadoc.dir} subdirectory"/>
+ <nbbrowse file="${dist.javadoc.dir}/index.html" />
<!-- TODO implementation-independent approach if possible, but note that other Ant approaches usually have to be customized for each OS. -->
</target>
@@ -237,24 +234,24 @@
<target name="zip-full" description="full set of everything, pdus and enumerations">
<!-- TODO README -->
- <delete file="dist/open-dis7-full.zip"/>
- <zip destfile="dist/open-dis7-full.zip"
+ <delete file="${dist.dir}/open-dis7-full.zip"/>
+ <zip destfile="${dist.dir}/open-dis7-full.zip"
update="true"
zip64Mode="always">
<!-- zip64Mode https://stackoverflow.com/questions/39524481/error-creating-jar-archive-contains-more-than-65535-entries/ -->
<!-- https://stackoverflow.com/questions/515428/clean-way-to-combine-multiple-jars-preferably-using-ant -->
- <zipfileset src="dist/open-dis7-enumerations-classes.jar"/>
- <zipfileset src="dist/open-dis7-enumerations-javadoc.jar"/>
- <zipfileset src="dist/open-dis7-enumerations-source.jar"/>
- <zipfileset src="dist/open-dis7-pdus-classes.jar"/>
- <zipfileset src="dist/open-dis7-pdus-javadoc.jar"/>
- <zipfileset src="dist/open-dis7-pdus-source.jar"/>
+ <zipfileset src="${dist.dir}/open-dis7-enumerations-classes.jar"/>
+ <zipfileset src="${dist.dir}/open-dis7-enumerations-javadoc.jar"/>
+ <zipfileset src="${dist.dir}/open-dis7-enumerations-source.jar"/>
+ <zipfileset src="${dist.dir}/open-dis7-pdus-classes.jar"/>
+ <zipfileset src="${dist.dir}/open-dis7-pdus-javadoc.jar"/>
+ <zipfileset src="${dist.dir}/open-dis7-pdus-source.jar"/>
<!-- <fileset dir="build" defaultexcludes="yes">
<include name="classes/**/*"/>
<exclude name="test/*"/>
</fileset>-->
- <fileset dir="dist" defaultexcludes="yes">
+ <fileset dir="${dist.dir}" defaultexcludes="yes">
<exclude name="javadoc/**"/>
</fileset>
<!-- <fileset dir="src" defaultexcludes="yes">
@@ -287,12 +284,12 @@
</target>
<target name="jar-pdus-javadoc" description="full set of javadoc"> <!-- avoid performing multiple times: depends="javadoc" -->
- <echo message="(note that generated javadoc subdirectory is found within dist subdirectory)"/>
- <delete file="dist/open-dis7-pdus-javadoc.jar"/>
- <jar destfile="dist/open-dis7-pdus-javadoc.jar"
+ <echo message="(note that generated javadoc subdirectory is found within ${dist.dir} subdirectory)"/>
+ <delete file="${dist.dir}/open-dis7-pdus-javadoc.jar"/>
+ <jar destfile="${dist.dir}/open-dis7-pdus-javadoc.jar"
update="true"
zip64Mode="always">
- <fileset dir="dist/javadoc" defaultexcludes="yes">
+ <fileset dir="${dist.javadoc.dir}" defaultexcludes="yes">
<include name="**/*"/>
<exclude name="edu/nps/moves/dis7/entities/**"/>
<exclude name="edu/nps/moves/dis7/enumerations/**"/>
@@ -318,8 +315,8 @@
</target>
<target name="jar-pdus-source">
- <delete file="dist/open-dis7-pdus-source.jar"/>
- <jar destfile="dist/open-dis7-pdus-source.jar"
+ <delete file="${dist.dir}/open-dis7-pdus-source.jar"/>
+ <jar destfile="${dist.dir}/open-dis7-pdus-source.jar"
update="true"
zip64Mode="always">
<fileset dir="src" defaultexcludes="yes">
@@ -353,12 +350,12 @@
</target>
<target name="jar-full" depends="compile" description="merges all dis7 subpackage assets">
- <delete file="dist/open-dis7-full.jar" verbose="false"/>
+ <delete file="${dist.dir}/open-dis7-full.jar" verbose="false"/>
<!-- https://stackoverflow.com/questions/515428/clean-way-to-combine-multiple-jars-preferably-using-ant -->
- <jar destfile="dist/open-dis7-full.jar"
+ <jar destfile="${dist.dir}/open-dis7-full.jar"
update="true"
zip64Mode="always">
- <zipgroupfileset dir="dist">
+ <zipgroupfileset dir="${dist.dir}">
<include name="open-dis7-*.jar"/>
<!-- TODO consider whether these dependencies are strictly needed -->
<include name="../lib/commons-io-2.6.jar"/>
@@ -394,8 +391,8 @@
</target>
<target name="jar-pdus-classes" depends="compile" description="merges all dis7 subpackage classes except for enumerations">
- <delete file="dist/open-dis7-pdus-classes.jar"/>
- <jar destfile="dist/open-dis7-pdus-classes.jar"
+ <delete file="${dist.jar}"/>
+ <jar destfile="${dist.jar}"
update="true"
zip64Mode="always">
<fileset dir="build/classes" defaultexcludes="yes">
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 4eef826249b980c61623f0d14ce9c7d694f878c0..a56bff38d62b4b41c3818956be35f78e7264a4aa 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -46,8 +46,8 @@ is divided into following sections:
<property file="${user.properties.file}"/>
<!-- The two properties below are usually overridden -->
<!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.6"/>
- <property name="default.javac.target" value="1.6"/>
+ <property name="default.javac.source" value="1.8"/>
+ <property name="default.javac.target" value="1.8"/>
</target>
<target depends="-pre-init,-init-private,-init-user" name="-init-project">
<property file="nbproject/configs/${config}.properties"/>
@@ -90,7 +90,7 @@ is divided into following sections:
</not>
</condition>
</fail>
- <j2seproject3:modulename property="module.name" sourcepath="${src.dir}:${src.src-generated.dir}"/>
+ <j2seproject3:modulename property="module.name" sourcepath="${src.src-generated.dir}:${src.dir}"/>
<condition property="named.module.internal">
<and>
<isset property="module.name"/>
@@ -119,7 +119,43 @@ is divided into following sections:
<property name="module.name" value=""/>
</target>
<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init">
- <property name="platform.java" value="${java.home}/bin/java"/>
+ <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
+ <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
+ <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
+ <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
+ <condition property="platform.javac" value="${platform.home}/bin/javac">
+ <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
+ </condition>
+ <property name="platform.javac" value="${platform.javac.tmp}"/>
+ <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
+ <condition property="platform.java" value="${platform.home}/bin/java">
+ <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
+ </condition>
+ <property name="platform.java" value="${platform.java.tmp}"/>
+ <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
+ <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
+ <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
+ </condition>
+ <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
+ <condition property="platform.invalid" value="true">
+ <or>
+ <contains string="${platform.javac}" substring="$${platforms."/>
+ <contains string="${platform.java}" substring="$${platforms."/>
+ <contains string="${platform.javadoc}" substring="$${platforms."/>
+ </or>
+ </condition>
+ <fail unless="platform.home">Must set platform.home</fail>
+ <fail unless="platform.bootcp">Must set platform.bootcp</fail>
+ <fail unless="platform.java">Must set platform.java</fail>
+ <fail unless="platform.javac">Must set platform.javac</fail>
+ <fail if="platform.invalid">
+ The J2SE Platform is not correctly set up.
+ Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files.
+ Either open the project in the IDE and setup the Platform with the same name or add it manually.
+ For example like this:
+ ant -Duser.properties.file=<path_to_property_file> jar (where you put the property "platforms.${platform.active}.home" in a .properties file)
+ or ant -Dplatforms.${platform.active}.home=<path_to_JDK_home> jar (where no properties file is used)
+ </fail>
<available file="${manifest.file}" property="manifest.available"/>
<condition property="splashscreen.available">
<and>
@@ -185,8 +221,8 @@ is divided into following sections:
</condition>
<condition property="have.sources">
<or>
- <available file="${src.dir}"/>
<available file="${src.src-generated.dir}"/>
+ <available file="${src.dir}"/>
</or>
</condition>
<condition property="netbeans.home+have.tests">
@@ -243,20 +279,6 @@ is divided into following sections:
<condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
<isset property="profile.available"/>
</condition>
- <condition else="false" property="jdkBug6558476">
- <and>
- <matches pattern="1\.[56]" string="${java.specification.version}"/>
- <not>
- <os family="unix"/>
- </not>
- </and>
- </condition>
- <condition else="false" property="javac.fork">
- <or>
- <istrue value="${jdkBug6558476}"/>
- <istrue value="${javac.external.vm}"/>
- </or>
- </condition>
<property name="jar.index" value="false"/>
<property name="jar.index.metainf" value="${jar.index}"/>
<property name="copylibs.rebase" value="true"/>
@@ -289,8 +311,8 @@ is divided into following sections:
<!-- You can override this target in the ../build.xml file. -->
</target>
<target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
<fail unless="src.src-generated.dir">Must set src.src-generated.dir</fail>
+ <fail unless="src.dir">Must set src.dir</fail>
<fail unless="test.src.dir">Must set test.src.dir</fail>
<fail unless="build.dir">Must set build.dir</fail>
<fail unless="dist.dir">Must set dist.dir</fail>
@@ -312,7 +334,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal" name="-init-macrodef-javac-with-module">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.dir}:${src.src-generated.dir}" name="srcdir"/>
+ <attribute default="${src.src-generated.dir}:${src.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.modulepath}" name="modulepath"/>
@@ -324,7 +346,7 @@ is divided into following sections:
<attribute default="${excludes}" name="excludes"/>
<attribute default="${javac.debug}" name="debug"/>
<attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/>
- <attribute default="${src.dir}:${src.src-generated.dir}" if:set="named.module.internal" name="sourcepath"/>
+ <attribute default="${src.src-generated.dir}:${src.dir}" if:set="named.module.internal" name="sourcepath"/>
<attribute default="${empty.dir}" name="gensrcdir"/>
<element name="customize" optional="true"/>
<sequential>
@@ -345,7 +367,7 @@ is divided into following sections:
</path>
</resourcecount>
</condition>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/>
@@ -379,7 +401,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors" unless="modules.supported.internal">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.dir}:${src.src-generated.dir}" name="srcdir"/>
+ <attribute default="${src.src-generated.dir}:${src.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.modulepath}" name="modulepath"/>
@@ -396,7 +418,7 @@ is divided into following sections:
<property location="${build.dir}/empty" name="empty.dir"/>
<mkdir dir="${empty.dir}"/>
<mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/>
@@ -422,7 +444,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties,-init-source-module-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.dir}:${src.src-generated.dir}" name="srcdir"/>
+ <attribute default="${src.src-generated.dir}:${src.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.modulepath}" name="modulepath"/>
@@ -438,7 +460,7 @@ is divided into following sections:
<sequential>
<property location="${build.dir}/empty" name="empty.dir"/>
<mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/>
@@ -457,7 +479,7 @@ is divided into following sections:
</target>
<target depends="-init-macrodef-javac-with-module,-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.dir}:${src.src-generated.dir}" name="srcdir"/>
+ <attribute default="${src.src-generated.dir}:${src.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<sequential>
@@ -517,7 +539,7 @@ is divided into following sections:
<element name="customizePrototype" optional="true"/>
<sequential>
<property name="junit.forkmode" value="perTest"/>
- <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+ <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
<mapper from="test-sys-prop.*" to="*" type="glob"/>
@@ -545,7 +567,7 @@ is divided into following sections:
<element name="customizePrototype" optional="true"/>
<sequential>
<property name="junit.forkmode" value="perTest"/>
- <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+ <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
<mapper from="test-sys-prop.*" to="*" type="glob"/>
@@ -621,7 +643,7 @@ is divided into following sections:
</fileset>
</union>
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
- <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="open-dis7-java" testname="TestNG tests" workingDir="${work.dir}">
+ <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="open-dis7-java" testname="TestNG tests" workingDir="${work.dir}">
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
<propertyset>
<propertyref prefix="test-sys-prop."/>
@@ -852,6 +874,9 @@ is divided into following sections:
<classpath>
<path path="@{classpath}"/>
</classpath>
+ <bootclasspath>
+ <path path="${platform.bootcp}"/>
+ </bootclasspath>
</nbjpdastart>
</sequential>
</macrodef>
@@ -901,7 +926,7 @@ is divided into following sections:
<attribute default="jvm" name="jvm"/>
<element name="customize" optional="true"/>
<sequential>
- <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}">
+ <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}" module="@{modulename}">
<classpath>
<path path="@{classpath}"/>
</classpath>
@@ -935,7 +960,7 @@ is divided into following sections:
<attribute default="jvm" name="jvm"/>
<element name="customize" optional="true"/>
<sequential>
- <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
+ <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}">
<classpath>
<path path="@{classpath}"/>
</classpath>
@@ -967,7 +992,7 @@ is divided into following sections:
<attribute default="jvm" name="jvm"/>
<element name="customize" optional="true"/>
<sequential>
- <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
+ <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}">
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
@@ -1092,13 +1117,13 @@ is divided into following sections:
<include name="*"/>
</dirset>
</pathconvert>
- <j2seproject3:depend srcdir="${src.dir}:${src.src-generated.dir}:${build.generated.subdirs}"/>
+ <j2seproject3:depend srcdir="${src.src-generated.dir}:${src.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.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.src-generated.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
</copy>
</target>
<target if="has.persistence.xml" name="-copy-persistence-xml">
@@ -1119,7 +1144,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}, module-info.java" sourcepath="${src.dir}:${src.src-generated.dir}"/>
+ <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.src-generated.dir}:${src.dir}"/>
</target>
<target name="-post-compile-single">
<!-- Empty placeholder for easier customization. -->
@@ -1202,7 +1227,7 @@ is divided into following sections:
<j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
<echo level="info">To run this application from the command line without Ant, try:</echo>
<property location="${dist.jar}" name="dist.jar.resolved"/>
- <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+ <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
</target>
<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,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
<j2seproject1:jar manifest="${tmp.manifest.file}"/>
@@ -1304,8 +1329,8 @@ is divided into following sections:
<isset property="main.class.available"/>
</and>
</condition>
- <property name="platform.jlink" value="${jdk.home}/bin/jlink"/>
- <property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/>
+ <property name="platform.jlink" value="${platform.home}/bin/jlink"/>
+ <property name="jlink.systemmodules.internal" value="${platform.home}/jmods"/>
<exec executable="${platform.jlink}">
<arg value="--module-path"/>
<arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/>
@@ -1498,23 +1523,26 @@ is divided into following sections:
</not>
</and>
</condition>
+ <exec executable="${platform.java}" failonerror="false" outputproperty="platform.version.output">
+ <arg value="-version"/>
+ </exec>
<condition else="" property="bug5101868workaround" value="*.java">
- <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
+ <matches multiline="true" pattern="1\.[56](\..*)?" string="${platform.version.output}"/>
</condition>
<condition else="" property="javadoc.html5.cmd.line.arg" value="-html5">
<and>
<isset property="javadoc.html5"/>
- <available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
+ <available file="${platform.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
</and>
</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}">
+ <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}" executable="${platform.javadoc}" 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="${bug5101868workaround},${excludes}" includes="${includes}">
+ <fileset dir="${src.src-generated.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.src-generated.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+ <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
@@ -1525,10 +1553,10 @@ is divided into following sections:
<arg line="${javadoc.html5.cmd.line.arg}"/>
</javadoc>
<copy todir="${dist.javadoc.dir}">
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+ <fileset dir="${src.src-generated.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
- <fileset dir="${src.src-generated.dir}" excludes="${excludes}" includes="${includes}">
+ <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index d825ad3dbb1b4fa6e977d49ae381540d2c6871af..6fb4115f1be842d205bfe43aa0010b2b5d5c095e 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,5 +1,5 @@
# 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=7793ec18
-nbproject/build-impl.xml.script.CRC32=2b37b8f7
-nbproject/build-impl.xml.stylesheet.CRC32=d549e5cc@1.97.0.48
+nbproject/build-impl.xml.data.CRC32=a21aee8e
+nbproject/build-impl.xml.script.CRC32=b33f34e1
+nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.100.0.48
diff --git a/nbproject/project.properties b/nbproject/project.properties
index c12eb931982e3ede30dcffe1154121b7b1170403..16f310dda4c8c73d41f1be19fbc1745c81c2841b 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -35,7 +35,7 @@ debug.test.modulepath=\
dist.archive.excludes=
# This directory is removed when the project is cleaned:
dist.dir=dist
-dist.jar=${dist.dir}/open-dis7-java.jar
+dist.jar=${dist.dir}/open-dis7-pdus-classes.jar
dist.javadoc.dir=${dist.dir}/javadoc
dist.jlink.dir=${dist.dir}/jlink
dist.jlink.output=${dist.jlink.dir}/open-dis7-java
@@ -117,7 +117,7 @@ manifest.custom.permissions=
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
no.dependencies=true
-platform.active=default_platform
+platform.active=JDK_16
project.licensePath=./license.txt
run.classpath=\
${javac.classpath}:\
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 0c2247b44b1421f5287cc9a3b943f52926c0a05e..37d2ed61d0f3ae5c2ad5ba091a71bbc80e79aaa9 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -4,6 +4,7 @@
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>open-dis7-java</name>
+ <explicit-platform explicit-source-supported="true"/>
<source-roots>
<root id="src.src-generated.dir"/>
<root id="src.dir"/>