From b3dbfc1780dea6e4e7074bfb7c3ecaab4ae4530e Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 9 Oct 2015 21:37:34 +0200
Subject: [PATCH] Auto-formatted whole project

---
 build.xml                |   44 +-
 nbproject/ant-deploy.xml |  212 +++----
 nbproject/build-impl.xml | 1302 +++++++++++++++++++-------------------
 nbproject/project.xml    |  120 ++--
 4 files changed, 839 insertions(+), 839 deletions(-)

diff --git a/build.xml b/build.xml
index a34c7b7..d26bf60 100644
--- a/build.xml
+++ b/build.xml
@@ -12,21 +12,21 @@
     <import file="nbproject/build-impl.xml"/>
     <!--
 
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      pre-init:                 called before initialization of project properties 
-      post-init:                called after initialization of project properties 
-      pre-compile:              called before javac compilation 
-      post-compile:             called after javac compilation 
-      pre-dist:                 called before archive building 
-      post-dist:                called after archive building 
-      post-clean:               called after cleaning build products 
+    There exist several targets which are by default empty and which can be
+    used for execution of your tasks. These targets are usually executed
+    before and after some main targets. They are:
+
+      pre-init:                 called before initialization of project properties
+      post-init:                called after initialization of project properties
+      pre-compile:              called before javac compilation
+      post-compile:             called after javac compilation
+      pre-dist:                 called before archive building
+      post-dist:                called after archive building
+      post-clean:               called after cleaning build products
       pre-run-deploy:           called before deploying
       post-run-deploy:          called after deploying
 
-    Example of pluging an obfuscator after the compilation could look like 
+    Example of pluging an obfuscator after the compilation could look like
 
         <target name="post-compile">
             <obfuscate>
@@ -34,17 +34,17 @@
             </obfuscate>
         </target>
 
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
+    For list of available properties check the imported
+    nbproject/build-impl.xml file.
 
 
     Other way how to customize the build is by overriding existing main targets.
-    The target of interest are: 
+    The target of interest are:
 
       do-dist:                archive building
-      run:                    execution of project 
+      run:                    execution of project
 
-    Example of overriding the target for project execution could look like 
+    Example of overriding the target for project execution could look like
 
         <target name="run" depends="<PROJNAME>-impl.jar">
             <exec dir="bin" executable="launcher.exe">
@@ -52,10 +52,10 @@
             </exec>
         </target>
 
-    Notice that overridden target depends on jar target and not only on 
-    compile target as regular run target does. Again, for list of available 
-    properties which you can use check the target you are overriding in 
-    nbproject/build-impl.xml file. 
+    Notice that overridden target depends on jar target and not only on
+    compile target as regular run target does. Again, for list of available
+    properties which you can use check the target you are overriding in
+    nbproject/build-impl.xml file.
 
-    -->
+	-->
 </project>
diff --git a/nbproject/ant-deploy.xml b/nbproject/ant-deploy.xml
index 2d5f877..3c01560 100644
--- a/nbproject/ant-deploy.xml
+++ b/nbproject/ant-deploy.xml
@@ -1,111 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="-deploy-ant" basedir=".">
-    <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
-        <property file="${deploy.ant.properties.file}" />
-        <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
-        <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
-        <available file="${deploy.ant.resource.dir}" property="has.setup"/>
-        <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
-    </target>
-    
-    <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
-        <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
-        <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
-        <!-- The doctype triggers resolution which can fail -->
-        <replace file="${temp.sun.web}">
-            <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
-            <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
-        </replace>
-        <replace file="${temp.sun.web}">
-            <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
-            <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
-        </replace>
-        <xmlproperty file="${temp.sun.web}" validate="false">
-        </xmlproperty>    
-        <delete file="${temp.sun.web}"/>
-        <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
-            <isset property="sun-web-app.context-root"/>
-        </condition>
-        <condition property="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
-            <isset property="sun-web-app.context-root"/>
-        </condition>
-    </target>
-    <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
-        <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
-        <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
-        <!-- The doctype triggers resolution which can fail -->
-        <replace file="${temp.gf.web}">
-            <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
-            <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
-        </replace>
-        <replace file="${temp.gf.web}">
-            <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
-            <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
-        </replace>
-        <xmlproperty file="${temp.gf.web}" validate="false">
-        </xmlproperty>
-        <delete file="${temp.gf.web}"/>
-        <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
-            <isset property="glassfish-web-app.context-root"/>
-        </condition>
-        <condition property="deploy.context.root.argument" value="&amp;contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
-            <isset property="glassfish-web-app.context-root"/>
-        </condition>
-    </target>
-    <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
-        <property name="deploy.context.root.argument" value=""/>
-    </target>
-    <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
-        <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
-        <mkdir dir="${gfv3.resources.dir}"/>
-        <mkdir dir="${gfv3.resources.dir}/META-INF"/>
-        <copy todir="${gfv3.resources.dir}/META-INF">
-            <fileset dir="${deploy.ant.resource.dir}"/>
-        </copy>
-        <jar destfile="${deploy.ant.archive}" update="true">
-            <fileset dir="${gfv3.resources.dir}"/>
-        </jar>
-        <delete dir="${gfv3.resources.dir}"/>
-    </target>
-    <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
-        <antcall target="-deploy-without-pw"/>
-        <antcall target="-deploy-with-pw"/>
-    </target>
+	<target name="-init-cl-deployment-env" if="deploy.ant.enabled">
+		<property file="${deploy.ant.properties.file}" />
+		<available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
+		<available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
+		<available file="${deploy.ant.resource.dir}" property="has.setup"/>
+		<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+		<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
+	</target>
 
-    <target name="-deploy-without-pw" unless="gfv3.password">
-        <echo message="Deploying ${deploy.ant.archive}"/>
-        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
-        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
-            dest="${gfv3.results.file}"/>
-        <delete file="${gfv3.results.file}"/>    
-    </target>
-    <target name="-deploy-with-pw" if="gfv3.password">
-        <echo message="Deploying ${deploy.ant.archive}"/>
-        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
-        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
-            dest="${gfv3.results.file}"/>
-        <delete file="${gfv3.results.file}"/>
-    </target>
-    <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
-        <antcall target="-undeploy-without-pw"/>
-        <antcall target="-undeploy-with-pw"/>
-    </target>
+	<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
+		<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
+		<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
+		<!-- The doctype triggers resolution which can fail -->
+		<replace file="${temp.sun.web}">
+			<replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
+			<replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
+		</replace>
+		<replace file="${temp.sun.web}">
+			<replacetoken><![CDATA[<sun-web-app]]></replacetoken>
+			<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
+		</replace>
+		<xmlproperty file="${temp.sun.web}" validate="false">
+		</xmlproperty>
+		<delete file="${temp.sun.web}"/>
+		<condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
+			<isset property="sun-web-app.context-root"/>
+		</condition>
+		<condition property="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
+			<isset property="sun-web-app.context-root"/>
+		</condition>
+	</target>
+	<target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
+		<tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
+		<copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
+		<!-- The doctype triggers resolution which can fail -->
+		<replace file="${temp.gf.web}">
+			<replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
+			<replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
+		</replace>
+		<replace file="${temp.gf.web}">
+			<replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
+			<replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
+		</replace>
+		<xmlproperty file="${temp.gf.web}" validate="false">
+		</xmlproperty>
+		<delete file="${temp.gf.web}"/>
+		<condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
+			<isset property="glassfish-web-app.context-root"/>
+		</condition>
+		<condition property="deploy.context.root.argument" value="&amp;contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
+			<isset property="glassfish-web-app.context-root"/>
+		</condition>
+	</target>
+	<target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
+		<property name="deploy.context.root.argument" value=""/>
+	</target>
+	<target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
+		<tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
+		<mkdir dir="${gfv3.resources.dir}"/>
+		<mkdir dir="${gfv3.resources.dir}/META-INF"/>
+		<copy todir="${gfv3.resources.dir}/META-INF">
+			<fileset dir="${deploy.ant.resource.dir}"/>
+		</copy>
+		<jar destfile="${deploy.ant.archive}" update="true">
+			<fileset dir="${gfv3.resources.dir}"/>
+		</jar>
+		<delete dir="${gfv3.resources.dir}"/>
+	</target>
+	<target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
+		<antcall target="-deploy-without-pw"/>
+		<antcall target="-deploy-with-pw"/>
+	</target>
 
