Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Oct 2014 16:20:23 +0000 (UTC)
From:      Wen Heping <wen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r371756 - head/www/sakai
Message-ID:  <201410301620.s9UGKNWF009944@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wen
Date: Thu Oct 30 16:20:23 2014
New Revision: 371756
URL: https://svnweb.freebsd.org/changeset/ports/371756
QAT: https://qat.redports.org/buildarchive/r371756/

Log:
  - Update to 10.2

Modified:
  head/www/sakai/Makefile
  head/www/sakai/distinfo
  head/www/sakai/pkg-plist

Modified: head/www/sakai/Makefile
==============================================================================
--- head/www/sakai/Makefile	Thu Oct 30 16:06:44 2014	(r371755)
+++ head/www/sakai/Makefile	Thu Oct 30 16:20:23 2014	(r371756)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sakai
-PORTVERSION=	10.0
+PORTVERSION=	10.2
 CATEGORIES=	www java
 MASTER_SITES=	http://source.sakaiproject.org/release/${PORTVERSION}/artifacts/
 DISTNAME=	${PORTNAME}-bin-${PORTVERSION}

Modified: head/www/sakai/distinfo
==============================================================================
--- head/www/sakai/distinfo	Thu Oct 30 16:06:44 2014	(r371755)
+++ head/www/sakai/distinfo	Thu Oct 30 16:20:23 2014	(r371756)
@@ -1,2 +1,2 @@
-SHA256 (sakai-bin-10.0.tar.gz) = 1facaf4e81af35164fce00d74cf31d1a42092307f256ab35898756b0630e73c7
-SIZE (sakai-bin-10.0.tar.gz) = 585317663
+SHA256 (sakai-bin-10.2.tar.gz) = 19c32cec536de327ad22b9c3a3eeb194a61fecb8d5ec70eed8b0c1909357636b
+SIZE (sakai-bin-10.2.tar.gz) = 582844846

Modified: head/www/sakai/pkg-plist
==============================================================================
--- head/www/sakai/pkg-plist	Thu Oct 30 16:06:44 2014	(r371755)
+++ head/www/sakai/pkg-plist	Thu Oct 30 16:20:23 2014	(r371756)
@@ -99,33 +99,14 @@
 %%TOMCAT_DIR%%/components/elasticsearch-component/META-INF/maven/org.sakaiproject.search.elasticsearch/elasticsearch-component/pom.properties
 %%TOMCAT_DIR%%/components/elasticsearch-component/META-INF/maven/org.sakaiproject.search.elasticsearch/elasticsearch-component/pom.xml
 %%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/aws-java-sdk-1.3.26.jar
 %%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/commons-httpclient-3.1.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/elasticsearch-0.90.7.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/elasticsearch-cloud-aws-1.%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/elasticsearch-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/entitybroker-utils-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/guava-11.0.2.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/httpclient-4.1.1.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/httpcore-4.1.jar
 %%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/jsr305-1.3.9.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/lucene-analyzers-common-4.5.1.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/lucene-codecs-4.5.1.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/lucene-core-4.5.1.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/lucene-grouping-4.5.1.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/lucene-highlighter-4.5.1.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/lucene-join-4.5.1.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/lucene-memory-4.5.1.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/lucene-misc-4.5.1.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/lucene-queries-4.5.1.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/lucene-queryparser-4.5.1.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/lucene-sandbox-4.5.1.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/lucene-spatial-4.5.1.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/lucene-suggest-4.5.1.jar
 %%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/reflectutils-0.9.19.jar
 %%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/search-util-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/lib/spatial4j-0.3.jar
 %%TOMCAT_DIR%%/components/elasticsearch-component/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/emailtemplateservice-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/emailtemplateservice-pack/META-INF/maven/org.sakaiproject.emailtemplateservice/emailtemplateservice-pack/pom.properties
@@ -210,6 +191,7 @@
 %%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl$1.class
 %%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl$2.class
 %%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl$3.class
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl$4.class
 %%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl.class
 %%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/org/sakaiproject/lessonbuildertool/service/SimplePageToolService.class
 %%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/components.xml
@@ -511,7 +493,6 @@
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/classes/TutorialMessages.properties
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/classes/TutorialMessages_ca_ES.properties
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/classes/TutorialMessages_es.properties
-%%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/classes/TutorialMessages_es_ES.properties
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/classes/TutorialMessages_eu.properties
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/classes/TutorialMessages_fr_FR.properties
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/classes/TutorialMessages_mn.properties
@@ -530,7 +511,6 @@
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/lib/commons-beanutils-core-1.8.0.jar
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/lib/commons-configuration-1.6.jar
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/lib/commons-digester-1.8.jar
-%%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/lib/lucene-core-3.5.0.jar
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-courier-pack/META-INF/MANIFEST.MF
@@ -583,6 +563,7 @@
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/isoparser-1.0-RC-1.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/jempbox-1.8.4.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/jhighlight-1.0.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/jsoup-1.7.3.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/jsr305-2.0.3.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/juniversalchardet-1.0.3.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/metadata-extractor-2.6.2.jar
@@ -939,7 +920,6 @@
 %%TOMCAT_DIR%%/components/search-pack/META-INF/maven/org.sakaiproject.search/search-pack/pom.xml
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/contentAdapterComponents.xml
-%%TOMCAT_DIR%%/components/search-pack/WEB-INF/coreSearchComponents.xml
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/apache-mime4j-core-0.7.2.jar
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/apache-mime4j-dom-0.7.2.jar
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/asm-3.1.jar
@@ -958,10 +938,6 @@
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/jempbox-1.7.0.jar
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/jtidy-4aug2000r7-dev.jar
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/juniversalchardet-1.0.3.jar
-%%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/lucene-core-2.9.4.jar
-%%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/lucene-highlighter-2.9.4.jar
-%%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/lucene-memory-2.9.4.jar
-%%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/lucene-spellchecker-2.9.4.jar
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/metadata-extractor-2.4.0-beta-1.jar
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/netcdf-4.2-min.jar
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/pdfbox-1.7.0.jar
@@ -974,7 +950,6 @@
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/sanselan-0.97-incubator.jar
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/search-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/search-model-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/search-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/stax-api-1.0.1.jar
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/tagsoup-1.2.1.jar
@@ -985,7 +960,6 @@
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/vorbis-java-tika-0.1.jar
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/xmlbeans-2.3.0.jar
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/lib/xz-1.0.jar
-%%TOMCAT_DIR%%/components/search-pack/WEB-INF/parallelIndexComponents.xml
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/siteAdapterComponents.xml
 %%TOMCAT_DIR%%/components/search-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sections-pack/META-INF/MANIFEST.MF
@@ -1218,6 +1192,7 @@
 %%TOMCAT_DIR%%/shared/lib/dom4j-1.6.1.jar
 %%TOMCAT_DIR%%/shared/lib/ehcache-core-2.6.6.jar
 %%TOMCAT_DIR%%/shared/lib/ehcache-terracotta-2.6.6.jar
+%%TOMCAT_DIR%%/shared/lib/elasticsearch-1.1.2.jar
 %%TOMCAT_DIR%%/shared/lib/emailtemplateservice-api-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/shared/lib/entitybroker-api-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/shared/lib/external-calendaring-service-api-%%SAKAI_VER%%.jar
@@ -1237,9 +1212,24 @@
 %%TOMCAT_DIR%%/shared/lib/jdom-1.0.jar
 %%TOMCAT_DIR%%/shared/lib/jstl-1.1.2.jar
 %%TOMCAT_DIR%%/shared/lib/jta-1.0.1B.jar
+%%TOMCAT_DIR%%/shared/lib/jts-1.13.jar
 %%TOMCAT_DIR%%/shared/lib/lessonbuilder-api-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/shared/lib/lessonbuilder-hbm-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/shared/lib/login-api-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/shared/lib/lucene-analyzers-common-4.7.2.jar
+%%TOMCAT_DIR%%/shared/lib/lucene-codecs-4.7.2.jar
+%%TOMCAT_DIR%%/shared/lib/lucene-core-4.7.2.jar
+%%TOMCAT_DIR%%/shared/lib/lucene-expressions-4.7.2.jar
+%%TOMCAT_DIR%%/shared/lib/lucene-grouping-4.7.2.jar
+%%TOMCAT_DIR%%/shared/lib/lucene-highlighter-4.7.2.jar
+%%TOMCAT_DIR%%/shared/lib/lucene-join-4.7.2.jar
+%%TOMCAT_DIR%%/shared/lib/lucene-memory-4.7.2.jar
+%%TOMCAT_DIR%%/shared/lib/lucene-misc-4.7.2.jar
+%%TOMCAT_DIR%%/shared/lib/lucene-queries-4.7.2.jar
+%%TOMCAT_DIR%%/shared/lib/lucene-queryparser-4.7.2.jar
+%%TOMCAT_DIR%%/shared/lib/lucene-sandbox-4.7.2.jar
+%%TOMCAT_DIR%%/shared/lib/lucene-spatial-4.7.2.jar
+%%TOMCAT_DIR%%/shared/lib/lucene-suggest-4.7.2.jar
 %%TOMCAT_DIR%%/shared/lib/mail-1.4.5.jar
 %%TOMCAT_DIR%%/shared/lib/mailsender-api-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/shared/lib/messageforums-api-%%SAKAI_VER%%.jar
@@ -1315,10 +1305,12 @@
 %%TOMCAT_DIR%%/shared/lib/sections-api-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/shared/lib/sections-model-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/shared/lib/shortenedurl-api-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/shared/lib/sigar-1.6.4.jar
 %%TOMCAT_DIR%%/shared/lib/signup-api-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/shared/lib/simple-xml-2.6.jar
 %%TOMCAT_DIR%%/shared/lib/sitestats-api-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/shared/lib/sitestats-impl-hib-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/shared/lib/spatial4j-0.4.1.jar
 %%TOMCAT_DIR%%/shared/lib/spring-aop-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/shared/lib/spring-beans-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/shared/lib/spring-context-3.2.3.RELEASE.jar
@@ -1353,7 +1345,6 @@
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/classes/org/sakaiproject/accountvalidator/bundle/messages_de.properties
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/classes/org/sakaiproject/accountvalidator/bundle/messages_en_GB.properties
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/classes/org/sakaiproject/accountvalidator/bundle/messages_es.properties
-%%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/classes/org/sakaiproject/accountvalidator/bundle/messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/classes/org/sakaiproject/accountvalidator/bundle/messages_eu.properties
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/classes/org/sakaiproject/accountvalidator/bundle/messages_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/classes/org/sakaiproject/accountvalidator/bundle/messages_it.properties
@@ -1374,7 +1365,7 @@
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/classes/org/sakaiproject/accountvalidator/tool/producers/TransferMembershipsProducer.class
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/classes/org/sakaiproject/accountvalidator/tool/producers/ValidationProducer.class
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/lib/RSFComponents-evolvers-0.8.0.jar
-%%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/lib/SakaiRSFComponents-evolvers-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/lib/SakaiRSFComponents-evolvers-10.0.jar
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/lib/commons-httpclient-3.1.jar
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/lib/entitybroker-utils-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/lib/j-servletutil-1.3.0.jar
@@ -1383,7 +1374,7 @@
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/lib/reflectutils-0.9.19.jar
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/lib/rsfutil-0.8.0.jar
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/lib/sakairsf-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/lib/sakairsf-10.0.jar
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/lib/xpp3_min-1.1.3.4.O.jar
 %%TOMCAT_DIR%%/webapps/accountvalidator/WEB-INF/requestContext.xml
@@ -1544,8 +1535,8 @@
 %%TOMCAT_DIR%%/webapps/adminsiteperms/WEB-INF/classes/i18n/Messages.properties
 %%TOMCAT_DIR%%/webapps/adminsiteperms/WEB-INF/classes/i18n/Messages_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/adminsiteperms/WEB-INF/classes/i18n/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/adminsiteperms/WEB-INF/classes/i18n/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/adminsiteperms/WEB-INF/classes/i18n/Messages_eu.properties
+%%TOMCAT_DIR%%/webapps/adminsiteperms/WEB-INF/classes/i18n/Messages_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/adminsiteperms/WEB-INF/classes/org/sakaiproject/adminsiteperms/service/SitePermsService$1.class
 %%TOMCAT_DIR%%/webapps/adminsiteperms/WEB-INF/classes/org/sakaiproject/adminsiteperms/service/SitePermsService.class
 %%TOMCAT_DIR%%/webapps/adminsiteperms/WEB-INF/classes/org/sakaiproject/adminsiteperms/tool/ResourceLoaderMessageSource.class
@@ -1573,7 +1564,6 @@
 %%TOMCAT_DIR%%/webapps/authn/WEB-INF/classes/sitenav_de.properties
 %%TOMCAT_DIR%%/webapps/authn/WEB-INF/classes/sitenav_en_GB.properties
 %%TOMCAT_DIR%%/webapps/authn/WEB-INF/classes/sitenav_es.properties
-%%TOMCAT_DIR%%/webapps/authn/WEB-INF/classes/sitenav_es_ES.properties
 %%TOMCAT_DIR%%/webapps/authn/WEB-INF/classes/sitenav_eu.properties
 %%TOMCAT_DIR%%/webapps/authn/WEB-INF/classes/sitenav_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/authn/WEB-INF/classes/sitenav_fr_FR.properties
@@ -1600,7 +1590,6 @@
 %%TOMCAT_DIR%%/webapps/basiclti-admin-tool/WEB-INF/classes/ltitool_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/basiclti-admin-tool/WEB-INF/classes/ltitool_de.properties
 %%TOMCAT_DIR%%/webapps/basiclti-admin-tool/WEB-INF/classes/ltitool_es.properties
-%%TOMCAT_DIR%%/webapps/basiclti-admin-tool/WEB-INF/classes/ltitool_es_ES.properties
 %%TOMCAT_DIR%%/webapps/basiclti-admin-tool/WEB-INF/classes/ltitool_eu.properties
 %%TOMCAT_DIR%%/webapps/basiclti-admin-tool/WEB-INF/classes/ltitool_mn.properties
 %%TOMCAT_DIR%%/webapps/basiclti-admin-tool/WEB-INF/classes/ltitool_zh_CN.properties
@@ -1707,7 +1696,6 @@
 %%TOMCAT_DIR%%/webapps/dav/WEB-INF/classes/org/sakaiproject/tool/dav/bundle/Messages_de.properties
 %%TOMCAT_DIR%%/webapps/dav/WEB-INF/classes/org/sakaiproject/tool/dav/bundle/Messages_en_GB.properties
 %%TOMCAT_DIR%%/webapps/dav/WEB-INF/classes/org/sakaiproject/tool/dav/bundle/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/dav/WEB-INF/classes/org/sakaiproject/tool/dav/bundle/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/dav/WEB-INF/classes/org/sakaiproject/tool/dav/bundle/Messages_eu.properties
 %%TOMCAT_DIR%%/webapps/dav/WEB-INF/classes/org/sakaiproject/tool/dav/bundle/Messages_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/dav/WEB-INF/classes/org/sakaiproject/tool/dav/bundle/Messages_it.properties
@@ -1729,9 +1717,9 @@
 %%TOMCAT_DIR%%/webapps/delegatedaccess-tool/WEB-INF/classes/org/sakaiproject/delegatedaccess/tool/DelegatedAccessApplication.properties
 %%TOMCAT_DIR%%/webapps/delegatedaccess-tool/WEB-INF/classes/org/sakaiproject/delegatedaccess/tool/DelegatedAccessApplication_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/delegatedaccess-tool/WEB-INF/classes/org/sakaiproject/delegatedaccess/tool/DelegatedAccessApplication_es.properties
-%%TOMCAT_DIR%%/webapps/delegatedaccess-tool/WEB-INF/classes/org/sakaiproject/delegatedaccess/tool/DelegatedAccessApplication_es_ES.properties
 %%TOMCAT_DIR%%/webapps/delegatedaccess-tool/WEB-INF/classes/org/sakaiproject/delegatedaccess/tool/DelegatedAccessApplication_eu.properties
 %%TOMCAT_DIR%%/webapps/delegatedaccess-tool/WEB-INF/classes/org/sakaiproject/delegatedaccess/tool/DelegatedAccessApplication_fr_FR.properties
+%%TOMCAT_DIR%%/webapps/delegatedaccess-tool/WEB-INF/classes/org/sakaiproject/delegatedaccess/tool/DelegatedAccessApplication_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/delegatedaccess-tool/WEB-INF/classes/org/sakaiproject/delegatedaccess/tool/pages/AdministratePage$1.class
 %%TOMCAT_DIR%%/webapps/delegatedaccess-tool/WEB-INF/classes/org/sakaiproject/delegatedaccess/tool/pages/AdministratePage$2.class
 %%TOMCAT_DIR%%/webapps/delegatedaccess-tool/WEB-INF/classes/org/sakaiproject/delegatedaccess/tool/pages/AdministratePage.class
@@ -1972,7 +1960,6 @@
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/classes/org/sakaiproject/emailtemplateservice/tool/bundle/messages_de.properties
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/classes/org/sakaiproject/emailtemplateservice/tool/bundle/messages_en_GB.properties
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/classes/org/sakaiproject/emailtemplateservice/tool/bundle/messages_es.properties
-%%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/classes/org/sakaiproject/emailtemplateservice/tool/bundle/messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/classes/org/sakaiproject/emailtemplateservice/tool/bundle/messages_eu.properties
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/classes/org/sakaiproject/emailtemplateservice/tool/bundle/messages_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/classes/org/sakaiproject/emailtemplateservice/tool/bundle/messages_it.properties
@@ -1992,12 +1979,12 @@
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/classes/org/sakaiproject/emailtemplateservice/tool/producers/MainViewProducer.class
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/classes/org/sakaiproject/emailtemplateservice/tool/producers/ModifyEmailProducer.class
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/lib/RSFComponents-evolvers-0.8.0.jar
-%%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/lib/SakaiRSFComponents-evolvers-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/lib/SakaiRSFComponents-evolvers-10.0.jar
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/lib/j-servletutil-1.3.0.jar
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/lib/ponderutilcore-1.3.0.jar
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/lib/rsfutil-0.8.0.jar
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/lib/sakairsf-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/lib/sakairsf-10.0.jar
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/lib/xpp3_min-1.1.3.4.O.jar
 %%TOMCAT_DIR%%/webapps/emailtemplateservice-tool/WEB-INF/requestContext.xml
@@ -2172,7 +2159,6 @@
 %%TOMCAT_DIR%%/webapps/imsblis/WEB-INF/classes/blis_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/imsblis/WEB-INF/classes/blis_de.properties
 %%TOMCAT_DIR%%/webapps/imsblis/WEB-INF/classes/blis_es.properties
-%%TOMCAT_DIR%%/webapps/imsblis/WEB-INF/classes/blis_es_ES.properties
 %%TOMCAT_DIR%%/webapps/imsblis/WEB-INF/classes/blis_eu.properties
 %%TOMCAT_DIR%%/webapps/imsblis/WEB-INF/classes/blis_mn.properties
 %%TOMCAT_DIR%%/webapps/imsblis/WEB-INF/classes/blis_pl_PL.properties
@@ -2206,7 +2192,6 @@
 %%TOMCAT_DIR%%/webapps/imsblti/WEB-INF/classes/basiclti-events.properties
 %%TOMCAT_DIR%%/webapps/imsblti/WEB-INF/classes/basiclti-events_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/imsblti/WEB-INF/classes/basiclti-events_es.properties
-%%TOMCAT_DIR%%/webapps/imsblti/WEB-INF/classes/basiclti-events_es_ES.properties
 %%TOMCAT_DIR%%/webapps/imsblti/WEB-INF/classes/basiclti-events_eu.properties
 %%TOMCAT_DIR%%/webapps/imsblti/WEB-INF/classes/basiclti-events_mn.properties
 %%TOMCAT_DIR%%/webapps/imsblti/WEB-INF/classes/basiclti-events_zh_CN.properties
@@ -2214,7 +2199,6 @@
 %%TOMCAT_DIR%%/webapps/imsblti/WEB-INF/classes/basiclti_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/imsblti/WEB-INF/classes/basiclti_de.properties
 %%TOMCAT_DIR%%/webapps/imsblti/WEB-INF/classes/basiclti_es.properties
-%%TOMCAT_DIR%%/webapps/imsblti/WEB-INF/classes/basiclti_es_ES.properties
 %%TOMCAT_DIR%%/webapps/imsblti/WEB-INF/classes/basiclti_eu.properties
 %%TOMCAT_DIR%%/webapps/imsblti/WEB-INF/classes/basiclti_ja.properties
 %%TOMCAT_DIR%%/webapps/imsblti/WEB-INF/classes/basiclti_mn.properties
@@ -2468,7 +2452,6 @@
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/Events_de.properties
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/Events_en_GB.properties
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/Events_es.properties
-%%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/Events_es_ES.properties
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/Events_eu.properties
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/Events_fr.properties
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/Events_it.properties
@@ -2484,7 +2467,6 @@
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/messages_de.properties
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/messages_en_GB.properties
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/messages_es.properties
-%%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/messages_eu.properties
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/messages_fr.properties
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/messages_it.properties
@@ -2607,6 +2589,7 @@
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean$Status.class
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean$UrlItem.class
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.class
+%%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/org/sakaiproject/lessonbuildertool/tool/beans/helpers/ResourceHelper.class
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/org/sakaiproject/lessonbuildertool/tool/entityproviders/LessonsEntityProvider$DecoratedAnswerItem.class
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/org/sakaiproject/lessonbuildertool/tool/entityproviders/LessonsEntityProvider$DecoratedItem.class
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/org/sakaiproject/lessonbuildertool/tool/entityproviders/LessonsEntityProvider$DecoratedLesson.class
@@ -2668,7 +2651,7 @@
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/org/sakaiproject/lessonbuildertool/util/ResourceLoaderMessageSource.class
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/classes/org/sakaiproject/lessonbuildertool/util/RootHandlerBeanOverride.class
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/lib/RSFComponents-evolvers-0.8.0.jar
-%%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/lib/SakaiRSFComponents-evolvers-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/lib/SakaiRSFComponents-evolvers-10.0.jar
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/lib/commons-beanutils-1.7.0.jar
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/lib/commons-httpclient-3.1.jar
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/lib/entitybroker-utils-%%SAKAI_VER%%.jar
@@ -2678,7 +2661,7 @@
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/lib/rsfutil-0.8.0.jar
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/lib/sakai-portal-util-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/lib/sakairsf-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/lib/sakairsf-10.0.jar
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/lib/samigo-qti-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/lib/saxpath-1.0-FCS.jar
 %%TOMCAT_DIR%%/webapps/lessonbuilder-tool/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
@@ -2972,8 +2955,9 @@
 %%TOMCAT_DIR%%/webapps/library/WEB-INF/classes/org/sakaiproject/connector/fck/Messages.properties
 %%TOMCAT_DIR%%/webapps/library/WEB-INF/classes/org/sakaiproject/connector/fck/Messages_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/library/WEB-INF/classes/org/sakaiproject/connector/fck/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/library/WEB-INF/classes/org/sakaiproject/connector/fck/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/library/WEB-INF/classes/org/sakaiproject/connector/fck/Messages_eu.properties
+%%TOMCAT_DIR%%/webapps/library/WEB-INF/classes/org/sakaiproject/connector/fck/Messages_fr_FR.properties
+%%TOMCAT_DIR%%/webapps/library/WEB-INF/classes/org/sakaiproject/connector/fck/Messages_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/library/WEB-INF/classes/org/sakaiproject/connector/fck/SortElementsForDisplay.class
 %%TOMCAT_DIR%%/webapps/library/WEB-INF/components.xml
 %%TOMCAT_DIR%%/webapps/library/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
@@ -9202,7 +9186,6 @@
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/classes/Messages.properties
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/classes/Messages_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/classes/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/classes/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/classes/Messages_eu.properties
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/classes/Messages_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/classes/Messages_ko.properties
@@ -9224,12 +9207,12 @@
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/classes/org/sakaiproject/mailsender/tool/producers/fragments/UserGroupingProducer.class
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/classes/org/sakaiproject/mailsender/tool/producers/fragments/UsersProducer.class
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/lib/RSFComponents-evolvers-0.8.0.jar
-%%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/lib/SakaiRSFComponents-evolvers-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/lib/SakaiRSFComponents-evolvers-10.0.jar
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/lib/j-servletutil-1.3.0.jar
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/lib/ponderutilcore-1.3.0.jar
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/lib/rsfutil-0.8.0.jar
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/lib/sakairsf-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/lib/sakairsf-10.0.jar
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/lib/xpp3_min-1.1.3.4.O.jar
 %%TOMCAT_DIR%%/webapps/mailsender-tool/WEB-INF/requestContext.xml
@@ -9391,8 +9374,8 @@
 %%TOMCAT_DIR%%/webapps/messageforums-tool/WEB-INF/classes/forums.properties
 %%TOMCAT_DIR%%/webapps/messageforums-tool/WEB-INF/classes/forums_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/messageforums-tool/WEB-INF/classes/forums_es.properties
-%%TOMCAT_DIR%%/webapps/messageforums-tool/WEB-INF/classes/forums_es_ES.properties
 %%TOMCAT_DIR%%/webapps/messageforums-tool/WEB-INF/classes/forums_eu.properties
+%%TOMCAT_DIR%%/webapps/messageforums-tool/WEB-INF/classes/forums_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/messageforums-tool/WEB-INF/classes/org/sakaiproject/tool/messageforums/AuthzGroupComparator.class
 %%TOMCAT_DIR%%/webapps/messageforums-tool/WEB-INF/classes/org/sakaiproject/tool/messageforums/DiscussionForumTool$1.class
 %%TOMCAT_DIR%%/webapps/messageforums-tool/WEB-INF/classes/org/sakaiproject/tool/messageforums/DiscussionForumTool$ThreadUpdateSorter.class
@@ -9702,7 +9685,6 @@
 %%TOMCAT_DIR%%/webapps/osp-common-tool/WEB-INF/classes/org/theospi/portfolio/common/bundle/Messages.properties
 %%TOMCAT_DIR%%/webapps/osp-common-tool/WEB-INF/classes/org/theospi/portfolio/common/bundle/Messages_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/osp-common-tool/WEB-INF/classes/org/theospi/portfolio/common/bundle/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/osp-common-tool/WEB-INF/classes/org/theospi/portfolio/common/bundle/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/osp-common-tool/WEB-INF/classes/org/theospi/portfolio/common/bundle/Messages_eu.properties
 %%TOMCAT_DIR%%/webapps/osp-common-tool/WEB-INF/classes/org/theospi/portfolio/common/bundle/Messages_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/osp-common-tool/WEB-INF/classes/org/theospi/portfolio/common/bundle/Messages_fr_FR.properties
@@ -9822,7 +9804,6 @@
 %%TOMCAT_DIR%%/webapps/osp-glossary-tool/WEB-INF/classes/org/theospi/portfolio/glossary/bundle/Messages.properties
 %%TOMCAT_DIR%%/webapps/osp-glossary-tool/WEB-INF/classes/org/theospi/portfolio/glossary/bundle/Messages_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/osp-glossary-tool/WEB-INF/classes/org/theospi/portfolio/glossary/bundle/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/osp-glossary-tool/WEB-INF/classes/org/theospi/portfolio/glossary/bundle/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/osp-glossary-tool/WEB-INF/classes/org/theospi/portfolio/glossary/bundle/Messages_eu.properties
 %%TOMCAT_DIR%%/webapps/osp-glossary-tool/WEB-INF/classes/org/theospi/portfolio/glossary/bundle/Messages_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/osp-glossary-tool/WEB-INF/classes/org/theospi/portfolio/glossary/bundle/Messages_fr_FR.properties
@@ -9944,7 +9925,6 @@
 %%TOMCAT_DIR%%/webapps/osp-matrix-tool/WEB-INF/classes/org/theospi/portfolio/matrix/bundle/Messages.properties
 %%TOMCAT_DIR%%/webapps/osp-matrix-tool/WEB-INF/classes/org/theospi/portfolio/matrix/bundle/Messages_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/osp-matrix-tool/WEB-INF/classes/org/theospi/portfolio/matrix/bundle/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/osp-matrix-tool/WEB-INF/classes/org/theospi/portfolio/matrix/bundle/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/osp-matrix-tool/WEB-INF/classes/org/theospi/portfolio/matrix/bundle/Messages_eu.properties
 %%TOMCAT_DIR%%/webapps/osp-matrix-tool/WEB-INF/classes/org/theospi/portfolio/matrix/bundle/Messages_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/osp-matrix-tool/WEB-INF/classes/org/theospi/portfolio/matrix/bundle/Messages_fr_FR.properties
@@ -10138,7 +10118,6 @@
 %%TOMCAT_DIR%%/webapps/osp-portal-tool/WEB-INF/classes/org/theospi/portfolio/portal/messages.properties
 %%TOMCAT_DIR%%/webapps/osp-portal-tool/WEB-INF/classes/org/theospi/portfolio/portal/messages_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/osp-portal-tool/WEB-INF/classes/org/theospi/portfolio/portal/messages_es.properties
-%%TOMCAT_DIR%%/webapps/osp-portal-tool/WEB-INF/classes/org/theospi/portfolio/portal/messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/osp-portal-tool/WEB-INF/classes/org/theospi/portfolio/portal/messages_eu.properties
 %%TOMCAT_DIR%%/webapps/osp-portal-tool/WEB-INF/classes/org/theospi/portfolio/portal/messages_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/osp-portal-tool/WEB-INF/classes/org/theospi/portfolio/portal/messages_fr_FR.properties
@@ -10199,7 +10178,6 @@
 %%TOMCAT_DIR%%/webapps/osp-portal/WEB-INF/classes/org/theospi/portfolio/portal/messages.properties
 %%TOMCAT_DIR%%/webapps/osp-portal/WEB-INF/classes/org/theospi/portfolio/portal/messages_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/osp-portal/WEB-INF/classes/org/theospi/portfolio/portal/messages_es.properties
-%%TOMCAT_DIR%%/webapps/osp-portal/WEB-INF/classes/org/theospi/portfolio/portal/messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/osp-portal/WEB-INF/classes/org/theospi/portfolio/portal/messages_eu.properties
 %%TOMCAT_DIR%%/webapps/osp-portal/WEB-INF/classes/org/theospi/portfolio/portal/messages_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/osp-portal/WEB-INF/classes/org/theospi/portfolio/portal/messages_fr_FR.properties
@@ -10240,7 +10218,6 @@
 %%TOMCAT_DIR%%/webapps/osp-presentation-tool/WEB-INF/classes/org/theospi/portfolio/presentation/bundle/Messages.properties
 %%TOMCAT_DIR%%/webapps/osp-presentation-tool/WEB-INF/classes/org/theospi/portfolio/presentation/bundle/Messages_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/osp-presentation-tool/WEB-INF/classes/org/theospi/portfolio/presentation/bundle/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/osp-presentation-tool/WEB-INF/classes/org/theospi/portfolio/presentation/bundle/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/osp-presentation-tool/WEB-INF/classes/org/theospi/portfolio/presentation/bundle/Messages_eu.properties
 %%TOMCAT_DIR%%/webapps/osp-presentation-tool/WEB-INF/classes/org/theospi/portfolio/presentation/bundle/Messages_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/osp-presentation-tool/WEB-INF/classes/org/theospi/portfolio/presentation/bundle/Messages_fr_FR.properties
@@ -10452,7 +10429,6 @@
 %%TOMCAT_DIR%%/webapps/osp-wizard-tool/WEB-INF/classes/org/theospi/portfolio/wizard/bundle/Messages.properties
 %%TOMCAT_DIR%%/webapps/osp-wizard-tool/WEB-INF/classes/org/theospi/portfolio/wizard/bundle/Messages_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/osp-wizard-tool/WEB-INF/classes/org/theospi/portfolio/wizard/bundle/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/osp-wizard-tool/WEB-INF/classes/org/theospi/portfolio/wizard/bundle/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/osp-wizard-tool/WEB-INF/classes/org/theospi/portfolio/wizard/bundle/Messages_eu.properties
 %%TOMCAT_DIR%%/webapps/osp-wizard-tool/WEB-INF/classes/org/theospi/portfolio/wizard/bundle/Messages_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/osp-wizard-tool/WEB-INF/classes/org/theospi/portfolio/wizard/bundle/Messages_fr_FR.properties
@@ -10552,7 +10528,6 @@
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/org/sakaiproject/poll/bundle/Messages_de.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/org/sakaiproject/poll/bundle/Messages_en_GB.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/org/sakaiproject/poll/bundle/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/org/sakaiproject/poll/bundle/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/org/sakaiproject/poll/bundle/Messages_eu.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/org/sakaiproject/poll/bundle/Messages_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/org/sakaiproject/poll/bundle/Messages_fr_FR.properties
@@ -10599,7 +10574,6 @@
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll-option_de.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll-option_en_GB.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll-option_es.properties
-%%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll-option_es_ES.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll-option_eu.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll-option_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll-option_it.properties
@@ -10614,7 +10588,6 @@
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll-vote_de.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll-vote_en_GB.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll-vote_es.properties
-%%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll-vote_es_ES.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll-vote_eu.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll-vote_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll-vote_it.properties
@@ -10629,7 +10602,6 @@
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll_de.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll_en_GB.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll_es.properties
-%%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll_es_ES.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll_eu.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/poll_it.properties
@@ -10642,11 +10614,11 @@
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/polls.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/polls_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/polls_es.properties
-%%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/polls_es_ES.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/polls_eu.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/polls_fr_FR.properties
+%%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/classes/polls_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/lib/RSFComponents-evolvers-0.8.0.jar
-%%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/lib/SakaiRSFComponents-evolvers-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/lib/SakaiRSFComponents-evolvers-10.0.jar
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/lib/commons-beanutils-1.8.3.jar
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/lib/commons-httpclient-3.1.jar
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/lib/entitybroker-utils-%%SAKAI_VER%%.jar
@@ -10655,7 +10627,7 @@
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/lib/reflectutils-0.9.19.jar
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/lib/rsfutil-0.8.0.jar
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/lib/sakairsf-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/lib/sakairsf-10.0.jar
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/lib/xpp3_min-1.1.3.4.O.jar
 %%TOMCAT_DIR%%/webapps/polls-tool/WEB-INF/requestContext.xml
@@ -10824,8 +10796,8 @@
 %%TOMCAT_DIR%%/webapps/portal-chat/WEB-INF/classes/portal-chat.properties
 %%TOMCAT_DIR%%/webapps/portal-chat/WEB-INF/classes/portal-chat_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/portal-chat/WEB-INF/classes/portal-chat_es.properties
-%%TOMCAT_DIR%%/webapps/portal-chat/WEB-INF/classes/portal-chat_es_ES.properties
 %%TOMCAT_DIR%%/webapps/portal-chat/WEB-INF/classes/portal-chat_eu.properties
+%%TOMCAT_DIR%%/webapps/portal-chat/WEB-INF/classes/portal-chat_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/portal-chat/WEB-INF/classes/portal-chat_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/portal-chat/WEB-INF/lib/commons-httpclient-3.1.jar
 %%TOMCAT_DIR%%/webapps/portal-chat/WEB-INF/lib/commons-lang3-3.1.jar
@@ -10937,9 +10909,10 @@
 %%TOMCAT_DIR%%/webapps/profile2-tool/WEB-INF/classes/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/WEB-INF/classes/org/apache/wicket/markup/html/form/upload/MultiFileUploadField_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/WEB-INF/classes/org/apache/wicket/markup/html/form/upload/MultiFileUploadField_es.properties
-%%TOMCAT_DIR%%/webapps/profile2-tool/WEB-INF/classes/org/apache/wicket/markup/html/form/upload/MultiFileUploadField_es_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/WEB-INF/classes/org/apache/wicket/markup/html/form/upload/MultiFileUploadField_eu.properties
+%%TOMCAT_DIR%%/webapps/profile2-tool/WEB-INF/classes/org/apache/wicket/markup/html/form/upload/MultiFileUploadField_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/WEB-INF/classes/org/apache/wicket/markup/html/form/upload/MultiFileUploadField_ja.properties
+%%TOMCAT_DIR%%/webapps/profile2-tool/WEB-INF/classes/org/apache/wicket/markup/html/form/upload/MultiFileUploadField_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/WEB-INF/classes/org/sakaiproject/profile2/tool/Dispatcher.class
 %%TOMCAT_DIR%%/webapps/profile2-tool/WEB-INF/classes/org/sakaiproject/profile2/tool/Locator.class
 %%TOMCAT_DIR%%/webapps/profile2-tool/WEB-INF/classes/org/sakaiproject/profile2/tool/ProfileApplication$1.class
@@ -11356,7 +11329,6 @@
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/ProfileApplication_en_US.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/ProfileApplication_en_US_DEBUG.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/ProfileApplication_es.properties
-%%TOMCAT_DIR%%/webapps/profile2-tool/bundle/ProfileApplication_es_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/ProfileApplication_es_MX.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/ProfileApplication_eu.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/ProfileApplication_fr_FR.properties
@@ -11375,7 +11347,6 @@
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/my_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/my_de.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/my_es.properties
-%%TOMCAT_DIR%%/webapps/profile2-tool/bundle/my_es_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/my_eu.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/my_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/my_it.properties
@@ -11386,7 +11357,6 @@
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-events_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-events_de.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-events_es.properties
-%%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-events_es_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-events_eu.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-events_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-events_it.properties
@@ -11399,7 +11369,6 @@
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-message_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-message_de.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-message_es.properties
-%%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-message_es_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-message_eu.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-message_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-message_it.properties
@@ -11414,7 +11383,6 @@
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-status_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-status_de.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-status_es.properties
-%%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-status_es_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-status_eu.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-status_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile-status_it.properties
@@ -11427,7 +11395,6 @@
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile_de.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile_es.properties
-%%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile_es_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile_eu.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/profile_it.properties
@@ -11439,8 +11406,9 @@
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/roster.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/roster_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/roster_es.properties
-%%TOMCAT_DIR%%/webapps/profile2-tool/bundle/roster_es_ES.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/bundle/roster_eu.properties
+%%TOMCAT_DIR%%/webapps/profile2-tool/bundle/roster_fr_FR.properties
+%%TOMCAT_DIR%%/webapps/profile2-tool/bundle/roster_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/profile2-tool/css/profile2-help.css
 %%TOMCAT_DIR%%/webapps/profile2-tool/css/profile2-profile-entity.css
 %%TOMCAT_DIR%%/webapps/profile2-tool/css/profile2.css
