diff --git a/nbproject/ide-file-targets.xml b/nbproject/ide-file-targets.xml index b4c242136ca7d5641a38f2dbba98e9056f83b30a..5f6c06ecda6931f39939cac788f0e54139ef89dc 100644 --- a/nbproject/ide-file-targets.xml +++ b/nbproject/ide-file-targets.xml @@ -293,14 +293,10 @@ <target name="run-selected-test" depends="compile.tests"> <fail unless="test.class">Must set property 'test.class'</fail> - <nbjpdastart addressproperty="jpda.address" name="Xj3D" transport="${debug.transport}"> - <classpath path="${run.test.classpath}"/> - </nbjpdastart> <junit dir="${basedir}" printsummary="yes" showoutput="yes" fork="yes"> - <jvmarg value="-agentlib:jdwp=transport=${debug.transport},address=${jpda.address}"/> <jvmarg line="${run.args}"/> <formatter type="plain" usefile="false"/> <classpath path="${run.test.classpath}"/> @@ -312,14 +308,10 @@ </target> <target name="run-single-test-method" depends="compile.tests"> <fail unless="test.class">Must set property 'test.class'</fail> - <nbjpdastart addressproperty="jpda.address" name="Xj3D" transport="${debug.transport}"> - <classpath path="${run.test.classpath}"/> - </nbjpdastart> <junit dir="${basedir}" printsummary="yes" showoutput="yes" fork="yes"> - <jvmarg value="-agentlib:jdwp=transport=${debug.transport},address=${jpda.address}"/> <jvmarg line="${run.args}"/> <formatter type="plain" usefile="false"/> <classpath path="${run.test.classpath}"/> diff --git a/nbproject/project.xml b/nbproject/project.xml index 00345fd85a5e0f66ea670e70d50a2d2da655d515..dd159a2aa32989d71e4eae39095b4689f5d09397 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -26,9 +26,9 @@ <encoding>ISO-8859-1</encoding> </source-folder> <source-folder> - <label>src/xml</label> + <label>Test Packages</label> <type>java</type> - <location>src/xml</location> + <location>test</location> <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> <encoding>ISO-8859-1</encoding> </source-folder> @@ -39,13 +39,6 @@ <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> <encoding>ISO-8859-1</encoding> </source-folder> - <source-folder> - <label>Test Packages</label> - <type>java</type> - <location>test</location> - <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> - <encoding>ISO-8859-1</encoding> - </source-folder> <source-folder> <label>CadFilter App Source Packages</label> <type>java</type> @@ -68,14 +61,14 @@ <encoding>ISO-8859-1</encoding> </source-folder> <source-folder> - <label>examples/sai/simserver</label> + <label>SimServer Examples</label> <type>java</type> <location>examples/sai/simserver</location> <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> <encoding>ISO-8859-1</encoding> </source-folder> <source-folder> - <label>parsetest/dis</label> + <label>DIS Examples</label> <type>java</type> <location>parsetest/dis</location> <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> @@ -89,19 +82,26 @@ <encoding>ISO-8859-1</encoding> </source-folder> <source-folder> - <label>parsetest/sai/external</label> + <label>External Examples</label> <type>java</type> <location>parsetest/sai/external</location> <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> <encoding>ISO-8859-1</encoding> </source-folder> <source-folder> - <label>parsetest/scripts</label> + <label>Scripts Examples</label> <type>java</type> <location>parsetest/scripts</location> <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> <encoding>ISO-8859-1</encoding> </source-folder> + <source-folder> + <label>XML</label> + <type>java</type> + <location>src/xml</location> + <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> + <encoding>ISO-8859-1</encoding> + </source-folder> </folders> <ide-actions> <action name="build"> @@ -518,8 +518,8 @@ <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> </source-folder> <source-folder style="packages"> - <label>src/xml</label> - <location>src/xml</location> + <label>Test Packages</label> + <location>test</location> <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> </source-folder> <source-folder style="packages"> @@ -527,11 +527,6 @@ <location>apps/browser/src/java</location> <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> </source-folder> - <source-folder style="packages"> - <label>Test Packages</label> - <location>test</location> - <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> - </source-folder> <source-folder style="packages"> <label>CadFilter App Source Packages</label> <location>apps/cadfilter/src/java</location> @@ -548,12 +543,12 @@ <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> </source-folder> <source-folder style="packages"> - <label>examples/sai/simserver</label> + <label>SimServer Examples</label> <location>examples/sai/simserver</location> <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> </source-folder> <source-folder style="packages"> - <label>parsetest/dis</label> + <label>DIS Examples</label> <location>parsetest/dis</location> <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> </source-folder> @@ -563,15 +558,20 @@ <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> </source-folder> <source-folder style="packages"> - <label>parsetest/sai/external</label> + <label>External Examples</label> <location>parsetest/sai/external</location> <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> </source-folder> <source-folder style="packages"> - <label>parsetest/scripts</label> + <label>Scripts Examples</label> <location>parsetest/scripts</location> <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> </source-folder> + <source-folder style="packages"> + <label>XML</label> + <location>src/xml</location> + <excludes>xj3d/filter/importer/OBJFileParser.java</excludes> + </source-folder> <source-file> <location>${ant.script}</location> </source-file>