Please cherry-pick:

- added debugger class for making JSF life-cycles visible, thanks to BalusC for this free code
- registered above debugger
- rewrote all templates with f:metadata to, again, BalusC's recommendation to have "metadata" in a own ui:define block
- added NOISY debug lines (please comment out on productive systems!)

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/de/chotime/landingpage/converter/fax/LandingFaxNumberConverter.java b/src/java/de/chotime/landingpage/converter/fax/LandingFaxNumberConverter.java
index f133ea0a4e51bff32351384b11eea2076f22b342..7bd5fd33be983443ef75344cb20a671de50a5b48 100644 (file)
--- a/src/java/de/chotime/landingpage/converter/fax/LandingFaxNumberConverter.java
+++ b/src/java/de/chotime/landingpage/converter/fax/LandingFaxNumberConverter.java
@@ -73,6 +73,9 @@ public class LandingFaxNumberConverter implements Converter {
 
        @Override
        public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+               // Log message
+               this.loggerBeanLocal.logTrace(MessageFormat.format("{0}.getAsObject: context={1},component={2},submittedValue={3} - CALLED!", this.getClass().getSimpleName(), context, component, submittedValue)); //NOI18N
+
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -89,6 +92,9 @@ public class LandingFaxNumberConverter implements Converter {
                        // Try to parse the value as long
                        Long faxNumberId = Long.valueOf(submittedValue);
 
+                       // Log message
+                       this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject: faxNumberId={1}", this.getClass().getSimpleName(), faxNumberId)); //NOI18N
+
                        // Try to get mobile instance from it
                        faxNumber = this.phoneBean.findFaxNumberById(faxNumberId);
                } catch (final NumberFormatException ex) {
@@ -99,6 +105,9 @@ public class LandingFaxNumberConverter implements Converter {
                        this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N
                }
 
+               // Log message
+               this.loggerBeanLocal.logTrace(MessageFormat.format("{0}.getAsObject: faxNumber={1} - EXIT!", this.getClass().getSimpleName(), faxNumber)); //NOI18N
+
                // Return it
                return faxNumber;
        }

diff --git a/src/java/de/chotime/landingpage/debug/LandingDebugLifeCycleListener.java b/src/java/de/chotime/landingpage/debug/LandingDebugLifeCycleListener.java
new file mode 100644 (file)
index 0000000..2a1c24a
--- /dev/null
+++ b/src/java/de/chotime/landingpage/debug/LandingDebugLifeCycleListener.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2016 Roland Haeder<rhaeder@cho-time.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package de.chotime.landingpage.debug;
+
+import java.text.MessageFormat;
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+
+/**
+ * A listener for debugging JSF lifecycle phases
+ * <p>
+ * @author Roland Haeder<rhaeder@cho-time.de>
+ */
+public class LandingDebugLifeCycleListener implements PhaseListener {
+
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 523_467_675_719_515L;
+
+       @Override
+       public void afterPhase (final PhaseEvent event) {
+               System.out.println(MessageFormat.format("<--- End phase {0}", event.getPhaseId())); //NOI18N
+       }
+
+       @Override
+       public void beforePhase (final PhaseEvent event) {
+               System.out.println(MessageFormat.format("---> Start phase {0}", event.getPhaseId())); //NOI18N
+       }
+
+       @Override
+       public PhaseId getPhaseId () {
+               return PhaseId.ANY_PHASE;
+       }
+
+}

diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java
index b5fa53a52404485cac28dd271b8e7376aa8ce57c..3bca9397e9cefed3a64246698925695f3fd20a4a 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java
@@ -67,6 +67,11 @@ import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
 @RequestScoped
 public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController implements JobsAdminContactPhoneWebRequestController {
 
+       /**
+        * Call-stack instance (5 may show BeanELResolver.getValue as caller)
+        */
+       private static final short THREAD_STACK = 5;
+
        /**
         * Serial number
         */
@@ -129,6 +134,9 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl
         * Default constructor
         */
        public JobsAdminContactPhoneWebRequestBean () {
+               String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[3].getClassName(), Thread.currentThread().getStackTrace()[3].getMethodName());
+               System.out.println(MessageFormat.format("{0}: Constructed, caller: {1}", this.getClass().getSimpleName(), caller));
+
                // Try it
                try {
                        // Get initial context

diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java
index 1337cc1771ec786c95a4c80c07e2eb59a0e84c2f..165bc260e26167db69b29f9dab867db3c478af88 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Cho-Time GmbH
+ * Copyright (C) 2016 Roland Haeder
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -44,7 +44,7 @@ import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
 /**
  * An administrative contact phone controller (bean)
  * <p>
- * @author Roland Haeder<rhaeder@cho-time.de>
+ * @author Roland Haeder<roland@mxchange.org>
  */
 @Named ("contactPhoneController")
 @SessionScoped

diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java
index 7c2451830762d3e508fbf840df08d4ef2b92eb7c..f798a08bcc7b4ceec189e11294db8f1fdd2653a8 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Cho-Time GmbH
+ * Copyright (C) 2016 Roland Haeder
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -30,7 +30,7 @@ import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
 /**
  * An interface for user beans
  * <p>
- * @author Roland Haeder<rhaeder@cho-time.de>
+ * @author Roland Haeder<roland@mxchange.org>
  */
 @Local
 public interface JobsContactPhoneWebSessionController extends Serializable {

diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java
index 2fe796f20af93fd352e16320e4b6209f4e05eb38..081dc6c74dc6cfa3240b222187a28095963390c3 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java
+++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java
@@ -21,6 +21,7 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jjobs.beans.BaseJobsController;
 import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController;
 import org.mxchange.jjobs.beans.phone.JobsAdminPhoneWebRequestController;
 import org.mxchange.jjobs.beans.user.JobsUserWebSessionController;
@@ -36,7 +37,12 @@ import org.mxchange.jusercore.model.user.User;
  */
 @Named ("adminHelper")
 @RequestScoped
-public class JobsWebRequestHelper implements JobsWebRequestController {
+public class JobsWebRequestHelper extends BaseJobsController implements JobsWebRequestController {
+
+       /**
+        * Call-stack instance (5 may show BeanELResolver.getValue as caller)
+        */
+       private static final short THREAD_STACK = 5;
 
        /**
         * Serial number
@@ -90,10 +96,15 @@ public class JobsWebRequestHelper implements JobsWebRequestController {
         * Default constructor
         */
        public JobsWebRequestHelper () {
+               String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[3].getClassName(), Thread.currentThread().getStackTrace()[3].getMethodName());
+               System.out.println(MessageFormat.format("{0}: Constructed, caller: {1}", this.getClass().getSimpleName(), caller));
        }
 
        @Override
        public void copyContactToController () {
+               String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName());
+               System.out.println(MessageFormat.format("{0}.copyContactToController: CALLED, caller: {2}", this.getClass().getSimpleName(), this.contact, caller));
+
                // Validate contact instance
                if (this.getContact() == null) {
                        // Throw NPE
@@ -125,7 +136,7 @@ public class JobsWebRequestHelper implements JobsWebRequestController {
                } else if (this.getFaxNumber().getPhoneId() < 1) {
                        // Invalid id number
                        throw new IllegalArgumentException(MessageFormat.format("this.faxNumber.phoneId={0} is not valid", this.getFaxNumber().getPhoneId()));
-               } else if (this.getFaxNumber().getPhoneAreaCode()== null) {
+               } else if (this.getFaxNumber().getPhoneAreaCode() == null) {
                        // Throw again
                        throw new NullPointerException("this.faxNumber.phoneAreaCode is null");
                } else if (this.getFaxNumber().getPhoneAreaCode() < 1) {
@@ -166,7 +177,7 @@ public class JobsWebRequestHelper implements JobsWebRequestController {
                } else if (this.getLandLineNumber().getPhoneId() < 1) {
                        // Invalid id number
                        throw new IllegalArgumentException(MessageFormat.format("this.landLineNumber.phoneId={0} is not valid", this.getLandLineNumber().getPhoneId()));
-               } else if (this.getLandLineNumber().getPhoneAreaCode()== null) {
+               } else if (this.getLandLineNumber().getPhoneAreaCode() == null) {
                        // Throw again
                        throw new NullPointerException("this.landLineNumber.phoneAreaCode is null");
                } else if (this.getLandLineNumber().getPhoneAreaCode() < 1) {
@@ -261,11 +272,15 @@ public class JobsWebRequestHelper implements JobsWebRequestController {
 
        @Override
        public Contact getContact () {
+               String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName());
+               System.out.println(MessageFormat.format("{0}: Returning this.contact={1}, caller: {2}", this.getClass().getSimpleName(), this.contact, caller));
                return this.contact;
        }
 
        @Override
        public void setContact (final Contact contact) {
+               String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName());
+               System.out.println(MessageFormat.format("{0}: Setting contact={1}, previous: {2}, caller: {3}", this.getClass().getSimpleName(), contact, this.contact, caller));
                this.contact = contact;
        }
 

diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
index 462d12f9eafa07e52ec9ea0f4ef63912c3d3e624..ad707af4af65f06dc9ae8efcf98e5017a8135c15 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
@@ -56,6 +56,11 @@ import org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote;
 @RequestScoped
 public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements JobsAdminPhoneWebRequestController {
 
+       /**
+        * Call-stack position
+        */
+       private static final short THREAD_STACK = 5;
+
        /**
         * Serial number
         */
@@ -128,8 +133,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements
        private Long phoneNumber;
 
        /**
-        * Event being fired when a list of all unsed fax numbers is being
-        * created.
+        * Event being fired when a list of all unsed fax numbers is being created.
         */
        @Inject
        @Any
@@ -155,6 +159,9 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements
         * Default constructor
         */
        public JobsAdminPhoneWebRequestBean () {
+               String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[3].getClassName(), Thread.currentThread().getStackTrace()[3].getMethodName());
+               System.out.println(MessageFormat.format("{0}: Constructed, caller: {1}", this.getClass().getSimpleName(), caller));
+
                // Try it
                try {
                        // Get initial context
@@ -308,11 +315,15 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements
 
        @Override
        public DialableFaxNumber getChoosenFaxNumber () {
+               String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName());
+               System.out.println(MessageFormat.format("{0}: Returning this.choosenFaxNumber={1}, caller: {2}", this.getClass().getSimpleName(), this.choosenFaxNumber, caller));
                return this.choosenFaxNumber;
        }
 
        @Override
        public void setChoosenFaxNumber (final DialableFaxNumber choosenFaxNumber) {
+               String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName());
+               System.out.println(MessageFormat.format("{0}: Settin choosenFaxNumber={1}, previous: this.choosenFaxNumber={2}, caller: {3}", this.getClass().getSimpleName(), choosenFaxNumber, this.choosenFaxNumber, caller));
                this.choosenFaxNumber = choosenFaxNumber;
        }
 

diff --git a/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java b/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java
index 25849b090afcc441dadb7bd2b62abf8698f25cf1..2b948d292aba9a737c734bddc7abaded3a5b07e9 100644 (file)
--- a/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java
+++ b/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jjobs.validator.booleans;
 
+import java.text.MessageFormat;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
@@ -38,14 +39,20 @@ public class JobsUserProfileVisibilityValidator extends BaseBooleanValidator imp
 
        @Override
        public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+               // Log message
+               System.out.println(MessageFormat.format("{0}.validate: context={1},component={2},value={3} - CALLED!", this.getClass().getSimpleName(), context, component, value));
+
                // The required field
                String[] requiredFields = {"landLineAreaCode", "landLineNumber", "faxAreaCode", "faxNumber", "mobileNumber"}; //NOI18N
 
+               // Log message
+               System.out.println(MessageFormat.format("{0}.validate: component.clientId={1}", this.getClass().getSimpleName(), component.getClientId()));
+
                // Pre-validation (example: not null, not a string, empty string ...)
-               super.preValidate(context, component, value, requiredFields, false);
+               super.preValidate(context, component, value, requiredFields, true);
 
-               // Trace message
-               //* NOISY-DEBUG: */ System.out.println("validate: EXIT!"); //NOI18N
+               // Log message
+               System.out.println(MessageFormat.format("{0}.validate: EXIT!", this.getClass().getSimpleName()));
        }
 
 }

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index d23945fc07fb93b56212e16380b9a98014bec6f1..0de8e75c08a2f47c9fde47b52fc675107a08d12a 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -9,6 +9,9 @@
                        <supported-locale>en_US</supported-locale>
                </locale-config>
        </application>
+       <lifecycle>
+               <phase-listener>de.chotime.landingpage.debug.LandingDebugLifeCycleListener</phase-listener>
+       </lifecycle>
        <navigation-rule>
                <from-view-id>*</from-view-id>
                <navigation-case>

diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
index c13329c93785ff6dc116ee06e5dd5cf9f101758e..b350fa7552d5de3af7714d5e8f3c786f923ba808 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -61,7 +61,10 @@
 
                        <div class="table_footer">
                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <h:commandButton styleClass="submit" id="submit_add_link_contact_fax" type="submit" action="#{adminContactPhoneController.doLinkAddFaxNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}" />
+
+                               <h:commandButton styleClass="submit" id="submit_add_link_contact_fax" type="submit" action="#{adminContactPhoneController.doLinkAddFaxNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}">
+                                       <f:param name="contactId" value="#{param.contactId}" />
+                               </h:commandButton>
                        </div>
                </h:panelGroup>
        </h:form>

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index 28d711c9050945a098401b0b4af0164fa6d697f5..e2ec77f69a46465a663938cc384b18ef717f48a0 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -61,7 +61,10 @@
 
                        <div class="table_footer">
                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <h:commandButton styleClass="submit" id="submit_add_link_contact_landline" type="submit" action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}" />
+
+                               <h:commandButton styleClass="submit" id="submit_add_link_contact_landline" type="submit" action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}">
+                                       <f:param name="contactId" value="#{param.contactId}" />
+                               </h:commandButton>
                        </div>
                </h:panelGroup>
        </h:form>

diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
index c89840e171b747af29dbfe6c18ae9e2aefff9f54..cb686076b6b03ff057e9d54d1707e192634d9ed6 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
@@ -49,7 +49,10 @@
 
                        <div class="table_footer">
                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <h:commandButton styleClass="submit" id="submit_add_link_contact_mobile" type="submit" action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}" />
+
+                               <h:commandButton styleClass="submit" id="submit_add_link_contact_mobile" type="submit" action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}">
+                                       <f:param name="contactId" value="#{param.contactId}" />
+                               </h:commandButton>
                        </div>
                </h:panelGroup>
        </h:form>

diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index 8aeeb260e19936300a6cfef20f9c316e00fa5106..3a7d128fc7fd4824d72341f38a4c86cf35ef5a35 100644 (file)
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -6,6 +6,9 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:f="http://xmlns.jcp.org/jsf/core">
 
+       <ui:insert name="metadata">
+       </ui:insert>
+
        <f:view locale="#{localizationController.locale}" contentType="text/html">
                <h:head>
                        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index f48fcf3a1ffdf4acd89a331e5618b2438c7c5623..2a3053a1966af3b2a80d550df8fbacf016d9138e 100644 (file)
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -2,6 +2,10 @@
 <web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
     <description>An application for handling and sending out applications to companies.</description>
     <display-name>JJobs v1.0</display-name>
+    <context-param>
+        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-value>Development</param-value>
+    </context-param>
     <context-param>
         <description>Whether the multi-page registration page or a single registration page is active</description>
         <param-name>is_feature_user_register_multiple_page_enabled</param-name>

diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index 34b638358c584dda43adaf18569934bddc7da291..6a069436a579802e2d8e7f9c83d6cb564f25253e 100644 (file)
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+                               <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index e6e11210b77d7a9c807c6a2c88d073cb02e3459b..c973a90c15fb0a1a456a1d0b94ed58ad93b6b292 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+                               <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index ec009c3a3d855444a1446526189ae9245363733d..4dbbab12115c13fdbf4ab12b7cba23f817df9dee 100644 (file)
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+                               <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 6d9a47bcfc82cd3dda3c85c9342439a0fb6d94f0..6d0e615d64524e3f2aa365fd6f026d40f72557c1 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index cb177c4d104815a3e4b1e511e2e063f0a17f5e49..489ee1f07de014e0e0ee6f259e3fc183e2fc7f1d 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 80116b690cc0de8ac1b37af84595a8c7c08f9006..1c226a3c1722ab4afc40ed154dddb309ced20155 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -7,10 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-       </f:metadata>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+               </f:metadata>
+       </ui:define>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}</ui:define>

diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index 67b6c54ec3ac7f4a2833401b6b8247fa1e000bbe..ade80e5a9e086535db46a01ba2ad1ea917e3eed8 100644 (file)
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -7,11 +7,13 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_FAX}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index be3465497e42ba14c637392c6b0b3f29ed5aa3ee..20e186d60d58296e03cc65dd508ced2b6ef07368 100644 (file)
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                               <f:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_FAX}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 9a02c0d7aaf3cbb78c649c296c7a300b08f85160..81251537ef5d12d6c82644d45def52be2144393f 100644 (file)
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -7,11 +7,13 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_FAX}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index d9c359fd38e20dfdb30a8b7b5fb38e5d04413c34..67f398ee2c4ab5e764fb0fe340430c4af08a1ed9 100644 (file)
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -7,11 +7,13 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index 97d31978bd8da4f3214cd46abe580036e2d026e0..c29fca9a7477206c22c3e1f141584012f15d570c 100644 (file)
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyLandLineNumberToController()}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                               <f:viewAction onPostback="true" action="#{beanHelper.copyLandLineNumberToController()}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index 773e8aa15321ff14a5c5ce0a975fde9c7cc83867..6ceeb3cabf356011658f49b65dc1e0c8d2d8fe52 100644 (file)
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -7,11 +7,13 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index 536a64d34ee83d822523460b4ef768e93f1f3f35..c93778518bc44c70ab64a8be9f59ce00cfbd88ba 100644 (file)
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -7,9 +7,11 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-       </f:metadata>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+               </f:metadata>
+       </ui:define>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER}</ui:define>

diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index 4eaf05d7976d2c815c563aa15e9367d55c632096..09f436e475a41832f70c3027bce6cc6002d9d5f0 100644 (file)
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -7,10 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyMobileNumberToController()}" />
-       </f:metadata>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.copyMobileNumberToController()}" />
+               </f:metadata>
+       </ui:define>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER}</ui:define>

diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 1fbe6f19d443f04cd31704853bdfd14be4604f71..6beb5e6811fd90f8699df7ccacc67ebe520f8312 100644 (file)
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -7,9 +7,11 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-       </f:metadata>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+               </f:metadata>
+       </ui:define>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER}</ui:define>

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 4a1c9969786fb055ba106b2d92929b648c3b4bcf..2dda44de6aa58996b24bee8bbba9add3b0fa171e 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_USER}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index eb18aaf569015bf22647e82ea5e64e260f680c13..be0d4472d73e65d3a0e2da490e59aad39953afba 100644 (file)
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -8,12 +8,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_USER}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index c7bd7b3e84108f7e83d76e21d42381332c17802a..0444377337010ab0cab8fe6b829cc33ab0f7485b 100644 (file)
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -8,12 +8,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LOCK_USER}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index cc29b2991db33d61a77c5bdc65ec050224d53c05..2694b41b92637e4b4fb813b8f0419fb59ff583e2 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_USER}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index ce0d3a9d71cdaac009d9a560ff4e995bc2fff492..9682c043057944d9188dcc49a314aaaeff52745f 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -7,10 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-       </f:metadata>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+               </f:metadata>
+       </ui:define>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}</ui:define>

