Rewrite:

- introduced jcountry-core which is a library for handling country-related data, e.g. dial prefix, country code ...
- introduced jphone-core which is a library for handling phone, fax and cell phone numbers
- these both new libraries required a rewrite of many parts

diff --git a/.gitignore b/.gitignore
index 811c681db520ee3053c3bc2d75511a762b8effed..0383bcc9e4d5d046929d1f5b3102c94012efafb2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 /nbproject/private/
+/nbproject/*~
 /manifest.mf
 /build/
 /dist/
+/data/*
 /*.properties
-/data/*.*
-/nbproject/*~
\ No newline at end of file

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index 98ca617007e9f5e8090f6843513e80bec85acfa1..855385dcf75d9ff7c6acb19cddb65dde39bd5bc0 100644 (file)
Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ

diff --git a/lib/jcore-logger-lib.jar b/lib/jcore-logger-lib.jar
index 8e5a5b954c3f18434a17e24e50fd7392d64bf46e..4cb7da5146cc64855a32f2f76722c7325c3514cb 100644 (file)
Binary files a/lib/jcore-logger-lib.jar and b/lib/jcore-logger-lib.jar differ

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 57a3b6cecdc73685710c2cf6d6760b52b39a09d7..1a75fc00ef1f570f9b3af2edf1b0065404ef10eb 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 3900e4e429207d9bb6bf44a793b20eb1fcd3c033..76ac2d386eba9d82637d0b52fdc62d0932179b5e 100644 (file)
Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ

diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar
new file mode 100644 (file)
index 0000000..ed08999
Binary files /dev/null and b/lib/jcountry-core.jar differ

diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar
new file mode 100644 (file)
index 0000000..480f9f8
Binary files /dev/null and b/lib/jphone-core.jar differ

diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar
index f86ba13bf7593aa234782a84ed87b4ec43e53b8b..fbe89251f031c082458559985eb1fe59616beaf9 100644 (file)
Binary files a/lib/jshop-core.jar and b/lib/jshop-core.jar differ

diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar
index 86ee61543696781e286b7c243258a055fbcbc82b..0ad3d8f06124d293c25a8c1b318e15b7027fb72b 100644 (file)
Binary files a/lib/jshop-ee-lib.jar and b/lib/jshop-ee-lib.jar differ

diff --git a/nbproject/ant-deploy.xml b/nbproject/ant-deploy.xml
index 3c01560598dfb6e9553a981b2c724a341cd8a592..2d5f8778d18757ea5ded4eea4da13ca1adc51093 100644 (file)
--- 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="-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="-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="-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="-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>
+    <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 c98c1438b6dcfcfa5f78edba357706d835adbd34..1a6f7cb7c90b58e264ea5c80bf083687761b4505 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -821,9 +821,9 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f
     <target name="-init-taskdefs">
         <fail unless="libs.CopyLibs.classpath">
 The libs.CopyLibs.classpath property is not set up.
-This property must point to
+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
+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:
@@ -1033,6 +1033,8 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcore.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcore-logger-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcoreee.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jcountry-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jphone-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1046,6 +1048,8 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcore.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcoreee.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jcountry-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jphone-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
@@ -1364,7 +1368,7 @@ exists or setup the property manually. For example like this:
     </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">
@@ -1403,7 +1407,7 @@ exists or setup the property manually. For example like this:
     </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">
@@ -1439,7 +1443,7 @@ exists or setup the property manually. For example like this:
     </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">
@@ -1461,35 +1465,35 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
     <!--
-
-               CLEANUP SECTION
-       -->
-       <target depends="init" name="deps-clean" unless="no.deps">
-               <ant antfile="${project.PizzaService-lib}/build.xml" inheritall="false" target="clean"/>
-       </target>
-       <target depends="init" name="do-clean">
-               <condition property="build.dir.to.clean" value="${build.web.dir}">
-                       <isset property="dist.ear.dir"/>
-               </condition>
-               <property name="build.dir.to.clean" value="${build.web.dir}"/>
-               <delete includeEmptyDirs="true" quiet="true">
-                       <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
-               </delete>
-               <delete dir="${build.dir}"/>
-               <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
-               <delete dir="${dist.dir}"/>
-       </target>
-       <target depends="do-clean" if="status.clean-failed" name="check-clean">
-               <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
-               <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
-       </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,check-clean,-post-clean" description="Clean build products." name="clean"/>
-       <target depends="clean" description="Clean build products." name="clean-ear"/>
+                
+                CLEANUP SECTION
+            -->
+    <target depends="init" name="deps-clean" unless="no.deps">
+        <ant antfile="${project.PizzaService-lib}/build.xml" inheritall="false" target="clean"/>
+    </target>
+    <target depends="init" name="do-clean">
+        <condition property="build.dir.to.clean" value="${build.web.dir}">
+            <isset property="dist.ear.dir"/>
+        </condition>
+        <property name="build.dir.to.clean" value="${build.web.dir}"/>
+        <delete includeEmptyDirs="true" quiet="true">
+            <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
+        </delete>
+        <delete dir="${build.dir}"/>
+        <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
+        <delete dir="${dist.dir}"/>
+    </target>
+    <target depends="do-clean" if="status.clean-failed" name="check-clean">
+        <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
+        <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
+    </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,check-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target depends="clean" description="Clean build products." name="clean-ear"/>
 </project>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index bb9588530887cb0c3f2053474211234581274df2..502b5f11aaeb9254cc82e14644c9966640805ee2 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=82213886
 build.xml.stylesheet.CRC32=651128d4@1.68.1.1
 # 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=656c188b
-nbproject/build-impl.xml.script.CRC32=3f1a63d0
+nbproject/build-impl.xml.data.CRC32=2f309951
+nbproject/build-impl.xml.script.CRC32=fc9d2f6b
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index da431701fb3fd5716d14cbcab860ed26b6b3d44b..16206423375363c03c5f7d37e5f0748503ca302f 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -33,6 +33,7 @@ dist.dir=dist
 dist.ear.war=${dist.dir}/${war.ear.name}
 dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
+endorsed.classpath=
 excludes=
 file.reference.cdi-api.jar=lib/cdi-api.jar
 file.reference.gf-client.jar=lib/gf-client.jar
@@ -40,6 +41,8 @@ file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
 file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar
 file.reference.jcore.jar=lib/jcore.jar
 file.reference.jcoreee.jar=lib/jcoreee.jar
+file.reference.jcountry-core.jar=lib/jcountry-core.jar
+file.reference.jphone-core.jar=lib/jphone-core.jar
 file.reference.jshop-core.jar=lib/jshop-core.jar
 file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.jar
 includes=**
@@ -59,6 +62,8 @@ javac.classpath=\
     ${file.reference.jcore.jar}:\
     ${file.reference.jcore-logger-lib.jar}:\
     ${file.reference.jcoreee.jar}:\
+    ${file.reference.jcountry-core.jar}:\
+    ${file.reference.jphone-core.jar}:\
     ${file.reference.jcontacts-core.jar}:\
     ${file.reference.jshop-core.jar}:\
     ${file.reference.jshop-ee-lib.jar}:\
@@ -108,6 +113,8 @@ source.reference.jcontacts-core.jar=../jcontacts-core/src/
 source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/
 source.reference.jcore.jar=../jcore/src/
 source.reference.jcoreee.jar=../jcoreee/src/
+source.reference.jcountry-core.jar=../jcountry-core/src/
+source.reference.jphone-core.jar=../jphone-core/src/
 source.reference.jshop-core.jar=../jshop-core/src/
 source.reference.jshop-ee-lib.jar=../jshop-ee-lib/src/
 source.root=src

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 9c6aa1fc823220accc899fff07fb7f12c3993d53..078ef3c9decee8cd16be00f7bb7d2277f26a8180 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -1,68 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://www.netbeans.org/ns/project/1">
-       <type>org.netbeans.modules.web.project</type>
-       <configuration>
-               <data xmlns="http://www.netbeans.org/ns/web-project/3">
-                       <name>PizzaService-war</name>
-                       <minimum-ant-version>1.6.5</minimum-ant-version>
-                       <web-module-libraries>
-                               <library dirs="200">
-                                       <file>${file.reference.jcore.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.jcore-logger-lib.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.jcoreee.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.jcontacts-core.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.jshop-core.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.jshop-ee-lib.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${reference.PizzaService-lib.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.cdi-api.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.gf-client.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                       </web-module-libraries>
-                       <web-module-additional-libraries/>
-                       <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>
-               <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-                       <reference>
-                               <foreign-project>PizzaService-lib</foreign-project>
-                               <artifact-type>jar</artifact-type>
-                               <script>build.xml</script>
-                               <target>jar</target>
-                               <clean-target>clean</clean-target>
-                               <id>jar</id>
-                       </reference>
-               </references>
-       </configuration>
+    <type>org.netbeans.modules.web.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/web-project/3">
+            <name>PizzaService-war</name>
+            <minimum-ant-version>1.6.5</minimum-ant-version>
+            <web-module-libraries>
+                <library dirs="200">
+                    <file>${file.reference.jcore.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jcore-logger-lib.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jcoreee.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jcountry-core.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jphone-core.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jcontacts-core.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jshop-core.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jshop-ee-lib.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${reference.PizzaService-lib.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.cdi-api.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.gf-client.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+            </web-module-libraries>
+            <web-module-additional-libraries/>
+            <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>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>PizzaService-lib</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
+    </configuration>
 </project>

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 4072e584bd31d245530949feabbefe3515ce038e..a0c3ee5bd1556109e5bb4ee022286f6d765801f3 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -50,7 +50,7 @@ PAGE_TITLE_ADMIN_CATEGORIES=Categories
 CONTENT_TITLE_ADMIN_CATEGORIES=Administrate categories:
 SELECT_ENTRY=Select:
 ADMIN_ENTER_CATEGORY_TITLE=Title:
-ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE=(e.g. Pizza)
+ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE=(example: Pizza)
 ADMIN_PARENT_CATEGORY=Parent category:
 CONTENT_TITLE_ADMIN_PRODUCTS=These products has been created:
 PAGE_TITLE_ADMIN_PRODUCTS=Products
@@ -63,7 +63,7 @@ CATEGORY=Category:
 PLEASE_FILL_ALL_FIELDS=Please fill out all fields:
 ADMIN_BUTTON_ADD_CATEGORY=Add category
 ADMIN_ENTER_PRODUCT_TITLE=Product title:
-ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE=(e.g. <em>Pizza Italia)
+ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE=(example: <em>Pizza Italia)
 IS_AVAILABLE=Available:
 ADMIN_BUTTON_ADD_PRODUCT=Add product
 ADMIN_ADD_PRODUCT_NOTICE_TITLE=Notices for adding new product:

diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
index f61d35203afe94e67e56ea501d9a404587e15f9d..559d9f189b5a93c9f73ce1c725d4e97af61d7afc 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
@@ -25,6 +25,10 @@ import javax.naming.NamingException;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.UserContact;
 import org.mxchange.jcontacts.contact.gender.Gender;
+import org.mxchange.jcountry.data.Country;
+import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
+import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
 import org.mxchange.jshopcore.model.customer.Customer;
 import org.mxchange.jshopcore.model.customer.CustomerSessionBeanRemote;
 import org.mxchange.jshopcore.model.customer.ShopCustomer;
@@ -47,7 +51,7 @@ public class CustomerWebBean implements CustomerWebController {
        /**
         * Cellphone number
         */