@@ -11486,9 +11454,9 @@
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/membership.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/membership_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/membership_es.properties
-%%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/membership_es_ES.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/membership_eu.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/membership_mn.properties
+%%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/membership_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/org/sakaiproject/entitybroker/providers/MembershipEntityProvider$SiteGroup.class
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/org/sakaiproject/entitybroker/providers/MembershipEntityProvider.class
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/org/sakaiproject/entitybroker/providers/ServerConfigEntityProvider$ESCComparator.class
@@ -11513,27 +11481,27 @@
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/server-config.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/server-config_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/server-config_es.properties
-%%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/server-config_es_ES.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/server-config_eu.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/server-config_mn.properties
+%%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/server-config_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/session.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/session_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/session_es.properties
-%%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/session_es_ES.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/session_eu.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/session_mn.properties
+%%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/session_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/site.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/site_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/site_es.properties
-%%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/site_es_ES.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/site_eu.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/site_mn.properties
+%%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/site_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/user.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/user_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/user_es.properties
-%%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/user_es_ES.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/user_eu.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/user_mn.properties
+%%TOMCAT_DIR%%/webapps/providers/WEB-INF/classes/user_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/lib/commons-httpclient-3.1.jar
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/lib/entitybroker-utils-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/webapps/providers/WEB-INF/lib/reflectutils-0.9.19.jar
@@ -11548,7 +11516,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-alias-tool/WEB-INF/classes/admin_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-alias-tool/WEB-INF/classes/admin_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-alias-tool/WEB-INF/classes/admin_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-alias-tool/WEB-INF/classes/admin_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-alias-tool/WEB-INF/classes/admin_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-alias-tool/WEB-INF/classes/admin_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/sakai-alias-tool/WEB-INF/classes/admin_fr_FR.properties
@@ -11591,7 +11558,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-announcement-tool/WEB-INF/classes/announcement_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-announcement-tool/WEB-INF/classes/announcement_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-announcement-tool/WEB-INF/classes/announcement_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-announcement-tool/WEB-INF/classes/announcement_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-announcement-tool/WEB-INF/classes/announcement_es_MX.properties
 %%TOMCAT_DIR%%/webapps/sakai-announcement-tool/WEB-INF/classes/announcement_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-announcement-tool/WEB-INF/classes/announcement_fr_CA.properties
@@ -11631,7 +11597,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-announcement-tool/WEB-INF/classes/permissions_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-announcement-tool/WEB-INF/classes/permissions_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-announcement-tool/WEB-INF/classes/permissions_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-announcement-tool/WEB-INF/classes/permissions_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-announcement-tool/WEB-INF/classes/permissions_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-announcement-tool/WEB-INF/classes/permissions_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/sakai-announcement-tool/WEB-INF/classes/permissions_it.properties
@@ -11676,7 +11641,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-archive-tool/WEB-INF/classes/admin_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-archive-tool/WEB-INF/classes/admin_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-archive-tool/WEB-INF/classes/admin_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-archive-tool/WEB-INF/classes/admin_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-archive-tool/WEB-INF/classes/admin_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-archive-tool/WEB-INF/classes/admin_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/sakai-archive-tool/WEB-INF/classes/admin_fr_FR.properties
@@ -11782,7 +11746,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-authz-tool/WEB-INF/classes/authz-tool_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-authz-tool/WEB-INF/classes/authz-tool_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-authz-tool/WEB-INF/classes/authz-tool_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-authz-tool/WEB-INF/classes/authz-tool_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-authz-tool/WEB-INF/classes/authz-tool_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-authz-tool/WEB-INF/classes/authz-tool_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/sakai-authz-tool/WEB-INF/classes/authz-tool_fr_FR.properties
@@ -11844,9 +11807,9 @@
 %%TOMCAT_DIR%%/webapps/sakai-axis/WEB-INF/classes/i18n_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-axis/WEB-INF/classes/i18n_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-axis/WEB-INF/classes/i18n_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-axis/WEB-INF/classes/i18n_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-axis/WEB-INF/classes/i18n_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-axis/WEB-INF/classes/i18n_fr_CA.properties
+%%TOMCAT_DIR%%/webapps/sakai-axis/WEB-INF/classes/i18n_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/sakai-axis/WEB-INF/classes/i18n_it.properties
 %%TOMCAT_DIR%%/webapps/sakai-axis/WEB-INF/classes/i18n_ja.properties
 %%TOMCAT_DIR%%/webapps/sakai-axis/WEB-INF/classes/i18n_ko.properties
@@ -11873,8 +11836,9 @@
 %%TOMCAT_DIR%%/webapps/sakai-calendar-connector/WEB-INF/classes/calendar.properties
 %%TOMCAT_DIR%%/webapps/sakai-calendar-connector/WEB-INF/classes/calendar_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-calendar-connector/WEB-INF/classes/calendar_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-calendar-connector/WEB-INF/classes/calendar_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-calendar-connector/WEB-INF/classes/calendar_eu.properties
+%%TOMCAT_DIR%%/webapps/sakai-calendar-connector/WEB-INF/classes/calendar_fr_FR.properties
+%%TOMCAT_DIR%%/webapps/sakai-calendar-connector/WEB-INF/classes/calendar_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/sakai-calendar-connector/WEB-INF/components.xml
 %%TOMCAT_DIR%%/webapps/sakai-calendar-connector/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/webapps/sakai-calendar-connector/WEB-INF/local.xml
@@ -11989,7 +11953,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-chat-tool/WEB-INF/classes/chat_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-chat-tool/WEB-INF/classes/chat_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-chat-tool/WEB-INF/classes/chat_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-chat-tool/WEB-INF/classes/chat_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-chat-tool/WEB-INF/classes/chat_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-chat-tool/WEB-INF/classes/chat_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/sakai-chat-tool/WEB-INF/classes/chat_fr_FR.properties
@@ -12022,7 +11985,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-chat-tool/WEB-INF/classes/permissions_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-chat-tool/WEB-INF/classes/permissions_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-chat-tool/WEB-INF/classes/permissions_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-chat-tool/WEB-INF/classes/permissions_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-chat-tool/WEB-INF/classes/permissions_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-chat-tool/WEB-INF/classes/permissions_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/sakai-chat-tool/WEB-INF/classes/permissions_it.properties
@@ -12178,16 +12140,15 @@
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/dropbox.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/dropbox_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/dropbox_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/dropbox_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/dropbox_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/dropbox_fr_FR.properties
+%%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/dropbox_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/helper.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/helper_ar.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/helper_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/helper_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/helper_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/helper_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/helper_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/helper_es_MX.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/helper_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/helper_fr_CA.properties
@@ -12247,7 +12208,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/right_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/right_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/right_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/right_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/right_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/right_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/sakai-content-tool/WEB-INF/classes/right_fr_FR.properties
@@ -12339,8 +12299,9 @@
 %%TOMCAT_DIR%%/webapps/sakai-fck-connector/WEB-INF/classes/org/sakaiproject/connector/fck/Messages.properties
 %%TOMCAT_DIR%%/webapps/sakai-fck-connector/WEB-INF/classes/org/sakaiproject/connector/fck/Messages_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-fck-connector/WEB-INF/classes/org/sakaiproject/connector/fck/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-fck-connector/WEB-INF/classes/org/sakaiproject/connector/fck/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-fck-connector/WEB-INF/classes/org/sakaiproject/connector/fck/Messages_eu.properties
