Committing changes for KNL-1158

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/KNL-1158@133259 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1158 - Changed to use parameter instead of different name for mail exception

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/KNL-1158@133313 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-24423 Additional Joinable Site Settings

git-svn-id: https://source.sakaiproject.org/svn/kernel/trunk@133332 66ffb92e-73f9-0310-93c1-f5514f145a0a
WL-521 Support EID/AID split.

Conflicts:
	kernel-impl/src/main/java/org/sakaiproject/user/impl/UserAuthnComponent.java
	kernel-impl/src/test/java/org/sakaiproject/jcr/test/mock/MockUserDirectoryService.java
WL-5 Support for Devolved Administration.
WL-517 Fix for when a site is deleted.
Add a event observer to catch stie deletes.
Autocreate a test admin site.
WL-769 Lookup admin realm on all authz groups.

Conflicts:
	api/src/main/java/org/sakaiproject/site/api/SiteService.java
	api/src/main/java/org/sakaiproject/site/cover/SiteService.java
	kernel-component/src/main/webapp/WEB-INF/authz-components.xml
	kernel-component/src/main/webapp/WEB-INF/site-components.xml
	kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSiteService.java
	kernel-impl/src/test/java/org/sakaiproject/site/impl/SiteServiceTest.java

WL-896 Fix roleswap with admin sites.
WL-646 Add SQL for contribute role to MySQL setup.

Conflicts:
	kernel-impl/src/main/sql/mysql/sakai_realm.sql
WL-480 Add SQL for default .auth/.anon (MySQL)
Allow more than just .anon and .auth

Initial refactoring of SQL to allow more roles.

Conflicts:
	kernel-impl/src/main/java/org/sakaiproject/authz/impl/BaseAuthzGroup.java
	kernel-impl/src/main/java/org/sakaiproject/authz/impl/BaseAuthzGroupService.java
	kernel-impl/src/main/java/org/sakaiproject/authz/impl/DbAuthzGroupService.java
	kernel-impl/src/main/java/org/sakaiproject/authz/impl/DbAuthzGroupSql.java
	kernel-impl/src/main/java/org/sakaiproject/authz/impl/DbAuthzGroupSqlDefault.java
	kernel-impl/src/main/java/org/sakaiproject/authz/impl/DbAuthzGroupSqlMySql.java

WL-2163 Don't copy .auth/.anon roles into groups.

The problem was the .auth/.anon were getting copied into groups which means that the groups no longer function as you don't have to be a member of the group to access content protected by it.
WL-561 Don't send notifications.
WL-512 Allow duplicating of sites for maintainers.

Part of WL-521

Conflicts:
	api/src/main/java/org/sakaiproject/site/cover/SiteService.java
WL-630 Support the locating of site aliases.

Conflicts:
	kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSiteService.java
Added a new filter for setting a thread local.
This is to support only allowing some sorts of authentication for some requests.
WL-66 Allow control of creating a session cookie.
This is useful for DAV, which shouldn't create new session cookies
Moved roles code into the kernel API.

Conflicts:
	api/src/main/java/org/sakaiproject/authz/api/AuthzGroupService.java
	api/src/main/java/org/sakaiproject/authz/cover/AuthzGroupService.java
	kernel-impl/src/test/java/org/sakai/memory/impl/test/MockAuthzGroupService.java
KNL-812 Tests to make sure equals() is working.
KNL-812 Added a toString() to User.

This makes it much easier to debug as you can print out the essentials of a user.
KNL-812 Improve User.equals() to check ID & EID.
Quick hack so we log the locale we're using.
Small Javadoc change.
WL-367 First stab at top and tailing HTML content.

Conflicts:
	api/src/main/java/org/sakaiproject/content/api/ContentFilter.java
	api/src/main/java/org/sakaiproject/entity/api/ResourceProperties.java
	kernel-impl/src/main/java/org/sakaiproject/content/impl/HtmlPageFilter.java