Skip to content

Commit 4b4bdf0

Browse files
malaqueueitmalaqueueit
committed
Updated NetBeans project
1 parent 2c91e44 commit 4b4bdf0

File tree

9 files changed

+134
-88
lines changed

9 files changed

+134
-88
lines changed

‎QueueIT.Security.Examples/nbproject/build-impl.xml‎

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,24 @@
105105
<condition property="do.display.browser">
106106
<istrue value="${display.browser}"/>
107107
</condition>
108+
<condition property="do.display.browser.debug.old">
109+
<and>
110+
<isset property="do.display.browser"/>
111+
<not>
112+
<isset property="do.debug.client"/>
113+
</not>
114+
<not>
115+
<isset property="browser.context"/>
116+
</not>
117+
</and>
118+
</condition>
108119
<condition property="do.display.browser.debug">
109120
<and>
110121
<isset property="do.display.browser"/>
111122
<not>
112123
<isset property="do.debug.client"/>
113124
</not>
125+
<isset property="browser.context"/>
114126
</and>
115127
</condition>
116128
<available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
@@ -458,7 +470,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
458470
</fileset>
459471
</union>
460472
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
461-
<testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="QueueIT.Security.Examples.Java" testname="TestNG tests" workingDir="${basedir}">
473+
<testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="QueueIT.Security.Examples.Java" testname="TestNG tests" workingDir="${basedir}">
462474
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
463475
<propertyset>
464476
<propertyref prefix="test-sys-prop."/>
@@ -959,28 +971,28 @@ exists or setup the property manually. For example like this:
959971
<dirname file="${dist.war}" property="dist.jar.dir"/>
960972
<mkdir dir="${dist.jar.dir}"/>
961973
<jar compress="${jar.compress}" jarfile="${dist.war}">
962-
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
974+
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
963975
</jar>
964976
</target>
965977
<target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
966978
<dirname file="${dist.war}" property="dist.jar.dir"/>
967979
<mkdir dir="${dist.jar.dir}"/>
968980
<jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
969-
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
981+
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
970982
</jar>
971983
</target>
972984
<target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
973985
<dirname file="${dist.war}" property="dist.jar.dir"/>
974986
<mkdir dir="${dist.jar.dir}"/>
975987
<jar compress="${jar.compress}" jarfile="${dist.war}">
976-
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
988+
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
977989
</jar>
978990
</target>
979991
<target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
980992
<dirname file="${dist.war}" property="dist.jar.dir"/>
981993
<mkdir dir="${dist.jar.dir}"/>
982994
<jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
983-
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
995+
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
984996
</jar>
985997
</target>
986998
<target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
@@ -999,7 +1011,7 @@ exists or setup the property manually. For example like this:
9991011
<dirname file="${dist.ear.war}" property="dist.jar.dir"/>
10001012
<mkdir dir="${dist.jar.dir}"/>
10011013
<jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
1002-
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
1014+
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
10031015
</jar>
10041016
</target>
10051017
<target name="-post-dist">
@@ -1048,18 +1060,32 @@ exists or setup the property manually. For example like this:
10481060
<target depends="init,-pre-dist,dist,-post-dist" name="verify">
10491061
<nbverify file="${dist.war}"/>
10501062
</target>
1051-
<target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
1063+
<target depends="run-deploy,-init-display-browser,-display-browser-nb-old,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
10521064
<target if="do.display.browser" name="-init-display-browser">
1065+
<condition property="do.display.browser.nb.old">
1066+
<and>
1067+
<isset property="netbeans.home"/>
1068+
<not>
1069+
<isset property="browser.context"/>
1070+
</not>
1071+
</and>
1072+
</condition>
10531073
<condition property="do.display.browser.nb">
1054-
<isset property="netbeans.home"/>
1074+
<and>
1075+
<isset property="netbeans.home"/>
1076+
<isset property="browser.context"/>
1077+
</and>
10551078
</condition>
10561079
<condition property="do.display.browser.cl">
10571080
<isset property="deploy.ant.enabled"/>
10581081
</condition>
10591082
</target>
1060-
<target if="do.display.browser.nb" name="-display-browser-nb">
1083+
<target if="do.display.browser.nb.old" name="-display-browser-nb-old">
10611084
<nbbrowse url="${client.url}"/>
10621085
</target>
1086+
<target if="do.display.browser.nb" name="-display-browser-nb">
1087+
<nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
1088+
</target>
10631089
<target if="do.display.browser.cl" name="-get-browser" unless="browser">
10641090
<condition property="browser" value="rundll32">
10651091
<os family="windows"/>
@@ -1127,6 +1153,7 @@ exists or setup the property manually. For example like this:
11271153
<nbstartserver debugmode="true"/>
11281154
<antcall target="connect-debugger"/>
11291155
<nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
1156+
<antcall target="debug-display-browser-old"/>
11301157
<antcall target="debug-display-browser"/>
11311158
<antcall target="connect-client-debugger"/>
11321159
</target>
@@ -1143,9 +1170,12 @@ exists or setup the property manually. For example like this:
11431170
</sourcepath>
11441171
</nbjpdaconnect>
11451172
</target>
1146-
<target if="do.display.browser.debug" name="debug-display-browser">
1173+
<target if="do.display.browser.debug.old" name="debug-display-browser-old">
11471174
<nbbrowse url="${client.url}"/>
11481175
</target>
1176+
<target if="do.display.browser.debug" name="debug-display-browser">
1177+
<nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
1178+
</target>
11491179
<target if="do.debug.client" name="connect-client-debugger">
11501180
<webproject1:nbjsdebugstart webUrl="${client.url}"/>
11511181
</target>
@@ -1240,6 +1270,7 @@ exists or setup the property manually. For example like this:
12401270
<startprofiler/>
12411271
<nbstartserver profilemode="true"/>
12421272
<nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/>
1273+
<antcall target="debug-display-browser-old"/>
12431274
<antcall target="debug-display-browser"/>
12441275
<antcall target="-profile-start-loadgen"/>
12451276
</target>
@@ -1330,7 +1361,7 @@ exists or setup the property manually. For example like this:
13301361
<mkdir dir="${build.test.results.dir}"/>
13311362
</target>
13321363
<target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
1333-
<webproject2:test testincludes="**/*Test.java"/>
1364+
<webproject2:test includes="${includes}" testincludes="**/*Test.java"/>
13341365
</target>
13351366
<target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
13361367
<fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>

