diff --git a/build.xml b/build.xml
index 8b636f2b6f006f3320fc621291264ca842e11b5f..cddc5fa07142ff5fd981ffd097578455373f795f 100644
--- a/build.xml
+++ b/build.xml
@@ -34,8 +34,8 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-->
-<project name="open-dis7-java" default="default" basedir="." xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3">
- <description>Builds, tests, and runs the open-dis7-java project.</description>
+<project name="opendis7-java" default="default" basedir="." xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3">
+ <description>Builds, tests, and runs the opendis7-java project.</description>
<import file="nbproject/build-impl.xml"/>
<property file="nbproject/project.properties"/>
@@ -45,7 +45,7 @@ POSSIBILITY OF SUCH DAMAGE.
<!-- javadoc manifest properties -->
<property name="manifest.name" value="OpenDIS7 Protocol Data Units (PDUs)"/>
- <property name="Built-By" value="https://github.com/open-dis/open-dis7-java"/>
+ <property name="Built-By" value="https://github.com/open-dis/opendis7-java"/>
<property name="Specification-Title" value="IEEE Distributed Interactive Simulation (DIS) Protocol"/>
<property name="Specification-Version" value="7"/>
<property name="Specification-Vendor" value="Institute of Electrical and Electronics Engineers (IEEE)"/>
@@ -61,7 +61,7 @@ POSSIBILITY OF SUCH DAMAGE.
<property name="javadoc.author" value="Don Brutzman brutzman@nps.edu"/>
<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-java%20feedback'>Feedback</a> is welcome."/>
+ <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=opendis7-java%20feedback'>Feedback</a> is welcome."/>
<property name="javadoc.noindex" value="false"/>
<property name="javadoc.nonavbar" value="false"/>
<property name="javadoc.notree" value="false"/>
@@ -101,10 +101,12 @@ POSSIBILITY OF SUCH DAMAGE.
<echo message="================"/>
<antcall target="deploy.guidance"/>
<echo message="================"/>
- <echo message="open-dis7-java build all complete"/>
+ <echo message="opendis7-java build all complete"/>
</target>
<target name="clean.pduLog" description="clean recorded pduLog files">
+ <mkdir dir="pduLog" description="ensure necessary directory present"/>
+ <echo message="deleting prior default autogenerated pduLog/*.dislog files, if any"/>
<delete verbose="true">
<fileset dir="pduLog">
<include name="*.dislog"/>
@@ -115,15 +117,15 @@ POSSIBILITY OF SUCH DAMAGE.
<target name="clean" depends="init" description="clean assets created by this project">
<delete verbose="true" failonerror="false">
<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"/>
- <include name="open-dis7-full.zip"/>
- <include name="open-dis7-full.jar"/>
- <!-- do not delete jar files produced by open-dis7-source-generator -->
- <exclude name="open-dis7-enumerations-classes.jar"/>
- <exclude name="open-dis7-enumerations-source.jar"/>
- <exclude name="open-dis7-enumerations-javadoc.jar"/>
+ <include name="opendis7-pdus-classes.jar"/>
+ <include name="opendis7-pdus-source.jar"/>
+ <include name="opendis7-pdus-javadoc.jar"/>
+ <include name="opendis7-full.zip"/>
+ <include name="opendis7-full.jar"/>
+ <!-- do not delete jar files produced by opendis7-source-generator -->
+ <exclude name="opendis7-enumerations-classes.jar"/>
+ <exclude name="opendis7-enumerations-source.jar"/>
+ <exclude name="opendis7-enumerations-javadoc.jar"/>
<exclude name="README.md"/>
</fileset>
</delete>
@@ -144,8 +146,8 @@ POSSIBILITY OF SUCH DAMAGE.
</target>
<target name="view.issues.online" description="view online issues in web browser (Netbeans only)">
- <echo message="https://github.com/open-dis/open-dis7-java/issues" />
- <nbbrowse url="https://github.com/open-dis/open-dis7-java/issues" />
+ <echo message="https://github.com/open-dis/opendis7-java/issues" />
+ <nbbrowse url="https://github.com/open-dis/opendis7-java/issues" />
<!-- TODO implementation-independent approach if possible, but note that other Ant approaches usually have to be customized for each OS. -->
</target>
@@ -157,7 +159,7 @@ POSSIBILITY OF SUCH DAMAGE.
<target name="view.javadoc.online" description="view online package javadoc in web browser (Netbeans only)">
<echo message="view online javadoc in dist/javadoc subdirectory"/>
- <nbbrowse url="https://savage.nps.edu/open-dis7-java/javadoc" />
+ <nbbrowse url="https://savage.nps.edu/opendis7-java/javadoc" />
<!-- TODO implementation-independent approach if possible, but note that other Ant approaches usually have to be customized for each OS. -->
</target>
@@ -166,12 +168,12 @@ POSSIBILITY OF SUCH DAMAGE.
<echo message="* NetworkedGraphicsMV3500"/>
<echo message=" * update.open-dis7.jar.local"/>
<echo message=" * Test student assignments and course examples"/>
- <echo message=" * commit open-dis7-full.jar"/>
- <echo message=" * scp savage.nps.edu/data/html/open-dis7-java"/>
- <echo message=" * open-dis7-java/dist/javadoc"/>
- <echo message=" * open-dis7-java/dist/open-dis7-full.jar"/>
- <echo message=" * open-dis7-source-generator/xml/DIS_7_2012.autogenerated.xsd to xml"/>
- <echo message=" * open-dis7-source-generator/xml/dis_7_2021 directory of template files"/>
+ <echo message=" * commit opendis7-full.jar"/>
+ <echo message=" * scp savage.nps.edu/data/html/opendis7-java"/>
+ <echo message=" * opendis7-java/dist/javadoc"/>
+ <echo message=" * opendis7-java/dist/opendis7-full.jar"/>
+ <echo message=" * opendis7-source-generator/xml/DIS_7_2012.autogenerated.xsd to xml"/>
+ <echo message=" * opendis7-source-generator/xml/dis_7_2021 directory of template files"/>
<echo message=" * Corresponding Altova XMLSpy autogenerated documentation to xml/SchemaDocumentation"/>
<!-- TODO additional pieces/parts -->
</target>
@@ -259,7 +261,7 @@ POSSIBILITY OF SUCH DAMAGE.
An example of overriding the target for project execution could look like this:
- <target name="run" depends="open-dis7-java-impl.jar">
+ <target name="run" depends="opendis7-java-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
@@ -303,18 +305,18 @@ POSSIBILITY OF SUCH DAMAGE.
<target name="zip-full" description="full set of everything, pdus and enumerations">
<!-- TODO README -->
- <delete file="${dist.dir}/open-dis7-full.zip"/>
- <zip destfile="${dist.dir}/open-dis7-full.zip"
+ <delete file="${dist.dir}/opendis7-full.zip"/>
+ <zip destfile="${dist.dir}/opendis7-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.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"/>
+ <zipfileset src="${dist.dir}/opendis7-enumerations-classes.jar"/>
+ <zipfileset src="${dist.dir}/opendis7-enumerations-javadoc.jar"/>
+ <zipfileset src="${dist.dir}/opendis7-enumerations-source.jar"/>
+ <zipfileset src="${dist.dir}/opendis7-pdus-classes.jar"/>
+ <zipfileset src="${dist.dir}/opendis7-pdus-javadoc.jar"/>
+ <zipfileset src="${dist.dir}/opendis7-pdus-source.jar"/>
<!-- <fileset dir="build" defaultexcludes="yes">
<include name="classes/**/*"/>
@@ -354,8 +356,8 @@ POSSIBILITY OF SUCH DAMAGE.
<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.dir} subdirectory)"/>
- <delete file="${dist.dir}/open-dis7-pdus-javadoc.jar"/>
- <jar destfile="${dist.dir}/open-dis7-pdus-javadoc.jar"
+ <delete file="${dist.dir}/opendis7-pdus-javadoc.jar"/>
+ <jar destfile="${dist.dir}/opendis7-pdus-javadoc.jar"
update="true"
zip64Mode="always">
<fileset dir="${dist.javadoc.dir}" defaultexcludes="yes">
@@ -384,8 +386,8 @@ POSSIBILITY OF SUCH DAMAGE.
</target>
<target name="jar-pdus-source">
- <delete file="${dist.dir}/open-dis7-pdus-source.jar"/>
- <jar destfile="${dist.dir}/open-dis7-pdus-source.jar"
+ <delete file="${dist.dir}/opendis7-pdus-source.jar"/>
+ <jar destfile="${dist.dir}/opendis7-pdus-source.jar"
update="true"
zip64Mode="always">
<fileset dir="src" defaultexcludes="yes">
@@ -419,19 +421,19 @@ POSSIBILITY OF SUCH DAMAGE.
</target>
<target name="jar-full" depends="compile" description="merges all dis7 subpackage assets">
- <delete file="${dist.dir}/open-dis7-full.jar" verbose="false"/>
+ <delete file="${dist.dir}/opendis7-full.jar" verbose="false"/>
<!-- https://stackoverflow.com/questions/515428/clean-way-to-combine-multiple-jars-preferably-using-ant -->
- <jar destfile="${dist.dir}/open-dis7-full.jar"
+ <jar destfile="${dist.dir}/opendis7-full.jar"
update="true"
zip64Mode="always">
<zipgroupfileset dir="${dist.dir}">
- <include name="open-dis7-*.jar"/>
+ <include name="opendis7-*.jar"/>
<!-- TODO consider whether these dependencies are strictly needed -->
<include name="../lib/commons-io-2.6.jar"/>
<include name="../lib/guava-28.0-jre.jar"/>
<include name="../lib/srm-4.4.0.jar"/>
- <!--<exclude name="open-dis7-source.jar"/> only about 30MB, keep it for debugging -->
- <exclude name="open-dis7-full.jar"/><!-- not self -->
+ <!--<exclude name="opendis7-source.jar"/> only about 30MB, keep it for debugging -->
+ <exclude name="opendis7-full.jar"/><!-- not self -->
</zipgroupfileset>
<zipgroupfileset dir="lib">
<include name="commons-io-2.6.jar"/>