From 1ebbab9d2132e9cac3da9e8cd767e9f1d6d93326 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 24 Nov 2022 02:20:23 +0100
Subject: [PATCH] Don't cherry-pick: - upgraded project files for Apache
 NetBeans IDE 15 - updated jar(s)

---
 lib/jcontacts-lib.jar        | Bin 5456 -> 5463 bytes
 lib/jcoreee.jar              | Bin 48061 -> 47956 bytes
 nbproject/ant-deploy.xml     |  22 +++++++++++++++++++++-
 nbproject/build-impl.xml     |  22 ++++------------------
 nbproject/project.properties |   2 +-
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/lib/jcontacts-lib.jar b/lib/jcontacts-lib.jar
index 2625c0716b58383268279ac2cf76f6bdb35b6496..87eb95b5e57c10219e22125028222a11196fd788 100644
GIT binary patch
delta 541
zcmcbhbzO@$z?+$ci-CcIfnn~N@`=0}ymQu+hjwU4-YaEbU?`pF6mO$vp=S_pXl|%$
zQ3@iH3=MUSK%|0(e^Fv`PO5@)eo;YwQDRAEex4>T7cUpW$d41RDKdVX_(O~F<78z<
z6CfGEXvGY)X!2A>2QYnu(H=}oG1-CW&CyKPnZOKFRs&`*BZFfVgdxiFgaxejkAMZL
zD<?Y&ngY!(7nBvf1ax(NQM!JBHzSh>GsI&bC$AKgwfzE>$*oAvNX$!5MODIaEd(eJ
z2jXy+0K;2HdB({FB9fD3gm{3qXbQ<Pg@6R)b&xFqIzAMx3CK`|b3i8agEdU{W9FE=
zONa;Ti<3gqOqW2yYLj_{Awtr^(o7;uAfqRT3k!i&<p703AwnR{8-(>0KsG)3ti^PR
ziGcxxo#8eyFf3`*X9eq*6ETtpDRezmc*>EPfdPd5P!uLj&KHRV+i_k*nu(tWtc_dL
Kp6!bONF4x!T#ZZs

delta 536
zcmcbvbwP_az?+$ci-CcIfq{uHZ6dD*FC$-C=#%>LmOKUqhP;VR@ur4)26~2O+7`M6
z`Nbu=E~!bGiFvw)DXB?@hNXrI8V~_ZUM^lPgjt^^-c@A$H1WR{<EP15j3z)bp3#aK
zXv5?=j1FM>KBGODR%EgR(VLT)t}}rdHmnBBU`9U2DhNY{=Lri~Ewi8ns`Dm$2$}-T
zt`n3MJq>hjeo?x9fHxzP2s6Y-pC)e*lx2K7`JA8(P}OTeStbd_$%RakKu;qpG7yqw
z@&!rAPtFtK0ozn7B+b+T5>n?!RtxgL1)$Vvh-zLYPA!B%K*>;`Bj7+8&JtjF>&VLl
zw!oi>15L~N3zJ@zFflNIum@ZV1H+O=Kadu$$=)ImH@y^=X3}5<xoNVlh!)tHQ6kbz
z(Hvld=W-Z=R4Ra6;jhS7T+PD30Kz^fMsn~#UBNavfJaj-z?+o~B+m<kzCguq1wcFi
DeYtS+

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 7875d1e28aa5c7870a87df416ff27491d35ee45d..fa82023e537b42f98b05c403a446c558650e5f35 100644
GIT binary patch
delta 1758
zcmZWpYgANK6#nj+VeZVGJ1|H%!+<z|yatsSUp#yjJ{PtY0kZN5qG3x!7=Z~hMX2yC
zg1f*>^AV+`;J}E3sAbx!UuLgA{ZQ*i|7tB;D|1!0Y~QP*t!C!#^L=}t{W$0D*_ZE$
z@Ba|C7Zw?e3Sb7l9&GBgW!P>EHkIwnh`SX45a=wZ@J-B}=&kVO_$K5AG`ZU6n=na}
z?u?@P$~84r?m2b!{<`|g#&vbInKs3ykYBhue?Dd4NTCktH_33Ly^a)-Mv1kiP|#2k
zq34J(#C9LC14k&zGJo6W3R2)#FbNwq;g?ZwMuP$)8WjZaii{>RHYr?ZqZzN7v027z
z3T*IOu?1UYG|Sj#VaFCL>}b`{>oVT3;!U(^WV;oy*rB1FGIq(>En|;@1nf0qpNw`(
zF<bV_=rE&G#sLK`kb<}Hwt^&dX>Q$GRR_&@N2~LYf_HJ)im^Ci#(SFOs2RtsIF1u$
zyf33i#s{>j#1kq~?g^RMhcZr5p>4W>lZV=Dn<Z)GfvB05Q*2T35k4kkaynH<m77kh
zID=mLDr$zI4`<0{kGBU^^kYE9d@N8A!a2&dmrH}xZU4)49$^_nDlTAH#X?+EF&#5h
ztielkIyx);5-!X5M8&5FtGI$w5~4O#H8fPdT;*QZ;I0kS)TpS!TKXqC$@H0utGE^#
zH!35-u}sEt{sHz#`#luNSYd&{N?POCZ74?t-Ela~tK#_8RAMznIrC||b2L>r)9D(o
zhn?vM;*9jAGtaON)ntepPFar{NLb4KWQ54JV}p()#Iv@Ru|Qqu$GF(V(cC9x<9`jN
z-ZlZ+lSReC$z78?b`mCQ*E~hRR7}%EjwW(7k;j56YTcH(m}ka(1(BgWwMQj~j6xN~
zh*wdfiBe50Mm){(FO<g94u4sqj72IRbA<$JYD0c@c4~w6RWTkDB&5=DDK=ETQ5C5%
zh~!G2;m5^YG@4h3UbT}ex3Eq-M*{6{7?Q@&!p5R)iEJ(5PHlsMTf_|$WE|s0N@l&v
zos+^k3DM}nI7Wgab|RILfg5rU(ij<eZyVB)fe7@BM9F0T6qp{s2a^nsjI5EL1VqY~
zsrL~t<M}L($!E~2VvotZvKbMcFh=z=5E#Q!;T2fMsg^@4Sbew&6OqkKf|sR$FSIwX
zHpjrDf$pBk{qJm`{N7UOTWat1Nx##T-h44uqHl~2is|!+5{X(v3ADUV)usSd_r;6d
z4^>`^kxufCFEpA=cNrQ5C7oR$W(wWC<wcoxp7n^PCp1_p(+{i~dRk>8Z_pziJXS?g
zE7NBUdW?=rE8PfkZXP_hg7KpHp_=CpIr}{#tkEQ@>i2Nv9sR{(nvtY^X=EAjh)qV_
z)@QU(#XyF*q)`ur7$Smh4!GUgd>olwJin&#MLquXv_3HF2lrYMXvd(PszNU54z+|<
zNeAht&<Zhi3OzT)NB(mjVaZ|Wq1ibyU1xeTPp2t^KG8ozhb;`-W>e>EpB`#Sfn9x)
zXIX*1r=vjDjm76(B6}XIGO6plSNvJ5UxRj)!BW1c5-0r<R>=`g6eWwFGG$V8*eiCG
zJyJ!|aG8V3hg7;VXr%jLmuOk?$dpM-hP>jtr8@1XOronyv#LjEUA2w!E~xJR{e>Tw
z%xh2U-y3v?#M;q%)rSI4A1Nik#w5CZVUAe8jXL|&sBn0$*s_;j%}lyJ>=Dgf`i4HE
gOyvh-XjZq0)pjbp=n_{>uqlJuFJ_vyp3zeN3(_aiX#fBK

delta 1850
zcmZWpX>b%(5dP-vvTrk)O(ubm&AG#6$cB(Cgb)tF3Wos-ksNZ!wLpYmvb#w(AcsZ-
zJRk~5BOss#34$0Bk`3fQ4$B`{ASG5|6+bLWE!3hYz#o>Ng-6c<u_(7@`t|qq>wZ1`
zdi%=n;`CkNcy@-xsseUkeQSBWW2j?YYkA4_+BKVf0DSfNiwAp#XAk$}X5?iC{MEtC
z$)!unyuM7&^3tUqPmRYI8Yb$$`jVzw^iY#>U7-kzPN^b+T$Q#^r=_q@OkPWQiFL!(
z)jM^-d~@jsC50}xC)Zy1yXOp_GZLSx7zCe+5%8PBClRotQiT;&D(0hFB4|gA%6V4V
zvD%I`5-+K6z!!<NSSPVwVnYNwz8nc1ub5h`#H*3mh}TT8DH3tmY-(F1UYB@7;!PFF
z^YNA)TP3!cmO6>I?RZCGyNX2YP*INt6$3z~ai^KpyLRj{^W3ds58jJ}3w!O@XIl2#
z@qQ#ez=w7;N*s{*hysP~&~xftVLd3(M8%GAp$5k~MOi?O=qGK5G<=N1)Nf!Kt&3h{
zJEGwe9Hnc~<1L?}nNsv5{g{Rpv}%}&r!^c$8x`n_ly*9-|Cty<hr|gDC()^)09_i!
zVY~(}meQ%1jI?g_NSxB}89Fqa#vujK6{XeH-W8=rS+(J-DKFQs49m$8JHU2E!&#gQ
z<-`u{6F)*?K0kmSrQgLYiRU9Auz;%Lw^|lrQG+wyo|wQFvKULq<s54<&s*ReOY@xl
zso9xEyLi3fOtY-OO6r@?GpG!!pkN+fuN5Lo$BSW2K@zj&tP50xeocrgj#*V%R8qA6
z$CYy>V7?jL9!~BaohJBVT_cgBa)XRgk%3%Oj5bA{DaNoMzt7NyVX_@lR77E_J+#O7
zq0&#oY$R(aG)0jqijhpu1PYW)+8rpNJAt^lnHa8M)+Ddb=MNg*Wy`om##Apall;D5
z=}W<3Mum6n(o$oszs6YUU0rGftIA538$rKOQ_Wx{7js#;mz`dy@>dvMpD|^6{zL^s
zsD4yj$W^Hc*^d)a5Jy=%<02yXyOSBE(6iNDN-9MJXVtp63WeO#TVR2~oo0hXBL;GZ
z0UGvUFmnoGunR+26X?$^`2=egj<gMFtXX;Y77Rr?`k<*diktlh!S)Y4ut{V{4C{Rq
zAWBAzx{oA@+F=}%t6*lu9t+u@&4_b%BDM?4c{onNJ}<U!C)BfTY_K4eWh@^GZWAjO
zK*b{T!xH`@m<flSk%eqVW(v&w!)8UY09!pQ1xEBv9LnjAqhhNow4^3|w1vkH)ivim
zK7Z(&<|28K{rpucD77_(3XVl7w`k6>vBIg)?3{Qyddw|mJW#VjeaLw{nW9>v#HRnK
z%k5U0(Bc+nA5oE1$M7!`rqH)7ZY8&&b(#`rXm!!KB1wT(x6<|iIOsfsdnTAUM{;nt
zGKT7pJE_qdNsVpEbfhIpS;I_$ay-oMs8{Je@4D5CrnO~>ENeK`9re-d<QA2Wph~xQ
zOZtte6Avi8DTWH#-Qo``1=|hde{+)y@#xpI@t!>#)%@zq?Ni0~2@hd`c+<nGo342z
z9Sym~kQ{~{k{uj4H*A?TS~Aq><`|tWgj8{9OqlNJ@Q4HB!)p8qkEoeQ2PS%G{Ry|2
zo*!l#^Cewn=$gVXoia~miyN~^X-(zAIq0cECna@i)N(Ra<QG4r(`o<7SPFDlDWfw{
ztSt%CGv_$zPUi!fm=4Sh)0a96l`qKXDicYoXh2sU)vj{T<u1*1PkwAdJgNe(O&f1k
za5nJ|2ZoK(yWOI$CQN1TO`*5Cv&EI#Ff?!HyY6Y?r@DvGps(v}w7pxWU{9j>WmoU6
c+q)C#Vo$b6KNzO;roohVs=w{$X7k{G0o>8{(f|Me

diff --git a/nbproject/ant-deploy.xml b/nbproject/ant-deploy.xml
index 2d5f8778..fdc06d56 100644
--- a/nbproject/ant-deploy.xml
+++ b/nbproject/ant-deploy.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project default="-deploy-ant" basedir=".">
     <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
         <property file="${deploy.ant.properties.file}" />
@@ -8,7 +28,7 @@
         <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
         <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
     </target>
-    
+
     <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
         <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
         <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 809b0a52..528371a9 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -582,8 +582,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
                     <formatter type="brief" usefile="false"/>
                     <formatter type="xml"/>
                     <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
                     <customize/>
                 </junit>
             </sequential>
@@ -615,8 +614,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
                     <formatter type="xml"/>
                     <jvmarg value="-ea"/>
                     <jvmarg line="${run.jvmargs.ide}"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
                     <customize/>
                 </junit>
             </sequential>
@@ -774,18 +772,6 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
         </macrodef>
     </target>
     <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
         <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
             <os family="windows"/>
         </condition>
@@ -802,8 +788,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
             <sequential>
                 <java classname="@{classname}" fork="true">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
                     <jvmarg line="${runmain.jvmargs}"/>
                     <classpath>
                         <path path="@{classpath}"/>
@@ -1443,6 +1428,7 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
     <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
+    <target depends="debug-test-method" name="debug-single-method"/>
     <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
         <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
     </target>
diff --git a/nbproject/project.properties b/nbproject/project.properties
index dab8378d..14173ff3 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -56,7 +56,7 @@ j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
 j2ee.deploy.on.save=true
 j2ee.platform=1.7-web
-j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.security.enterprise-api.jar:${j2ee.server.home}/modules/javax.security.enterprise.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/modules/cdi-api.jar:${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/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.enterprise-api.jar:${j2ee.server.home}/modules/javax.security.enterprise.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.middleware}/mq/lib/jaxm-api.jar
 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
 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
-- 
2.39.5