-    <target name="-undeploy-without-pw" unless="gfv3.password">
-        <echo message="Undeploying ${deploy.ant.archive}"/>
-        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
-            dest="${gfv3.results.file}"/>
-        <delete file="${gfv3.results.file}"/>    
-    </target>
-    <target name="-undeploy-with-pw" if="gfv3.password">
-        <echo message="Undeploying ${deploy.ant.archive}"/>
-        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
-            dest="${gfv3.results.file}"/>
-        <delete file="${gfv3.results.file}"/>
-    </target>
+	<target name="-deploy-without-pw" unless="gfv3.password">
+		<echo message="Deploying ${deploy.ant.archive}"/>
+		<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+		<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
+		<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
+			 dest="${gfv3.results.file}"/>
+		<delete file="${gfv3.results.file}"/>
+	</target>
+	<target name="-deploy-with-pw" if="gfv3.password">
+		<echo message="Deploying ${deploy.ant.archive}"/>
+		<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+		<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
+		<get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
+			 dest="${gfv3.results.file}"/>
+		<delete file="${gfv3.results.file}"/>
+	</target>
+	<target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
+		<antcall target="-undeploy-without-pw"/>
+		<antcall target="-undeploy-with-pw"/>
+	</target>
+
+	<target name="-undeploy-without-pw" unless="gfv3.password">
+		<echo message="Undeploying ${deploy.ant.archive}"/>
+		<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+		<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
+			 dest="${gfv3.results.file}"/>
+		<delete file="${gfv3.results.file}"/>
+	</target>
+	<target name="-undeploy-with-pw" if="gfv3.password">
+		<echo message="Undeploying ${deploy.ant.archive}"/>
+		<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+		<get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
+			 dest="${gfv3.results.file}"/>
+		<delete file="${gfv3.results.file}"/>
+	</target>
 </project>
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 8943992..bbe3776 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -15,656 +15,656 @@ is divided into following sections:
 
 -->
 <project xmlns:ear2="http://www.netbeans.org/ns/j2ee-earproject/2" basedir=".." default="default" name="addressbook-impl">
-    <import file="ant-deploy.xml"/>
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <target depends="dist" description="Build 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/private.properties"/>
-    </target>
-    <target depends="pre-init,init-private" name="init-userdir">
-        <property location="${netbeans.user}/build.properties" name="user.properties.file"/>
-    </target>
-    <target depends="pre-init,init-private,init-userdir" name="init-user">
-        <property file="${user.properties.file}"/>
-    </target>
-    <target depends="pre-init,init-private,init-userdir,init-user" name="init-project">
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="pre-init,init-private,init-userdir,init-user,init-project" name="do-init">
-        <!-- 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"/>
-        <condition property="do.compile.jsps">
-            <istrue value="${compile.jsps}"/>
-        </condition>
-        <condition property="do.display.browser.old">
-            <and>
-                <istrue value="${display.browser}"/>
-                <isset property="client.module.uri"/>
-                <not>
-                    <isset property="app.client"/>
-                </not>
-                <not>
-                    <isset property="browser.context"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="do.display.browser">
-            <and>
-                <istrue value="${display.browser}"/>
-                <isset property="client.module.uri"/>
-                <not>
-                    <isset property="app.client"/>
-                </not>
-                <isset property="browser.context"/>
-            </and>
-        </condition>
-        <available file="${meta.inf}/MANIFEST.MF" property="has.custom.manifest"/>
-        <!--
-                    Variables needed to support directory deployment.
-                -->
-        <condition property="do.package.with.custom.manifest.not.directory.deploy">
-            <and>
-                <isset property="has.custom.manifest"/>
-                <isfalse value="${directory.deployment.supported}"/>
-            </and>
-        </condition>
-        <condition property="do.package.without.custom.manifest.not.directory.deploy">
-            <and>
-                <not>
-                    <isset property="has.custom.manifest"/>
-                </not>
-                <isfalse value="${directory.deployment.supported}"/>
-            </and>
-        </condition>
-        <condition property="do.package.not.directory.deploy">
-            <isfalse value="${directory.deployment.supported}"/>
-        </condition>
-        <!--End Variables needed to support directory deployment.-->
-        <condition else="" property="j2ee.appclient.mainclass.tool.param" value="-mainclass ${main.class}">
-            <and>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="" property="j2ee.appclient.jvmoptions.param" value="${j2ee.appclient.jvmoptions}">
-            <and>
-                <isset property="j2ee.appclient.jvmoptions"/>
-                <not>
-                    <equals arg1="${j2ee.appclient.jvmoptions}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="" property="application.args.param" value="${application.args}">
-            <and>
-                <isset property="application.args"/>
-                <not>
-                    <equals arg1="${application.args}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="can.debug.appclient">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="app.client"/>
-            </and>
-        </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"/>
-                <length length="0" string="${endorsed.classpath}" when="greater"/>
-            </and>
-        </condition>
-    </target>
-    <target depends="init" name="-init-cos">
-        <condition else="false" property="build.deploy.on.save">
-            <or>
-                <istrue value="${j2ee.deploy.on.save}"/>
-                <istrue value="${j2ee.compile.on.save}"/>
-            </or>
-        </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-userdir,init-user,init-project,do-init" name="init-check">
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="build.generated.dir">Must set build.generated.dir</fail>
-        <fail unless="dist.dir">Must set dist.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-taskdefs">
-        <fail unless="libs.CopyLibs.classpath">
-The libs.CopyLibs.classpath property is not set up.
-This property must point to 
-org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at 
+	<import file="ant-deploy.xml"/>
+	<fail message="Please build using Ant 1.7.1 or higher.">
+		<condition>
+			<not>
+				<antversion atleast="1.7.1"/>
+			</not>
+		</condition>
+	</fail>
+	<target depends="dist" description="Build 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/private.properties"/>
+	</target>
+	<target depends="pre-init,init-private" name="init-userdir">
+		<property location="${netbeans.user}/build.properties" name="user.properties.file"/>
+	</target>
+	<target depends="pre-init,init-private,init-userdir" name="init-user">
+		<property file="${user.properties.file}"/>
+	</target>
+	<target depends="pre-init,init-private,init-userdir,init-user" name="init-project">
+		<property file="nbproject/project.properties"/>
+	</target>
+	<target depends="pre-init,init-private,init-userdir,init-user,init-project" name="do-init">
+		<!-- 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"/>
+		<condition property="do.compile.jsps">
+			<istrue value="${compile.jsps}"/>
+		</condition>
+		<condition property="do.display.browser.old">
+			<and>
+				<istrue value="${display.browser}"/>
+				<isset property="client.module.uri"/>
+				<not>
+					<isset property="app.client"/>
+				</not>
+				<not>
+					<isset property="browser.context"/>
+				</not>
+			</and>
+		</condition>
+		<condition property="do.display.browser">
+			<and>
+				<istrue value="${display.browser}"/>
+				<isset property="client.module.uri"/>
+				<not>
+					<isset property="app.client"/>
+				</not>
+				<isset property="browser.context"/>
+			</and>
+		</condition>
+		<available file="${meta.inf}/MANIFEST.MF" property="has.custom.manifest"/>
+		<!--
+			Variables needed to support directory deployment.
+		-->
+		<condition property="do.package.with.custom.manifest.not.directory.deploy">
+			<and>
+				<isset property="has.custom.manifest"/>
+				<isfalse value="${directory.deployment.supported}"/>
+			</and>
+		</condition>
+		<condition property="do.package.without.custom.manifest.not.directory.deploy">
+			<and>
+				<not>
+					<isset property="has.custom.manifest"/>
+				</not>
+				<isfalse value="${directory.deployment.supported}"/>
+			</and>
+		</condition>
+		<condition property="do.package.not.directory.deploy">
+			<isfalse value="${directory.deployment.supported}"/>
+		</condition>
+		<!--End Variables needed to support directory deployment.-->
+		<condition else="" property="j2ee.appclient.mainclass.tool.param" value="-mainclass ${main.class}">
+			<and>
+				<isset property="main.class"/>
+				<not>
+					<equals arg1="${main.class}" arg2="" trim="true"/>
+				</not>
+			</and>
+		</condition>
+		<condition else="" property="j2ee.appclient.jvmoptions.param" value="${j2ee.appclient.jvmoptions}">
+			<and>
+				<isset property="j2ee.appclient.jvmoptions"/>
+				<not>
+					<equals arg1="${j2ee.appclient.jvmoptions}" arg2="" trim="true"/>
+				</not>
+			</and>
+		</condition>
+		<condition else="" property="application.args.param" value="${application.args}">
+			<and>
+				<isset property="application.args"/>
+				<not>
+					<equals arg1="${application.args}" arg2="" trim="true"/>
+				</not>
+			</and>
+		</condition>
+		<condition property="can.debug.appclient">
+			<and>
+				<isset property="netbeans.home"/>
+				<isset property="app.client"/>
+			</and>
+		</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"/>
+				<length length="0" string="${endorsed.classpath}" when="greater"/>
+			</and>
+		</condition>
+	</target>
+	<target depends="init" name="-init-cos">
+		<condition else="false" property="build.deploy.on.save">
+			<or>
+				<istrue value="${j2ee.deploy.on.save}"/>
+				<istrue value="${j2ee.compile.on.save}"/>
+			</or>
+		</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-userdir,init-user,init-project,do-init" name="init-check">
+		<fail unless="build.dir">Must set build.dir</fail>
+		<fail unless="build.generated.dir">Must set build.generated.dir</fail>
+		<fail unless="dist.dir">Must set dist.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-taskdefs">
+		<fail unless="libs.CopyLibs.classpath">
+			The libs.CopyLibs.classpath property is not set up.
+			This property must point to
+			org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
+			of NetBeans IDE installation and is usually located at
 &lt;netbeans_installation&gt;/java&lt;version&gt;/ant/extra folder.
