From a69768a9a012c9a165b7b81003aa5dbe63e01f45 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 10 Oct 2015 22:01:56 +0200
Subject: [PATCH] Continued: - added named queries for some classes (more will
 follow) - updated project files + .gitignore - updated jars

---
 .gitignore                                    |   13 +-
 lib/jcontacts-business-core.jar               |  Bin 38326 -> 39604 bytes
 lib/jcontacts-core.jar                        |  Bin 18101 -> 19800 bytes
 lib/jcore-logger-lib.jar                      |  Bin 2505 -> 2505 bytes
 lib/jcore-swing.jar                           |  Bin 6808 -> 6813 bytes
 lib/jcore.jar                                 |  Bin 13656 -> 13656 bytes
 lib/jcoreee.jar                               |  Bin 17973 -> 17973 bytes
 lib/juser-core.jar                            |  Bin 16590 -> 16704 bytes
 nbproject/build-impl.xml                      | 2863 +++++++++--------
 nbproject/genfiles.properties                 |    4 +-
 nbproject/project.xml                         |   30 +-
 .../model/addressbook/UserAddressbook.java    |   13 +-
 .../entry/UserAddressbookEntry.java           |    3 +-
 .../names/AddressbookNameValidator.java       |    2 +-
 14 files changed, 1476 insertions(+), 1452 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8f32b37..0383bcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
