Skip to content
Snippets Groups Projects
Commit b047d0db authored by Brutzman, Don's avatar Brutzman, Don
Browse files

rename netbeans project internal name as opendis7-source-java, omitting hyphen

parent 256f6700
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
nbproject/build-impl.xml
+ 20
− 20
View file @ b047d0db
...@@ -19,7 +19,7 @@ is divided into following sections: ...@@ -19,7 +19,7 @@ is divided into following sections:
- cleanup - cleanup
--> -->
<project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" xmlns:unless="ant:unless" basedir=".." default="default" name="open-dis7-java-impl"> <project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" xmlns:unless="ant:unless" basedir=".." default="default" name="opendis7-java-impl">
<fail message="Please build using Ant 1.8.0 or higher."> <fail message="Please build using Ant 1.8.0 or higher.">
<condition> <condition>
<not> <not>
...@@ -90,7 +90,7 @@ is divided into following sections: ...@@ -90,7 +90,7 @@ is divided into following sections:
</not> </not>
</condition> </condition>
</fail> </fail>
<j2seproject3:modulename property="module.name" sourcepath="${src.src-generated.dir}:${src.dir}"/> <j2seproject3:modulename property="module.name" sourcepath="${src.dir}:${src.src-generated.dir}"/>
<condition property="named.module.internal"> <condition property="named.module.internal">
<and> <and>
<isset property="module.name"/> <isset property="module.name"/>
...@@ -221,8 +221,8 @@ is divided into following sections: ...@@ -221,8 +221,8 @@ is divided into following sections:
</condition> </condition>
<condition property="have.sources"> <condition property="have.sources">
<or> <or>
<available file="${src.src-generated.dir}"/>
<available file="${src.dir}"/> <available file="${src.dir}"/>
<available file="${src.src-generated.dir}"/>
</or> </or>
</condition> </condition>
<condition property="netbeans.home+have.tests"> <condition property="netbeans.home+have.tests">
...@@ -311,8 +311,8 @@ is divided into following sections: ...@@ -311,8 +311,8 @@ is divided into following sections:
<!-- You can override this target in the ../build.xml file. --> <!-- You can override this target in the ../build.xml file. -->
</target> </target>
<target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check"> <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
<fail unless="src.src-generated.dir">Must set src.src-generated.dir</fail>
<fail unless="src.dir">Must set src.dir</fail> <fail unless="src.dir">Must set src.dir</fail>
<fail unless="src.src-generated.dir">Must set src.src-generated.dir</fail>
<fail unless="test.src.dir">Must set test.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="build.dir">Must set build.dir</fail>
<fail unless="dist.dir">Must set dist.dir</fail> <fail unless="dist.dir">Must set dist.dir</fail>
...@@ -334,7 +334,7 @@ is divided into following sections: ...@@ -334,7 +334,7 @@ is divided into following sections:
</target> </target>
<target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal" name="-init-macrodef-javac-with-module"> <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"> <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
<attribute default="${src.src-generated.dir}:${src.dir}" name="srcdir"/> <attribute default="${src.dir}:${src.src-generated.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/> <attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.modulepath}" name="modulepath"/> <attribute default="${javac.modulepath}" name="modulepath"/>
...@@ -346,7 +346,7 @@ is divided into following sections: ...@@ -346,7 +346,7 @@ is divided into following sections:
<attribute default="${excludes}" name="excludes"/> <attribute default="${excludes}" name="excludes"/>
<attribute default="${javac.debug}" name="debug"/> <attribute default="${javac.debug}" name="debug"/>
<attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/> <attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/>
<attribute default="${src.src-generated.dir}:${src.dir}" if:set="named.module.internal" name="sourcepath"/> <attribute default="${src.dir}:${src.src-generated.dir}" if:set="named.module.internal" name="sourcepath"/>
<attribute default="${empty.dir}" name="gensrcdir"/> <attribute default="${empty.dir}" name="gensrcdir"/>
<element name="customize" optional="true"/> <element name="customize" optional="true"/>
<sequential> <sequential>
...@@ -401,7 +401,7 @@ is divided into following sections: ...@@ -401,7 +401,7 @@ is divided into following sections:
</target> </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"> <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"> <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
<attribute default="${src.src-generated.dir}:${src.dir}" name="srcdir"/> <attribute default="${src.dir}:${src.src-generated.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/> <attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.modulepath}" name="modulepath"/> <attribute default="${javac.modulepath}" name="modulepath"/>
...@@ -444,7 +444,7 @@ is divided into following sections: ...@@ -444,7 +444,7 @@ is divided into following sections:
</target> </target>
<target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal"> <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"> <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
<attribute default="${src.src-generated.dir}:${src.dir}" name="srcdir"/> <attribute default="${src.dir}:${src.src-generated.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/> <attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.modulepath}" name="modulepath"/> <attribute default="${javac.modulepath}" name="modulepath"/>
...@@ -479,7 +479,7 @@ is divided into following sections: ...@@ -479,7 +479,7 @@ is divided into following sections:
</target> </target>
<target depends="-init-macrodef-javac-with-module,-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac"> <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"> <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
<attribute default="${src.src-generated.dir}:${src.dir}" name="srcdir"/> <attribute default="${src.dir}:${src.src-generated.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/> <attribute default="${javac.classpath}" name="classpath"/>
<sequential> <sequential>
...@@ -643,7 +643,7 @@ is divided into following sections: ...@@ -643,7 +643,7 @@ is divided into following sections:
</fileset> </fileset>
</union> </union>
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
<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}"> <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="opendis7-java" testname="TestNG tests" workingDir="${work.dir}">
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
<propertyset> <propertyset>
<propertyref prefix="test-sys-prop."/> <propertyref prefix="test-sys-prop."/>
...@@ -740,7 +740,7 @@ is divided into following sections: ...@@ -740,7 +740,7 @@ is divided into following sections:
<condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}"> <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
<isset property="test.method"/> <isset property="test.method"/>
</condition> </condition>
<condition else="-suitename open-dis7-java -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}"> <condition else="-suitename opendis7-java -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
<matches pattern=".*\.xml" string="@{testClass}"/> <matches pattern=".*\.xml" string="@{testClass}"/>
</condition> </condition>
<delete dir="${build.test.results.dir}" quiet="true"/> <delete dir="${build.test.results.dir}" quiet="true"/>
...@@ -1084,7 +1084,7 @@ is divided into following sections: ...@@ -1084,7 +1084,7 @@ is divided into following sections:
<delete file="${built-jar.properties}" quiet="true"/> <delete file="${built-jar.properties}" quiet="true"/>
</target> </target>
<target if="already.built.jar.${basedir}" name="-warn-already-built-jar"> <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
<echo level="warn" message="Cycle detected: open-dis7-java was already built"/> <echo level="warn" message="Cycle detected: opendis7-java was already built"/>
</target> </target>
<target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps"> <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
<mkdir dir="${build.dir}"/> <mkdir dir="${build.dir}"/>
...@@ -1117,13 +1117,13 @@ is divided into following sections: ...@@ -1117,13 +1117,13 @@ is divided into following sections:
<include name="*"/> <include name="*"/>
</dirset> </dirset>
</pathconvert> </pathconvert>
<j2seproject3:depend srcdir="${src.src-generated.dir}:${src.dir}:${build.generated.subdirs}"/> <j2seproject3:depend srcdir="${src.dir}:${src.src-generated.dir}:${build.generated.subdirs}"/>
</target> </target>
<target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile"> <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}"/> <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
<copy todir="${build.classes.dir}"> <copy todir="${build.classes.dir}">
<fileset dir="${src.src-generated.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.src-generated.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
</copy> </copy>
</target> </target>
<target if="has.persistence.xml" name="-copy-persistence-xml"> <target if="has.persistence.xml" name="-copy-persistence-xml">
...@@ -1144,7 +1144,7 @@ is divided into following sections: ...@@ -1144,7 +1144,7 @@ is divided into following sections:
<target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single"> <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> <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
<j2seproject3:force-recompile/> <j2seproject3:force-recompile/>
<j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.src-generated.dir}:${src.dir}"/> <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.dir}:${src.src-generated.dir}"/>
</target> </target>
<target name="-post-compile-single"> <target name="-post-compile-single">
<!-- Empty placeholder for easier customization. --> <!-- Empty placeholder for easier customization. -->
...@@ -1539,10 +1539,10 @@ is divided into following sections: ...@@ -1539,10 +1539,10 @@ is divided into following sections:
<classpath> <classpath>
<path path="${javac.classpath}"/> <path path="${javac.classpath}"/>
</classpath> </classpath>
<fileset dir="${src.src-generated.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/> <filename name="**/*.java"/>
</fileset> </fileset>
<fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> <fileset dir="${src.src-generated.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/> <filename name="**/*.java"/>
</fileset> </fileset>
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
...@@ -1553,10 +1553,10 @@ is divided into following sections: ...@@ -1553,10 +1553,10 @@ is divided into following sections:
<arg line="${javadoc.html5.cmd.line.arg}"/> <arg line="${javadoc.html5.cmd.line.arg}"/>
</javadoc> </javadoc>
<copy todir="${dist.javadoc.dir}"> <copy todir="${dist.javadoc.dir}">
<fileset dir="${src.src-generated.dir}" excludes="${excludes}" includes="${includes}"> <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/> <filename name="**/doc-files/**"/>
</fileset> </fileset>
<fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}"> <fileset dir="${src.src-generated.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/> <filename name="**/doc-files/**"/>
</fileset> </fileset>
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
...@@ -1765,7 +1765,7 @@ is divided into following sections: ...@@ -1765,7 +1765,7 @@ is divided into following sections:
<delete file="${built-clean.properties}" quiet="true"/> <delete file="${built-clean.properties}" quiet="true"/>
</target> </target>
<target if="already.built.clean.${basedir}" name="-warn-already-built-clean"> <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
<echo level="warn" message="Cycle detected: open-dis7-java was already built"/> <echo level="warn" message="Cycle detected: opendis7-java was already built"/>
</target> </target>
<target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps"> <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
<mkdir dir="${build.dir}"/> <mkdir dir="${build.dir}"/>
......
nbproject/genfiles.properties
+ 2
− 2
View file @ b047d0db
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # 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. # 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=93471be1 nbproject/build-impl.xml.data.CRC32=1069bbfb
nbproject/build-impl.xml.script.CRC32=b33f34e1 nbproject/build-impl.xml.script.CRC32=0dd2ef82
nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.101.0.48 nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.101.0.48
nbproject/project.properties
+ 3
− 3
View file @ b047d0db
...@@ -8,7 +8,7 @@ application.homepage=https://github.com/open-dis/open-dis7-java ...@@ -8,7 +8,7 @@ application.homepage=https://github.com/open-dis/open-dis7-java
application.title=open-dis7 Java Library for IEEE Distributed Interactive Simulation (DIS) Protocol application.title=open-dis7 Java Library for IEEE Distributed Interactive Simulation (DIS) Protocol
application.vendor=Don Brutzman, Don McGregor application.vendor=Don Brutzman, Don McGregor
application.splash=..\\images\\OpenDisSurferDude.png application.splash=..\\images\\OpenDisSurferDude.png
application.title=open-dis7-java application.title=opendis7-java
application.vendor=Naval Postgraduate School (NPS) application.vendor=Naval Postgraduate School (NPS)
auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
build.classes.dir=${build.dir}/classes build.classes.dir=${build.dir}/classes
...@@ -39,7 +39,7 @@ dist.dir=dist ...@@ -39,7 +39,7 @@ dist.dir=dist
dist.jar=${dist.dir}/open-dis7-pdus-classes.jar dist.jar=${dist.dir}/open-dis7-pdus-classes.jar
dist.javadoc.dir=${dist.dir}/javadoc dist.javadoc.dir=${dist.dir}/javadoc
dist.jlink.dir=${dist.dir}/jlink dist.jlink.dir=${dist.dir}/jlink
dist.jlink.output=${dist.jlink.dir}/open-dis7-java dist.jlink.output=${dist.jlink.dir}/opendis7-java
endorsed.classpath= endorsed.classpath=
excludes=**/logs/ **/X3dInterpolators/ excludes=**/logs/ **/X3dInterpolators/
file.reference.apiguardian-api-1.1.0.jar=testlibs/apiguardian-api-1.1.0.jar file.reference.apiguardian-api-1.1.0.jar=testlibs/apiguardian-api-1.1.0.jar
...@@ -98,7 +98,7 @@ jlink.additionalmodules= ...@@ -98,7 +98,7 @@ jlink.additionalmodules=
# The jlink additional command line parameters # The jlink additional command line parameters
jlink.additionalparam= jlink.additionalparam=
jlink.launcher=true jlink.launcher=true
jlink.launcher.name=open-dis7-java jlink.launcher.name=opendis7-java
jnlp.codebase.type=no.codebase jnlp.codebase.type=no.codebase
jnlp.descriptor=application jnlp.descriptor=application
jnlp.enabled=false jnlp.enabled=false
......
nbproject/project.xml
+ 1
− 1
View file @ b047d0db
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<type>org.netbeans.modules.java.j2seproject</type> <type>org.netbeans.modules.java.j2seproject</type>
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3"> <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>open-dis7-java</name> <name>opendis7-java</name>
<explicit-platform explicit-source-supported="true"/> <explicit-platform explicit-source-supported="true"/>
<source-roots> <source-roots>
<root id="src.dir"/> <root id="src.dir"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment