Skip to content

Commit 8a8ff68

Browse files
keilwkeilw
committed
Updated project settings and gitignore
1 parent eab02b5 commit 8a8ff68

File tree

3 files changed

+61
-18
lines changed

3 files changed

+61
-18
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/.project
2+
/nbproject/private/

‎nbproject/build-impl.xml

Lines changed: 58 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,24 @@
135135
<condition property="do.display.browser">
136136
<istrue value="${display.browser}"/>
137137
</condition>
138+
<condition property="do.display.browser.debug.old">
139+
<and>
140+
<isset property="do.display.browser"/>
141+
<not>
142+
<isset property="do.debug.client"/>
143+
</not>
144+
<not>
145+
<isset property="browser.context"/>
146+
</not>
147+
</and>
148+
</condition>
138149
<condition property="do.display.browser.debug">
139150
<and>
140151
<isset property="do.display.browser"/>
141152
<not>
142153
<isset property="do.debug.client"/>
143154
</not>
155+
<isset property="browser.context"/>
144156
</and>
145157
</condition>
146158
<available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
@@ -403,6 +415,11 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
403415
</and>
404416
</condition>
405417
</target>
418+
<target name="-init-test-properties">
419+
<property name="test.binaryincludes" value="&lt;nothing&gt;"/>
420+
<property name="test.binarytestincludes" value=""/>
421+
<property name="test.binaryexcludes" value=""/>
422+
</target>
406423
<target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
407424
<macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
408425
<attribute default="${includes}" name="includes"/>
@@ -425,7 +442,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
425442
</sequential>
426443
</macrodef>
427444
</target>
428-
<target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
445+
<target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
429446
<macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
430447
<attribute default="${includes}" name="includes"/>
431448
<attribute default="${excludes}" name="excludes"/>
@@ -439,6 +456,9 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
439456
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
440457
<filename name="@{testincludes}"/>
441458
</fileset>
459+
<fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
460+
<filename name="${test.binarytestincludes}"/>
461+
</fileset>
442462
</batchtest>
443463
<syspropertyset>
444464
<propertyref prefix="test-sys-prop."/>
@@ -471,7 +491,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
471491
</fileset>
472492
</union>
473493
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
474-
<testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="remotecontrol" testname="TestNG tests" workingDir="${basedir}">
494+
<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="remotecontrol" testname="TestNG tests" workingDir="${basedir}">
475495
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
476496
<propertyset>
477497
<propertyref prefix="test-sys-prop."/>
@@ -565,7 +585,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
565585
</sequential>
566586
</macrodef>
567587
</target>
568-
<target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
588+
<target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
569589
<macrodef name="junit-debug" uri="http://www.netbeans.org/ns/web-project/2">
570590
<attribute default="${includes}" name="includes"/>
571591
<attribute default="${excludes}" name="excludes"/>
@@ -579,6 +599,9 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
579599
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
580600
<filename name="@{testincludes}"/>
581601
</fileset>
602+
<fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
603+
<filename name="${test.binarytestincludes}"/>
604+
</fileset>
582605
</batchtest>
583606
<syspropertyset>
584607
<propertyref prefix="test-sys-prop."/>
@@ -836,11 +859,11 @@ exists or setup the property manually. For example like this:
836859
pre NB7.2 profiling section; consider it deprecated
837860
-->
838861
<target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
839-
<target name="-profile-pre-init">
862+
<target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
840863
<!-- Empty placeholder for easier customization. -->
841864
<!-- You can override this target in the ../build.xml file. -->
842865
</target>
843-
<target name="-profile-post-init">
866+
<target if="profiler.info.jvmargs.agent" name="-profile-post-init">
844867
<!-- Empty placeholder for easier customization. -->
845868
<!-- You can override this target in the ../build.xml file. -->
846869
</target>
@@ -888,7 +911,7 @@ exists or setup the property manually. For example like this:
888911
<target if="has.persistence.xml" name="-copy-persistence-xml">
889912
<mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
890913
<copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
891-
<fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
914+
<fileset dir="${persistence.xml.dir}" includes="persistence.xml orm.xml"/>
892915
</copy>
893916
</target>
894917
<target name="-post-compile">
@@ -974,28 +997,28 @@ exists or setup the property manually. For example like this:
974997
<dirname file="${dist.war}" property="dist.jar.dir"/>
975998
<mkdir dir="${dist.jar.dir}"/>
976999
<jar compress="${jar.compress}" jarfile="${dist.war}">
977-
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
1000+
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
9781001
</jar>
9791002
</target>
9801003
<target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
9811004
<dirname file="${dist.war}" property="dist.jar.dir"/>
9821005
<mkdir dir="${dist.jar.dir}"/>
9831006
<jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
984-
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
1007+
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
9851008
</jar>
9861009
</target>
9871010
<target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
9881011
<dirname file="${dist.war}" property="dist.jar.dir"/>
9891012
<mkdir dir="${dist.jar.dir}"/>
9901013
<jar compress="${jar.compress}" jarfile="${dist.war}">
991-
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
1014+
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
9921015
</jar>
9931016
</target>
9941017
<target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
9951018
<dirname file="${dist.war}" property="dist.jar.dir"/>
9961019
<mkdir dir="${dist.jar.dir}"/>
9971020
<jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
998-
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
1021+
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
9991022
</jar>
10001023
</target>
10011024
<target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
@@ -1016,7 +1039,7 @@ exists or setup the property manually. For example like this:
10161039
<dirname file="${dist.ear.war}" property="dist.jar.dir"/>
10171040
<mkdir dir="${dist.jar.dir}"/>
10181041
<jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
1019-
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
1042+
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
10201043
</jar>
10211044
</target>
10221045
<target name="-post-dist">
@@ -1065,18 +1088,32 @@ exists or setup the property manually. For example like this:
10651088
<target depends="init,-pre-dist,dist,-post-dist" name="verify">
10661089
<nbverify file="${dist.war}"/>
10671090
</target>
1068-
<target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
1091+
<target depends="run-deploy,-init-display-browser,-display-browser-nb-old,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
10691092
<target if="do.display.browser" name="-init-display-browser">
1093+
<condition property="do.display.browser.nb.old">
1094+
<and>
1095+
<isset property="netbeans.home"/>
1096+
<not>
1097+
<isset property="browser.context"/>
1098+
</not>
1099+
</and>
1100+
</condition>
10701101
<condition property="do.display.browser.nb">
1071-
<isset property="netbeans.home"/>
1102+
<and>
1103+
<isset property="netbeans.home"/>
1104+
<isset property="browser.context"/>
1105+
</and>
10721106
</condition>
10731107
<condition property="do.display.browser.cl">
10741108
<isset property="deploy.ant.enabled"/>
10751109
</condition>
10761110
</target>
1077-
<target if="do.display.browser.nb" name="-display-browser-nb">
1111+
<target if="do.display.browser.nb.old" name="-display-browser-nb-old">
10781112
<nbbrowse url="${client.url}"/>
10791113
</target>
1114+
<target if="do.display.browser.nb" name="-display-browser-nb">
1115+
<nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
1116+
</target>
10801117
<target if="do.display.browser.cl" name="-get-browser" unless="browser">
10811118
<condition property="browser" value="rundll32">
10821119
<os family="windows"/>
@@ -1144,6 +1181,7 @@ exists or setup the property manually. For example like this:
11441181
<nbstartserver debugmode="true"/>
11451182
<antcall target="connect-debugger"/>
11461183
<nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
1184+
<antcall target="debug-display-browser-old"/>
11471185
<antcall target="debug-display-browser"/>
11481186
<antcall target="connect-client-debugger"/>
11491187
</target>
@@ -1163,9 +1201,12 @@ exists or setup the property manually. For example like this:
11631201
</bootclasspath>
11641202
</nbjpdaconnect>
11651203
</target>
1166-
<target if="do.display.browser.debug" name="debug-display-browser">
1204+
<target if="do.display.browser.debug.old" name="debug-display-browser-old">
11671205
<nbbrowse url="${client.url}"/>
11681206
</target>
1207+
<target if="do.display.browser.debug" name="debug-display-browser">
1208+
<nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
1209+
</target>
11691210
<target if="do.debug.client" name="connect-client-debugger">
11701211
<webproject1:nbjsdebugstart webUrl="${client.url}"/>
11711212
</target>
@@ -1223,7 +1264,7 @@ exists or setup the property manually. For example like this:
12231264
<jvmarg value="${profiler.j2ee.agentID}"/>
12241265
</nbstartprofiledserver>
12251266
</target>
1226-
<target if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
1267+
<target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
12271268
<fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
12281269
<nbprofiledirect>
12291270
<classpath>
@@ -1260,6 +1301,7 @@ exists or setup the property manually. For example like this:
12601301
<startprofiler/>
12611302
<nbstartserver profilemode="true"/>
12621303
<nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/>
1304+
<antcall target="debug-display-browser-old"/>
12631305
<antcall target="debug-display-browser"/>
12641306
<antcall target="-profile-start-loadgen"/>
12651307
</target>

‎nbproject/genfiles.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ [email protected]
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
66
nbproject/build-impl.xml.data.CRC32=e63453d7
7-
nbproject/build-impl.xml.script.CRC32=7dfa7c81
8-
nbproject/build-impl.xml.stylesheet.CRC32=4e9cae83@1.38.1.1
7+
nbproject/build-impl.xml.script.CRC32=1a02a090
8+
nbproject/build-impl.xml.stylesheet.CRC32=d659eb7a@1.65.1.1

0 commit comments

Comments
 (0)