catch up with development

Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.authentication.ui/ecviews/org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAccount.ecview b/org.eclipse.osbp.authentication.ui/ecviews/org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAccount.ecview
index 9849283..62283ce 100644
--- a/org.eclipse.osbp.authentication.ui/ecviews/org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAccount.ecview
+++ b/org.eclipse.osbp.authentication.ui/ecviews/org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAccount.ecview
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <core:YView xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:binding="http://osbp.eclipse.org/ecview/v1/core/binding" xmlns:core="http://osbp.eclipse.org/ecview/v1/core/view" xmlns:extension="http://osbp.eclipse.org/ecview/v1/extension/view" xmlns:model="http://osbp.de/ecview/v1/extension" xmlns:visibility="http://osbp.de/ecview/v1/extension/visibility" id="org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAccount" name="org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAccount" viewName="org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAccount" contentAlignment="UNDEFINED">
-  <content xsi:type="extension:YHorizontalLayout" label="" labelI18nKey="">
-    <elements xsi:type="model:YStrategyLayout" id="strategyLayout">
+  <content xsi:type="extension:YHorizontalLayout" label="" labelI18nKey="" numberColumns="2">
+    <elements xsi:type="model:YStrategyLayout" id="strategyLayout" numberColumns="2">
       <suspects xsi:type="model:YTypedSuspect" id="org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAccount.UserAccountDto.email" authorizationGroup="org.eclipse.osbp.authentication.account.dtos.UserAccountDto" authorizationId="email" labelI18nKey="email" label="email" groupName="personal" typeQualifiedName="java.lang.String" type="java.lang.String">
         <tags>text</tags>
         <tags>group</tags>
diff --git a/org.eclipse.osbp.authentication.ui/ecviews/org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAdministration.ecview b/org.eclipse.osbp.authentication.ui/ecviews/org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAdministration.ecview
index a4e7b49..af2827b 100644
--- a/org.eclipse.osbp.authentication.ui/ecviews/org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAdministration.ecview
+++ b/org.eclipse.osbp.authentication.ui/ecviews/org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAdministration.ecview
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <core:YView xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:binding="http://osbp.eclipse.org/ecview/v1/core/binding" xmlns:core="http://osbp.eclipse.org/ecview/v1/core/view" xmlns:extension="http://osbp.eclipse.org/ecview/v1/extension/view" xmlns:model="http://osbp.de/ecview/v1/extension" xmlns:visibility="http://osbp.de/ecview/v1/extension/visibility" id="org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAdministration" name="org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAdministration" viewName="org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAdministration" contentAlignment="UNDEFINED">
-  <content xsi:type="extension:YHorizontalLayout" label="" labelI18nKey="">
-    <elements xsi:type="model:YStrategyLayout" id="strategyLayout">
+  <content xsi:type="extension:YHorizontalLayout" label="" labelI18nKey="" numberColumns="2">
+    <elements xsi:type="model:YStrategyLayout" id="strategyLayout" numberColumns="2">
       <suspects xsi:type="model:YTypedSuspect" id="org.eclipse.osbp.authentication.account.dialogs.autobinded.UserAdministration.UserAccountDto.email" authorizationGroup="org.eclipse.osbp.authentication.account.dtos.UserAccountDto" authorizationId="email" labelI18nKey="email" label="email" groupName="personal" typeQualifiedName="java.lang.String" type="java.lang.String">
         <tags>text</tags>
         <tags>group</tags>
diff --git a/org.eclipse.osbp.authentication.ui/i18n/I18N_de_AT.properties b/org.eclipse.osbp.authentication.ui/i18n/I18N_de_AT.properties
deleted file mode 100644
index 266fc71..0000000
--- a/org.eclipse.osbp.authentication.ui/i18n/I18N_de_AT.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Generated by Eclipse Messages Editor (Eclipse Babel)
-#de_AT
diff --git a/org.eclipse.osbp.authentication.ui/i18n/I18N_en_US.properties b/org.eclipse.osbp.authentication.ui/i18n/I18N_en_US.properties
deleted file mode 100644
index b15b683..0000000
--- a/org.eclipse.osbp.authentication.ui/i18n/I18N_en_US.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Generated by Eclipse Messages Editor (Eclipse Babel)
-#en_US
diff --git a/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/DatamartsServiceBinder.java b/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/DatamartsServiceBinder.java
index ccdb769..2e48e11 100644
--- a/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/DatamartsServiceBinder.java
+++ b/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/DatamartsServiceBinder.java
@@ -12,6 +12,8 @@
 package org.eclipse.osbp.authentication.account.datamarts;
 
 import com.vaadin.ui.Notification;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.math.BigDecimal;
 import java.sql.Date;
 import java.sql.DriverManager;