‎QueueIT.Security.Examples/nbproject/genfiles.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=651128d4@1.43.0.1
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=7d1d0b70
7-
nbproject/build-impl.xml.script.CRC32=207be0b1
8-
nbproject/build-impl.xml.stylesheet.CRC32=5459df51@1.43.0.1
7+
nbproject/build-impl.xml.script.CRC32=a201594c
8+
nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1

‎QueueIT.Security.Examples/nbproject/private/private.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
deploy.ant.properties.file=C:\\Users\\mala_000\\AppData\\Roaming\\NetBeans\\7.3.1\\config\\GlassFishEE6\\Properties\\gfv3524525826.properties
1+
deploy.ant.properties.file=C:\\Users\\mala\\AppData\\Roaming\\NetBeans\\8.0.2\\config\\GlassFishEE6\\Properties\\gfv31491667657.properties
22
j2ee.platform.is.jsr109=true
3-
j2ee.server.domain=C:/Users/mala_000/AppData/Roaming/NetBeans/7.3.1/config/GF3/domain1
4-
j2ee.server.home=C:/Program Files/glassfish-4.0/glassfish
5-
j2ee.server.instance=[C:\\Program Files\\glassfish-4.0\\glassfish;C:\\Program Files\\glassfish-4.0\\glassfish\\domains\\domain1]deployer:gfv3ee6wc:localhost:4848
6-
j2ee.server.middleware=C:/Program Files/glassfish-4.0
3+
j2ee.server.domain=C:/Users/mala/AppData/Roaming/NetBeans/8.0.2/config/GF_4.1/domain1
4+
j2ee.server.home=C:/Program Files/glassfish-4.1/glassfish
5+
j2ee.server.instance=[C:\\Program Files\\glassfish-4.1\\glassfish;C:\\Program Files\\glassfish-4.1\\glassfish\\domains\\domain1]deployer:gfv3ee6:localhost:4848
6+
j2ee.server.middleware=C:/Program Files/glassfish-4.1
77
javac.debug=true
88
javadoc.preview=true
9-
user.properties.file=C:\\Users\\mala_000\\AppData\\Roaming\\NetBeans\\7.3.1\\build.properties
9+
user.properties.file=C:\\Users\\mala\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties

‎QueueIT.Security.Examples/nbproject/private/private.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
33
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
4+
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
5+
<group>
6+
<file>file:/C:/GIT/QueueIT.Security-JavaEE/QueueIT.Security.Examples/web/index.jsp</file>
7+
</group>
8+
</open-files>
49
</project-private>

‎QueueIT.Security.Examples/nbproject/project.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ j2ee.compile.on.save=true
3333
j2ee.copy.static.files.on.save=true
3434
j2ee.deploy.on.save=true
3535
j2ee.platform=1.6-web
36-
j2ee.platform.classpath=${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar
36+
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
3737
j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
3838
j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
39-
j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar
40-
j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar
39+
j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
40+
j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
4141
j2ee.platform.wsit.classpath=
4242
j2ee.server.type=gfv3ee6
4343
jar.compress=false

0 commit comments

Comments
 (0)