-Either open the project in the IDE and make sure CopyLibs library
-exists or setup the property manually. For example like this:
- ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar
-                </fail>
-        <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
-    </target>
-    <!--
-                pre NB7.2 profiling section; consider it deprecated
-            -->
-    <target depends="-profile-pre-init, init, -profile-post-init, -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 depends="-profile-pre-init, init, -profile-post-init" 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="pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check,-init-taskdefs" name="init"/>
-    <!--
-    COMPILATION SECTION
-    -->
-    <target depends="init" name="deps-jar" unless="no.deps">
-        <condition property="build.deploy.on.save" value="false">
-            <not>
-                <isset property="build.deploy.on.save"/>
-            </not>
-        </condition>
-    </target>
-    <target depends="init" name="deps-j2ee-archive" unless="no.deps">
-        <condition property="build.deploy.on.save" value="false">
-            <not>
-                <isset property="build.deploy.on.save"/>
-            </not>
-        </condition>
-        <ant antfile="${project.addressbook-ejb}/build.xml" inheritall="false" target="dist-ear">
-            <property location="${build.dir}" name="dist.ear.dir"/>
-            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
-        </ant>
-        <ant antfile="${project.jcontacts-ejb}/build.xml" inheritall="false" target="dist-ear">
-            <property location="${build.dir}" name="dist.ear.dir"/>
-            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
-        </ant>
-        <ant antfile="${project.jcore-logger-ejb}/build.xml" inheritall="false" target="dist-ear">
-            <property location="${build.dir}" name="dist.ear.dir"/>
-            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
-        </ant>
-        <ant antfile="${project.juser-ejb}/build.xml" inheritall="false" target="dist-ear">
-            <property location="${build.dir}" name="dist.ear.dir"/>
-            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
-        </ant>
-    </target>
-    <target depends="init,deps-jar,deps-j2ee-archive" name="pre-pre-compile"/>
-    <target name="pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,pre-pre-compile,pre-compile,-do-compile-deps" name="do-compile">
-        <copy todir="${build.dir}/META-INF">
-            <fileset dir="${meta.inf}"/>
-        </copy>
-    </target>
-    <target depends="init,deps-jar,pre-pre-compile,pre-compile" name="-do-compile-deps">
-        <copyfiles files="${reference.jcore-logger-ejb.dist-ear}" todir="${build.dir}//"/>
-        <copyfiles files="${reference.addressbook-ejb.dist-ear}" todir="${build.dir}//"/>
-        <copyfiles files="${reference.jcontacts-ejb.dist-ear}" todir="${build.dir}//"/>
-        <copyfiles files="${reference.juser-ejb.dist-ear}" todir="${build.dir}//"/>
-    </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,pre-pre-compile,pre-compile,do-compile,post-compile" description="Compile project." name="compile"/>
-    <!--
-                DIST BUILDING SECTION
-            -->
-    <target name="pre-dist">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,pre-dist" name="do-dist-without-manifest" unless="has.custom.manifest">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-        <jar compress="${jar.compress}" jarfile="${dist.jar}">
-            <fileset dir="${build.dir}"/>
-        </jar>
-    </target>
-    <target depends="init,compile,pre-dist" if="has.custom.manifest" name="do-dist-with-manifest">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-        <jar compress="${jar.compress}" jarfile="${dist.jar}" manifest="${meta.inf}/MANIFEST.MF">
-            <fileset dir="${build.dir}"/>
-        </jar>
-    </target>
-    <!--
-                TARGETS NEEDED TO SUPPORT DIRECTORY DEPLOYMENT
-            -->
-    <target depends="init,compile,pre-dist" if="do.package.without.custom.manifest.not.directory.deploy" name="-do-tmp-dist-without-manifest">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-        <jar compress="${jar.compress}" jarfile="${dist.jar}">
-            <fileset dir="${build.dir}"/>
-        </jar>
-    </target>
-    <target depends="init,compile,pre-dist" if="do.package.with.custom.manifest.not.directory.deploy" name="-do-tmp-dist-with-manifest">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-        <jar compress="${jar.compress}" jarfile="${dist.jar}" manifest="${meta.inf}/MANIFEST.MF">
-            <fileset dir="${build.dir}"/>
-        </jar>
-    </target>
-    <target depends="init,compile,pre-dist,-do-tmp-dist-without-manifest,-do-tmp-dist-with-manifest" name="-do-dist-directory-deploy"/>
-    <target depends="init,compile,pre-dist,-do-dist-directory-deploy,post-dist" description="Build distribution (JAR) - if directory deployment is not supported." name="dist-directory-deploy"/>
-    <!--
-                END TARGETS NEEDED TO SUPPORT DIRECTORY DEPLOYMENT
-            -->
-    <target name="post-dist">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,pre-dist,do-dist-without-manifest,do-dist-with-manifest,post-dist" description="Build distribution (JAR)." name="dist"/>
-    <!--
-    EXECUTION SECTION
-    -->
-    <target depends="run-deploy,run-display-browser,run-ac" description="Deploy to server." name="run"/>
-    <target name="pre-run-deploy">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="post-run-deploy">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-pre-nbmodule-run-deploy">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
-    </target>
-    <target name="-post-nbmodule-run-deploy">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
-    </target>
-    <target name="-run-deploy-am" unless="no.deps">
-        <!-- Task to deploy to the Access Manager runtime. -->
-        <ant antfile="${project.addressbook-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
-        <ant antfile="${project.jcontacts-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
-        <ant antfile="${project.jcore-logger-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
-        <ant antfile="${project.juser-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
-    </target>
-    <target depends="-init-cos,dist-directory-deploy,pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,post-run-deploy" name="run-deploy"/>
-    <target if="netbeans.home" name="-run-deploy-nb">
-        <nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
-    </target>
-    <target name="-init-deploy-ant" unless="netbeans.home">
-        <property name="deploy.ant.archive" value="${dist.jar}"/>
-        <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
-        <property name="deploy.ant.enabled" value="true"/>
-    </target>
-    <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
-    <target if="netbeans.home" name="-run-undeploy-nb">
-        <fail message="Undeploy is not supported from within the IDE"/>
-    </target>
-    <target depends="dist" name="verify">
-        <nbverify file="${dist.jar}"/>
-    </target>
-    <target depends="run-deploy,-init-display-browser,-display-browser-nb-old,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
-    <target if="do.display.browser" name="-init-display-browser">
-        <condition property="do.display.browser.nb.old">
-            <and>
-                <isset property="netbeans.home"/>
-                <not>
-                    <isset property="browser.context"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="do.display.browser.nb">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="browser.context"/>
-            </and>
-        </condition>
-        <condition property="do.display.browser.cl">
-            <and>
-                <isset property="deploy.ant.enabled"/>
-                <isset property="deploy.ant.client.url"/>
-            </and>
-        </condition>
-    </target>
-    <target if="do.display.browser.nb.old" name="-display-browser-nb-old">
-        <nbbrowse url="${client.url}"/>
-    </target>
-    <target if="do.display.browser.nb" name="-display-browser-nb">
-        <nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
-    </target>
-    <target if="do.display.browser.cl" name="-get-browser" unless="browser">
-        <condition property="browser" value="rundll32">
-            <os family="windows"/>
-        </condition>
-        <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
-            <os family="windows"/>
-        </condition>
-        <condition property="browser" value="/usr/bin/open">
-            <os family="mac"/>
-        </condition>
-        <property environment="env"/>
-        <condition property="browser" value="${env.BROWSER}">
-            <isset property="env.BROWSER"/>
-        </condition>
-        <condition property="browser" value="/usr/bin/firefox">
-            <available file="/usr/bin/firefox"/>
-        </condition>
-        <condition property="browser" value="/usr/local/firefox/firefox">
-            <available file="/usr/local/firefox/firefox"/>
-        </condition>
-        <condition property="browser" value="/usr/bin/mozilla">
-            <available file="/usr/bin/mozilla"/>
-        </condition>
-        <condition property="browser" value="/usr/local/mozilla/mozilla">
-            <available file="/usr/local/mozilla/mozilla"/>
-        </condition>
-        <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
-            <available file="/usr/sfw/lib/firefox/firefox"/>
-        </condition>
-        <condition property="browser" value="/opt/csw/bin/firefox">
-            <available file="/opt/csw/bin/firefox"/>
-        </condition>
-        <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
-            <available file="/usr/sfw/lib/mozilla/mozilla"/>
-        </condition>
-        <condition property="browser" value="/opt/csw/bin/mozilla">
-            <available file="/opt/csw/bin/mozilla"/>
-        </condition>
-    </target>
-    <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
-        <fail unless="browser">
-            Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
-        </fail>
-        <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
-        <echo>Launching ${browse.url}</echo>
-        <exec executable="${browser}" spawn="true">
-            <arg line="${browser.args} ${browse.url}"/>
-        </exec>
-    </target>
-    <target if="app.client" name="run-ac">
-        <antcall target="-run-ac"/>
-    </target>
-    <target depends="init,-as-retrieve-option-workaround,-init-run-macros,-run-appclient-pregfv3,-run-appclient" name="-run-ac"/>
-    <target if="j2ee.appclient.tool.args" name="-run-appclient-pregfv3">
-        <ear2:run-appclient-pregfv3/>
-    </target>
-    <target name="-run-appclient" unless="j2ee.appclient.tool.args">
-        <ear2:run-appclient subprojectname="${app.client}"/>
-    </target>
-    <target if="j2ee.appclient.mainclass.args" name="-as-retrieve-option-workaround" unless="j2ee.clientName">
-        <property name="client.jar" value="${dist.dir}/addressbookClient.jar"/>
-        <sleep seconds="3"/>
-        <copy failonerror="false" file="${wa.copy.client.jar.from}/addressbook/addressbookClient.jar" todir="${dist.dir}"/>
-        <copy failonerror="false" flatten="true" todir="${dist.dir}/">
-            <fileset dir="${wa.copy.client.jar.from}/addressbook" includes="**/addressbookClient.jar"/>
-        </copy>
-        <copy flatten="true" todir="${dist.dir}/addressbookClient">
-            <fileset dir="${wa.copy.client.jar.from}/addressbook" includes="**/*.*ar"/>
-        </copy>
-        <copy failonerror="false" flatten="false" todir="${dist.dir}/addressbookClient">
-            <fileset dir="${dist.dir}/gfdeploy/addressbook" includes="**/*.jar"/>
-        </copy>
-    </target>
-    <target depends="init" name="-init-run-macros">
-        <macrodef name="run-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
-            <attribute name="subprojectname"/>
-            <attribute default="${application.args.param}" name="args"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java dir="${basedir}" fork="true" jar="${client.jar}">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg line="${j2ee.appclient.tool.jvmoptions}${client.jar},arg=-name,arg=@{subprojectname}"/>
-                    <jvmarg line="${j2ee.appclient.jvmoptions.param}"/>
-                    <arg line="@{args}"/>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-        <macrodef name="run-appclient-pregfv3" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="${j2ee.appclient.tool.mainclass}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg line="${j2ee.appclient.tool.jvmoptions}"/>
-                    <jvmarg line="${j2ee.appclient.jvmoptions.param}"/>
-                    <arg line="${j2ee.appclient.tool.args}"/>
-                    <arg line="-client ${client.jar}"/>
-                    <arg line="${j2ee.appclient.mainclass.tool.param}"/>
-                    <arg line="${application.args.param}"/>
-                    <classpath>
-                        <path path="${j2ee.platform.classpath}:${j2ee.appclient.tool.runtime}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <!--
-    DEBUGGING SECTION
-    -->
-    <target depends="run-debug,run-debug-appclient" description="Deploy to server." name="debug"/>
-    <target depends="dist" description="Debug project in IDE." if="netbeans.home" name="run-debug" unless="app.client">
-        <nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="true"/>
-        <antcall target="connect-debugger"/>
-        <antcall target="debug-display-browser-old"/>
-        <antcall target="debug-display-browser"/>
-    </target>
-    <target name="connect-debugger" unless="is.debugged">
-        <condition property="listeningcp" value="sourcepath">
-            <istrue value="${j2ee.compile.on.save}"/>
-        </condition>
-        <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" listeningcp="${listeningcp}" name="${jpda.host}:${jpda.address}" transport="${jpda.transport}">
-            <classpath>
-                <path path="${debug.classpath}"/>
-                <fileset dir="${build.dir}" includes="lib/*.jar"/>
-            </classpath>
-            <sourcepath>
-                <path path="${ear.docbase.dirs}"/>
-            </sourcepath>
-        </nbjpdaconnect>
-    </target>
-    <target if="do.display.browser.old" name="debug-display-browser-old">
-        <nbbrowse url="${client.url}"/>
-    </target>
-    <target if="do.display.browser" name="debug-display-browser">
-        <nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
-    </target>
-    <target if="can.debug.appclient" name="run-debug-appclient">
-        <antcall target="-run-debug-appclient"/>
-    </target>
-    <target depends="init,-init-debug-args,-debug-appclient-deploy,-as-retrieve-option-workaround,-init-debug-macros,-debug-appclient-start-nbjpda,-debug-appclient-pregfv3,-debug-appclient,connect-debugger" name="-run-debug-appclient"/>
-    <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>
-    </target>
-    <target depends="init,-init-debug-args,-as-retrieve-option-workaround,-init-run-macros" name="-init-debug-macros">
-        <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-appclient" value="${debug.transport}">
-            <isset property="debug.transport"/>
-        </condition>
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address.appclient" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport-appclient}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="debug-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
-            <attribute name="subprojectname"/>
-            <sequential>
-                <ear2:run-appclient subprojectname="@{subprojectname}">
-                    <customize>
-                        <jvmarg value="-Xrunjdwp:transport=${debug-transport-appclient},address=${jpda.address.appclient}"/>
-                        <jvmarg line="${debug-args-line}"/>
-                    </customize>
-                </ear2:run-appclient>
-            </sequential>
-        </macrodef>
-        <macrodef name="debug-appclient-pregfv3" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
-            <sequential>
-                <ear2:run-appclient-pregfv3>
-                    <customize>
-                        <jvmarg value="-Xrunjdwp:transport=${debug-transport-appclient},address=${jpda.address.appclient}"/>
-                        <jvmarg line="${debug-args-line}"/>
-                    </customize>
-                </ear2:run-appclient-pregfv3>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-debug-appclient-deploy">
-        <nbstartserver debugmode="true"/>
-        <nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="true"/>
-    </target>
-    <target name="-debug-appclient-start-nbjpda">
-        <ear2:nbjpdastart classpath="" name="${app.client}"/>
-    </target>
-    <target if="j2ee.appclient.tool.args" name="-debug-appclient-pregfv3">
-        <ear2:debug-appclient-pregfv3/>
-    </target>
-    <target name="-debug-appclient" unless="j2ee.appclient.tool.args">
-        <ear2:debug-appclient subprojectname="${app.client}"/>
-    </target>
-    <!--
-    =================
-    PROFILING SECTION
-    =================
-    -->
-    <!--
-        pre NB7.2 profiling section; consider it deprecated
-    -->
-    <target description="Profile a J2EE project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
-        <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
-            <isset property="profiler.info.jvmargs.extra"/>
-        </condition>
-        <antcall target="${profiler.startserver.target}"/>
-        <antcall target="run"/>
-        <antcall target="-profile-start-loadgen"/>
-    </target>
-    <target name="start-profiled-server">
-        <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-            <jvmarg value="${profiler.j2ee.agentID}"/>
-        </nbstartprofiledserver>
-    </target>
-    <target name="start-profiled-server-extraargs">
-        <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
-            <jvmarg value="${profiler.info.jvmargs.extra}"/>
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-            <jvmarg value="${profiler.j2ee.agentID}"/>
-        </nbstartprofiledserver>
-    </target>
-    <!--
-        end of pre NB7.2 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="dist" name="-do-profile">
-        <startprofiler/>
-        <nbstartserver profilemode="true"/>
-        <nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/>
-        <antcall target="-profile-start-loadgen"/>
-    </target>
-    <target depends="-profile-check,-profile-pre72" description="Profile a J2EE project in the IDE." if="profiler.configured" name="profile">
-        <antcall target="-do-profile"/>
-    </target>
-    <target if="profiler.loadgen.path" name="-profile-start-loadgen">
-        <loadgenstart path="${profiler.loadgen.path}"/>
-    </target>
-    <!--
-    CLEANUP SECTION
-    -->
-    <target depends="init" name="deps-clean" unless="no.deps">
-        <condition property="build.deploy.on.save" value="false">
-            <not>
-                <isset property="build.deploy.on.save"/>
-            </not>
-        </condition>
-        <ant antfile="${project.addressbook-ejb}/build.xml" inheritall="false" target="clean-ear">
-            <property location="${build.dir}" name="dist.ear.dir"/>
-            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
-        </ant>
-        <ant antfile="${project.jcontacts-ejb}/build.xml" inheritall="false" target="clean-ear">
-            <property location="${build.dir}" name="dist.ear.dir"/>
-            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
-        </ant>
-        <ant antfile="${project.jcore-logger-ejb}/build.xml" inheritall="false" target="clean-ear">
-            <property location="${build.dir}" name="dist.ear.dir"/>
-            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
-        </ant>
-        <ant antfile="${project.juser-ejb}/build.xml" inheritall="false" target="clean-ear">
-            <property location="${build.dir}" name="dist.ear.dir"/>
-            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
-        </ant>
-    </target>
-    <target depends="init" name="do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}"/>
-        <delete dir="${build.dir}"/>
-    </target>
-    <target depends="init" if="netbeans.home" name="undeploy-clean">
-        <nbundeploy failOnError="false" startServer="false"/>
-    </target>
-    <target name="post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,undeploy-clean,deps-clean,do-clean,post-clean" description="Clean build products." name="clean"/>
+			Either open the project in the IDE and make sure CopyLibs library
+			exists or setup the property manually. For example like this:
+			ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar
+		</fail>
+		<taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
+	</target>
+	<!--
+		pre NB7.2 profiling section; consider it deprecated
+	-->
+	<target depends="-profile-pre-init, init, -profile-post-init, -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 depends="-profile-pre-init, init, -profile-post-init" 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="pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check,-init-taskdefs" name="init"/>
+	<!--
+	COMPILATION SECTION
+	-->
+	<target depends="init" name="deps-jar" unless="no.deps">
+		<condition property="build.deploy.on.save" value="false">
+			<not>
+				<isset property="build.deploy.on.save"/>
+			</not>
+		</condition>
+	</target>
+	<target depends="init" name="deps-j2ee-archive" unless="no.deps">
+		<condition property="build.deploy.on.save" value="false">
+			<not>
+				<isset property="build.deploy.on.save"/>
+			</not>
+		</condition>
+		<ant antfile="${project.addressbook-ejb}/build.xml" inheritall="false" target="dist-ear">
+			<property location="${build.dir}" name="dist.ear.dir"/>
+			<property name="deploy.on.save" value="${build.deploy.on.save}"/>
+		</ant>
+		<ant antfile="${project.jcontacts-ejb}/build.xml" inheritall="false" target="dist-ear">
+			<property location="${build.dir}" name="dist.ear.dir"/>
+			<property name="deploy.on.save" value="${build.deploy.on.save}"/>
+		</ant>
+		<ant antfile="${project.jcore-logger-ejb}/build.xml" inheritall="false" target="dist-ear">
+			<property location="${build.dir}" name="dist.ear.dir"/>
+			<property name="deploy.on.save" value="${build.deploy.on.save}"/>
+		</ant>
+		<ant antfile="${project.juser-ejb}/build.xml" inheritall="false" target="dist-ear">
+			<property location="${build.dir}" name="dist.ear.dir"/>
+			<property name="deploy.on.save" value="${build.deploy.on.save}"/>
+		</ant>
+	</target>
+	<target depends="init,deps-jar,deps-j2ee-archive" name="pre-pre-compile"/>
+	<target name="pre-compile">
+		<!-- Empty placeholder for easier customization. -->
+		<!-- You can override this target in the ../build.xml file. -->
+	</target>
+	<target depends="init,deps-jar,pre-pre-compile,pre-compile,-do-compile-deps" name="do-compile">
+		<copy todir="${build.dir}/META-INF">
+			<fileset dir="${meta.inf}"/>
+		</copy>
+	</target>
+	<target depends="init,deps-jar,pre-pre-compile,pre-compile" name="-do-compile-deps">
+		<copyfiles files="${reference.jcore-logger-ejb.dist-ear}" todir="${build.dir}//"/>
+		<copyfiles files="${reference.addressbook-ejb.dist-ear}" todir="${build.dir}//"/>
+		<copyfiles files="${reference.jcontacts-ejb.dist-ear}" todir="${build.dir}//"/>
+		<copyfiles files="${reference.juser-ejb.dist-ear}" todir="${build.dir}//"/>
+	</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,pre-pre-compile,pre-compile,do-compile,post-compile" description="Compile project." name="compile"/>
+	<!--
+		DIST BUILDING SECTION
+	-->
+	<target name="pre-dist">
+		<!-- Empty placeholder for easier customization. -->
+		<!-- You can override this target in the ../build.xml file. -->
+	</target>
+	<target depends="init,compile,pre-dist" name="do-dist-without-manifest" unless="has.custom.manifest">
+		<dirname file="${dist.jar}" property="dist.jar.dir"/>
+		<mkdir dir="${dist.jar.dir}"/>
+		<jar compress="${jar.compress}" jarfile="${dist.jar}">
+			<fileset dir="${build.dir}"/>
+		</jar>
+	</target>
+	<target depends="init,compile,pre-dist" if="has.custom.manifest" name="do-dist-with-manifest">
+		<dirname file="${dist.jar}" property="dist.jar.dir"/>
+		<mkdir dir="${dist.jar.dir}"/>
+		<jar compress="${jar.compress}" jarfile="${dist.jar}" manifest="${meta.inf}/MANIFEST.MF">
+			<fileset dir="${build.dir}"/>
+		</jar>
+	</target>
+	<!--
+		TARGETS NEEDED TO SUPPORT DIRECTORY DEPLOYMENT
+	-->
+	<target depends="init,compile,pre-dist" if="do.package.without.custom.manifest.not.directory.deploy" name="-do-tmp-dist-without-manifest">
+		<dirname file="${dist.jar}" property="dist.jar.dir"/>
+		<mkdir dir="${dist.jar.dir}"/>
+		<jar compress="${jar.compress}" jarfile="${dist.jar}">
+			<fileset dir="${build.dir}"/>
+		</jar>
+	</target>
+	<target depends="init,compile,pre-dist" if="do.package.with.custom.manifest.not.directory.deploy" name="-do-tmp-dist-with-manifest">
+		<dirname file="${dist.jar}" property="dist.jar.dir"/>
+		<mkdir dir="${dist.jar.dir}"/>
+		<jar compress="${jar.compress}" jarfile="${dist.jar}" manifest="${meta.inf}/MANIFEST.MF">
+			<fileset dir="${build.dir}"/>
+		</jar>
+	</target>
+	<target depends="init,compile,pre-dist,-do-tmp-dist-without-manifest,-do-tmp-dist-with-manifest" name="-do-dist-directory-deploy"/>
+	<target depends="init,compile,pre-dist,-do-dist-directory-deploy,post-dist" description="Build distribution (JAR) - if directory deployment is not supported." name="dist-directory-deploy"/>
+	<!--
+		END TARGETS NEEDED TO SUPPORT DIRECTORY DEPLOYMENT
+	-->
+	<target name="post-dist">
+		<!-- Empty placeholder for easier customization. -->
+		<!-- You can override this target in the ../build.xml file. -->
+	</target>
+	<target depends="init,compile,pre-dist,do-dist-without-manifest,do-dist-with-manifest,post-dist" description="Build distribution (JAR)." name="dist"/>
+	<!--
+	EXECUTION SECTION
+	-->
+	<target depends="run-deploy,run-display-browser,run-ac" description="Deploy to server." name="run"/>
+	<target name="pre-run-deploy">
+		<!-- Empty placeholder for easier customization. -->
+		<!-- You can override this target in the ../build.xml file. -->
+	</target>
+	<target name="post-run-deploy">
+		<!-- Empty placeholder for easier customization. -->
+		<!-- You can override this target in the ../build.xml file. -->
+	</target>
+	<target name="-pre-nbmodule-run-deploy">
+		<!-- Empty placeholder for easier customization. -->
+		<!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
+	</target>
+	<target name="-post-nbmodule-run-deploy">
+		<!-- Empty placeholder for easier customization. -->
+		<!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
+	</target>
+	<target name="-run-deploy-am" unless="no.deps">
+		<!-- Task to deploy to the Access Manager runtime. -->
+		<ant antfile="${project.addressbook-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
+		<ant antfile="${project.jcontacts-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
+		<ant antfile="${project.jcore-logger-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
+		<ant antfile="${project.juser-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
+	</target>
+	<target depends="-init-cos,dist-directory-deploy,pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,post-run-deploy" name="run-deploy"/>
+	<target if="netbeans.home" name="-run-deploy-nb">
+		<nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
+	</target>
+	<target name="-init-deploy-ant" unless="netbeans.home">
+		<property name="deploy.ant.archive" value="${dist.jar}"/>
+		<property name="deploy.ant.resource.dir" value="${resource.dir}"/>
+		<property name="deploy.ant.enabled" value="true"/>
+	</target>
+	<target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
+	<target if="netbeans.home" name="-run-undeploy-nb">
+		<fail message="Undeploy is not supported from within the IDE"/>
+	</target>
+	<target depends="dist" name="verify">
+		<nbverify file="${dist.jar}"/>
+	</target>
+	<target depends="run-deploy,-init-display-browser,-display-browser-nb-old,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
+	<target if="do.display.browser" name="-init-display-browser">
+		<condition property="do.display.browser.nb.old">
+			<and>
+				<isset property="netbeans.home"/>
+				<not>
+					<isset property="browser.context"/>
+				</not>
+			</and>
+		</condition>
+		<condition property="do.display.browser.nb">
+			<and>
+				<isset property="netbeans.home"/>
+				<isset property="browser.context"/>
+			</and>
+		</condition>
+		<condition property="do.display.browser.cl">
+			<and>
+				<isset property="deploy.ant.enabled"/>
+				<isset property="deploy.ant.client.url"/>
+			</and>
+		</condition>
+	</target>
+	<target if="do.display.browser.nb.old" name="-display-browser-nb-old">
+		<nbbrowse url="${client.url}"/>
+	</target>
+	<target if="do.display.browser.nb" name="-display-browser-nb">
+		<nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
+	</target>
+	<target if="do.display.browser.cl" name="-get-browser" unless="browser">
+		<condition property="browser" value="rundll32">
+			<os family="windows"/>
+		</condition>
+		<condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
+			<os family="windows"/>
+		</condition>
+		<condition property="browser" value="/usr/bin/open">
+			<os family="mac"/>
+		</condition>
+		<property environment="env"/>
+		<condition property="browser" value="${env.BROWSER}">
+			<isset property="env.BROWSER"/>
+		</condition>
+		<condition property="browser" value="/usr/bin/firefox">
+			<available file="/usr/bin/firefox"/>
+		</condition>
+		<condition property="browser" value="/usr/local/firefox/firefox">
+			<available file="/usr/local/firefox/firefox"/>
+		</condition>
+		<condition property="browser" value="/usr/bin/mozilla">
+			<available file="/usr/bin/mozilla"/>
+		</condition>
+		<condition property="browser" value="/usr/local/mozilla/mozilla">
+			<available file="/usr/local/mozilla/mozilla"/>
+		</condition>
+		<condition property="browser" value="/usr/sfw/lib/firefox/firefox">
+			<available file="/usr/sfw/lib/firefox/firefox"/>
+		</condition>
+		<condition property="browser" value="/opt/csw/bin/firefox">
+			<available file="/opt/csw/bin/firefox"/>
+		</condition>
+		<condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
+			<available file="/usr/sfw/lib/mozilla/mozilla"/>
+		</condition>
+		<condition property="browser" value="/opt/csw/bin/mozilla">
+			<available file="/opt/csw/bin/mozilla"/>
+		</condition>
+	</target>
+	<target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
+		<fail unless="browser">
+			Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
+		</fail>
+		<property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
+		<echo>Launching ${browse.url}</echo>
+		<exec executable="${browser}" spawn="true">
+			<arg line="${browser.args} ${browse.url}"/>
+		</exec>
+	</target>
+	<target if="app.client" name="run-ac">
+		<antcall target="-run-ac"/>
+	</target>
+	<target depends="init,-as-retrieve-option-workaround,-init-run-macros,-run-appclient-pregfv3,-run-appclient" name="-run-ac"/>
+	<target if="j2ee.appclient.tool.args" name="-run-appclient-pregfv3">
+		<ear2:run-appclient-pregfv3/>
+	</target>
+	<target name="-run-appclient" unless="j2ee.appclient.tool.args">
+		<ear2:run-appclient subprojectname="${app.client}"/>
+	</target>
+	<target if="j2ee.appclient.mainclass.args" name="-as-retrieve-option-workaround" unless="j2ee.clientName">
+		<property name="client.jar" value="${dist.dir}/addressbookClient.jar"/>
+		<sleep seconds="3"/>
+		<copy failonerror="false" file="${wa.copy.client.jar.from}/addressbook/addressbookClient.jar" todir="${dist.dir}"/>
+		<copy failonerror="false" flatten="true" todir="${dist.dir}/">
+			<fileset dir="${wa.copy.client.jar.from}/addressbook" includes="**/addressbookClient.jar"/>
+		</copy>
+		<copy flatten="true" todir="${dist.dir}/addressbookClient">
+			<fileset dir="${wa.copy.client.jar.from}/addressbook" includes="**/*.*ar"/>
+		</copy>
+		<copy failonerror="false" flatten="false" todir="${dist.dir}/addressbookClient">
+			<fileset dir="${dist.dir}/gfdeploy/addressbook" includes="**/*.jar"/>
+		</copy>
+	</target>
+	<target depends="init" name="-init-run-macros">
+		<macrodef name="run-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
+			<attribute name="subprojectname"/>
+			<attribute default="${application.args.param}" name="args"/>
+			<element name="customize" optional="true"/>
+			<sequential>
+				<java dir="${basedir}" fork="true" jar="${client.jar}">
+					<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+					<jvmarg line="${j2ee.appclient.tool.jvmoptions}${client.jar},arg=-name,arg=@{subprojectname}"/>
+					<jvmarg line="${j2ee.appclient.jvmoptions.param}"/>
+					<arg line="@{args}"/>
+					<syspropertyset>
+						<propertyref prefix="run-sys-prop."/>
+						<mapper from="run-sys-prop.*" to="*" type="glob"/>
+					</syspropertyset>
+					<customize/>
+				</java>
+			</sequential>
+		</macrodef>
+		<macrodef name="run-appclient-pregfv3" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
+			<element name="customize" optional="true"/>
+			<sequential>
+				<java classname="${j2ee.appclient.tool.mainclass}" fork="true">
+					<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+					<jvmarg line="${j2ee.appclient.tool.jvmoptions}"/>
+					<jvmarg line="${j2ee.appclient.jvmoptions.param}"/>
+					<arg line="${j2ee.appclient.tool.args}"/>
+					<arg line="-client ${client.jar}"/>
+					<arg line="${j2ee.appclient.mainclass.tool.param}"/>
+					<arg line="${application.args.param}"/>
+					<classpath>
+						<path path="${j2ee.platform.classpath}:${j2ee.appclient.tool.runtime}"/>
+					</classpath>
+					<syspropertyset>
+						<propertyref prefix="run-sys-prop."/>
+						<mapper from="run-sys-prop.*" to="*" type="glob"/>
+					</syspropertyset>
+					<customize/>
+				</java>
+			</sequential>
+		</macrodef>
+	</target>
+	<!--
+	DEBUGGING SECTION
+	-->
+	<target depends="run-debug,run-debug-appclient" description="Deploy to server." name="debug"/>
+	<target depends="dist" description="Debug project in IDE." if="netbeans.home" name="run-debug" unless="app.client">
+		<nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="true"/>
+		<antcall target="connect-debugger"/>
+		<antcall target="debug-display-browser-old"/>
+		<antcall target="debug-display-browser"/>
+	</target>
+	<target name="connect-debugger" unless="is.debugged">
+		<condition property="listeningcp" value="sourcepath">
+			<istrue value="${j2ee.compile.on.save}"/>
+		</condition>
+		<nbjpdaconnect address="${jpda.address}" host="${jpda.host}" listeningcp="${listeningcp}" name="${jpda.host}:${jpda.address}" transport="${jpda.transport}">
+			<classpath>
+				<path path="${debug.classpath}"/>
+				<fileset dir="${build.dir}" includes="lib/*.jar"/>
+			</classpath>
+			<sourcepath>
+				<path path="${ear.docbase.dirs}"/>
+			</sourcepath>
+		</nbjpdaconnect>
+	</target>
+	<target if="do.display.browser.old" name="debug-display-browser-old">
+		<nbbrowse url="${client.url}"/>
+	</target>
+	<target if="do.display.browser" name="debug-display-browser">
+		<nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
+	</target>
+	<target if="can.debug.appclient" name="run-debug-appclient">
+		<antcall target="-run-debug-appclient"/>
+	</target>
+	<target depends="init,-init-debug-args,-debug-appclient-deploy,-as-retrieve-option-workaround,-init-debug-macros,-debug-appclient-start-nbjpda,-debug-appclient-pregfv3,-debug-appclient,connect-debugger" name="-run-debug-appclient"/>
+	<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>
+	</target>
+	<target depends="init,-init-debug-args,-as-retrieve-option-workaround,-init-run-macros" name="-init-debug-macros">
+		<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-appclient" value="${debug.transport}">
+			<isset property="debug.transport"/>
+		</condition>
+		<macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
+			<attribute default="${main.class}" name="name"/>
+			<attribute default="${debug.classpath}" name="classpath"/>
+			<attribute default="" name="stopclassname"/>
+			<sequential>
+				<nbjpdastart addressproperty="jpda.address.appclient" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport-appclient}">
+					<classpath>
+						<path path="@{classpath}"/>
+					</classpath>
+				</nbjpdastart>
+			</sequential>
+		</macrodef>
+		<macrodef name="debug-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
+			<attribute name="subprojectname"/>
+			<sequential>
+				<ear2:run-appclient subprojectname="@{subprojectname}">
+					<customize>
+						<jvmarg value="-Xrunjdwp:transport=${debug-transport-appclient},address=${jpda.address.appclient}"/>
+						<jvmarg line="${debug-args-line}"/>
+					</customize>
+				</ear2:run-appclient>
+			</sequential>
+		</macrodef>
+		<macrodef name="debug-appclient-pregfv3" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
+			<sequential>
+				<ear2:run-appclient-pregfv3>
+					<customize>
+						<jvmarg value="-Xrunjdwp:transport=${debug-transport-appclient},address=${jpda.address.appclient}"/>
+						<jvmarg line="${debug-args-line}"/>
+					</customize>
+				</ear2:run-appclient-pregfv3>
+			</sequential>
+		</macrodef>
+	</target>
+	<target name="-debug-appclient-deploy">
+		<nbstartserver debugmode="true"/>
+		<nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="true"/>
+	</target>
+	<target name="-debug-appclient-start-nbjpda">
+		<ear2:nbjpdastart classpath="" name="${app.client}"/>
+	</target>
+	<target if="j2ee.appclient.tool.args" name="-debug-appclient-pregfv3">
+		<ear2:debug-appclient-pregfv3/>
+	</target>
+	<target name="-debug-appclient" unless="j2ee.appclient.tool.args">
+		<ear2:debug-appclient subprojectname="${app.client}"/>
+	</target>
+	<!--
+	=================
+	PROFILING SECTION
+	=================
+	-->
+	<!--
+		pre NB7.2 profiling section; consider it deprecated
+	-->
+	<target description="Profile a J2EE project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
+		<condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
+			<isset property="profiler.info.jvmargs.extra"/>
+		</condition>
+		<antcall target="${profiler.startserver.target}"/>
+		<antcall target="run"/>
+		<antcall target="-profile-start-loadgen"/>
+	</target>
+	<target name="start-profiled-server">
+		<nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
+			<jvmarg value="${profiler.info.jvmargs.agent}"/>
+			<jvmarg value="${profiler.j2ee.agentID}"/>
+		</nbstartprofiledserver>
+	</target>
+	<target name="start-profiled-server-extraargs">
+		<nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
+			<jvmarg value="${profiler.info.jvmargs.extra}"/>
+			<jvmarg value="${profiler.info.jvmargs.agent}"/>
+			<jvmarg value="${profiler.j2ee.agentID}"/>
+		</nbstartprofiledserver>
+	</target>
+	<!--
+		end of pre NB7.2 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="dist" name="-do-profile">
+		<startprofiler/>
+		<nbstartserver profilemode="true"/>
+		<nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/>
+		<antcall target="-profile-start-loadgen"/>
+	</target>
+	<target depends="-profile-check,-profile-pre72" description="Profile a J2EE project in the IDE." if="profiler.configured" name="profile">
+		<antcall target="-do-profile"/>
+	</target>
+	<target if="profiler.loadgen.path" name="-profile-start-loadgen">
+		<loadgenstart path="${profiler.loadgen.path}"/>
+	</target>
+	<!--
+	CLEANUP SECTION
+	-->
+	<target depends="init" name="deps-clean" unless="no.deps">
+		<condition property="build.deploy.on.save" value="false">
+			<not>
+				<isset property="build.deploy.on.save"/>
+			</not>
+		</condition>
+		<ant antfile="${project.addressbook-ejb}/build.xml" inheritall="false" target="clean-ear">
+			<property location="${build.dir}" name="dist.ear.dir"/>
+			<property name="deploy.on.save" value="${build.deploy.on.save}"/>
+		</ant>
+		<ant antfile="${project.jcontacts-ejb}/build.xml" inheritall="false" target="clean-ear">
+			<property location="${build.dir}" name="dist.ear.dir"/>
+			<property name="deploy.on.save" value="${build.deploy.on.save}"/>
+		</ant>
+		<ant antfile="${project.jcore-logger-ejb}/build.xml" inheritall="false" target="clean-ear">
+			<property location="${build.dir}" name="dist.ear.dir"/>
+			<property name="deploy.on.save" value="${build.deploy.on.save}"/>
+		</ant>
+		<ant antfile="${project.juser-ejb}/build.xml" inheritall="false" target="clean-ear">
+			<property location="${build.dir}" name="dist.ear.dir"/>
+			<property name="deploy.on.save" value="${build.deploy.on.save}"/>
+		</ant>
+	</target>
+	<target depends="init" name="do-clean">
+		<delete dir="${build.dir}"/>
+		<delete dir="${dist.dir}"/>
+		<delete dir="${build.dir}"/>
+	</target>
+	<target depends="init" if="netbeans.home" name="undeploy-clean">
+		<nbundeploy failOnError="false" startServer="false"/>
+	</target>
+	<target name="post-clean">
+		<!-- Empty placeholder for easier customization. -->
+		<!-- You can override this target in the ../build.xml file. -->
+	</target>
+	<target depends="init,undeploy-clean,deps-clean,do-clean,post-clean" description="Clean build products." name="clean"/>
 </project>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 586ffe3..e72574a 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.j2ee.earproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2ee-earproject/2">
