inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V1.3 to HEAD (3180:3203, 3204:3217)

Browse Source 
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
This commit is contained in:
Derek Hulley
2006-07-26 11:00:06 +00:00
parent 6ba0877853
commit 3f8cef33c1
5 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/web/app/ContextListener.java
View File

@@ -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
}
/**

8
source/java/org/alfresco/web/bean/AdvancedSearchBean.java
View File

@@ -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();
}
}

5
source/java/org/alfresco/web/bean/LoginBean.java
View File

@@ -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));

5
source/java/org/alfresco/web/bean/wizard/NewUserWizard.java
View File

@@ -463,11 +463,6 @@ public class NewUserWizard extends AbstractWizardBean
{
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);

2
source/web/css/main.css
View File

@@ -346,7 +346,7 @@ input,textarea,select
.topToolbarTitle
{
background-color:#5D747F;
background-color: #465F7D;
color: #ffffff;
font-weight: bold;
padding-left: 5px;