From 3f8cef33c11be9ffe55e88d7d642c4309d2bc040 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Wed, 26 Jul 2006 11:00:06 +0000
Subject: [PATCH] Merged V1.3 to HEAD (3180:3203, 3204:3217)    svn merge
 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3180
 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3203 .    svn merge
 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3204
 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3217 .

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/web/app/ContextListener.java   | 12 +-----------
 .../org/alfresco/web/bean/AdvancedSearchBean.java    |  8 --------
 source/java/org/alfresco/web/bean/LoginBean.java     |  5 ++++-
 .../org/alfresco/web/bean/wizard/NewUserWizard.java  |  7 +------
 source/web/css/main.css                              |  2 +-
 5 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/source/java/org/alfresco/web/app/ContextListener.java b/source/java/org/alfresco/web/app/ContextListener.java
index 948f3d9305..cd36ba6598 100644
--- a/source/java/org/alfresco/web/app/ContextListener.java
+++ b/source/java/org/alfresco/web/app/ContextListener.java
@@ -146,17 +146,7 @@ public class ContextListener implements ServletContextListener, HttpSessionListe
     */
    public void contextDestroyed(ServletContextEvent event)
    {
-      WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
-      Scheduler quartz = (Scheduler) ctx.getBean("schedulerFactory");
-      try
-      {
-         quartz.shutdown(true);
-      }
-      catch (SchedulerException e)
-      {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      }
+      // nothing to do
    }
 
    /**
diff --git a/source/java/org/alfresco/web/bean/AdvancedSearchBean.java b/source/java/org/alfresco/web/bean/AdvancedSearchBean.java
index d883f16ac4..9ee2208ae1 100644
--- a/source/java/org/alfresco/web/bean/AdvancedSearchBean.java
+++ b/source/java/org/alfresco/web/bean/AdvancedSearchBean.java
@@ -621,10 +621,6 @@ public class AdvancedSearchBean
                   }
                }
             }
-            
-            // make sure the list is sorted by the label
-            QuickSort sorter = new QuickSort(this.contentTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
-            sorter.sort();
          }
       }
       
@@ -673,10 +669,6 @@ public class AdvancedSearchBean
                   }
                }
             }
-            
-            // make sure the list is sorted by the label
-            QuickSort sorter = new QuickSort(this.folderTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
-            sorter.sort();
          }
       }
       
diff --git a/source/java/org/alfresco/web/bean/LoginBean.java b/source/java/org/alfresco/web/bean/LoginBean.java
index aad12d6d3c..17274e42b9 100644
--- a/source/java/org/alfresco/web/bean/LoginBean.java
+++ b/source/java/org/alfresco/web/bean/LoginBean.java
@@ -279,12 +279,15 @@ public class LoginBean
             // in the session - this is used by the servlet filter etc. on each page to check for login
             this.authenticationService.authenticate(this.username, this.password.toCharArray());
             
+            // Set the user name as stored by the back end 
+            this.username = this.authenticationService.getCurrentUserName();
+            
             // remove the session invalidated flag (used to remove last username cookie by AuthenticationFilter)
             session.remove(AuthenticationHelper.SESSION_INVALIDATED);
             
             // setup User object and Home space ID
             User user = new User(
-                  this.authenticationService.getCurrentUserName(),
+                    this.username,
                   this.authenticationService.getCurrentTicket(),
                   personService.getPerson(this.username));
             
diff --git a/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java b/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java
index 68228babe6..0100a7fff6 100644
--- a/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java
@@ -462,12 +462,7 @@ public class NewUserWizard extends AbstractWizardBean
          else
          {
             if (this.password.equals(this.confirm))
-            {
-               if (!this.personService.getUserNamesAreCaseSensitive())
-               {
-                  this.userName = this.userName.toLowerCase();
-               }
-                
+            {   
                // create properties for Person type from submitted Form data
                Map<QName, Serializable> props = new HashMap<QName, Serializable>(7, 1.0f);
                props.put(ContentModel.PROP_USERNAME, this.userName);
diff --git a/source/web/css/main.css b/source/web/css/main.css
index 7f2e713ba6..cf3b3368db 100644
--- a/source/web/css/main.css
+++ b/source/web/css/main.css
@@ -346,7 +346,7 @@ input,textarea,select
 
 .topToolbarTitle
 {
-   background-color:#5D747F;
+   background-color: #465F7D;
    color: #ffffff;
    font-weight: bold;
    padding-left: 5px;