diff --git a/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/DatamartsTestClass.java b/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/DatamartsTestClass.java
index c289e66..4a8e3f6 100644
--- a/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/DatamartsTestClass.java
+++ b/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/DatamartsTestClass.java
@@ -12,6 +12,8 @@
 package org.eclipse.osbp.authentication.account.datamarts;
 
 import com.vaadin.ui.Notification;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.math.BigDecimal;
 import java.sql.Date;
 import java.sql.DriverManager;
diff --git a/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/UserAccountDatamart.java b/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/UserAccountDatamart.java
index 456863f..8027229 100644
--- a/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/UserAccountDatamart.java
+++ b/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/UserAccountDatamart.java
@@ -1,6 +1,8 @@
 package org.eclipse.osbp.authentication.account.datamarts;
 
 import com.vaadin.ui.Notification;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.Date;
@@ -51,7 +53,7 @@
   
   private Map<String, Map<String, String>> dateFilterAttributeProperties = new LinkedHashMap<String, Map<String, String>>();
   
-  private String statement = "select UserAccount.USER_NAME as \"userName\",UserAccount.EMAIL as \"email\",UserGroup_userGroup.USER_GROUP_NAME as \"userGroupName\",UserAccount.POSITION as \"position\",UserAccount.PROFILEIMAGE as \"profileimage\",UserAccount.NOT_REGISTERED as \"notRegistered\",UserGroup_userGroup.id as \"__UserGroup__ID__\",UserAccount.id as \"__UserAccount__ID__\" from USER_ACCOUNT UserAccount left join USER_GROUP UserGroup_userGroup on(UserGroup_userGroup.id=UserAccount.USER_GROUP_ID)";
+  private String statement = "select UserAccount.USER_NAME as \"userName\",UserAccount.EMAIL as \"email\",UserGroup_userGroup.USER_GROUP_NAME as \"userGroupName\",UserAccount.POSITION as \"position\",UserAccount.PROFILEIMAGE as \"profileimage\",UserAccount.NOT_REGISTERED as \"notRegistered\",UserGroup_userGroup.id as \"__UserGroup__ID__\",UserAccount.id as \"__UserAccount__ID__\" from USER_ACCOUNT UserAccount left join USER_GROUP UserGroup_userGroup on(UserGroup_userGroup.id=UserAccount.USER_GROUP_ID) order by UserGroup_userGroup.USER_GROUP_NAME ASC,UserAccount.USER_NAME ASC";
   
   private DatamartDtoMapper datamartDtoMapper = new DatamartDtoMapper()
     .add("org.eclipse.osbp.authentication.account.dtos.UserGroupDto", "id", EType.NONE, "__UserGroup__ID__")
@@ -145,6 +147,11 @@
     this.user = user;
   }
   
+  public String getName() {
+    return "UserAccount";
+    
+  }
+  
   public List<Object> getPrimaryListKeys(final String columnId) {
     return primaryList.get(columnId).getKeys();
     
diff --git a/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/UserGroupDatamart.java b/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/UserGroupDatamart.java
index f8c62c1..8ecd654 100644
--- a/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/UserGroupDatamart.java
+++ b/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/datamarts/UserGroupDatamart.java
@@ -1,6 +1,8 @@
 package org.eclipse.osbp.authentication.account.datamarts;
 
 import com.vaadin.ui.Notification;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.Date;
@@ -51,7 +53,7 @@
   
   private Map<String, Map<String, String>> dateFilterAttributeProperties = new LinkedHashMap<String, Map<String, String>>();
   
-  private String statement = "select UserGroup.USER_GROUP_NAME as \"userGroupName\",UserGroup.POSITION as \"position\",UserGroup.id as \"__UserGroup__ID__\" from USER_GROUP UserGroup";
+  private String statement = "select UserGroup.USER_GROUP_NAME as \"userGroupName\",UserGroup.POSITION as \"position\",UserGroup.id as \"__UserGroup__ID__\" from USER_GROUP UserGroup order by UserGroup.USER_GROUP_NAME ASC";
   
   private DatamartDtoMapper datamartDtoMapper = new DatamartDtoMapper()
     .add("org.eclipse.osbp.authentication.account.dtos.UserGroupDto", "id", EType.NONE, "__UserGroup__ID__")
@@ -128,6 +130,11 @@
     this.user = user;
   }
   
