jcountry-lib + renamed/moved template

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

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 1a6f7cb7c90b58e264ea5c80bf083687761b4505..4bfee71fb1c035265a7fe955bc064ee3074c9c90 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -1034,6 +1034,7 @@ exists or setup the property manually. For example like this:
         <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.jcountry-lib.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"/>
@@ -1049,6 +1050,7 @@ exists or setup the property manually. For example like this:
         <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.jcountry-lib.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"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 502b5f11aaeb9254cc82e14644c9966640805ee2..380295333006369322bfb80d9bcc0bb9c494e3ee 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=2f309951
-nbproject/build-impl.xml.script.CRC32=fc9d2f6b
+nbproject/build-impl.xml.data.CRC32=3d4ee603
+nbproject/build-impl.xml.script.CRC32=1aff867f
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 16206423375363c03c5f7d37e5f0748503ca302f..f1b2380f1277e22aaa6b04ec499c6e98c838124b 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -42,6 +42,7 @@ 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.jcountry-lib.jar=lib/jcountry-lib.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
@@ -63,6 +64,7 @@ javac.classpath=\
     ${file.reference.jcore-logger-lib.jar}:\
     ${file.reference.jcoreee.jar}:\
     ${file.reference.jcountry-core.jar}:\
+    ${file.reference.jcountry-lib.jar}:\
     ${file.reference.jphone-core.jar}:\
     ${file.reference.jcontacts-core.jar}:\
     ${file.reference.jshop-core.jar}:\
@@ -114,6 +116,7 @@ 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.jcountry-lib.jar=../jcountry-lib/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/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 078ef3c9decee8cd16be00f7bb7d2277f26a8180..9d65d23174785fcb775f4283aca75db936d34644 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -22,6 +22,10 @@
                     <file>${file.reference.jcountry-core.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.jcountry-lib.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>

diff --git a/web/WEB-INF/templates/generic/form_personal_data.tpl b/web/WEB-INF/templates/generic/form_personal_data.tpl
new file mode 100644 (file)
index 0000000..35f7ae9
--- /dev/null
+++ b/web/WEB-INF/templates/generic/form_personal_data.tpl
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://java.sun.com/jsf/facelets">
+
+       <div class="para notice">
+               #{msg.PERSONAL_DATA_MINIMUM_NOTICE}
+       </div>
+
+       <div class="para">
+               <fieldset id="personal_data">
+                       <legend title="#{msg.PERSONAL_DATA_LEGEND_TITLE}">#{msg.PERSONAL_DATA_LEGEND}</legend>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="gender" value="#{msg.PERSONAL_DATA_GENDER}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{customerController.firstName}" required="true">
+                                               <f:validator validatorId="NameValidator" />
+                                       </h:inputText>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="familyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{customerController.familyName}" required="true">
+                                               <f:validator validatorId="NameValidator" />
+                                       </h:inputText>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="street" value="#{msg.PERSONAL_DATA_STREET}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText class="input" id="street" size="20" maxlength="255" value="#{customerController.street}" required="true">
+                                               <f:validator validatorId="NameValidator" />
+                                       </h:inputText>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="houseNumber" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{customerController.houseNumber}" required="true">
+                                               <f:validateLongRange minimum="1" maximum="500" />
+                                       </h:inputText>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="zipCode" value="#{msg.PERSONAL_DATA_ZIP_CODE}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{customerController.zipCode}" required="true" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="city" value="#{msg.PERSONAL_DATA_CITY}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText class="input" id="city" size="10" maxlength="255" value="#{customerController.city}" required="true">
+                                               <f:validator validatorId="NameValidator" />
+                                       </h:inputText>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="phoneNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText class="input" id="phoneNumber" size="20" maxlength="255" value="#{customerController.phoneNumber}" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="faxNumber" value="#{msg.PERSONAL_DATA_FAX_NUMBER}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText class="input" id="faxNumber" size="20" maxlength="255" value="#{customerController.faxNumber}" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="cellphoneNumber" value="#{msg.PERSONAL_DATA_CELLPHONE_NUMBER}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText class="input" id="cellphoneNumber" size="20" maxlength="255" value="#{customerController.cellphoneNumber}" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+               </fieldset>
+       </div>
+</ui:composition>

diff --git a/web/WEB-INF/templates/guest/guest_personal_data.tpl b/web/WEB-INF/templates/guest/guest_personal_data.tpl
deleted file mode 100644 (file)
index 35f7ae9..0000000
--- a/web/WEB-INF/templates/guest/guest_personal_data.tpl
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://java.sun.com/jsf/facelets">
-
-       <div class="para notice">
-               #{msg.PERSONAL_DATA_MINIMUM_NOTICE}
-       </div>
-
-       <div class="para">
-               <fieldset id="personal_data">
-                       <legend title="#{msg.PERSONAL_DATA_LEGEND_TITLE}">#{msg.PERSONAL_DATA_LEGEND}</legend>
-
-                       <div class="table_row">
-                               <div class="table_left">
-                                       <h:outputLabel for="gender" value="#{msg.PERSONAL_DATA_GENDER}" />
-                               </div>
-
-                               <div class="table_right">
-                                       <ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl" />
-                               </div>
-
-                               <div class="clear"></div>
-                       </div>
-
-                       <div class="table_row">
-                               <div class="table_left">
-                                       <h:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
-                               </div>
-
-                               <div class="table_right">
-                                       <h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{customerController.firstName}" required="true">
-                                               <f:validator validatorId="NameValidator" />
-                                       </h:inputText>
-                               </div>
-
-                               <div class="clear"></div>
-                       </div>
-
-                       <div class="table_row">
-                               <div class="table_left">
-                                       <h:outputLabel for="familyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
-                               </div>
-
-                               <div class="table_right">
-                                       <h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{customerController.familyName}" required="true">
-                                               <f:validator validatorId="NameValidator" />
-                                       </h:inputText>
-                               </div>
-
-                               <div class="clear"></div>
-                       </div>
-
-                       <div class="table_row">
-                               <div class="table_left">
-                                       <h:outputLabel for="street" value="#{msg.PERSONAL_DATA_STREET}" />
-                               </div>
-
-                               <div class="table_right">
-                                       <h:inputText class="input" id="street" size="20" maxlength="255" value="#{customerController.street}" required="true">
-                                               <f:validator validatorId="NameValidator" />
-                                       </h:inputText>
-                               </div>
-
-                               <div class="clear"></div>
-                       </div>
-
-                       <div class="table_row">
-                               <div class="table_left">
-                                       <h:outputLabel for="houseNumber" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER}" />
-                               </div>
-
-                               <div class="table_right">
-                                       <h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{customerController.houseNumber}" required="true">
-                                               <f:validateLongRange minimum="1" maximum="500" />
-                                       </h:inputText>
-                               </div>
-
-                               <div class="clear"></div>
-                       </div>
-
-                       <div class="table_row">
-                               <div class="table_left">
-                                       <h:outputLabel for="zipCode" value="#{msg.PERSONAL_DATA_ZIP_CODE}" />
-                               </div>
-
-                               <div class="table_right">
-                                       <h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{customerController.zipCode}" required="true" />
-                               </div>
-
-                               <div class="clear"></div>
-                       </div>
-
-                       <div class="table_row">
-                               <div class="table_left">
-                                       <h:outputLabel for="city" value="#{msg.PERSONAL_DATA_CITY}" />
-                               </div>
-
-                               <div class="table_right">
-                                       <h:inputText class="input" id="city" size="10" maxlength="255" value="#{customerController.city}" required="true">
-                                               <f:validator validatorId="NameValidator" />
-                                       </h:inputText>
-                               </div>
-
-                               <div class="clear"></div>
-                       </div>
-
-                       <div class="table_row">
-                               <div class="table_left">
-                                       <h:outputLabel for="phoneNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
-                               </div>
-
-                               <div class="table_right">
-                                       <h:inputText class="input" id="phoneNumber" size="20" maxlength="255" value="#{customerController.phoneNumber}" />
-                               </div>
-
-                               <div class="clear"></div>
-                       </div>
-
-                       <div class="table_row">
-                               <div class="table_left">
-                                       <h:outputLabel for="faxNumber" value="#{msg.PERSONAL_DATA_FAX_NUMBER}" />
-                               </div>
-
-                               <div class="table_right">
-                                       <h:inputText class="input" id="faxNumber" size="20" maxlength="255" value="#{customerController.faxNumber}" />
-                               </div>
-
-                               <div class="clear"></div>
-                       </div>
-
-                       <div class="table_row">
-                               <div class="table_left">
-                                       <h:outputLabel for="cellphoneNumber" value="#{msg.PERSONAL_DATA_CELLPHONE_NUMBER}" />
-                               </div>
-
-                               <div class="table_right">
-                                       <h:inputText class="input" id="cellphoneNumber" size="20" maxlength="255" value="#{customerController.cellphoneNumber}" />
-                               </div>
-
-                               <div class="clear"></div>
-                       </div>
-               </fieldset>
-       </div>
-</ui:composition>

