[Terry N.] pdu-javadoc pulled in unnecessary stuff

build.xml

@@ -231,36 +231,32 @@
         <delete  file="dist/open-dis7-full.jar"/>
         <jar destfile="dist/open-dis7-full.jar"
                update="true"
-              basedir="."
             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"/> duplicative -->
-             <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/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"/>
 
-            <!--
-            <fileset dir="build/" defaultexcludes="yes">
+<!--            <fileset dir="build" defaultexcludes="yes">
                 <include name="classes/**/*"/>
                 <exclude name="test/*"/>
+            </fileset>-->
+            <fileset dir="dist" defaultexcludes="yes">
+                <exclude name="javadoc/**"/>
             </fileset>
-            <fileset dir="dist/" defaultexcludes="yes">
-                <include name="javadoc/*"/>
-                <include name="javadoc/**/*"/>
-                <exclude name="test/*"/>
-            </fileset>
-            <fileset dir="src/" defaultexcludes="yes">
+<!--            <fileset dir="src" defaultexcludes="yes">
                 <include name="**/*"/>
                 <exclude name="test/*"/>
             </fileset>
-            <fileset dir="src-generated/." defaultexcludes="yes">
+            <fileset dir="src-generated" defaultexcludes="yes">
                 <include name="**/*"/>
                 <exclude name="test/*"/>
-            </fileset>
-            -->
+            </fileset>-->
+            
             <!-- https://docs.oracle.com/javase/tutorial/deployment/jar/manifestindex.html -->
             <manifest>
                 <attribute name="description"            value="Full set of files for ${manifest.name}"/>
@@ -284,16 +280,13 @@
         <delete  file="dist/open-dis7-pdus-javadoc.jar"/>
         <jar destfile="dist/open-dis7-pdus-javadoc.jar"
                update="true"
-              basedir="dist"
             zip64Mode="always">
-            <fileset dir="dist" defaultexcludes="yes">
-                <include name="javadoc/edu/nps/moves/dis7/pdus/*"/>
-                <include name="javadoc/edu/nps/moves/dis7/utilities/**/*"/>
-                <include name="javadoc/edu/nps/moves/spatial/*"/>
-                <exclude name="javadoc/edu/nps/moves/dis7/entities/*"/>
-                <exclude name="javadoc/edu/nps/moves/dis7/enumerations/*"/>
-                <exclude name="javadoc/edu/nps/moves/dis7/jammers/*"/>
-                <exclude name="javadoc/edu/nps/moves/dis7/objectTypes/*"/>
+            <fileset dir="dist/javadoc" defaultexcludes="yes">
+                <include name="**/*"/>
+                <exclude name="edu/nps/moves/dis7/entities/**"/>
+                <exclude name="edu/nps/moves/dis7/enumerations/**"/>
+                <exclude name="edu/nps/moves/dis7/jammers/**"/>
+                <exclude name="edu/nps/moves/dis7/objectTypes/**"/>
             </fileset>
             <!-- https://docs.oracle.com/javase/tutorial/deployment/jar/manifestindex.html -->
             <manifest>