-            <name>addressbook</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
-            <web-module-libraries/>
-            <web-module-additional-libraries>
-                <library>
-                    <file>${reference.jcore-logger-ejb.dist-ear}</file>
-                    <path-in-war>/</path-in-war>
-                </library>
-                <library>
-                    <file>${reference.addressbook-ejb.dist-ear}</file>
-                    <path-in-war>/</path-in-war>
-                </library>
-                <library>
-                    <file>${reference.jcontacts-ejb.dist-ear}</file>
-                    <path-in-war>/</path-in-war>
-                </library>
-                <library>
-                    <file>${reference.juser-ejb.dist-ear}</file>
-                    <path-in-war>/</path-in-war>
-                </library>
-            </web-module-additional-libraries>
-        </data>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-            <reference>
-                <foreign-project>addressbook-ejb</foreign-project>
-                <artifact-type>j2ee_ear_archive</artifact-type>
-                <script>build.xml</script>
-                <target>dist-ear</target>
-                <clean-target>clean-ear</clean-target>
-                <id>dist-ear</id>
-            </reference>
-            <reference>
-                <foreign-project>jcontacts-ejb</foreign-project>
-                <artifact-type>j2ee_ear_archive</artifact-type>
-                <script>build.xml</script>
-                <target>dist-ear</target>
-                <clean-target>clean-ear</clean-target>
-                <id>dist-ear</id>
-            </reference>
-            <reference>
-                <foreign-project>jcore-logger-ejb</foreign-project>
-                <artifact-type>j2ee_ear_archive</artifact-type>
-                <script>build.xml</script>
-                <target>dist-ear</target>
-                <clean-target>clean-ear</clean-target>
-                <id>dist-ear</id>
-            </reference>
-            <reference>
-                <foreign-project>juser-ejb</foreign-project>
-                <artifact-type>j2ee_ear_archive</artifact-type>
-                <script>build.xml</script>
-                <target>dist-ear</target>
-                <clean-target>clean-ear</clean-target>
-                <id>dist-ear</id>
-            </reference>
-        </references>
-    </configuration>
+	<type>org.netbeans.modules.j2ee.earproject</type>
+	<configuration>
+		<data xmlns="http://www.netbeans.org/ns/j2ee-earproject/2">
+			<name>addressbook</name>
+			<minimum-ant-version>1.6.5</minimum-ant-version>
+			<web-module-libraries/>
+			<web-module-additional-libraries>
+				<library>
+					<file>${reference.jcore-logger-ejb.dist-ear}</file>
+					<path-in-war>/</path-in-war>
+				</library>
+				<library>
+					<file>${reference.addressbook-ejb.dist-ear}</file>
+					<path-in-war>/</path-in-war>
+				</library>
+				<library>
+					<file>${reference.jcontacts-ejb.dist-ear}</file>
+					<path-in-war>/</path-in-war>
+				</library>
+				<library>
+					<file>${reference.juser-ejb.dist-ear}</file>
+					<path-in-war>/</path-in-war>
+				</library>
+			</web-module-additional-libraries>
+		</data>
+		<references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+			<reference>
+				<foreign-project>addressbook-ejb</foreign-project>
+				<artifact-type>j2ee_ear_archive</artifact-type>
+				<script>build.xml</script>
+				<target>dist-ear</target>
+				<clean-target>clean-ear</clean-target>
+				<id>dist-ear</id>
+			</reference>
+			<reference>
+				<foreign-project>jcontacts-ejb</foreign-project>
+				<artifact-type>j2ee_ear_archive</artifact-type>
+				<script>build.xml</script>
+				<target>dist-ear</target>
+				<clean-target>clean-ear</clean-target>
+				<id>dist-ear</id>
+			</reference>
+			<reference>
+				<foreign-project>jcore-logger-ejb</foreign-project>
+				<artifact-type>j2ee_ear_archive</artifact-type>
+				<script>build.xml</script>
+				<target>dist-ear</target>
+				<clean-target>clean-ear</clean-target>
+				<id>dist-ear</id>
+			</reference>
+			<reference>
+				<foreign-project>juser-ejb</foreign-project>
+				<artifact-type>j2ee_ear_archive</artifact-type>
+				<script>build.xml</script>
+				<target>dist-ear</target>
+				<clean-target>clean-ear</clean-target>
+				<id>dist-ear</id>
+			</reference>
+		</references>
+	</configuration>
 </project>
-- 
2.39.5