diff --git a/web/WEB-INF/templates/guest/guest_registration_form.tpl b/web/WEB-INF/templates/guest/guest_registration_form.tpl
index 8806fa854f572ad34f038cfc7061ba07d01acac2..264b4b7d2d57fc08a3e6d7dbfdc8b207f148c491 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_registration_form.tpl
+++ b/web/WEB-INF/templates/guest/guest_registration_form.tpl
@@ -12,7 +12,7 @@
                                #{msg.GUEST_REGISTRATION_TITLE}
                        </div>
 
-                       <ui:include src="/WEB-INF/templates/guest/guest_personal_data.tpl" />
+                       <ui:include src="/WEB-INF/templates/generic/form_personal_data.tpl" />
 
                        <div class="para">
                                <fieldset id="login_data">

diff --git a/web/customer/checkout2.xhtml b/web/customer/checkout2.xhtml
index fa548f07786256e4a1d29f41d1a3e54d0b36897a..8be46683ebe4cb65584735baeb562a47b7c11903 100644 (file)
--- a/web/customer/checkout2.xhtml
+++ b/web/customer/checkout2.xhtml
@@ -32,7 +32,7 @@
                                                                #{msg.GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE}
                                                        </div>
 
-                                                       <ui:include src="/WEB-INF/templates/guest/guest_personal_data.tpl" />
+                                                       <ui:include src="/WEB-INF/templates/generic/form_personal_data.tpl" />
 
                                                        <div class="para">
                                                                Derzeit ist nur eine Bezahlung gegen Rechnung möglich.