-/nbproject/private/
-/manifest.mf
-/build/
-/data/*.*
-/dist/
-/*.properties
+/nbproject/private/
+/nbproject/*~
+/manifest.mf
+/build/
+/dist/
+/data/*
+/*.properties
diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar
index 9607d5cafc2f4f73a146df8192b1c83889597c96..5665c86076d45e0aeacb6a44e94b985cedcd6ef8 100644
GIT binary patch
delta 3684
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

delta 2835
zcmb7Gdu)?c6hB`(`uONr+l@Ua?bg8<>zIHr#PQsCjBdOp%#97$1}j6xw#t|cW$T_W
z2rO(D>M~4*32GG7K>?$QMASt80nvXjMhV75Q8AKeOiW1Tx#zp1U*YQ?Ho50@&$+*I
z&$+$dy?jM?^}H^2W3fI)1~37nzv~@{ovC*tTR1}OyHsKi$;dLLJg%}@X(jRVQa<rN
zrB%eA(XAlfrYj`=g>D(=A+vth1QPa{>g+bO6yC}0O8H6;z{hgdVM=EwQynbR5hqVG
zLYfiWMo4GZGw(|A%sn;UDM5U*Z~uy>27gWC!PPab>suOj`1VOKxel$&JuRNy%6gmq
z?#yHDuH?`I*Gws328fX$4ki+}f}-1mZijfXC%|OliDEuU%qI&yMd(w6?hyJ^p*y(_
z61b4+AT?Y{+U0@%zJD_80DLSHyOh~jj+O6p^D!ChaKH$yCO9Z#^vh<j!7H2`;-rm}
zc200FHt67_lanq^x;g1FLa&Vcun~?Jq0b0M+1+hfp_A@7{gQ;8O0}x|yPFz)RgI!z
zR$*2Z(LV0EtEN@>g%-@H*Zq&$|HbRh9=Iylz3gP>EU;Xfl`QGKP{c;t^0U2AX@L}&
zVu97*vA{}B3OJd|$vl{Efh;a92M;@v<27uA5(%DVFQ#UN#&XJ~fCmfgzye#5JF!r%
zX2^#$FSt?0b)KAEF+Ph>PtLC5vrl0xW+P_fP%A_PC+fKR8c0F`(??niiveb%AmRK3
z&j%n~q+YK@Y9M1KtV7wNIKX<?fSLrj38cj=zsxZ=?AuJfi3kTE3tuih2b<7ag3VA$
zQ5R1pW`?6$H4&bNGV-0Bl$6VT`56Leg9*^CLNPo-G4LJ`N;zzy$gw$UlrBw_3aBLC
zAM4d9M-Zhi3W`!z3APH9k#aT4aZQwM0>#~>Mj1eq!6+z7YbDq&P;5^p2Er8!YNAvr
zC|ISXSSwyFgD3k6n8F=ZYIp{5UyFjP95@N86<l27(cxg<uaQ+<JFA&Pjo4|dSH06W
z5b@0@i1;s|uI+%G)QLd1x}NW7qSS(qeAA|=QQk+C(I_apU_PPLiF%eas!=X$qU;uX
zNi9;Ne26F?MM1&;Iib8DPzHL`DAzPm_6U@lJxSDIrAMD3%I8r~@FF3U`X_tjxeT$R
z*fbr456hRDuzNKQ3tL(&t8%!3Ioynr!y=JGgJuqs9?#($%^VsvatPpwo%HyLy^WcC
z8zqyaJQHg^-bhXSOyK6{iPLZPWPbv2SHXJWv5I7<vN4MbL=S%QVzd1641OIa;41rZ
zMZ7Ru;3Xl1zkvM1-?JbshCcjn<(1k=7+aefOM<&1QBNPqUr#Kl{uDoud@P}l<k?Cy
zyJm?Cb#2=eV^8ok`1dv)^!cj%zJ1M2jWv5i_iGAG=G+QMhn$^I5L&#)X`m&y`oC7t
z=CqVq$#SgsuAYR3qw6FRK0bEepvQL(yD+ej8`v)c^hRM>gR@Dm98~PV!6MRs8r)1g
zkChPbXQjk{W}ApFK2=6McxnUjd#9?17oFZdDe|SmuAZ(=<EDsb0Ty!ncdqlHi*=gZ
z_!d%L2{A!C1)MN<|9t~rN_;FF_eOrMvwbcFbXeor?I2Z{-48l+ujdN0k=@BlVLt>d
zl+%`19lC!DX==23Dsv1e%e&;->DTc#<RdR)c}J;mp2(VN<wpS#EsF@4Urqs{gY58-
zlGB+XhpwbvOxf6P!aRoN3_qExTRcn-T4=lde+2Gz<5u}7h*&<*A)I5`twUBeUZ1**
vKJP<x<YPfZz>XdY*w}Al?;SO;MZ-!ViiRD!OT9E@oo;1A!-<BG<2>*`w;24)

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index 98ca617007e9f5e8090f6843513e80bec85acfa1..855385dcf75d9ff7c6acb19cddb65dde39bd5bc0 100644
GIT binary patch
literal 19800
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
Ov)fz@!S#Jy#{U5Yz|DUE

delta 5439
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
j%xTt~tnaEFWOPq1PH%0A;k^U?;1-WWeuvpKNm`!)iezsq

diff --git a/lib/jcore-logger-lib.jar b/lib/jcore-logger-lib.jar
index 8e5a5b954c3f18434a17e24e50fd7392d64bf46e..4cb7da5146cc64855a32f2f76722c7325c3514cb 100644
GIT binary patch
delta 172
zcmX>pd{US<z?+$ci-CcIfq`ee*F;_oW^N#5F&|9bk_S_Nz=D(28O=c4$q9@$V0u2I
z6PSL&=n0}X8!#C#ff>mx!A#6R(<bj^vjD63!e$Sq&Diz9bOt*_d@;KlnE!^|2TWUY
T1cB)Z9FY)ljwCQ0$XNjZqWd!~

delta 172
zcmX>pd{US<z?+$ci-CcIfk9!d=R{r&W?3L*F&|9bk_S_Nz=D(28O=c4$q9@$V0u2I
z6PSL&=n0}X8!#C#ff>mx!A#6R(<bj^vjD63!e$Sq&Diz9bOt*_d@;KlnE!^|2TWUY
T1cB)Z9FY)ljwCQ0$XNjZ2K_W$

diff --git a/lib/jcore-swing.jar b/lib/jcore-swing.jar
index 178b58f098a5314e75aaaac9d48dac7736114474..2428479575ef4cf48b08279a8bcbb8903149a423 100644
GIT binary patch
delta 737
zcmbPXI@gppz?+$ci-CcIfk9-w*F;_oW?>*@F&|9bk_S_Nz=D(28I3{Q$+3)9V0sp#
z9hkn&XbGmpne4%IB$GRc-n^J;7n2~6;eK%P*6m+d85lrVck)Ii>B$aEY?B+<I5*E=
zHD!@YVPIxpVqjp9X4GEBz`L7)HByLeI|KWEtt|{J!VHsNamoivF_<xk0+onC6ar~+
zAP=a8K?;Z&8DxNLW(G!nAXAn>4oC_E1qhfM%>^>o38%U8sOBm#ND^o68L+v2IL$?K
zuOhMTwdIzVlwyd&Ztmn#Ze?(w&*nbF2oCgLd<iuzz*q%gXK0}FOzvain0!D`aPvA|
zH8ySwpoc&K4+`ab!m`{f;J^b4FtBW96R~At2BwI~ZekYTSZx%8#O`4+eK7wkRNO$^
z8O$#e_X5+0#r?pvh=eDYPLS{i)0-s1!8DI#JTFS3m|P(V(Q#5znrRaEWJ3vs$)~uv
sC-0KvQ2;4K@d(IqP_U#ioENOPpI22Zz?+o~B+dtf-Yg6ZHew(i0Klb={{R30

delta 711
zcmbPhI>VGVz?+$ci-CcIfkADp=R{r&W>p|%F&|9bk_S_Nz=D(28I3{Q$+3)9V0sp#
z9hkn&XbGmpne4%IB$GRc-n^J;7n2~6;ePP;)wLg385lrVck)Ii>B%1i`8UsCHD!@a
zW?*JuVqjp9V$@#7z`L7)HByLeI|KWEtt|{JLX%%}$_Gg@m@$X~Rfs{<0cmj{52ynO
zr5P9*WPogD21b4$Q<gyvND2c5@EaS;1v1tNr?K*=#wsvK5@qapu(5tPjYV^<B9X3j
z<d&C|WQf9U?Bq&rWpH56=RU;93kvK*w(V1!fw9@VIgdAs&Bz?+bWi{@3$bkgQcS=w
zV_;wd3NkPlgToFIuFT-T0}3)QZ{`-UWnu;<hRNPy7T^eN6N5zT2{C;z{})u;RNNWN
zuNL<L(<j9Jz_g@<Czwu^@CVb|CBnh9pkzGQiSYC=xmFUQ<D8^4Qy=%_36ctv6@*wP
e3rGpcqxc2rA7_x`pkPU3@MK4+Fg9~BkN^OgF^KU1

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 57a3b6cecdc73685710c2cf6d6760b52b39a09d7..1a75fc00ef1f570f9b3af2edf1b0065404ef10eb 100644
GIT binary patch
delta 415
zcmcbSbt8*6z?+$ci-CcIfq{Fy*F;_oW-cIQF`pU4yCn~%{%C-x$?A-HU^;@)3QTh{
zsZ2ItVV`_}kqgW}%V-G|HwDv<OlDxZipdE?Z{E*zk_XJ_=67cTGp-8WVgxfb2|tD~
zW{5s#28%RFUW154ODjVZH_CQG7`zJp5JtSxE{GZ#6<-J=M>UxZto@SqRIte8EL{tb
zk0vkGwFgN|ey*zzrX}?(z;uY79hjb~=LM!8>A8YwEqzZgU8WD=@6&e!^Vto8z;uj3
zIGEmM5C*3C4Wq$yu3<cwK5rNbrqzuC!F07zKA3)Mlm(`vjI+V?31f&l1rvz65)+90
HLz8j<rJaHs

delta 415
zcmcbSbt8*6z?+$ci-CcIfkAey=R{r&W*H!5F`pU4yCn~%{%C-x$?A-HU^;@)3QTh{
zsZ2ItVV`_}kqgW}%V-G|HwDv<OlDxZipdE?Z{E*zk_XJ_=67cTGp-8WVgxfb2|tD~
zW{5s#28%RFUW154ODjVZH_CQG7`zJp5JtSxE{GZ#6<-J=M>UxZto@SqRIte8EL{tb
zk0vkGwFgN|ey*zzrX}?(z;uY79hjb~=LM!8>A8YwEqzZgU8WD=@6&e!^Vto8z;uj3
zIGEmM5C*3C4Wq$yu3<cwK5rNbrqzuC!F07zKA3)Mlm(`vjI+V?31f&l1rvz65)+90
HLz8j<+f#(=

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 3900e4e429207d9bb6bf44a793b20eb1fcd3c033..76ac2d386eba9d82637d0b52fdc62d0932179b5e 100644
GIT binary patch
delta 389
zcmdnm!??AFkvG7bnT3mifrEj8cfHp{UJYg*AZ0NhOx=<PQ-8pMlhqjwK-|eujFw<}
z8lx4MzRYM3rdKi<Oy2LzI@!R5p9gLzNW)K{#D9JE$#a;vpbCA#^iL*7Fm2214x%@=
zGoNPzGa|YEvO^d`UOZsNGC5UNFyowZ3MZIhs{5J+%uqJk2~m9C@-GWB&=ZsI+gX5Q
zCQI2v92R4*59asTL&Q(oJAnB-4xV5-!odqnFLm$-)2kh&Ckr_`f!W+n(vyoE&7k73
xP_aNT9q$wlrgu8UgK25!WH8<6oC&7iIyZpn0+$RhecPoBOozB;f$4*;B>+A{d!7IQ

delta 389
zcmdnm!??AFkvG7bnT3mifrEiTajoY>UJYgiAZ0NhOx=<PQ-8pMlhqjwK-|eujFw<}
z8lx4MzRYM3rdKi<Oy2LzI@!R5p9gLzNW)K{#D9JE$#a;vpbCA#^iL*7Fm2214x%@=
zGoNPzGa|YEvO^d`UOZsNGC5UNFyowZ3MZIhs{5J+%uqJk2~m9C@-GWB&=ZsI+gX5Q
zCQI2v92R4*59asTL&Q(oJAnB-4xV5-!odqnFLm$-)2kh&Ckr_`f!W+n(vyoE&7k73
xP_aNT9q$wlrgu8UgK25!WH8<6oC&7iIyZpn0+$RhecPoBOozB;f$4*;B>+T5erNyy

diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index 764cab64475977ea25d6ca0ab651a9505265ddcd..ae1dbfb3fe91d0177eebae36ea3da33efb5e7f15 100644
GIT binary patch
delta 1048
zcmZ9LNla5g7{|Y9`&wy(tO~UfMWnnI$x}$A>5fq}EQ*N<3I<fH+5ja`nn+yOT#%(u
z23!DH6j0DWVlQ|wF?t{|#pp!?a=?Qp4<5V`jm~^+i1G4YelwH2ynNsLR`R-yM3)rG
z6>5M@0CDpLfoM@4%gi(;=WS&N+AonC%^=z6r-==HgqR{-q<ftjs+Os-C&><S4_3%Z
zWf&F|r3wu3QKoPxj_#HtS&f|whn~bm`DXU&@apKHU2zHQYZ7RSB+}00<mTsU*am%S
z&_X~1IxhV{c^cqskf*ym-Q(##PY-w+;%S(t5uP6MG|JOh6q9i-6I>o~dCX;!%M_Ps
zE>BeOR0T6~70l8+!5BQMT_MUCpV!q;Ne#MO+OM<IGrH{H2VJ$GQMo<mU6);60$Mt;
zJ#jy876P$Vb)F0EhT5}@?mACpwX2DM(&us4`&@DWAOzG^bv3?PPm$Z(NMI*>nh-pe
zx=hHkpdl?l;;X;{>1Ch?YdH`X*uYLhyVr#_P(VAaH*TS8>7JAhh=DHl!QGGsJ&*-{
z$c0|WgFYyP0Ik;NlR><@s27DH5MY>27?P+aLn33yOEN@ZlJP0z1B}lgUuJxc@p<Ga
zqC|qo&xxY2!1zn#(~Q4D{+;nRjK4)L86>iZywM;EA;y;&&nF*|{buYFW1sPEo>3xS
z7`F*)jD1D+&Y0NT0CKnr1Vk@fgX<s*hi3LKoY2C~7;lBPGH8bzUf2gW+0{Mepm4&i
z@ZH<c;e|UJwUgJbjoQs?&qnq0+WYT9kb>Z$%&hRt`lKJ>QN5TGRPy1aDP|Mj7JAa`
zz&>P_&_j&#bCu-)dXc3VeZ+Dk(sfj34KGu!^#n4%)r0=W+Jt_^=0pE!yM$h0uR&k3
z*Z;pJMULZmH15#JW;1DOl$Nby4E^SaN4(DPiWI?mM5mlOStuuhG}Nz6rZ1dZl`UpA
GlJFO<+#O{A

delta 974
zcmZva*-KPW9LK+BX0A4qONx`rw2X|)b;g?12PbC_u|kZ3z|!i)Bq3AGHlvyx*GjYT
zfDdYExqv|%Q(y}cB(!Q0L@9wi)syrO1a;1D%m})0e&6r+bI-k(bNN0Gve{-9ySr4Y
zGXSfAj5|9+v8vW0#4$v&u#w~^L7vU>W#k8#n{<#lmb1!#F(dh8O|jJQAx*i4%%rYd
zM<!A4h?uh2E-jHSYwku&chXC3f_Q3s|Le@tLy3S~dEBf|<AD@Q-nap2xNJZwuB?Vh
zjxKadcU7_;>8?o^lCD=c{wT$qrx&DOjsZCa<+v`#4LOG77?$H^G;T#>BpRdKuUNyo
zQWqFA@Xe+|K4Qw})h18)qv@!^%zQF^UHC!z9AjhQpe4joD#5DZgbVH}c#v6vENI|`
zj}K=gac|~Vr3pHm<$kM?Z_TP(A3!{U;(INypcR|YhC;N%j}DZglTT-rurAtb&Q_HW
z6!h|joMe7D+s^ukPY6CB_#p8m!H0?GtEw_4_&D)Xs-4{?{#5XLg5M|pOYn!pi*r=v
zvEWYxFJV)}W(0d7*fi};u-e%x!QIM?V6(*f1^YmI7p<!DN$}6aEw-e<erRzH3~D3J
z<H8>k5GJ=0Iv*~I|03=+BiM+RmDnm{+e&Pgv1286%6RE-HDx*Wy_@g*rUm561yFzd
zi2c}^s_=W8F;cAW_8*Zx%@>5Dw4%+trzq0UH$`6AI3DA)lX{#H-sIdydCFNv8t2-v
zoK5_ME7JA}*Ivnb-F0-U!QDi<<UUDS?WrN1^VE`hy$x~yR+&$E_n7~80C5JoMw=Zr
vo~}>ji#8)a=!>EE)cQ=C8av_mEouDOGJY#?MFHXZ4Hll^UmF!yB;WEIxep4q

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 93e31a9..5e681cf 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -1,1425 +1,1438 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - test compilation
-  - test execution
-  - test debugging
-  - applet
-  - cleanup
-
--->
-<project 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" basedir=".." default="default" name="Addressbook-impl">
-	<fail message="Please build using Ant 1.8.0 or higher.">
-		<condition>
-			<not>
-				<antversion atleast="1.8.0"/>
-			</not>
-		</condition>
-	</fail>
-	<target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-	<!--
-		======================
-		INITIALIZATION SECTION
-		======================
-	-->
-	<target name="-pre-init">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="-pre-init" name="-init-private">
-		<property file="nbproject/private/config.properties"/>
-		<property file="nbproject/private/configs/${config}.properties"/>
-		<property file="nbproject/private/private.properties"/>
-	</target>
-	<target depends="-pre-init,-init-private" name="-init-user">
-		<property file="${user.properties.file}"/>
-		<!-- The two properties below are usually overridden -->
-		<!-- by the active platform. Just a fallback. -->
-		<property name="default.javac.source" value="1.4"/>
-		<property name="default.javac.target" value="1.4"/>
-	</target>
-	<target depends="-pre-init,-init-private,-init-user" name="-init-project">
-		<property file="nbproject/configs/${config}.properties"/>
-		<property file="nbproject/project.properties"/>
-	</target>
-	<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-		<property name="platform.java" value="${java.home}/bin/java"/>
-		<available file="${manifest.file}" property="manifest.available"/>
-		<condition property="splashscreen.available">
-			<and>
-				<not>
-					<equals arg1="${application.splash}" arg2="" trim="true"/>
-				</not>
-				<available file="${application.splash}"/>
-			</and>
-		</condition>
-		<condition property="main.class.available">
-			<and>
-				<isset property="main.class"/>
-				<not>
-					<equals arg1="${main.class}" arg2="" trim="true"/>
-				</not>
-			</and>
-		</condition>
-		<condition property="profile.available">
-			<and>
-				<isset property="javac.profile"/>
-				<length length="0" string="${javac.profile}" when="greater"/>
-				<matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
-			</and>
-		</condition>
-		<condition property="do.archive">
-			<or>
-				<not>
-					<istrue value="${jar.archive.disabled}"/>
-				</not>
-				<istrue value="${not.archive.disabled}"/>
-			</or>
-		</condition>
-		<condition property="do.mkdist">
-			<and>
-				<isset property="do.archive"/>
-				<isset property="libs.CopyLibs.classpath"/>
-				<not>
-					<istrue value="${mkdist.disabled}"/>
-				</not>
-			</and>
-		</condition>
-		<condition property="do.archive+manifest.available">
-			<and>
-				<isset property="manifest.available"/>
-				<istrue value="${do.archive}"/>
-			</and>
-		</condition>
-		<condition property="do.archive+main.class.available">
-			<and>
-				<isset property="main.class.available"/>
-				<istrue value="${do.archive}"/>
-			</and>
-		</condition>
-		<condition property="do.archive+splashscreen.available">
-			<and>
-				<isset property="splashscreen.available"/>
-				<istrue value="${do.archive}"/>
-			</and>
-		</condition>
-		<condition property="do.archive+profile.available">
-			<and>
-				<isset property="profile.available"/>
-				<istrue value="${do.archive}"/>
-			</and>
-		</condition>
-		<condition property="have.tests">
-			<or>
-				<available file="${test.src.dir}"/>
-			</or>
-		</condition>
-		<condition property="have.sources">
-			<or>
-				<available file="${src.dir}"/>
-			</or>
-		</condition>
-		<condition property="netbeans.home+have.tests">
-			<and>
-				<isset property="netbeans.home"/>
-				<isset property="have.tests"/>
-			</and>
-		</condition>
-		<condition property="no.javadoc.preview">
-			<and>
-				<isset property="javadoc.preview"/>
-				<isfalse value="${javadoc.preview}"/>
-			</and>
-		</condition>
-		<property name="run.jvmargs" value=""/>
-		<property name="run.jvmargs.ide" value=""/>
-		<property name="javac.compilerargs" value=""/>
-		<property name="work.dir" value="${basedir}"/>
-		<condition property="no.deps">
-			<and>
-				<istrue value="${no.dependencies}"/>
-			</and>
-		</condition>
-		<property name="javac.debug" value="true"/>
-		<property name="javadoc.preview" value="true"/>
-		<property name="application.args" value=""/>
-		<property name="source.encoding" value="${file.encoding}"/>
-		<property name="runtime.encoding" value="${source.encoding}"/>
-		<condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-			<and>
-				<isset property="javadoc.encoding"/>
-				<not>
-					<equals arg1="${javadoc.encoding}" arg2=""/>
-				</not>
-			</and>
-		</condition>
-		<property name="javadoc.encoding.used" value="${source.encoding}"/>
-		<property name="includes" value="**"/>
-		<property name="excludes" value=""/>
-		<property name="do.depend" value="false"/>
-		<condition property="do.depend.true">
-			<istrue value="${do.depend}"/>
-		</condition>
-		<path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
-		<condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-			<and>
-				<isset property="endorsed.classpath"/>
-				<not>
-					<equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
-				</not>
-			</and>
-		</condition>
-		<condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
-			<isset property="profile.available"/>
-		</condition>
-		<condition else="false" property="jdkBug6558476">
-			<and>
-				<matches pattern="1\.[56]" string="${java.specification.version}"/>
-				<not>
-					<os family="unix"/>
-				</not>
-			</and>
-		</condition>
-		<property name="javac.fork" value="${jdkBug6558476}"/>
-		<property name="jar.index" value="false"/>
-		<property name="jar.index.metainf" value="${jar.index}"/>
-		<property name="copylibs.rebase" value="true"/>
-		<available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
-		<condition property="junit.available">
-			<or>
-				<available classname="org.junit.Test" classpath="${run.test.classpath}"/>
-				<available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
-			</or>
-		</condition>
-		<condition property="testng.available">
-			<available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
-		</condition>
-		<condition property="junit+testng.available">
-			<and>
-				<istrue value="${junit.available}"/>
-				<istrue value="${testng.available}"/>
-			</and>
-		</condition>
-		<condition else="testng" property="testng.mode" value="mixed">
-			<istrue value="${junit+testng.available}"/>
-		</condition>
-		<condition else="" property="testng.debug.mode" value="-mixed">
-			<istrue value="${junit+testng.available}"/>
-		</condition>
-	</target>
-	<target name="-post-init">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-		<fail unless="src.dir">Must set 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="dist.dir">Must set dist.dir</fail>
-		<fail unless="build.classes.dir">Must set build.classes.dir</fail>
-		<fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-		<fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-		<fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-		<fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-		<fail unless="dist.jar">Must set dist.jar</fail>
-	</target>
-	<target name="-init-macrodef-property">
-		<macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-			<attribute name="name"/>
-			<attribute name="value"/>
-			<sequential>
-				<property name="@{name}" value="${@{value}}"/>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
-		<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${src.dir}" name="srcdir"/>
-			<attribute default="${build.classes.dir}" name="destdir"/>
-			<attribute default="${javac.classpath}" name="classpath"/>
-			<attribute default="${javac.processorpath}" name="processorpath"/>
-			<attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-			<attribute default="${includes}" name="includes"/>
-			<attribute default="${excludes}" name="excludes"/>
-			<attribute default="${javac.debug}" name="debug"/>
-			<attribute default="${empty.dir}" name="sourcepath"/>
-			<attribute default="${empty.dir}" name="gensrcdir"/>
-			<element name="customize" optional="true"/>
-			<sequential>
-				<property location="${build.dir}/empty" name="empty.dir"/>
-				<mkdir dir="${empty.dir}"/>
-				<mkdir dir="@{apgeneratedsrcdir}"/>
-				<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-					<src>
-						<dirset dir="@{gensrcdir}" erroronmissingdir="false">
-							<include name="*"/>
-						</dirset>
-					</src>
-					<classpath>
-						<path path="@{classpath}"/>
-					</classpath>
-					<compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-					<compilerarg line="${javac.profile.cmd.line.arg}"/>
-					<compilerarg line="${javac.compilerargs}"/>
-					<compilerarg value="-processorpath"/>
-					<compilerarg path="@{processorpath}:${empty.dir}"/>
-					<compilerarg line="${ap.processors.internal}"/>
-					<compilerarg line="${annotation.processing.processor.options}"/>
-					<compilerarg value="-s"/>
-					<compilerarg path="@{apgeneratedsrcdir}"/>
-					<compilerarg line="${ap.proc.none.internal}"/>
-					<customize/>
-				</javac>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
-		<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${src.dir}" name="srcdir"/>
-			<attribute default="${build.classes.dir}" name="destdir"/>
-			<attribute default="${javac.classpath}" name="classpath"/>
-			<attribute default="${javac.processorpath}" name="processorpath"/>
-			<attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-			<attribute default="${includes}" name="includes"/>
-			<attribute default="${excludes}" name="excludes"/>
-			<attribute default="${javac.debug}" name="debug"/>
-			<attribute default="${empty.dir}" name="sourcepath"/>
-			<attribute default="${empty.dir}" name="gensrcdir"/>
-			<element name="customize" optional="true"/>
-			<sequential>
-				<property location="${build.dir}/empty" name="empty.dir"/>
-				<mkdir dir="${empty.dir}"/>
-				<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-					<src>
-						<dirset dir="@{gensrcdir}" erroronmissingdir="false">
-							<include name="*"/>
-						</dirset>
-					</src>
-					<classpath>
-						<path path="@{classpath}"/>
-					</classpath>
-					<compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-					<compilerarg line="${javac.profile.cmd.line.arg}"/>
-					<compilerarg line="${javac.compilerargs}"/>
-					<customize/>
-				</javac>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-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">
-			<attribute default="${src.dir}" name="srcdir"/>
-			<attribute default="${build.classes.dir}" name="destdir"/>
-			<attribute default="${javac.classpath}" name="classpath"/>
-			<sequential>
-				<depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-					<classpath>
-						<path path="@{classpath}"/>
-					</classpath>
-				</depend>
-			</sequential>
-		</macrodef>
-		<macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${build.classes.dir}" name="destdir"/>
-			<sequential>
-				<fail unless="javac.includes">Must set javac.includes</fail>
-				<pathconvert pathsep="${line.separator}" property="javac.includes.binary">
-					<path>
-						<filelist dir="@{destdir}" files="${javac.includes}"/>
-					</path>
-					<globmapper from="*.java" to="*.class"/>
-				</pathconvert>
-				<tempfile deleteonexit="true" property="javac.includesfile.binary"/>
-				<echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
-				<delete>
-					<files includesfile="${javac.includesfile.binary}"/>
-				</delete>
-				<delete>
-					<fileset file="${javac.includesfile.binary}"/>
-				</delete>
-			</sequential>
-		</macrodef>
-	</target>
-	<target if="${junit.available}" name="-init-macrodef-junit-init">
-		<condition else="false" property="nb.junit.batch" value="true">
-			<and>
-				<istrue value="${junit.available}"/>
-				<not>
-					<isset property="test.method"/>
-				</not>
-			</and>
-		</condition>
-		<condition else="false" property="nb.junit.single" value="true">
-			<and>
-				<istrue value="${junit.available}"/>
-				<isset property="test.method"/>
-			</and>
-		</condition>
-	</target>
-	<target name="-init-test-properties">
-		<property name="test.binaryincludes" value="&lt;nothing&gt;"/>
-		<property name="test.binarytestincludes" value=""/>
-		<property name="test.binaryexcludes" value=""/>
-	</target>
-	<target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
-		<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${includes}" name="includes"/>
-			<attribute default="${excludes}" name="excludes"/>
-			<attribute default="**" name="testincludes"/>
-			<attribute default="" name="testmethods"/>
-			<element name="customize" optional="true"/>
-			<sequential>
-				<property name="junit.forkmode" value="perTest"/>
-				<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-					<test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-					<syspropertyset>
-						<propertyref prefix="test-sys-prop."/>
-						<mapper from="test-sys-prop.*" to="*" type="glob"/>
-					</syspropertyset>
-					<formatter type="brief" usefile="false"/>
-					<formatter type="xml"/>
-					<jvmarg value="-ea"/>
-					<customize/>
-				</junit>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
-		<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${includes}" name="includes"/>
-			<attribute default="${excludes}" name="excludes"/>
-			<attribute default="**" name="testincludes"/>
-			<attribute default="" name="testmethods"/>
-			<element name="customize" optional="true"/>
-			<sequential>
-				<property name="junit.forkmode" value="perTest"/>
-				<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-					<batchtest todir="${build.test.results.dir}">
-						<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-							<filename name="@{testincludes}"/>
-						</fileset>
-						<fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-							<filename name="${test.binarytestincludes}"/>
-						</fileset>
-					</batchtest>
-					<syspropertyset>
-						<propertyref prefix="test-sys-prop."/>
-						<mapper from="test-sys-prop.*" to="*" type="glob"/>
-					</syspropertyset>
-					<formatter type="brief" usefile="false"/>
-					<formatter type="xml"/>
-					<jvmarg value="-ea"/>
-					<customize/>
-				</junit>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
-	<target if="${testng.available}" name="-init-macrodef-testng">
-		<macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${includes}" name="includes"/>
-			<attribute default="${excludes}" name="excludes"/>
-			<attribute default="**" name="testincludes"/>
-			<attribute default="" name="testmethods"/>
-			<element name="customize" optional="true"/>
-			<sequential>
-				<condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
-					<isset property="test.method"/>
-				</condition>
-				<union id="test.set">
-					<fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
-						<filename name="@{testincludes}"/>
-					</fileset>
-				</union>
-				<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-				<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="Addressbook" testname="TestNG tests" workingDir="${work.dir}">
-					<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
-					<propertyset>
-						<propertyref prefix="test-sys-prop."/>
-						<mapper from="test-sys-prop.*" to="*" type="glob"/>
-					</propertyset>
-					<customize/>
-				</testng>
-			</sequential>
-		</macrodef>
-	</target>
-	<target name="-init-macrodef-test-impl">
-		<macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${includes}" name="includes"/>
-			<attribute default="${excludes}" name="excludes"/>
-			<attribute default="**" name="testincludes"/>
-			<attribute default="" name="testmethods"/>
-			<element implicit="true" name="customize" optional="true"/>
-			<sequential>
-				<echo>No tests executed.</echo>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
-		<macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${includes}" name="includes"/>
-			<attribute default="${excludes}" name="excludes"/>
-			<attribute default="**" name="testincludes"/>
-			<attribute default="" name="testmethods"/>
-			<element implicit="true" name="customize" optional="true"/>
-			<sequential>
-				<j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-					<customize/>
-				</j2seproject3:junit>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
-		<macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${includes}" name="includes"/>
-			<attribute default="${excludes}" name="excludes"/>
-			<attribute default="**" name="testincludes"/>
-			<attribute default="" name="testmethods"/>
-			<element implicit="true" name="customize" optional="true"/>
-			<sequential>
-				<j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-					<customize/>
-				</j2seproject3:testng>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
-		<macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${includes}" name="includes"/>
-			<attribute default="${excludes}" name="excludes"/>
-			<attribute default="**" name="testincludes"/>
-			<attribute default="" name="testmethods"/>
-			<sequential>
-				<j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-					<customize>
-						<classpath>
-							<path path="${run.test.classpath}"/>
-						</classpath>
-						<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-						<jvmarg line="${run.jvmargs}"/>
-						<jvmarg line="${run.jvmargs.ide}"/>
-					</customize>
-				</j2seproject3:test-impl>
-			</sequential>
-		</macrodef>
-	</target>
-	<target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
-		<macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${includes}" name="includes"/>
-			<attribute default="${excludes}" name="excludes"/>
-			<attribute default="**" name="testincludes"/>
-			<attribute default="" name="testmethods"/>
-			<element name="customize" optional="true"/>
-			<sequential>
-				<property name="junit.forkmode" value="perTest"/>
-				<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-					<test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-					<syspropertyset>
-						<propertyref prefix="test-sys-prop."/>
-						<mapper from="test-sys-prop.*" to="*" type="glob"/>
-					</syspropertyset>
-					<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}"/>
-					<customize/>
-				</junit>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
-		<macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${includes}" name="includes"/>
-			<attribute default="${excludes}" name="excludes"/>
-			<attribute default="**" name="testincludes"/>
-			<attribute default="" name="testmethods"/>
-			<element name="customize" optional="true"/>
-			<sequential>
-				<property name="junit.forkmode" value="perTest"/>
-				<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-					<batchtest todir="${build.test.results.dir}">
-						<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-							<filename name="@{testincludes}"/>
-						</fileset>
-						<fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-							<filename name="${test.binarytestincludes}"/>
-						</fileset>
-					</batchtest>
-					<syspropertyset>
-						<propertyref prefix="test-sys-prop."/>
-						<mapper from="test-sys-prop.*" to="*" type="glob"/>
-					</syspropertyset>
-					<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}"/>
-					<customize/>
-				</junit>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
-		<macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${includes}" name="includes"/>
-			<attribute default="${excludes}" name="excludes"/>
-			<attribute default="**" name="testincludes"/>
-			<attribute default="" name="testmethods"/>
-			<element implicit="true" name="customize" optional="true"/>
-			<sequential>
-				<j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-					<customize/>
-				</j2seproject3:junit-debug>
-			</sequential>
-		</macrodef>
-	</target>
-	<target if="${testng.available}" name="-init-macrodef-testng-debug">
-		<macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${main.class}" name="testClass"/>
-			<attribute default="" name="testMethod"/>
-			<element name="customize2" optional="true"/>
-			<sequential>
-				<condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
-					<isset property="test.method"/>
-				</condition>
-				<condition else="-suitename Addressbook -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
-					<matches pattern=".*\.xml" string="@{testClass}"/>
-				</condition>
-				<delete dir="${build.test.results.dir}" quiet="true"/>
-				<mkdir dir="${build.test.results.dir}"/>
-				<j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
-					<customize>
-						<customize2/>
-						<jvmarg value="-ea"/>
-						<arg line="${testng.debug.mode}"/>
-						<arg line="-d ${build.test.results.dir}"/>
-						<arg line="-listener org.testng.reporters.VerboseReporter"/>
-						<arg line="${testng.cmd.args}"/>
-					</customize>
-				</j2seproject3:debug>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
-		<macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${main.class}" name="testClass"/>
-			<attribute default="" name="testMethod"/>
-			<element implicit="true" name="customize2" optional="true"/>
-			<sequential>
-				<j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
-					<customize2/>
-				</j2seproject3:testng-debug>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
-		<macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${includes}" name="includes"/>
-			<attribute default="${excludes}" name="excludes"/>
-			<attribute default="**" name="testincludes"/>
-			<attribute default="" name="testmethods"/>
-			<attribute default="${main.class}" name="testClass"/>
-			<attribute default="" name="testMethod"/>
-			<sequential>
-				<j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-					<customize>
-						<classpath>
-							<path path="${run.test.classpath}"/>
-						</classpath>
-						<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-						<jvmarg line="${run.jvmargs}"/>
-						<jvmarg line="${run.jvmargs.ide}"/>
-					</customize>
-				</j2seproject3:test-debug-impl>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
-		<macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${includes}" name="includes"/>
-			<attribute default="${excludes}" name="excludes"/>
-			<attribute default="**" name="testincludes"/>
-			<attribute default="" name="testmethods"/>
-			<attribute default="${main.class}" name="testClass"/>
-			<attribute default="" name="testMethod"/>
-			<sequential>
-				<j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
-					<customize2>
-						<syspropertyset>
-							<propertyref prefix="test-sys-prop."/>
-							<mapper from="test-sys-prop.*" to="*" type="glob"/>
-						</syspropertyset>
-					</customize2>
-				</j2seproject3:testng-debug-impl>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
-	<!--
-		pre NB7.2 profiling section; consider it deprecated
-	-->
-	<target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
-	<target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target if="profiler.info.jvmargs.agent" name="-profile-post-init">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
-		<macrodef name="resolve">
-			<attribute name="name"/>
-			<attribute name="value"/>
-			<sequential>
-				<property name="@{name}" value="${env.@{value}}"/>
-			</sequential>
-		</macrodef>
-		<macrodef name="profile">
-			<attribute default="${main.class}" name="classname"/>
-			<element name="customize" optional="true"/>
-			<sequential>
-				<property environment="env"/>
-				<resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-				<java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
-					<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-					<jvmarg value="${profiler.info.jvmargs.agent}"/>
-					<jvmarg line="${profiler.info.jvmargs}"/>
-					<env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-					<arg line="${application.args}"/>
-					<classpath>
-						<path path="${run.classpath}"/>
-					</classpath>
-					<syspropertyset>
-						<propertyref prefix="run-sys-prop."/>
-						<mapper from="run-sys-prop.*" to="*" type="glob"/>
-					</syspropertyset>
-					<customize/>
-				</java>
-			</sequential>
-		</macrodef>
-	</target>
-	<target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
-		<fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
-		<fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
-	</target>
-	<!--
-		end of pre NB7.2 profiling section
-	-->
-	<target depends="-init-debug-args" name="-init-macrodef-nbjpda">
-		<macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-			<attribute default="${main.class}" name="name"/>
-			<attribute default="${debug.classpath}" name="classpath"/>
-			<attribute default="" name="stopclassname"/>
-			<sequential>
-				<nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
-					<classpath>
-						<path path="@{classpath}"/>
-					</classpath>
-				</nbjpdastart>
-			</sequential>
-		</macrodef>
-		<macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-			<attribute default="${build.classes.dir}" name="dir"/>
-			<sequential>
-				<nbjpdareload>
-					<fileset dir="@{dir}" includes="${fix.classes}">
-						<include name="${fix.includes}*.class"/>
-					</fileset>
-				</nbjpdareload>
-			</sequential>
-		</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>
-		<condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
-			<isset property="debug.transport"/>
-		</condition>
-	</target>
-	<target depends="-init-debug-args" name="-init-macrodef-debug">
-		<macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${main.class}" name="classname"/>
-			<attribute default="${debug.classpath}" name="classpath"/>
-			<element name="customize" optional="true"/>
-			<sequential>
-				<java classname="@{classname}" dir="${work.dir}" 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="-Dfile.encoding=${runtime.encoding}"/>
-					<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-					<jvmarg line="${run.jvmargs}"/>
-					<jvmarg line="${run.jvmargs.ide}"/>
-					<classpath>
-						<path path="@{classpath}"/>
-					</classpath>
-					<syspropertyset>
-						<propertyref prefix="run-sys-prop."/>
-						<mapper from="run-sys-prop.*" to="*" type="glob"/>
-					</syspropertyset>
-					<customize/>
-				</java>
-			</sequential>
-		</macrodef>
-	</target>
-	<target name="-init-macrodef-java">
-		<macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-			<attribute default="${main.class}" name="classname"/>
-			<attribute default="${run.classpath}" name="classpath"/>
-			<attribute default="jvm" name="jvm"/>
-			<element name="customize" optional="true"/>
-			<sequential>
-				<java classname="@{classname}" dir="${work.dir}" fork="true">
-					<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-					<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-					<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-					<jvmarg line="${run.jvmargs}"/>
-					<jvmarg line="${run.jvmargs.ide}"/>
-					<classpath>
-						<path path="@{classpath}"/>
-					</classpath>
-					<syspropertyset>
-						<propertyref prefix="run-sys-prop."/>
-						<mapper from="run-sys-prop.*" to="*" type="glob"/>
-					</syspropertyset>
-					<customize/>
-				</java>
-			</sequential>
-		</macrodef>
-	</target>
-	<target name="-init-macrodef-copylibs">
-		<macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
-			<attribute default="${manifest.file}" name="manifest"/>
-			<element name="customize" optional="true"/>
-			<sequential>
-				<property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-				<pathconvert property="run.classpath.without.build.classes.dir">
-					<path path="${run.classpath}"/>
-					<map from="${build.classes.dir.resolved}" to=""/>
-				</pathconvert>
-				<pathconvert pathsep=" " property="jar.classpath">
-					<path path="${run.classpath.without.build.classes.dir}"/>
-					<chainedmapper>
-						<flattenmapper/>
-						<filtermapper>
-							<replacestring from=" " to="%20"/>
-						</filtermapper>
-						<globmapper from="*" to="lib/*"/>
-					</chainedmapper>
-				</pathconvert>
-				<taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-				<copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-					<fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-					<manifest>
-						<attribute name="Class-Path" value="${jar.classpath}"/>
-						<customize/>
-					</manifest>
-				</copylibs>
-			</sequential>
-		</macrodef>
-	</target>
-	<target name="-init-presetdef-jar">
-		<presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-			<jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
-				<j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-			</jar>
-		</presetdef>
-	</target>
-	<target name="-init-ap-cmdline-properties">
-		<property name="annotation.processing.enabled" value="true"/>
-		<property name="annotation.processing.processors.list" value=""/>
-		<property name="annotation.processing.processor.options" value=""/>
-		<property name="annotation.processing.run.all.processors" value="true"/>
-		<property name="javac.processorpath" value="${javac.classpath}"/>
-		<property name="javac.test.processorpath" value="${javac.test.classpath}"/>
-		<condition property="ap.supported.internal" value="true">
-			<not>
-				<matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
-			</not>
-		</condition>
-	</target>
-	<target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
-		<condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
-			<isfalse value="${annotation.processing.run.all.processors}"/>
-		</condition>
-		<condition else="" property="ap.proc.none.internal" value="-proc:none">
-			<isfalse value="${annotation.processing.enabled}"/>
-		</condition>
-	</target>
-	<target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
-		<property name="ap.cmd.line.internal" value=""/>
-	</target>
-	<target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
-	<!--
-		===================
-		COMPILATION SECTION
-		===================
-	-->
-	<target name="-deps-jar-init" unless="built-jar.properties">
-		<property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
-		<delete file="${built-jar.properties}" quiet="true"/>
-	</target>
-	<target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-		<echo level="warn" message="Cycle detected: Addressbook was already built"/>
-	</target>
-	<target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
-		<mkdir dir="${build.dir}"/>
-		<touch file="${built-jar.properties}" verbose="false"/>
-		<property file="${built-jar.properties}" prefix="already.built.jar."/>
-		<antcall target="-warn-already-built-jar"/>
-		<propertyfile file="${built-jar.properties}">
-			<entry key="${basedir}" value=""/>
-		</propertyfile>
-		<antcall target="-maybe-call-dep">
-			<param name="call.built.properties" value="${built-jar.properties}"/>
-			<param name="call.target" value="jar"/>
-			<param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
-			<param name="transfer.not.archive.disabled" value="true"/>
-		</antcall>
-	</target>
-	<target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-	<target depends="init" name="-check-automatic-build">
-		<available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
-	</target>
-	<target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-		<antcall target="clean"/>
-	</target>
-	<target depends="init,deps-jar" name="-pre-pre-compile">
-		<mkdir dir="${build.classes.dir}"/>
-	</target>
-	<target name="-pre-compile">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target if="do.depend.true" name="-compile-depend">
-		<pathconvert property="build.generated.subdirs">
-			<dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-				<include name="*"/>
-			</dirset>
-		</pathconvert>
-		<j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
-	</target>
-	<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}"/>
-		<copy todir="${build.classes.dir}">
-			<fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-		</copy>
-	</target>
-	<target if="has.persistence.xml" name="-copy-persistence-xml">
-		<mkdir dir="${build.classes.dir}/META-INF"/>
-		<copy todir="${build.classes.dir}/META-INF">
-			<fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
-		</copy>
-	</target>
-	<target name="-post-compile">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-	<target name="-pre-compile-single">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<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>
-		<j2seproject3:force-recompile/>
-		<j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
-	</target>
-	<target name="-post-compile-single">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-	<!--
-		====================
-		JAR BUILDING SECTION
-		====================
-	-->
-	<target depends="init" name="-pre-pre-jar">
-		<dirname file="${dist.jar}" property="dist.jar.dir"/>
-		<mkdir dir="${dist.jar.dir}"/>
-	</target>
-	<target name="-pre-jar">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
-		<tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-		<touch file="${tmp.manifest.file}" verbose="false"/>
-	</target>
-	<target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
-		<tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-		<copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
-	</target>
-	<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
-		<manifest file="${tmp.manifest.file}" mode="update">
-			<attribute name="Main-Class" value="${main.class}"/>
-		</manifest>
-	</target>
-	<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
-		<manifest file="${tmp.manifest.file}" mode="update">
-			<attribute name="Profile" value="${javac.profile}"/>
-		</manifest>
-	</target>
-	<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
-		<basename file="${application.splash}" property="splashscreen.basename"/>
-		<mkdir dir="${build.classes.dir}/META-INF"/>
-		<copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-		<manifest file="${tmp.manifest.file}" mode="update">
-			<attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
-		</manifest>
-	</target>
-	<target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
-		<j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
-		<echo level="info">To run this application from the command line without Ant, try:</echo>
-		<property location="${dist.jar}" name="dist.jar.resolved"/>
-		<echo level="info">java -jar "${dist.jar.resolved}"</echo>
-	</target>
-	<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
-		<j2seproject1:jar manifest="${tmp.manifest.file}"/>
-		<property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-		<property location="${dist.jar}" name="dist.jar.resolved"/>
-		<pathconvert property="run.classpath.with.dist.jar">
-			<path path="${run.classpath}"/>
-			<map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-		</pathconvert>
-		<condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
-			<isset property="main.class.available"/>
-		</condition>
-		<condition else="debug" property="jar.usage.level" value="info">
-			<isset property="main.class.available"/>
-		</condition>
-		<echo level="${jar.usage.level}" message="${jar.usage.message}"/>
-	</target>
-	<target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
-		<delete>
-			<fileset file="${tmp.manifest.file}"/>
-		</delete>
-	</target>
-	<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
-	<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
-	<target name="-post-jar">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
-	<target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
-	<!--
-		=================
-		EXECUTION SECTION
-		=================
-	-->
-	<target depends="init,compile" description="Run a main class." name="run">
-		<j2seproject1:java>
-			<customize>
-				<arg line="${application.args}"/>
-			</customize>
-		</j2seproject1:java>
-	</target>
-	<target name="-do-not-recompile">
-		<property name="javac.includes.binary" value=""/>
-	</target>
-	<target depends="init,compile-single" name="run-single">
-		<fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-		<j2seproject1:java classname="${run.class}"/>
-	</target>
-	<target depends="init,compile-test-single" name="run-test-with-main">
-		<fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-		<j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
-	</target>
-	<!--
-		=================
-		DEBUGGING SECTION
-		=================
-	-->
-	<target depends="init" if="netbeans.home" name="-debug-start-debugger">
-		<j2seproject1:nbjpdastart name="${debug.class}"/>
-	</target>
-	<target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
-		<j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
-	</target>
-	<target depends="init,compile" name="-debug-start-debuggee">
-		<j2seproject3:debug>
-			<customize>
-				<arg line="${application.args}"/>
-			</customize>
-		</j2seproject3:debug>
-	</target>
-	<target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-	<target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-		<j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-	</target>
-	<target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-	<target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-		<fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-		<j2seproject3:debug classname="${debug.class}"/>
-	</target>
-	<target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-	<target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
-		<fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-		<j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
-	</target>
-	<target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
-	<target depends="init" name="-pre-debug-fix">
-		<fail unless="fix.includes">Must set fix.includes</fail>
-		<property name="javac.includes" value="${fix.includes}.java"/>
-	</target>
-	<target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-		<j2seproject1:nbjpdareload/>
-	</target>
-	<target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-	<!--
-		=================
-		PROFILING SECTION
-		=================
-	-->
-	<!--
-		pre NB7.2 profiler integration
-	-->
-	<target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
-		<fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-		<nbprofiledirect>
-			<classpath>
-				<path path="${run.classpath}"/>
-			</classpath>
-		</nbprofiledirect>
-		<profile/>
-	</target>
-	<target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
-		<fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
-		<fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-		<nbprofiledirect>
-			<classpath>
-				<path path="${run.classpath}"/>
-			</classpath>
-		</nbprofiledirect>
-		<profile classname="${profile.class}"/>
-	</target>
-	<target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
-		<fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-		<nbprofiledirect>
-			<classpath>
-				<path path="${run.classpath}"/>
-			</classpath>
-		</nbprofiledirect>
-		<profile classname="sun.applet.AppletViewer">
-			<customize>
-				<arg value="${applet.url}"/>
-			</customize>
-		</profile>
-	</target>
-	<target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
-		<fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-		<nbprofiledirect>
-			<classpath>
-				<path path="${run.test.classpath}"/>
-			</classpath>
-		</nbprofiledirect>
-		<junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
-			<env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-			<jvmarg value="${profiler.info.jvmargs.agent}"/>
-			<jvmarg line="${profiler.info.jvmargs}"/>
-			<test name="${profile.class}"/>
-			<classpath>
-				<path path="${run.test.classpath}"/>
-			</classpath>
-			<syspropertyset>
-				<propertyref prefix="test-sys-prop."/>
-				<mapper from="test-sys-prop.*" to="*" type="glob"/>
-			</syspropertyset>
-			<formatter type="brief" usefile="false"/>
-			<formatter type="xml"/>
-		</junit>
-	</target>
-	<!--
-		end of pre NB72 profiling section
-	-->
-	<target if="netbeans.home" name="-profile-check">
-		<condition property="profiler.configured">
-			<or>
-				<contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
-				<contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
-			</or>
-		</condition>
-	</target>
-	<target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
-		<startprofiler/>
-		<antcall target="run"/>
-	</target>
-	<target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
-		<fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-		<startprofiler/>
-		<antcall target="run-single"/>
-	</target>
-	<target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
-	<target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
-		<fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-		<startprofiler/>
-		<antcall target="test-single"/>
-	</target>
-	<target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
-		<fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-		<startprofiler/>
-		<antcal target="run-test-with-main"/>
-	</target>
-	<target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
-		<fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-		<startprofiler/>
-		<antcall target="run-applet"/>
-	</target>
-	<!--
-		===============
-		JAVADOC SECTION
-		===============
-	-->
-	<target depends="init" if="have.sources" name="-javadoc-build">
-		<mkdir dir="${dist.javadoc.dir}"/>
-		<condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
-			<and>
-				<isset property="endorsed.classpath.cmd.line.arg"/>
-				<not>
-					<equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
-				</not>
-			</and>
-		</condition>
-		<condition else="" property="bug5101868workaround" value="*.java">
-			<matches pattern="1\.[56](\..*)?" string="${java.version}"/>
-		</condition>
-		<javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-			<classpath>
-				<path path="${javac.classpath}"/>
-			</classpath>
-			<fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
-				<filename name="**/*.java"/>
-			</fileset>
-			<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-				<include name="**/*.java"/>
-				<exclude name="*.java"/>
-			</fileset>
-			<arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
-		</javadoc>
-		<copy todir="${dist.javadoc.dir}">
-			<fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-				<filename name="**/doc-files/**"/>
-			</fileset>
-			<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-				<include name="**/doc-files/**"/>
-			</fileset>
-		</copy>
-	</target>
-	<target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-		<nbbrowse file="${dist.javadoc.dir}/index.html"/>
-	</target>
-	<target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-	<!--
-		=========================
-		TEST COMPILATION SECTION
-		=========================
-	-->
-	<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-		<mkdir dir="${build.test.classes.dir}"/>
-	</target>
-	<target name="-pre-compile-test">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target if="do.depend.true" name="-compile-test-depend">
-		<j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-	</target>
-	<target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-		<j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
-		<copy todir="${build.test.classes.dir}">
-			<fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-		</copy>
-	</target>
-	<target name="-post-compile-test">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-	<target name="-pre-compile-test-single">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-		<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-		<j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-		<j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
-		<copy todir="${build.test.classes.dir}">
-			<fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-		</copy>
-	</target>
-	<target name="-post-compile-test-single">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-	<!--
-		=======================
-		TEST EXECUTION SECTION
-		=======================
-	-->
-	<target depends="init" if="have.tests" name="-pre-test-run">
-		<mkdir dir="${build.test.results.dir}"/>
-	</target>
-	<target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-		<j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
-	</target>
-	<target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-		<fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-	</target>
-	<target depends="init" if="have.tests" name="test-report"/>
-	<target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-	<target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-	<target depends="init" if="have.tests" name="-pre-test-run-single">
-		<mkdir dir="${build.test.results.dir}"/>
-	</target>
-	<target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-		<fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-		<j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
-	</target>
-	<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-		<fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-	</target>
-	<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-	<target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
-		<fail unless="test.class">Must select some files in the IDE or set test.class</fail>
-		<fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-		<j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
-	</target>
-	<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
-		<fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-	</target>
-	<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
-	<!--
-		=======================
-		TEST DEBUGGING SECTION
-		=======================
-	-->
-	<target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
-		<fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-		<j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
-	</target>
-	<target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
-		<fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-		<fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-		<j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
-	</target>
-	<target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-		<j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-	</target>
-	<target depends="init,compile-test-single,-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="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-		<j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-	</target>
-	<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-	<!--
-		=========================
-		APPLET EXECUTION SECTION
-		=========================
-	-->
-	<target depends="init,compile-single" name="run-applet">
-		<fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-		<j2seproject1:java classname="sun.applet.AppletViewer">
-			<customize>
-				<arg value="${applet.url}"/>
-			</customize>
-		</j2seproject1:java>
-	</target>
-	<!--
-		=========================
-		APPLET DEBUGGING  SECTION
-		=========================
-	-->
-	<target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-		<fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-		<j2seproject3:debug classname="sun.applet.AppletViewer">
-			<customize>
-				<arg value="${applet.url}"/>
-			</customize>
-		</j2seproject3:debug>
-	</target>
-	<target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-	<!--
-		===============
-		CLEANUP SECTION
-		===============
-	-->
-	<target name="-deps-clean-init" unless="built-clean.properties">
-		<property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
-		<delete file="${built-clean.properties}" quiet="true"/>
-	</target>
-	<target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-		<echo level="warn" message="Cycle detected: Addressbook was already built"/>
-	</target>
-	<target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
-		<mkdir dir="${build.dir}"/>
-		<touch file="${built-clean.properties}" verbose="false"/>
-		<property file="${built-clean.properties}" prefix="already.built.clean."/>
-		<antcall target="-warn-already-built-clean"/>
-		<propertyfile file="${built-clean.properties}">
-			<entry key="${basedir}" value=""/>
-		</propertyfile>
-		<antcall target="-maybe-call-dep">
-			<param name="call.built.properties" value="${built-clean.properties}"/>
-			<param name="call.target" value="clean"/>
-			<param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
-			<param name="transfer.not.archive.disabled" value="true"/>
-		</antcall>
-	</target>
-	<target depends="init" name="-do-clean">
-		<delete dir="${build.dir}"/>
-		<delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
-	</target>
-	<target name="-post-clean">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-	<target name="-check-call-dep">
-		<property file="${call.built.properties}" prefix="already.built."/>
-		<condition property="should.call.dep">
-			<and>
-				<not>
-					<isset property="already.built.${call.subproject}"/>
-				</not>
-				<available file="${call.script}"/>
-			</and>
-		</condition>
-	</target>
-	<target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
-		<ant antfile="${call.script}" inheritall="false" target="${call.target}">
-			<propertyset>
-				<propertyref prefix="transfer."/>
-				<mapper from="transfer.*" to="*" type="glob"/>
-			</propertyset>
-		</ant>
-	</target>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+  - initialization
+  - compilation
+  - jar
+  - execution
+  - debugging
+  - javadoc
+  - test compilation
+  - test execution
+  - test debugging
+  - applet
+  - cleanup
+
+        -->
+<project 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" basedir=".." default="default" name="addressbook-lib-impl">
+    <fail message="Please build using Ant 1.8.0 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.8.0"/>
+            </not>
+        </condition>
+    </fail>
+    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+    <!-- 
+                ======================
+                INITIALIZATION SECTION 
+                ======================
+            -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init" name="-init-private">
+        <property file="nbproject/private/config.properties"/>
+        <property file="nbproject/private/configs/${config}.properties"/>
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target name="-pre-init-libraries">
+        <property location=".\lib\nblibraries.properties" name="libraries.path"/>
+        <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>
+        <pathconvert dirsep="/" property="libraries.dir">
+            <path path="${libraries.dir.nativedirsep}"/>
+        </pathconvert>
+        <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/>
+        <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/>
+    </target>
+    <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries">
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties">
+            <filterchain>
+                <replacestring from="$${base}" to="${libraries.dir}"/>
+                <escapeunicode/>
+            </filterchain>
+        </loadproperties>
+    </target>
+    <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries">
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}">
+            <filterchain>
+                <replacestring from="$${base}" to="${libraries.dir}"/>
+                <escapeunicode/>
+            </filterchain>
+        </loadproperties>
+    </target>
+    <target depends="-pre-init,-init-private,-init-libraries" name="-init-user">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">
+        <property file="nbproject/configs/${config}.properties"/>
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <property name="platform.java" value="${java.home}/bin/java"/>
+        <available file="${manifest.file}" property="manifest.available"/>
+        <condition property="splashscreen.available">
+            <and>
+                <not>
+                    <equals arg1="${application.splash}" arg2="" trim="true"/>
+                </not>
+                <available file="${application.splash}"/>
+            </and>
+        </condition>
+        <condition property="main.class.available">
+            <and>
+                <isset property="main.class"/>
+                <not>
+                    <equals arg1="${main.class}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="profile.available">
+            <and>
+                <isset property="javac.profile"/>
+                <length length="0" string="${javac.profile}" when="greater"/>
+                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
+            </and>
+        </condition>
+        <condition property="do.archive">
+            <or>
+                <not>
+                    <istrue value="${jar.archive.disabled}"/>
+                </not>
+                <istrue value="${not.archive.disabled}"/>
+            </or>
+        </condition>
+        <condition property="do.mkdist">
+            <and>
+                <isset property="do.archive"/>
+                <isset property="libs.CopyLibs.classpath"/>
+                <not>
+                    <istrue value="${mkdist.disabled}"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available">
+            <and>
+                <isset property="manifest.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+main.class.available">
+            <and>
+                <isset property="main.class.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+splashscreen.available">
+            <and>
+                <isset property="splashscreen.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+profile.available">
+            <and>
+                <isset property="profile.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <and>
+                <isset property="javadoc.preview"/>
+                <isfalse value="${javadoc.preview}"/>
+            </and>
+        </condition>
+        <property name="run.jvmargs" value=""/>
+        <property name="run.jvmargs.ide" value=""/>
+        <property name="javac.compilerargs" value=""/>
+        <property name="work.dir" value="${basedir}"/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <property name="javac.debug" value="true"/>
+        <property name="javadoc.preview" value="true"/>
+        <property name="application.args" value=""/>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <property name="runtime.encoding" value="${source.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
+        <property name="do.depend" value="false"/>
+        <condition property="do.depend.true">
+            <istrue value="${do.depend}"/>
+        </condition>
+        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
+        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
+            <and>
+                <isset property="endorsed.classpath"/>
+                <not>
+                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
+            <isset property="profile.available"/>
+        </condition>
+        <condition else="false" property="jdkBug6558476">
+            <and>
+                <matches pattern="1\.[56]" string="${java.specification.version}"/>
+                <not>
+                    <os family="unix"/>
+                </not>
+            </and>
+        </condition>
+        <property name="javac.fork" value="${jdkBug6558476}"/>
+        <property name="jar.index" value="false"/>
+        <property name="jar.index.metainf" value="${jar.index}"/>
+        <property name="copylibs.rebase" value="true"/>
+        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
+        <condition property="junit.available">
+            <or>
+                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
+                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
+            </or>
+        </condition>
+        <condition property="testng.available">
+            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
+        </condition>
+        <condition property="junit+testng.available">
+            <and>
+                <istrue value="${junit.available}"/>
+                <istrue value="${testng.available}"/>
+            </and>
+        </condition>
+        <condition else="testng" property="testng.mode" value="mixed">
+            <istrue value="${junit+testng.available}"/>
+        </condition>
+        <condition else="" property="testng.debug.mode" value="-mixed">
+            <istrue value="${junit+testng.available}"/>
+        </condition>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.dir">Must set 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="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.jar">Must set dist.jar</fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg line="${annotation.processing.processor.options}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-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">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
+                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
+                <delete>
+                    <files includesfile="${javac.includesfile.binary}"/>
+                </delete>
+                <delete>
+                    <fileset file="${javac.includesfile.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${junit.available}" name="-init-macrodef-junit-init">
+        <condition else="false" property="nb.junit.batch" value="true">
+            <and>
+                <istrue value="${junit.available}"/>
+                <not>
+                    <isset property="test.method"/>
+                </not>
+            </and>
+        </condition>
+        <condition else="false" property="nb.junit.single" value="true">
+            <and>
+                <istrue value="${junit.available}"/>
+                <isset property="test.method"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-init-test-properties">
+        <property name="test.binaryincludes" value="&lt;nothing&gt;"/>
+        <property name="test.binarytestincludes" value=""/>
+        <property name="test.binaryexcludes" value=""/>
+    </target>
+    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+                            <filename name="${test.binarytestincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
+    <target if="${testng.available}" name="-init-macrodef-testng">
+        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
+                    <isset property="test.method"/>
+                </condition>
+                <union id="test.set">
+                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+                        <filename name="@{testincludes}"/>
+                    </fileset>
+                </union>
+                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
+                <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="addressbook-lib" testname="TestNG tests" workingDir="${work.dir}">
+                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
+                    <propertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </propertyset>
+                    <customize/>
+                </testng>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-test-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <echo>No tests executed.</echo>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </j2seproject3:junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </j2seproject3:testng>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
+        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <sequential>
+                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize>
+                        <classpath>
+                            <path path="${run.test.classpath}"/>
+                        </classpath>
+                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                        <jvmarg line="${run.jvmargs}"/>
+                        <jvmarg line="${run.jvmargs.ide}"/>
+                    </customize>
+                </j2seproject3:test-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
+        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <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}"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
+        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+                            <filename name="${test.binarytestincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <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}"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
+        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </j2seproject3:junit-debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${testng.available}" name="-init-macrodef-testng-debug">
+        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <element name="customize2" optional="true"/>
+            <sequential>
+                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
+                    <isset property="test.method"/>
+                </condition>
+                <condition else="-suitename addressbook-lib -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                    <matches pattern=".*\.xml" string="@{testClass}"/>
+                </condition>
+                <delete dir="${build.test.results.dir}" quiet="true"/>
+                <mkdir dir="${build.test.results.dir}"/>
+                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
+                    <customize>
+                        <customize2/>
+                        <jvmarg value="-ea"/>
+                        <arg line="${testng.debug.mode}"/>
+                        <arg line="-d ${build.test.results.dir}"/>
+                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
+                        <arg line="${testng.cmd.args}"/>
+                    </customize>
+                </j2seproject3:debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
+        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <element implicit="true" name="customize2" optional="true"/>
+            <sequential>
+                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
+                    <customize2/>
+                </j2seproject3:testng-debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
+        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <sequential>
+                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize>
+                        <classpath>
+                            <path path="${run.test.classpath}"/>
+                        </classpath>
+                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                        <jvmarg line="${run.jvmargs}"/>
+                        <jvmarg line="${run.jvmargs.ide}"/>
+                    </customize>
+                </j2seproject3:test-debug-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
+        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <sequential>
+                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
+                    <customize2>
+                        <syspropertyset>
+                            <propertyref prefix="test-sys-prop."/>
+                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                        </syspropertyset>
+                    </customize2>
+                </j2seproject3:testng-debug-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
+    <!--
+                pre NB7.2 profiling section; consider it deprecated
+            -->
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
+    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
+        <macrodef name="resolve">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${env.@{value}}"/>
+            </sequential>
+        </macrodef>
+        <macrodef name="profile">
+            <attribute default="${main.class}" name="classname"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property environment="env"/>
+                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
+                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
+                    <jvmarg line="${profiler.info.jvmargs}"/>
+                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+                    <arg line="${application.args}"/>
+                    <classpath>
+                        <path path="${run.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
+        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
+        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
+    </target>
+    <!--
+                end of pre NB7.2 profiling section
+            -->
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <attribute default="" name="stopclassname"/>
+            <sequential>
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${build.classes.dir}" name="dir"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
+                </nbjpdareload>
+            </sequential>
+        </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>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" 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="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <jvmarg line="${run.jvmargs.ide}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <attribute default="jvm" name="jvm"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <jvmarg line="${run.jvmargs.ide}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-copylibs">
+        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${manifest.file}" name="manifest"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+                <pathconvert property="run.classpath.without.build.classes.dir">
+                    <path path="${run.classpath}"/>
+                    <map from="${build.classes.dir.resolved}" to=""/>
+                </pathconvert>
+                <pathconvert pathsep=" " property="jar.classpath">
+                    <path path="${run.classpath.without.build.classes.dir}"/>
+                    <chainedmapper>
+                        <flattenmapper/>
+                        <filtermapper>
+                            <replacestring from=" " to="%20"/>
+                        </filtermapper>
+                        <globmapper from="*" to="lib/*"/>
+                    </chainedmapper>
+                </pathconvert>
+                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
+                    <manifest>
+                        <attribute name="Class-Path" value="${jar.classpath}"/>
+                        <customize/>
+                    </manifest>
+                </copylibs>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-presetdef-jar">
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
+                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
+            </jar>
+        </presetdef>
+    </target>
+    <target name="-init-ap-cmdline-properties">
+        <property name="annotation.processing.enabled" value="true"/>
+        <property name="annotation.processing.processors.list" value=""/>
+        <property name="annotation.processing.processor.options" value=""/>
+        <property name="annotation.processing.run.all.processors" value="true"/>
+        <property name="javac.processorpath" value="${javac.classpath}"/>
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+        <condition property="ap.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+            <isfalse value="${annotation.processing.run.all.processors}"/>
+        </condition>
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">
+            <isfalse value="${annotation.processing.enabled}"/>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+        <property name="ap.cmd.line.internal" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
+    <!--
+                ===================
+                COMPILATION SECTION
+                ===================
+            -->
+    <target name="-deps-jar-init" unless="built-jar.properties">
+        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
+        <delete file="${built-jar.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
+        <echo level="warn" message="Cycle detected: addressbook-lib was already built"/>
+    </target>
+    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-jar.properties}" verbose="false"/>
+        <property file="${built-jar.properties}" prefix="already.built.jar."/>
+        <antcall target="-warn-already-built-jar"/>
+        <propertyfile file="${built-jar.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-depend">
+        <pathconvert property="build.generated.subdirs">
+            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="*"/>
+            </dirset>
+        </pathconvert>
+        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+    </target>
+    <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}"/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target if="has.persistence.xml" name="-copy-persistence-xml">
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy todir="${build.classes.dir}/META-INF">
+            <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <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>
+        <j2seproject3:force-recompile/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <!--
+                ====================
+                JAR BUILDING SECTION
+                ====================
+            -->
+    <target depends="init" name="-pre-pre-jar">
+        <dirname file="${dist.jar}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+    </target>
+    <target name="-pre-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+        <touch file="${tmp.manifest.file}" verbose="false"/>
+    </target>
+    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
+    </target>
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="Main-Class" value="${main.class}"/>
+        </manifest>
+    </target>
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="Profile" value="${javac.profile}"/>
+        </manifest>
+    </target>
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
+        <basename file="${application.splash}" property="splashscreen.basename"/>
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
+        </manifest>
+    </target>
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
+        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
+        <echo level="info">To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
+        <j2seproject1:jar manifest="${tmp.manifest.file}"/>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
+            <isset property="main.class.available"/>
+        </condition>
+        <condition else="debug" property="jar.usage.level" value="info">
+            <isset property="main.class.available"/>
+        </condition>
+        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
+    </target>
+    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
+        <delete>
+            <fileset file="${tmp.manifest.file}"/>
+        </delete>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
+    <target name="-post-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                EXECUTION SECTION
+                =================
+            -->
+    <target depends="init,compile" description="Run a main class." name="run">
+        <j2seproject1:java>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <target name="-do-not-recompile">
+        <property name="javac.includes.binary" value=""/>
+    </target>
+    <target depends="init,compile-single" name="run-single">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}"/>
+    </target>
+    <target depends="init,compile-test-single" name="run-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
+    </target>
+    <!--
+                =================
+                DEBUGGING SECTION
+                =================
+            -->
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+        <j2seproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
+    </target>
+    <target depends="init,compile" name="-debug-start-debuggee">
+        <j2seproject3:debug>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+    </target>
+    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}"/>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
+    <target depends="init" name="-pre-debug-fix">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+        <j2seproject1:nbjpdareload/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+    <!--
+                =================
+                PROFILING SECTION
+                =================
+            -->
+    <!--
+                pre NB7.2 profiler integration
+            -->
+    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile/>
+    </target>
+    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
+        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="${profile.class}"/>
+    </target>
+    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </profile>
+    </target>
+    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
+            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+            <jvmarg value="${profiler.info.jvmargs.agent}"/>
+            <jvmarg line="${profiler.info.jvmargs}"/>
+            <test name="${profile.class}"/>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+            <syspropertyset>
+                <propertyref prefix="test-sys-prop."/>
+                <mapper from="test-sys-prop.*" to="*" type="glob"/>
+            </syspropertyset>
+            <formatter type="brief" usefile="false"/>
+            <formatter type="xml"/>
+        </junit>
+    </target>
+    <!--
+                end of pre NB72 profiling section
+            -->
+    <target if="netbeans.home" name="-profile-check">
+        <condition property="profiler.configured">
+            <or>
+                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
+                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
+            </or>
+        </condition>
+    </target>
+    <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
+        <startprofiler/>
+        <antcall target="run"/>
+    </target>
+    <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <startprofiler/>
+        <antcall target="run-single"/>
+    </target>
+    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
+    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <startprofiler/>
+        <antcall target="test-single"/>
+    </target>
+    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <startprofiler/>
+        <antcal target="run-test-with-main"/>
+    </target>
+    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <startprofiler/>
+        <antcall target="run-applet"/>
+    </target>
+    <!--
+                ===============
+                JAVADOC SECTION
+                ===============
+            -->
+    <target depends="init" if="have.sources" name="-javadoc-build">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
+            <and>
+                <isset property="endorsed.classpath.cmd.line.arg"/>
+                <not>
+                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <condition else="" property="bug5101868workaround" value="*.java">
+            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
+        </condition>
+        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <classpath>
+                <path path="${javac.classpath}"/>
+            </classpath>
+            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/*.java"/>
+                <exclude name="*.java"/>
+            </fileset>
+            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
+        </javadoc>
+        <copy todir="${dist.javadoc.dir}">
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/doc-files/**"/>
+            </fileset>
+        </copy>
+    </target>
+    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+    <!--
+                =========================
+                TEST COMPILATION SECTION
+                =========================
+            -->
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+        <mkdir dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-test-depend">
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+    </target>
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <!--
+                =======================
+                TEST EXECUTION SECTION
+                =======================
+            -->
+    <target depends="init" if="have.tests" name="-pre-test-run">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
+        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
+        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
+        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
+    <!--
+                =======================
+                TEST DEBUGGING SECTION
+                =======================
+            -->
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
+        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
+    </target>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+    </target>
+    <target depends="init,compile-test-single,-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="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+    <!--
+                =========================
+                APPLET EXECUTION SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" name="run-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject1:java classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <!--
+                =========================
+                APPLET DEBUGGING  SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject3:debug classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+    <!--
+                ===============
+                CLEANUP SECTION
+                ===============
+            -->
+    <target name="-deps-clean-init" unless="built-clean.properties">
+        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
+        <delete file="${built-clean.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
+        <echo level="warn" message="Cycle detected: addressbook-lib was already built"/>
+    </target>
+    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-clean.properties}" verbose="false"/>
+        <property file="${built-clean.properties}" prefix="already.built.clean."/>
+        <antcall target="-warn-already-built-clean"/>
+        <propertyfile file="${built-clean.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init" name="-do-clean">
+        <delete dir="${build.dir}"/>
+        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target name="-check-call-dep">
+        <property file="${call.built.properties}" prefix="already.built."/>
+        <condition property="should.call.dep">
+            <and>
+                <not>
+                    <isset property="already.built.${call.subproject}"/>
+                </not>
+                <available file="${call.script}"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
+        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
+            <propertyset>
+                <propertyref prefix="transfer."/>
+                <mapper from="transfer.*" to="*" type="glob"/>
+            </propertyset>
+        </ant>
+    </target>
+</project>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index a91cda3..01bd009 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=3172ff94
 build.xml.stylesheet.CRC32=8064a381@1.75.2.48
 # 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.
-nbproject/build-impl.xml.data.CRC32=b3f3ee43
-nbproject/build-impl.xml.script.CRC32=96150614
+nbproject/build-impl.xml.data.CRC32=5c7b88c5
+nbproject/build-impl.xml.script.CRC32=e767927c
 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 4628342..c001750 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://www.netbeans.org/ns/project/1">
-	<type>org.netbeans.modules.java.j2seproject</type>
-	<configuration>
-		<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-			<name>addressbook-lib</name>
-			<source-roots>
-				<root id="src.dir"/>
-			</source-roots>
-			<test-roots>
-				<root id="test.src.dir"/>
-			</test-roots>
-		</data>
-		<libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
-			<definitions>.\lib\nblibraries.properties</definitions>
-		</libraries>
-	</configuration>
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>addressbook-lib</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+            <definitions>.\lib\nblibraries.properties</definitions>
+        </libraries>
+    </configuration>
 </project>
diff --git a/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java b/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java
index 724b123..b86baf1 100644
--- a/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java
+++ b/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java
@@ -46,7 +46,8 @@ import org.mxchange.jusercore.model.user.User;
 @Table (name = "addressbooks")
 @NamedQueries (
 		{
-			@NamedQuery (name = "AllUsersAddressbooks", query = "SELECT a FROM addressbooks AS a WHERE a.addressbookUser = :param ORDER BY a.addressbookId ASC")
+			@NamedQuery (name = "AllUsersAddressbooks", query = "SELECT a FROM addressbooks AS a WHERE a.addressbookUser = :param ORDER BY a.addressbookId ASC"),
+			@NamedQuery(name = "SearchUserAddressbookName", query = "SELECT a FROM addressbooks AS a WHERE a.addressbookUser = :user AND LOWER(a.addressbookName) LIKE LOWER(:name)")
 		}
 )
 public class UserAddressbook implements Addressbook, Comparable<Addressbook> {
@@ -94,12 +95,22 @@ public class UserAddressbook implements Addressbook, Comparable<Addressbook> {
 	@Column (name = "addressbook_name", length = 50, nullable = false)
 	private String addressbookName;
 
+	/**
+	 * Default protected constructor
+	 */
+	protected UserAddressbook () {
+	}
+
 	/**
 	 * Public constructor with address book name
 	 * <p>
 	 * @param addressbookName Address book name
 	 */
 	public UserAddressbook (final String addressbookName) {
+		// Call default constructor
+		this();
+
+		// Set name
 		this.addressbookName = addressbookName;
 	}
 
