From: Roland Haeder Date: Sun, 11 Oct 2015 19:25:50 +0000 (+0200) Subject: added jcountry-lib + country bean (controller) + renamed/moved template X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2de8052b0975a9ffaf45d901c27cc01a63f9bedb;p=addressbook-war.git added jcountry-lib + country bean (controller) + renamed/moved template --- diff --git a/lib/jcountry-lib.jar b/lib/jcountry-lib.jar new file mode 100644 index 00000000..7f61f695 Binary files /dev/null and b/lib/jcountry-lib.jar differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index a20c1a6a..3afa43c8 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -1033,10 +1033,11 @@ exists or setup the property manually. For example like this: + + - @@ -1050,10 +1051,11 @@ exists or setup the property manually. For example like this: + + - diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index a923f677..61bd5aed 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=be5f34f7 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=80fe4962 -nbproject/build-impl.xml.script.CRC32=498d3940 +nbproject/build-impl.xml.data.CRC32=b91929ff +nbproject/build-impl.xml.script.CRC32=b3fbd4a7 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index f47c2cdf..f0edbd56 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -44,6 +44,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.juser-core.jar=lib/juser-core.jar file.reference.juser-lib.jar=lib/juser-lib.jar @@ -64,10 +65,11 @@ javac.classpath=\ ${file.reference.jcore.jar}:\ ${file.reference.jcoreee.jar}:\ ${file.reference.jcore-logger-lib.jar}:\ + ${file.reference.jcountry-core.jar}:\ + ${file.reference.jcountry-lib.jar}:\ ${file.reference.jcontacts-core.jar}:\ ${file.reference.jcontacts-business-core.jar}:\ ${file.reference.jcontacts-lib.jar}:\ - ${file.reference.jcountry-core.jar}:\ ${file.reference.jphone-core.jar}:\ ${file.reference.juser-core.jar}:\ ${file.reference.juser-lib.jar}:\ @@ -120,6 +122,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.juser-core.jar=../juser-core/src/ source.reference.juser-lib.jar=../juser-lib/src/ diff --git a/nbproject/project.xml b/nbproject/project.xml index d6e38d45..a34b45f1 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -19,19 +19,23 @@ WEB-INF/lib - ${file.reference.jcontacts-core.jar} + ${file.reference.jcountry-core.jar} WEB-INF/lib - ${file.reference.jcontacts-business-core.jar} + ${file.reference.jcountry-lib.jar} WEB-INF/lib - ${file.reference.jcontacts-lib.jar} + ${file.reference.jcontacts-core.jar} WEB-INF/lib - ${file.reference.jcountry-core.jar} + ${file.reference.jcontacts-business-core.jar} + WEB-INF/lib + + + ${file.reference.jcontacts-lib.jar} WEB-INF/lib diff --git a/src/java/org/mxchange/addressbook/beans/country/CountryWebBean.java b/src/java/org/mxchange/addressbook/beans/country/CountryWebBean.java new file mode 100644 index 00000000..158abc05 --- /dev/null +++ b/src/java/org/mxchange/addressbook/beans/country/CountryWebBean.java @@ -0,0 +1,49 @@ +package org.mxchange.addressbook.beans.country; + +/* + * Copyright (C) 2015 Roland Haeder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Named; +import org.mxchange.jcountry.data.Country; + +/** + * A country bean + *

+ * @author Roland Haeder + */ +@Named ("country") +@ApplicationScoped +public class CountryWebBean implements CountryWebController { + + /** + * Serial number + */ + private static final long serialVersionUID = 176_985_298_681_742_960L; + + /** + * Default constructor + */ + public CountryWebBean () { + } + + @Override + public Country[] allCountries () { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } +} diff --git a/src/java/org/mxchange/addressbook/beans/country/CountryWebController.java b/src/java/org/mxchange/addressbook/beans/country/CountryWebController.java new file mode 100644 index 00000000..b1a80240 --- /dev/null +++ b/src/java/org/mxchange/addressbook/beans/country/CountryWebController.java @@ -0,0 +1,35 @@ +package org.mxchange.addressbook.beans.country; + +/* + * Copyright (C) 2015 Roland Haeder + * + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation, either version 3 of the License, or (at your option) any later + * version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ +import java.io.Serializable; +import org.mxchange.jcountry.data.Country; + +/** + * An interface for country beans + *

+ * @author Roland Haeder + */ +public interface CountryWebController extends Serializable { + + /** + * A list of all countries + *

+ * @return All countries + */ + public Country[] allCountries (); +} 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 index 00000000..fd33b314 --- /dev/null +++ b/web/WEB-INF/templates/generic/form_personal_data.tpl @@ -0,0 +1,161 @@ + + + +

+ #{msg.PERSONAL_DATA_MINIMUM_NOTICE} +
+ +
+
+ #{msg.PERSONAL_DATA_LEGEND} + +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+
+
+ 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 index 0f96614d..00000000 --- a/web/WEB-INF/templates/guest/guest_personal_data.tpl +++ /dev/null @@ -1,161 +0,0 @@ - - - -
- #{msg.PERSONAL_DATA_MINIMUM_NOTICE} -
- -
-
- #{msg.PERSONAL_DATA_LEGEND} - -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- - - -
- -
-
- -
-
- -
- -
- - - -
- -
-
- -
-
- -
- -
- - - -
- -
-
- -
-
- -
- -
- - - -
- -
-
- -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- - - -
- -
-
- -
-
- -
- -
- - - -
- -
-
- -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- -
- -
-
-
-
- diff --git a/web/WEB-INF/templates/guest/guest_registration_form.tpl b/web/WEB-INF/templates/guest/guest_registration_form.tpl index c92e59bd..9dd4e546 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} - +