Revert "NPS MOVES open-source license; default Java platform, target 1.8 source"

This reverts commit 09dc7623.

Revert "NPS MOVES open-source license; default Java platform, target 1.8 source"
This reverts commit 09dc7623.
4c6e4968 · brutzman · 09dc7623 · 09dc7623 · 09dc7623 · 4c6e4968
Commit 4c6e4968 authored 5 years ago by brutzman
--- a/license.html
+++ b/license.html
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-    <head>
-        <title>Open-Source Software License for NPS MOVES Savage Research Group</title>
-        <meta name="description" content="Open-Source Software License for NPS MOVES Savage Research Group.
-              This BSD-style license is non-viral and friendly to academia, government, industry, and individuals." />
-        <meta name="author" content="Donald P. Brutzman" />
-        <meta name="created" content="4 March 2005" />
-        <meta name="revised" content="5 August 2019" />
-        <meta name="identifier" content="https://savage.nps.edu/Savage/license.html" />
-        <meta name="identifier" content="https://savage.nps.edu/Savage/license.txt" />
-        <meta name="identifier" content="https://handle.dtic.mil/100.2/ADA450769" />
-        <meta name="reference" content="https://www.oreilly.com/catalog/osfreesoft" />
-        <meta name="reference" content="https://opensource.org/licenses/bsd-license.php" />
-        <meta name="reference" content="https://xchat.movesinstitute.org/bugzilla/show_bug.cgi?id=32" />
-        <link rel="icon" href="https://www.web3D.org/x3d/content/examples/images/X3DtextIcon16.png" title="X3D" type="image/png"/>
-    </head>
-    <body>
-        <p>Copyright (c) 1995-2019 held by the author(s).  All rights reserved.</p>
-
-        <p>
-            Redistribution and use in source and binary forms, with or without
-            modification, are permitted provided that the following conditions
-            are met:
-        </p>
-
-        <ul>
-            <li>
-                Redistributions of source code must retain the above copyright
-                notice, this list of conditions and the following disclaimer.
-            </li>
-            <li>
-                Redistributions in binary form must reproduce the above copyright
-                notice, this list of conditions and the following disclaimer
-                in the documentation and/or other materials provided with the
-                distribution.
-            </li>
-            <li>
-                Neither the names of the
-                <a href="https://www.nps.edu">Naval Postgraduate School (NPS)</a>
-                <a href="https://www.MovesInstitute.org">Modeling Virtual Environments and Simulation (MOVES) Institute</a>
-                nor the names of its contributors may be used to endorse or
-                promote products derived from this software without specific
-                prior written permission.
-            </li>
-        </ul>
-
-        <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-            "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-            LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-            FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-            COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-            INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-            BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-            LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-            CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-            LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-            ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-            POSSIBILITY OF SUCH DAMAGE.</p>
-
-    </body>
-</html>
--- a/license.txt
+++ b/license.txt
-Copyright (c) 1995-2019 held by the author(s).  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer
-      in the documentation and/or other materials provided with the
-      distribution.
-    * Neither the names of the Naval Postgraduate School (NPS)
-      Modeling Virtual Environments and Simulation (MOVES) Institute
-      (https://www.nps.edu and https://www.MovesInstitute.org)
-      nor the names of its contributors may be used to endorse or
-      promote products derived from this software without specific
-      prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=open-dis7-java
-application.vendor=mike
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.modulepath=\
-    ${run.modulepath}
-debug.test.classpath=\
-    ${run.test.classpath}
-debug.test.modulepath=\
-    ${run.test.modulepath}
-# Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/open-dis7-java.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-dist.jlink.dir=${dist.dir}/jlink
-dist.jlink.output=${dist.jlink.dir}/open-dis7-java
-endorsed.classpath=
-excludes=
-file.reference.commons-io-2.6.jar=optionallibs/commons-io-2.6.jar
-file.reference.guava-28.0-jre.jar=optionallibs/guava-28.0-jre.jar
-file.reference.open-dis7-entities-all.jar=entityjars/open-dis7-entities-all.jar
-file.reference.open-dis7-entities-usa-land.jar=entityjars/open-dis7-entities-usa-land.jar
-file.reference.open-dis7-entities-usa-surface.jar=entityjars/open-dis7-entities-usa-surface.jar
-includes=**
-jar.compress=false
-javac.classpath=\
-    ${file.reference.guava-28.0-jre.jar}:\
-    ${file.reference.commons-io-2.6.jar}:\
-    ${file.reference.open-dis7-entities-usa-surface.jar}:\
-    ${file.reference.open-dis7-entities-usa-land.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.external.vm=true
-javac.modulepath=
-javac.processormodulepath=
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.8
-javac.target=1.8
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit_5.classpath}:\
-    ${file.reference.open-dis7-entities-all.jar}
-javac.test.modulepath=\
-    ${javac.modulepath}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.html5=false
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.reference.open-dis7-entities-usa-surface.jar=entityjars/open-dis7-entities-javadoc.jar
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-# The jlink additional root modules to resolve
-jlink.additionalmodules=
-# The jlink additional command line parameters
-jlink.additionalparam=
-jlink.launcher=true
-jlink.launcher.name=open-dis7-java
-main.class=edu.nps.moves.dis7.util.playerrecorder.Player
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=true
-platform.active=default_platform
-project.licensePath=./license.txt
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.modulepath=\
-    ${javac.modulepath}
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}:\
-    ${file.reference.open-dis7-entities-all.jar}
-run.test.modulepath=\
-    ${javac.test.modulepath}
-source.encoding=UTF-8
-src.dir=src
-src.src-generated.dir=src-generated
-test.src.dir=test
-manifest.file=MANIFEST.MF
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=open-dis7-java
+application.vendor=mike
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
+debug.test.classpath=\
+    ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
+# Files in build.classes.dir which should be excluded from distribution jar
+dist.archive.excludes=
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/open-dis7-java.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+dist.jlink.dir=${dist.dir}/jlink
+dist.jlink.output=${dist.jlink.dir}/open-dis7-java
+endorsed.classpath=
+excludes=
+file.reference.commons-io-2.6.jar=optionallibs/commons-io-2.6.jar
+file.reference.guava-28.0-jre.jar=optionallibs/guava-28.0-jre.jar
+file.reference.open-dis7-entities-all.jar=entityjars/open-dis7-entities-all.jar
+file.reference.open-dis7-entities-usa-land.jar=entityjars/open-dis7-entities-usa-land.jar
+file.reference.open-dis7-entities-usa-surface.jar=entityjars/open-dis7-entities-usa-surface.jar
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${file.reference.guava-28.0-jre.jar}:\
+    ${file.reference.commons-io-2.6.jar}:\
+    ${file.reference.open-dis7-entities-usa-surface.jar}:\
+    ${file.reference.open-dis7-entities-usa-land.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.external.vm=true
+javac.modulepath=
+javac.processormodulepath=
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.8
+javac.target=1.8
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit_5.classpath}:\
+    ${file.reference.open-dis7-entities-all.jar}
+javac.test.modulepath=\
+    ${javac.modulepath}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.html5=false
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.reference.open-dis7-entities-usa-surface.jar=entityjars/open-dis7-entities-javadoc.jar
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+# The jlink additional root modules to resolve
+jlink.additionalmodules=
+# The jlink additional command line parameters
+jlink.additionalparam=
+jlink.launcher=true
+jlink.launcher.name=open-dis7-java
+main.class=edu.nps.moves.dis7.util.playerrecorder.Player
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=true
+platform.active=JDK_1.8
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
+run.jvmargs=
+run.modulepath=\
+    ${javac.modulepath}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}:\
+    ${file.reference.open-dis7-entities-all.jar}
+run.test.modulepath=\
+    ${javac.test.modulepath}
+source.encoding=UTF-8
+src.dir=src
+src.src-generated.dir=src-generated
+test.src.dir=test
+manifest.file=MANIFEST.MF
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>open-dis7-java</name>
-            <source-roots>
-                <root id="src.src-generated.dir"/>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <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"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>