diff --git a/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java b/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java
index a2d543d..f730fe5 100644
--- a/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java
+++ b/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java
@@ -27,7 +27,6 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
@@ -89,7 +88,7 @@ public class UserAddressbookEntry implements AddressbookEntry, Comparable<Addres
 	 * Connection to table "users" (who has added this entry)
 	 */
 	@JoinColumn (name = "addressbook_entry_added_user_id", updatable = false)
-	@OneToMany (targetEntity = LoginUser.class, cascade = CascadeType.ALL)
+	@ManyToOne (targetEntity = LoginUser.class, cascade = CascadeType.ALL)
 	private List<User> addressbookEntryUserAddedList;
 
 	/**
diff --git a/src/org/mxchange/addressbook/validator/names/AddressbookNameValidator.java b/src/org/mxchange/addressbook/validator/names/AddressbookNameValidator.java
index 15ef2bc..67007bb 100644
--- a/src/org/mxchange/addressbook/validator/names/AddressbookNameValidator.java
+++ b/src/org/mxchange/addressbook/validator/names/AddressbookNameValidator.java
@@ -42,7 +42,7 @@ public class AddressbookNameValidator extends BaseStringValidator implements Val
 		// All accepted, required fields
 		String[] requiredFileds = {"addressbookName"}; //NOI18N
 
-		// Pre-validation (e.g. not null, not a string, empty string ...)
+		// Pre-validation (example: not null, not a string, empty string ...)
 		super.preValidate(context, component, value, requiredFileds);
 
 		// Trace message
-- 
2.39.5