From 2e670801904f4b0aa7da5fa127ba0f44ba0ed2d2 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sun, 11 Oct 2015 21:25:06 +0200
Subject: [PATCH] jcountry-lib + renamed/moved template

---
 lib/jcountry-lib.jar                              | Bin 0 -> 363 bytes
 nbproject/build-impl.xml                          |   2 ++
 nbproject/genfiles.properties                     |   4 ++--
 nbproject/project.properties                      |   3 +++
 nbproject/project.xml                             |   4 ++++
 .../form_personal_data.tpl}                       |   0
 .../templates/guest/guest_registration_form.tpl   |   2 +-
 web/customer/checkout2.xhtml                      |   2 +-
 8 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 lib/jcountry-lib.jar
 rename web/WEB-INF/templates/{guest/guest_personal_data.tpl => generic/form_personal_data.tpl} (100%)

diff --git a/lib/jcountry-lib.jar b/lib/jcountry-lib.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7f61f695fc83f28a4d8e7e1b0eb34fc44c578b38
GIT binary patch
literal 363
zcmWIWW@h1HVBlb2*tWvkodF4OGO#fCx`sIFdiuHP|2xIN5CB)Y6{xgqRzGt(P&o*T
z03lqducM!*n`>~0p067tg8*0_WGYA<2>2%EWu~PTm*|G278Pga=UFKj>KX8IIp!gW
zI2I%(XQV0s#ekBQdM3PF&PAz-C8;U8PL&|_7J3HpW(K-RM&=3{{zZw&IjIWH`9%f!
zMTsRq6E%6cc)0?+8JR?war+G77y*X2j$lWj`V*lQ)29%PAaY5gHju>T?*MOBHjoM?
MAgl$_H$WT)0F0|gcmMzZ

literal 0
HcmV?d00001

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 1a6f7cb7..4bfee71f 100644
--- 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 502b5f11..38029533 100644
--- 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 16206423..f1b2380f 100644
--- 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 078ef3c9..9d65d231 100644
--- 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/guest/guest_personal_data.tpl b/web/WEB-INF/templates/generic/form_personal_data.tpl
similarity index 100%
rename from web/WEB-INF/templates/guest/guest_personal_data.tpl
rename to web/WEB-INF/templates/generic/form_personal_data.tpl
diff --git a/web/WEB-INF/templates/guest/guest_registration_form.tpl b/web/WEB-INF/templates/guest/guest_registration_form.tpl
index 8806fa85..264b4b7d 100644
--- 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 fa548f07..8be46683 100644
--- 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.
-- 
2.39.5