-       private String cellphoneNumber;
+       private DialableCellphoneNumber cellphoneNumber;
 
        /**
         * City
@@ -62,7 +66,7 @@ public class CustomerWebBean implements CustomerWebController {
        /**
         * Country code
         */
-       private String countryCode;
+       private Country country;
 
        /**
         * Remote customer bean
@@ -82,7 +86,7 @@ public class CustomerWebBean implements CustomerWebController {
        /**
         * Fax number
         */
-       private String faxNumber;
+       private DialableFaxNumber faxNumber;
 
        /**
         * First name
@@ -102,7 +106,7 @@ public class CustomerWebBean implements CustomerWebController {
        /**
         * Phone number
         */
-       private String phoneNumber;
+       private DialableLandLineNumber phoneNumber;
 
        /**
         * Street
@@ -151,6 +155,7 @@ public class CustomerWebBean implements CustomerWebController {
                contact.setHouseNumber(this.getHouseNumber());
                contact.setZipCode(this.getZipCode());
                contact.setCity(this.getCity());
+               contact.setCountry(this.getCountry());
                contact.setPhoneNumber(this.getPhoneNumber());
                contact.setFaxNumber(this.getFaxNumber());
                contact.setCellphoneNumber(this.getCellphoneNumber());
@@ -165,12 +170,12 @@ public class CustomerWebBean implements CustomerWebController {
        }
 
        @Override
-       public String getCellphoneNumber () {
+       public DialableCellphoneNumber getCellphoneNumber () {
                return this.cellphoneNumber;
        }
 
        @Override
-       public void setCellphoneNumber (final String cellphoneNumber) {
+       public void setCellphoneNumber (final DialableCellphoneNumber cellphoneNumber) {
                this.cellphoneNumber = cellphoneNumber;
        }
 
@@ -185,13 +190,13 @@ public class CustomerWebBean implements CustomerWebController {
        }
 
        @Override
-       public String getCountryCode () {
-               return this.countryCode;
+       public Country getCountry () {
+               return this.country;
        }
 
        @Override
-       public void setCountryCode (final String countryCode) {
-               this.countryCode = countryCode;
+       public void setCountry (final Country country) {
+               this.country = country;
        }
 
        @Override
@@ -215,12 +220,12 @@ public class CustomerWebBean implements CustomerWebController {
        }
 
        @Override
-       public String getFaxNumber () {
+       public DialableFaxNumber getFaxNumber () {
                return this.faxNumber;
        }
 
        @Override
-       public void setFaxNumber (final String faxNumber) {
+       public void setFaxNumber (final DialableFaxNumber faxNumber) {
                this.faxNumber = faxNumber;
        }
 
@@ -255,12 +260,12 @@ public class CustomerWebBean implements CustomerWebController {
        }
 
        @Override
-       public String getPhoneNumber () {
+       public DialableLandLineNumber getPhoneNumber () {
                return this.phoneNumber;
        }
 
        @Override
-       public void setPhoneNumber (final String phoneNumber) {
+       public void setPhoneNumber (final DialableLandLineNumber phoneNumber) {
                this.phoneNumber = phoneNumber;
        }
 

diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java
index 47955f0f19551998336c6145cb945673f1f0ef8e..bb57d7f1d5e26e6cfc226284b277039ed3b392eb 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java
@@ -18,6 +18,10 @@ package org.mxchange.pizzaapplication.beans.customer;
 
 import java.io.Serializable;
 import org.mxchange.jcontacts.contact.gender.Gender;
+import org.mxchange.jcountry.data.Country;
+import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
+import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
 import org.mxchange.jshopcore.model.customer.Customer;
 
 /**
@@ -39,14 +43,14 @@ public interface CustomerWebController extends Serializable {
         * <p>
         * @return the cellphoneNumber
         */