+%%TOMCAT_DIR%%/webapps/sakai-fck-connector/WEB-INF/classes/org/sakaiproject/connector/fck/Messages_fr_FR.properties
+%%TOMCAT_DIR%%/webapps/sakai-fck-connector/WEB-INF/classes/org/sakaiproject/connector/fck/Messages_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/sakai-fck-connector/WEB-INF/classes/org/sakaiproject/connector/fck/SortElementsForDisplay.class
 %%TOMCAT_DIR%%/webapps/sakai-fck-connector/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/webapps/sakai-fck-connector/WEB-INF/web.xml
@@ -12374,7 +12335,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/bundle/messages_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/bundle/messages_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/bundle/messages_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/bundle/messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/bundle/messages_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/bundle/messages_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/bundle/messages_mn.properties
@@ -12389,7 +12349,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/classes/org/sakaiproject/tool/gradebook/bundle/Messages_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/classes/org/sakaiproject/tool/gradebook/bundle/Messages_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/classes/org/sakaiproject/tool/gradebook/bundle/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/classes/org/sakaiproject/tool/gradebook/bundle/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/classes/org/sakaiproject/tool/gradebook/bundle/Messages_es_MX.properties
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/classes/org/sakaiproject/tool/gradebook/bundle/Messages_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/classes/org/sakaiproject/tool/gradebook/bundle/Messages_fr_CA.properties
@@ -12412,7 +12371,7 @@
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/faces-navigation.xml
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/faces-test.xml
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/lib/RSFComponents-evolvers-0.8.0.jar
-%%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/lib/SakaiRSFComponents-evolvers-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/lib/SakaiRSFComponents-evolvers-10.0.jar
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/lib/batik-awt-util-1.6-1.jar
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/lib/batik-ext-1.6-1.jar
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/lib/batik-gui-util-1.6-1.jar
@@ -12445,7 +12404,7 @@
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/lib/sakai-gradebook-app-business-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/lib/sakai-gradebook-app-ui-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/lib/sakairsf-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/lib/sakairsf-10.0.jar
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/lib/standard-1.1.2.jar
 %%TOMCAT_DIR%%/webapps/sakai-gradebook-tool/WEB-INF/lib/stax-api-1.0.1.jar
@@ -12754,7 +12713,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-help-tool/WEB-INF/classes/org/sakaiproject/tool/help/bundle/Messages_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-help-tool/WEB-INF/classes/org/sakaiproject/tool/help/bundle/Messages_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-help-tool/WEB-INF/classes/org/sakaiproject/tool/help/bundle/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-help-tool/WEB-INF/classes/org/sakaiproject/tool/help/bundle/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-help-tool/WEB-INF/classes/org/sakaiproject/tool/help/bundle/Messages_es_ES_Pearson.properties
 %%TOMCAT_DIR%%/webapps/sakai-help-tool/WEB-INF/classes/org/sakaiproject/tool/help/bundle/Messages_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-help-tool/WEB-INF/classes/org/sakaiproject/tool/help/bundle/Messages_fr_CA.properties
@@ -12820,7 +12778,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/classes/auth_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/classes/auth_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/classes/auth_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/classes/auth_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/classes/auth_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/classes/auth_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/classes/auth_fr_FR.properties
@@ -12845,10 +12802,24 @@
 %%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/classes/org/sakaiproject/login/tool/ContainerLogin.class
 %%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/classes/org/sakaiproject/login/tool/SkinnableLogin.class
 %%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/annotations-1.3.9.jar
-%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/cas-client-core-3.2.1.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/bcprov-jdk15-1.45.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/cas-client-core-3.3.3.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/commons-httpclient-3.1.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/esapi-2.0GA.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/jcip-annotations-1.0.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/joda-time-1.6.2.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/jul-to-slf4j-1.6.1.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/log4j-over-slf4j-1.6.1.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/not-yet-commons-ssl-0.3.9.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/opensaml-2.5.1-1.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/openws-1.4.2-1.jar
 %%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/spring-security-core-2.0.4.jar
 %%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/velocity-1.5.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/xml-resolver-1.2.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/xmlsec-1.4.4.jar
+%%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/lib/xmltooling-1.3.2-1.jar
 %%TOMCAT_DIR%%/webapps/sakai-login-tool/WEB-INF/web.xml
 %%TOMCAT_DIR%%/webapps/sakai-login-tool/tools/sakai.login.xml
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-james/META-INF/MANIFEST.MF
@@ -12863,7 +12834,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-james/WEB-INF/classes/sakaimailet.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-james/WEB-INF/classes/sakaimailet_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-james/WEB-INF/classes/sakaimailet_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-mailarchive-james/WEB-INF/classes/sakaimailet_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-james/WEB-INF/classes/sakaimailet_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-james/WEB-INF/classes/sakaimailet_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-james/WEB-INF/classes/sakaimailet_mn.properties
@@ -12939,7 +12909,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-tool/WEB-INF/classes/email_ar.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-tool/WEB-INF/classes/email_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-tool/WEB-INF/classes/email_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-mailarchive-tool/WEB-INF/classes/email_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-tool/WEB-INF/classes/email_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-tool/WEB-INF/classes/email_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-tool/WEB-INF/classes/email_fr_FR.properties
@@ -12961,7 +12930,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-tool/WEB-INF/classes/permissions.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-tool/WEB-INF/classes/permissions_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-tool/WEB-INF/classes/permissions_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-mailarchive-tool/WEB-INF/classes/permissions_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-tool/WEB-INF/classes/permissions_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-tool/WEB-INF/classes/permissions_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/sakai-mailarchive-tool/WEB-INF/classes/permissions_mn.properties
@@ -12994,7 +12962,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-memory-tool/WEB-INF/classes/admin_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-memory-tool/WEB-INF/classes/admin_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-memory-tool/WEB-INF/classes/admin_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-memory-tool/WEB-INF/classes/admin_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-memory-tool/WEB-INF/classes/admin_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-memory-tool/WEB-INF/classes/admin_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/sakai-memory-tool/WEB-INF/classes/admin_fr_FR.properties
@@ -13039,7 +13006,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-message-tool/WEB-INF/classes/recent_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-message-tool/WEB-INF/classes/recent_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-message-tool/WEB-INF/classes/recent_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-message-tool/WEB-INF/classes/recent_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-message-tool/WEB-INF/classes/recent_es_MX.properties
 %%TOMCAT_DIR%%/webapps/sakai-message-tool/WEB-INF/classes/recent_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-message-tool/WEB-INF/classes/recent_fr_CA.properties
@@ -13080,7 +13046,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-metaobj-tool/WEB-INF/classes/messages_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-metaobj-tool/WEB-INF/classes/messages_en_US.properties
 %%TOMCAT_DIR%%/webapps/sakai-metaobj-tool/WEB-INF/classes/messages_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-metaobj-tool/WEB-INF/classes/messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-metaobj-tool/WEB-INF/classes/messages_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-metaobj-tool/WEB-INF/classes/messages_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/sakai-metaobj-tool/WEB-INF/classes/messages_it.properties