diff --git a/web/guest/user/confirm_account.xhtml b/web/guest/user/confirm_account.xhtml
index 0adfb02da00bcc7bca676248a5ca0b0f23c8565f..a6d5789c2cbc49651c99ea30d2389bb57a0834af 100644 (file)
--- a/web/guest/user/confirm_account.xhtml
+++ b/web/guest/user/confirm_account.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="confirmKey" value="#{confirmationLinkController.confirmationKey}" />
-               <f:viewAction onPostback="true" action="#{confirmationLinkController.maybeConfirmUserAccount()}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="confirmKey" value="#{confirmationLinkController.confirmationKey}" />
+                               <f:viewAction onPostback="true" action="#{confirmationLinkController.maybeConfirmUserAccount()}" />
+                       </f:metadata>
+               </ui:define>
+
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index e57c5865056012991d587601545fab2327198fd9..62ff8d7d9f8090b6730fdb538542b742b4b04431 100644 (file)
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -6,15 +6,17 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <f:metadata>
-               <f:viewParam id="userId" name="userId" value="#{userController.userId}" required="true" requiredMessage="#{msg.PARAMETER_USER_ID_MISSING}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" validatorMessage="#{msg.PARAMETER_USER_ID_NOT_FOUND}">
-                       <f:convertNumber for="userId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
-                       <f:validator for="userId" validatorId="UserIdValidator" />
-               </f:viewParam>
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_PROFILE}</ui:define>
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam id="userId" name="userId" value="#{userController.userId}" required="true" requiredMessage="#{msg.PARAMETER_USER_ID_MISSING}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" validatorMessage="#{msg.PARAMETER_USER_ID_NOT_FOUND}">
+                                       <f:convertNumber for="userId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
+                                       <f:validator for="userId" validatorId="UserIdValidator" />
+                               </f:viewParam>
+                       </f:metadata>
+               </ui:define>
+
+               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE}</ui:define>
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_USER_PROFILE}</ui:define>
 
                <ui:define name="content_header">