-       public String getCellphoneNumber ();
+       public DialableCellphoneNumber getCellphoneNumber ();
 
        /**
         * Cellphone number
         * <p>
         * @param cellphoneNumber the cellphoneNumber to set
         */
-       public void setCellphoneNumber (final String cellphoneNumber);
+       public void setCellphoneNumber (final DialableCellphoneNumber cellphoneNumber);
 
        /**
         * City
@@ -63,18 +67,18 @@ public interface CustomerWebController extends Serializable {
        public void setCity (final String city);
 
        /**
-        * Country code
+        * Getter for country instance
         * <p>
-        * @return the countryCode
+        * @return Country instance
         */
-       public String getCountryCode ();
+       public Country getCountry ();
 
        /**
-        * Country code
+        * Setter for country instance
         * <p>
-        * @param countryCode the countryCode to set
+        * @param country Country instance
         */
-       public void setCountryCode (final String countryCode);
+       public void setCountry (final Country country);
 
        /**
         * Email address
@@ -109,14 +113,14 @@ public interface CustomerWebController extends Serializable {
         * <p>
         * @return the faxNumber
         */
-       public String getFaxNumber ();
+       public DialableFaxNumber getFaxNumber ();
 
        /**
         * Fax number
         * <p>
         * @param faxNumber the faxNumber to set
         */
-       public void setFaxNumber (final String faxNumber);
+       public void setFaxNumber (final DialableFaxNumber faxNumber);
 
        /**
         * First name
@@ -165,14 +169,14 @@ public interface CustomerWebController extends Serializable {
         * <p>
         * @return the phoneNumber
         */
-       public String getPhoneNumber ();
+       public DialableLandLineNumber getPhoneNumber ();
 
        /**
         * Phone number
         * <p>
         * @param phoneNumber the phoneNumber to set
         */
-       public void setPhoneNumber (final String phoneNumber);
+       public void setPhoneNumber (final DialableLandLineNumber phoneNumber);
 
        /**
         * Street