@@ -13157,7 +13122,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-news-tool/WEB-INF/classes/news_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-news-tool/WEB-INF/classes/news_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-news-tool/WEB-INF/classes/news_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-news-tool/WEB-INF/classes/news_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-news-tool/WEB-INF/classes/news_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-news-tool/WEB-INF/classes/news_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/sakai-news-tool/WEB-INF/classes/news_fr_FR.properties
@@ -13217,8 +13181,8 @@
 %%TOMCAT_DIR%%/webapps/sakai-podcasts/WEB-INF/classes/podcast.properties
 %%TOMCAT_DIR%%/webapps/sakai-podcasts/WEB-INF/classes/podcast_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-podcasts/WEB-INF/classes/podcast_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-podcasts/WEB-INF/classes/podcast_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-podcasts/WEB-INF/classes/podcast_eu.properties
+%%TOMCAT_DIR%%/webapps/sakai-podcasts/WEB-INF/classes/podcast_fr_FR.properties
 %%TOMCAT_DIR%%/webapps/sakai-podcasts/WEB-INF/faces-config.xml
 %%TOMCAT_DIR%%/webapps/sakai-podcasts/WEB-INF/lib/commons-beanutils-1.7.0.jar
 %%TOMCAT_DIR%%/webapps/sakai-podcasts/WEB-INF/lib/commons-digester-1.6.jar
@@ -13277,7 +13241,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-postem-tool/WEB-INF/classes/org/sakaiproject/tool/postem/bundle/Messages_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-postem-tool/WEB-INF/classes/org/sakaiproject/tool/postem/bundle/Messages_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-postem-tool/WEB-INF/classes/org/sakaiproject/tool/postem/bundle/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-postem-tool/WEB-INF/classes/org/sakaiproject/tool/postem/bundle/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-postem-tool/WEB-INF/classes/org/sakaiproject/tool/postem/bundle/Messages_es_ES_Pearson.properties
 %%TOMCAT_DIR%%/webapps/sakai-postem-tool/WEB-INF/classes/org/sakaiproject/tool/postem/bundle/Messages_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-postem-tool/WEB-INF/classes/org/sakaiproject/tool/postem/bundle/Messages_fr_CA.properties
@@ -13355,7 +13318,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-presence-tool/WEB-INF/classes/admin_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-presence-tool/WEB-INF/classes/admin_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-presence-tool/WEB-INF/classes/admin_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-presence-tool/WEB-INF/classes/admin_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-presence-tool/WEB-INF/classes/admin_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-presence-tool/WEB-INF/classes/admin_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/sakai-presence-tool/WEB-INF/classes/admin_fr_FR.properties
@@ -13380,7 +13342,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-presence-tool/WEB-INF/classes/presence_ca_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-presence-tool/WEB-INF/classes/presence_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-presence-tool/WEB-INF/classes/presence_en_GB.properties
-%%TOMCAT_DIR%%/webapps/sakai-presence-tool/WEB-INF/classes/presence_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-presence-tool/WEB-INF/classes/presence_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-presence-tool/WEB-INF/classes/presence_fr_CA.properties
 %%TOMCAT_DIR%%/webapps/sakai-presence-tool/WEB-INF/classes/presence_fr_FR.properties
@@ -13430,7 +13391,6 @@
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/classes/org/sakaiproject/tool/resetpass/bundle/Messages_de.properties
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/classes/org/sakaiproject/tool/resetpass/bundle/Messages_en_GB.properties
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/classes/org/sakaiproject/tool/resetpass/bundle/Messages_es.properties
-%%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/classes/org/sakaiproject/tool/resetpass/bundle/Messages_es_ES.properties
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/classes/org/sakaiproject/tool/resetpass/bundle/Messages_es_MX.properties
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/classes/org/sakaiproject/tool/resetpass/bundle/Messages_eu.properties
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/classes/org/sakaiproject/tool/resetpass/bundle/Messages_fr_FR.properties
@@ -13447,13 +13407,13 @@
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/classes/org/sakaiproject/tool/resetpass/bundle/Messages_zh_CN.properties
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/classes/org/sakaiproject/tool/resetpass/bundle/Messages_zh_TW.properties
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/lib/RSFComponents-evolvers-0.8.0.jar
-%%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/lib/SakaiRSFComponents-evolvers-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/lib/SakaiRSFComponents-evolvers-10.0.jar
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/lib/j-servletutil-1.3.0.jar
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/lib/joda-time-2.3.jar
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/lib/ponderutilcore-1.3.0.jar
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/lib/rsfutil-0.8.0.jar
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/lib/sakairsf-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/lib/sakairsf-10.0.jar
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/lib/xpp3_min-1.1.3.4.O.jar
 %%TOMCAT_DIR%%/webapps/sakai-reset-pass/WEB-INF/requestContext.xml
@@ -13618,7 +13578,7 @@
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/META-INF/maven/org.sakaiproject.roster2/sakai-roster2-tool/pom.properties
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/META-INF/maven/org.sakaiproject.roster2/sakai-roster2-tool/pom.xml
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/applicationContext.xml
-%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/bootstrap.vm
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/bootstrap.jsp
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/api/RosterEnrollment.class
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/api/RosterFunctions.class
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/api/RosterGroup.class
@@ -13626,17 +13586,68 @@
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/api/RosterMemberComparator.class
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/api/RosterSite.class
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/api/SakaiProxy.class
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/bundle/ui.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/bundle/ui_ca.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/bundle/ui_en_GB.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/bundle/ui_es.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/bundle/ui_fr_CA.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/bundle/ui_fr_FR.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/bundle/ui_ja.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/bundle/ui_nl.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/bundle/ui_pt_BR.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/bundle/ui_pt_PT.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/bundle/ui_ru.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/bundle/ui_sv.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/bundle/ui_zh_TW.properties
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/impl/SakaiProxyImpl.class
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/tool/RosterTool.class
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/tool/entityprovider/RosterPOIEntityProvider.class
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/classes/org/sakaiproject/roster/tool/entityprovider/RosterSiteEntityProvider.class
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/lib/commons-httpclient-3.1.jar
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/lib/entitybroker-utils-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/lib/jstl-1.1.2.jar
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/lib/poi-3.9.jar
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/lib/reflectutils-0.9.19.jar
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/lib/velocity-1.7.jar
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/lib/standard-1.1.2.jar
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/partials/connections.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/partials/profile_picture.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/partials/user_info.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/enrollment_header.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/enrollment_section_filter.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/enrollment_status.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/group_section_filter.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/group_section_filter_with_participants.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/grouped.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/groups_header.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/navbar.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/navbar_low_res.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/overview.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/overview_header.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/participants.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/permissions.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/permissions_header.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/pics.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/pics_header.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/pics_wrapper.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/search_with_participants.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/search_with_students.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/section_filter.handlebars
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/templates/ungrouped.handlebars
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/WEB-INF/web.xml
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/bundle/ui.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/bundle/ui_ca.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/bundle/ui_en_GB.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/bundle/ui_es.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/bundle/ui_fr_CA.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/bundle/ui_fr_FR.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/bundle/ui_ja.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/bundle/ui_nl.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/bundle/ui_pt_BR.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/bundle/ui_pt_PT.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/bundle/ui_ru.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/bundle/ui_sv.properties
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/bundle/ui_zh_TW.properties
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/css/images/wait.gif
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/css/jquery.cluetip.css
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/css/roster.css
@@ -13646,32 +13657,16 @@
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/images/darrowup.gif
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/js/roster.js
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/js/roster_permissions.js
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/lib/es5-shim.min.js
+%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/lib/handlebars.runtime-v1.3.0.js
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/lib/jquery.cluetip.min.js
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/lib/jquery.dimensions.js
 %%TOMCAT_DIR%%/webapps/sakai-roster2-tool/lib/jquery.hoverIntent.min.js
-%%TOMCAT_DIR%%/webapps/sakai-roster2-tool/lib/jquery.localisation.js

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410301620.s9UGKNWF009944>