+  public String getName() {
+    return "UserGroup";
+    
+  }
+  
   public List<Object> getPrimaryListKeys(final String columnId) {
     return primaryList.get(columnId).getKeys();
     
diff --git a/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/tables/UserAdministrationTable.java b/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/tables/UserAdministrationTable.java
index 98cb66b..7778720 100644
--- a/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/tables/UserAdministrationTable.java
+++ b/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/tables/UserAdministrationTable.java
@@ -447,17 +447,11 @@
     			EventDispatcherEvent evnt = new EventDispatcherEvent(getContext().get(MPerspective.class), EventDispatcherCommand.SELECT, "org.eclipse.osbp.authentication.account.entities.UserAccount.id", "org.eclipse.osbp.authentication.account.tables.UserAdministration");
     			evnt.addItem(EventDispatcherDataTag.ID, idObj);
     			eventDispatcher.sendEvent(evnt);
-    			
     			// send all refs too
     			for (String alias : datamartInstance.getPrimaryList().keySet()){
     				if (!"__UserAccount__ID__".equals(alias)){
-    					String key = datamartInstance.getPrimaryList().get(alias).getEntityName() + "." + datamartInstance.getPrimaryList().get(alias).getAttributeName();
-    					idObj = datamartInstance.getPrimaryListKeys(alias).get(selection);
-    					
-    					SelectionStore.putSelectionToPerspectiveContext(getPart(),key,idObj);
-    					
-    					evnt = new EventDispatcherEvent(getContext().get(MPerspective.class), EventDispatcherCommand.SELECT, key, "org.eclipse.osbp.authentication.account.tables.UserAdministration");
-    					evnt.addItem(EventDispatcherDataTag.ID, idObj);
+    					evnt = new EventDispatcherEvent(getContext().get(MPerspective.class), EventDispatcherCommand.SELECT, datamartInstance.getPrimaryList().get(alias).getEntityName() + "." + datamartInstance.getPrimaryList().get(alias).getAttributeName(), "org.eclipse.osbp.authentication.account.tables.UserAdministration");
+    					evnt.addItem(EventDispatcherDataTag.ID, datamartInstance.getPrimaryListKeys(alias).get(selection));
     					eventDispatcher.sendEvent(evnt);
     				}
     			}
@@ -642,11 +636,13 @@
     switch(event.getCommand()) {
     	case SELECT: 
     		MPerspective perspective = eclipseContext.get(MPerspective.class);
-    		ArrayList<String> allowedSenderParts = (ArrayList<String>) eclipseContext.getActive(MPart.class).getTransientData().get(IPerspectiveProvider.EventDispatcherConstants.ACCEPTED_SENDERS);
-    		if((event.getPerspective() == null || (perspective != null && event.getPerspective().equals(perspective))) && ((allowedSenderParts != null && allowedSenderParts.contains(event.getSender())) || allowedSenderParts == null)){
-    			if(!event.getSender().equals("org.eclipse.osbp.authentication.account.tables.UserAdministration")) {
-    				if(filterGenerator.selectItem(event, getSelectById())) {
-    					renderData();
+    		if(perspective != null) {
+    			ArrayList<String> allowedSenderParts = (ArrayList<String>) eclipseContext.getActive(MPart.class).getTransientData().get(IPerspectiveProvider.EventDispatcherConstants.ACCEPTED_SENDERS);
+    			if((event.getPerspective() == null || (perspective != null && event.getPerspective().equals(perspective))) && ((allowedSenderParts != null && allowedSenderParts.contains(event.getSender())) || allowedSenderParts == null)){
+    				if(!event.getSender().equals("org.eclipse.osbp.authentication.account.tables.UserAdministration")) {
+    					if(filterGenerator.selectItem(event, getSelectById())) {
+    						renderData();
+    					}
     				}
     			}
     		}
@@ -654,13 +650,13 @@
     	case SAVE:
     	case DELETE:
     		if(!event.getSender().equals("org.eclipse.osbp.authentication.account.tables.UserAdministration")) {
-    			if(event.getTopic().equals("org.eclipse.osbp.authentication.account.entities.UserAccount")){
+    			if(event.getTopic().equals("org.eclipse.osbp.authentication.account.entities.UserGroup")){
     				datamartInstance.clearCache();
     				if(datamartInstance.contains(event.getData().get(EventDispatcherDataTag.ID))) {
     					dataRefresh();
     				}
     			}
-    			if(event.getTopic().equals("org.eclipse.osbp.authentication.account.entities.UserGroup")){
+    			if(event.getTopic().equals("org.eclipse.osbp.authentication.account.entities.UserAccount")){
     				datamartInstance.clearCache();
     				if(datamartInstance.contains(event.getData().get(EventDispatcherDataTag.ID))) {
     					dataRefresh();
@@ -670,11 +666,11 @@
     		break;
     	case REFRESH:
     		if(!event.getSender().equals("org.eclipse.osbp.authentication.account.tables.UserAdministration")) {
-    			if(event.getTopic().equals("org.eclipse.osbp.authentication.account.entities.UserAccount")){
+    			if(event.getTopic().equals("org.eclipse.osbp.authentication.account.entities.UserGroup")){
     				datamartInstance.clearCache();
     				dataRefresh();
     			}
-    			if(event.getTopic().equals("org.eclipse.osbp.authentication.account.entities.UserGroup")){
+    			if(event.getTopic().equals("org.eclipse.osbp.authentication.account.entities.UserAccount")){
     				datamartInstance.clearCache();
     				dataRefresh();
     			}
diff --git a/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/tables/UserGroupAdministrationTable.java b/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/tables/UserGroupAdministrationTable.java
index a73a27b..40a49f6 100644
--- a/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/tables/UserGroupAdministrationTable.java
+++ b/org.eclipse.osbp.authentication.ui/src-gen/org/eclipse/osbp/authentication/account/tables/UserGroupAdministrationTable.java
@@ -441,17 +441,11 @@
     			EventDispatcherEvent evnt = new EventDispatcherEvent(getContext().get(MPerspective.class), EventDispatcherCommand.SELECT, "org.eclipse.osbp.authentication.account.entities.UserGroup.id", "org.eclipse.osbp.authentication.account.tables.UserGroupAdministration");
     			evnt.addItem(EventDispatcherDataTag.ID, idObj);
     			eventDispatcher.sendEvent(evnt);
-    			
     			// send all refs too
     			for (String alias : datamartInstance.getPrimaryList().keySet()){
     				if (!"__UserGroup__ID__".equals(alias)){
-    					String key = datamartInstance.getPrimaryList().get(alias).getEntityName() + "." + datamartInstance.getPrimaryList().get(alias).getAttributeName();
-    					idObj = datamartInstance.getPrimaryListKeys(alias).get(selection);
-    					
-    					SelectionStore.putSelectionToPerspectiveContext(getPart(),key,idObj);
-    					
-    					evnt = new EventDispatcherEvent(getContext().get(MPerspective.class), EventDispatcherCommand.SELECT, key, "org.eclipse.osbp.authentication.account.tables.UserGroupAdministration");
-    					evnt.addItem(EventDispatcherDataTag.ID, idObj);
+    					evnt = new EventDispatcherEvent(getContext().get(MPerspective.class), EventDispatcherCommand.SELECT, datamartInstance.getPrimaryList().get(alias).getEntityName() + "." + datamartInstance.getPrimaryList().get(alias).getAttributeName(), "org.eclipse.osbp.authentication.account.tables.UserGroupAdministration");
+    					evnt.addItem(EventDispatcherDataTag.ID, datamartInstance.getPrimaryListKeys(alias).get(selection));
     					eventDispatcher.sendEvent(evnt);
     				}
     			}
@@ -636,11 +630,13 @@
     switch(event.getCommand()) {
     	case SELECT: 
     		MPerspective perspective = eclipseContext.get(MPerspective.class);
-    		ArrayList<String> allowedSenderParts = (ArrayList<String>) eclipseContext.getActive(MPart.class).getTransientData().get(IPerspectiveProvider.EventDispatcherConstants.ACCEPTED_SENDERS);
-    		if((event.getPerspective() == null || (perspective != null && event.getPerspective().equals(perspective))) && ((allowedSenderParts != null && allowedSenderParts.contains(event.getSender())) || allowedSenderParts == null)){
-    			if(!event.getSender().equals("org.eclipse.osbp.authentication.account.tables.UserGroupAdministration")) {
-    				if(filterGenerator.selectItem(event, getSelectById())) {
-    					renderData();
+    		if(perspective != null) {
+    			ArrayList<String> allowedSenderParts = (ArrayList<String>) eclipseContext.getActive(MPart.class).getTransientData().get(IPerspectiveProvider.EventDispatcherConstants.ACCEPTED_SENDERS);
+    			if((event.getPerspective() == null || (perspective != null && event.getPerspective().equals(perspective))) && ((allowedSenderParts != null && allowedSenderParts.contains(event.getSender())) || allowedSenderParts == null)){
+    				if(!event.getSender().equals("org.eclipse.osbp.authentication.account.tables.UserGroupAdministration")) {
+    					if(filterGenerator.selectItem(event, getSelectById())) {
+    						renderData();
+    					}
     				}
     			}
     		}
diff --git a/org.eclipse.osbp.authentication.ui/src/account.datamart b/org.eclipse.osbp.authentication.ui/src/account.datamart
index 7c06336..213eb30 100644
--- a/org.eclipse.osbp.authentication.ui/src/account.datamart
+++ b/org.eclipse.osbp.authentication.ui/src/account.datamart
@@ -23,6 +23,9 @@
 				attributes {
 					attribute userGroupName axis columns columnWeight 700
 				}
+				ordering {
+					order userGroupName ascending
+				}
 			}
 		} 
 		attributes {
@@ -32,6 +35,9 @@
 			attribute profileimage axis columns columnWeight 500
 			attribute notRegistered axis columns columnWeight 400
 		}
+		ordering {
+			order userName ascending
+		}
 	}
 	datamart UserGroup 
 	using entity UserGroup { 
@@ -39,5 +45,9 @@
 			attribute userGroupName axis columns columnWeight 900 
 			attribute position axis columns columnWeight 800
 		}
+		ordering {
+			order userGroupName ascending
+		}
 	}
+	
 }
diff --git a/org.eclipse.osbp.authentication.ui/src/account.dialog b/org.eclipse.osbp.authentication.ui/src/account.dialog
index 11ef0cf..246c59c 100644
--- a/org.eclipse.osbp.authentication.ui/src/account.dialog
+++ b/org.eclipse.osbp.authentication.ui/src/account.dialog
@@ -15,9 +15,9 @@
 import ns org.eclipse.osbp.authentication.account.actions.Dialog
 import ns org.eclipse.osbp.authentication.account.dtos.UserGroupDto package org.eclipse.osbp.authentication.account.dialogs {
 
-	dialog UserAccount autobinding UserAccountDto embedded
+	dialog UserAccount autobinding UserAccountDto embedded numColumns 2
 
-	dialog UserAdministration autobinding UserAccountDto toolbar Dialog
+	dialog UserAdministration autobinding UserAccountDto toolbar Dialog numColumns 2
 
 	dialog UserGroupAdministration autobinding UserGroupDto toolbar Dialog
 }
\ No newline at end of file
diff --git a/org.eclipse.osbp.authentication.ui/src/org/eclipse/osbp/authentication/ui/login/AuthenticationProvider.java b/org.eclipse.osbp.authentication.ui/src/org/eclipse/osbp/authentication/ui/login/AuthenticationProvider.java
index 055d2f1..202d3a8 100644
--- a/org.eclipse.osbp.authentication.ui/src/org/eclipse/osbp/authentication/ui/login/AuthenticationProvider.java
+++ b/org.eclipse.osbp.authentication.ui/src/org/eclipse/osbp/authentication/ui/login/AuthenticationProvider.java
@@ -458,12 +458,13 @@
 				// wait exponentially along failed logins up to a maximum of
 				// 18,2 hours to prevent "Rapid-Fire Login Attempts"
 				// http://stackoverflow.com/questions/549/the-definitive-guide-to-form-based-website-authentication
-				
-				Double sleep=(1000.0 * Math.max(5,Math.pow(2, Math.min(failedLoginCnt++, 16))-1));
-				int sleepSeconds=sleep.intValue()/1000;					
+				// JCD - disabled due to tickets because of the long period of time waiting for a response
+//				Double sleep=(1000.0 * Math.max(5,Math.pow(2, Math.min(failedLoginCnt++, 16))-1));
+//				int sleepSeconds=sleep.intValue()/1000;					
 				Notification notification = new Notification(dslMetadataService.translate(locale.toLanguageTag(), "lockedmessage"), Type.ERROR_MESSAGE);
-				notification.setDelayMsec(sleep.intValue());
-				LOGGER.info("Login '{}' is locked for {} seconds now ... pls. wait", username, ((Integer)sleepSeconds).toString() ); //NOSONAR
+//				notification.setDelayMsec(sleep.intValue());
+//				LOGGER.info("Login '{}' is locked for {} seconds now ... pls. wait", username, ((Integer)sleepSeconds).toString() ); //NOSONAR
+				LOGGER.info("Login '{}' is locked for max 128 seconds now ... pls. wait", username ); //NOSONAR
 				notification.show(Page.getCurrent());
 				
 			} else if (InitializationListener.getUserAccessService().isAccountNotRegistered(username)) {