Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Jul 2014 14:09:28 +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: r360903 - head/www/sakai
Message-ID:  <201407061409.s66E9ScB016654@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wen
Date: Sun Jul  6 14:09:27 2014
New Revision: 360903
URL: http://svnweb.freebsd.org/changeset/ports/360903
QAT: https://qat.redports.org/buildarchive/r360903/

Log:
  - Update to 10.0
  - Improve pkg-message

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

Modified: head/www/sakai/Makefile
==============================================================================
--- head/www/sakai/Makefile	Sun Jul  6 14:02:52 2014	(r360902)
+++ head/www/sakai/Makefile	Sun Jul  6 14:09:27 2014	(r360903)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sakai
-PORTVERSION=	2.9.3
+PORTVERSION=	10.0
 CATEGORIES=	www java
 MASTER_SITES=	http://source.sakaiproject.org/release/${PORTVERSION}/artifacts/
 DISTNAME=	${PORTNAME}-bin-${PORTVERSION}
@@ -12,10 +12,10 @@ COMMENT=	Online Collaboration and Learni
 
 LICENSE=	ECLv2
 LICENSE_NAME=	Educational Community License version 2
-LICENSE_FILE=	${WRKDIR}/ECLv2.txt
+LICENSE_FILE=	${WRKDIR}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+RUN_DEPENDS=	${LOCALBASE}/apache-tomcat-7.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
@@ -23,9 +23,9 @@ JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}
 SYSTEM_DIR=	common components licenses shared webapps
-TOMCAT_DIR=	${PREFIX}/apache-tomcat-6.0
+TOMCAT_DIR=	${PREFIX}/apache-tomcat-7.0
 PLIST_SUB+=	TOMCAT_DIR=${TOMCAT_DIR:S|^${PREFIX}/||} \
-	SAKAI_VER="${PORTVERSION}"
+		SAKAI_VER="${PORTVERSION}"
 
 post-extract:
 	@cd ${WRKSRC}/webapps && `${LS} -1 |${SED} 's/.war//' >> ${WRKSRC}/list`

Modified: head/www/sakai/distinfo
==============================================================================
--- head/www/sakai/distinfo	Sun Jul  6 14:02:52 2014	(r360902)
+++ head/www/sakai/distinfo	Sun Jul  6 14:09:27 2014	(r360903)
@@ -1,2 +1,2 @@
-SHA256 (sakai-bin-2.9.3.tar.gz) = aa33de1cbd8465ddcfe51baf8ad53a749590ffe69ec0b5c0d8a307e731b4c8cb
-SIZE (sakai-bin-2.9.3.tar.gz) = 444636106
+SHA256 (sakai-bin-10.0.tar.gz) = 1facaf4e81af35164fce00d74cf31d1a42092307f256ab35898756b0630e73c7
+SIZE (sakai-bin-10.0.tar.gz) = 585317663

Modified: head/www/sakai/pkg-message
==============================================================================
--- head/www/sakai/pkg-message	Sun Jul  6 14:02:52 2014	(r360902)
+++ head/www/sakai/pkg-message	Sun Jul  6 14:09:27 2014	(r360903)
@@ -1,17 +1,12 @@
-==================================================================
-To start Sakai correctly, please set the variable JAVA_OPTS with:
+========================================================================
+Please visit :
+https://confluence.sakaiproject.org/pages/viewpage.action?pageId=82249313
+for more post-install information.
 
-JAVA_OPTS="-server -Xms512m -Xmx1024m -XX:PermSize=128m \
--XX:MaxPermSize=512m -XX:NewSize=192m -XX:MaxNewSize=384m \
--Djava.awt.headless=true -Dhttp.agent=Sakai \
--Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false \
--Dsun.lang.ClassLoader.allowArraySyntax=true"
-
-Now you should start your Tomcat server and browse with:
+After modify Java environment variable(JAVA_OPTS) and Tomcat's config file
+catalina.properties, you can start your Tomcat server and browse with:
    http://your-server:8180/portal
 
 Login into the Sakai system with the user/admin and password/admin
 to configure and setup the system.
-
-More install information please visit:
-http://confluence.sakaiproject.org/display/DOC/Install+Guide+-+Binary+Install+(2.7)
+=========================================================================

Modified: head/www/sakai/pkg-plist
==============================================================================
--- head/www/sakai/pkg-plist	Sun Jul  6 14:02:52 2014	(r360902)
+++ head/www/sakai/pkg-plist	Sun Jul  6 14:09:27 2014	(r360903)
@@ -2,7 +2,9 @@
 %%TOMCAT_DIR%%/common/lib/log4j-1.2.16.jar
 %%TOMCAT_DIR%%/common/lib/sakai-dav-common-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/common/lib/sakai-dav-server-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/common/lib/sakai-kernel-common-1.3.3.jar
+%%TOMCAT_DIR%%/common/lib/sakai-kernel-common-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/common/lib/slf4j-api-1.7.5.jar
+%%TOMCAT_DIR%%/common/lib/slf4j-log4j12-1.7.5.jar
 %%TOMCAT_DIR%%/components/accountvalidator-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/accountvalidator-pack/META-INF/maven/org.sakaiproject.accountvalidator/accountvalidator-pack/pom.properties
 %%TOMCAT_DIR%%/components/accountvalidator-pack/META-INF/maven/org.sakaiproject.accountvalidator/accountvalidator-pack/pom.xml
@@ -10,43 +12,50 @@
 %%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/hibernate-hbms.xml
 %%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/lib/accountvalidator-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/lib/commons-beanutils-1.7.0.jar
-%%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/lib/commons-digester-1.6.jar
 %%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/lib/commons-validator-1.3.1.jar
 %%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/lib/generic-dao-0.9.18.jar
-%%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/lib/joda-time-1.6.2.jar
+%%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/lib/joda-time-2.3.jar
 %%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/lib/oro-2.0.8.jar
 %%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/lib/reflectutils-0.9.14.jar
-%%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/spring-hibernate.xml
 %%TOMCAT_DIR%%/components/accountvalidator-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/archive-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/archive-pack/META-INF/maven/org.sakaiproject.common/archive-pack/pom.properties
 %%TOMCAT_DIR%%/components/archive-pack/META-INF/maven/org.sakaiproject.common/archive-pack/pom.xml
 %%TOMCAT_DIR%%/components/archive-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/archive-pack/WEB-INF/lib/archive-impl-1.2.3.jar
-%%TOMCAT_DIR%%/components/archive-pack/WEB-INF/lib/archive-impl2-1.2.3.jar
-%%TOMCAT_DIR%%/components/archive-pack/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/archive-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/archive-pack/WEB-INF/lib/archive-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/archive-pack/WEB-INF/lib/archive-impl2-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/archive-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/archive-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/basiclti-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/basiclti-pack/META-INF/maven/org.sakaiproject.basiclti/basiclti-pack/pom.properties
 %%TOMCAT_DIR%%/components/basiclti-pack/META-INF/maven/org.sakaiproject.basiclti/basiclti-pack/pom.xml
 %%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/basiclti-common-2.1.1.jar
-%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/basiclti-impl-2.1.1.jar
-%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/basiclti-util-2.1.1.jar
+%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/basiclti-common-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/basiclti-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/basiclti-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/commons-beanutils-1.7.0.jar
 %%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/commons-beanutils-core-1.8.0.jar
-%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/commons-configuration-1.6.jar
 %%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/commons-digester-1.8.jar
 %%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/commons-httpclient-3.1.jar
-%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/entitybroker-utils-1.5.3.jar
-%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/portlet-util-2.1.1.jar
+%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/entitybroker-utils-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/jackson-core-asl-1.8.5.jar
+%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/jackson-mapper-asl-1.8.5.jar
+%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/json-simple-1.1.jar
+%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/portlet-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/reflectutils-0.9.19.jar
-%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/lib/sakai-portal-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/basiclti-pack/WEB-INF/web.xml
+%%TOMCAT_DIR%%/components/content-cleanup-pack/META-INF/MANIFEST.MF
+%%TOMCAT_DIR%%/components/content-cleanup-pack/META-INF/maven/org.sakaiproject.content/content-cleanup-pack/pom.properties
+%%TOMCAT_DIR%%/components/content-cleanup-pack/META-INF/maven/org.sakaiproject.content/content-cleanup-pack/pom.xml
+%%TOMCAT_DIR%%/components/content-cleanup-pack/WEB-INF/components.xml
+%%TOMCAT_DIR%%/components/content-cleanup-pack/WEB-INF/lib/content-cleanup-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/content-cleanup-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/content-copyright-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/content-copyright-pack/META-INF/maven/org.sakaiproject.content/content-copyright-pack/pom.properties
 %%TOMCAT_DIR%%/components/content-copyright-pack/META-INF/maven/org.sakaiproject.content/content-copyright-pack/pom.xml
@@ -63,43 +72,90 @@
 %%TOMCAT_DIR%%/components/content-types-pack/META-INF/maven/org.sakaiproject.content/content-types-pack/pom.properties
 %%TOMCAT_DIR%%/components/content-types-pack/META-INF/maven/org.sakaiproject.content/content-types-pack/pom.xml
 %%TOMCAT_DIR%%/components/content-types-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/content-types-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/content-types-pack/WEB-INF/lib/content-types-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/content-types-pack/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/content-types-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/content-types-pack/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/content-types-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/content-types-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/coursemanagement-hibernate-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/coursemanagement-hibernate-pack/META-INF/maven/org.sakaiproject.edu-services.course-management/coursemanagement-hibernate-pack/pom.properties
 %%TOMCAT_DIR%%/components/coursemanagement-hibernate-pack/META-INF/maven/org.sakaiproject.edu-services.course-management/coursemanagement-hibernate-pack/pom.xml
 %%TOMCAT_DIR%%/components/coursemanagement-hibernate-pack/WEB-INF/components-demo.xml
 %%TOMCAT_DIR%%/components/coursemanagement-hibernate-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/coursemanagement-hibernate-pack/WEB-INF/lib/coursemanagement-hibernate-impl-1.2.3.jar
+%%TOMCAT_DIR%%/components/coursemanagement-hibernate-pack/WEB-INF/lib/coursemanagement-hibernate-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/coursemanagement-hibernate-pack/WEB-INF/web.xml
+%%TOMCAT_DIR%%/components/delegatedaccess-pack/META-INF/MANIFEST.MF
+%%TOMCAT_DIR%%/components/delegatedaccess-pack/META-INF/maven/org.sakaiproject.delegatedaccess/delegatedaccess-pack/pom.properties
+%%TOMCAT_DIR%%/components/delegatedaccess-pack/META-INF/maven/org.sakaiproject.delegatedaccess/delegatedaccess-pack/pom.xml
+%%TOMCAT_DIR%%/components/delegatedaccess-pack/WEB-INF/components-demo.xml
+%%TOMCAT_DIR%%/components/delegatedaccess-pack/WEB-INF/components.xml
+%%TOMCAT_DIR%%/components/delegatedaccess-pack/WEB-INF/lib/commons-beanutils-1.7.0.jar
+%%TOMCAT_DIR%%/components/delegatedaccess-pack/WEB-INF/lib/commons-beanutils-core-1.8.0.jar
+%%TOMCAT_DIR%%/components/delegatedaccess-pack/WEB-INF/lib/commons-configuration-1.6.jar
+%%TOMCAT_DIR%%/components/delegatedaccess-pack/WEB-INF/lib/commons-digester-1.8.jar
+%%TOMCAT_DIR%%/components/delegatedaccess-pack/WEB-INF/lib/delegatedaccess-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/delegatedaccess-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/delegatedaccess-pack/WEB-INF/web.xml
+%%TOMCAT_DIR%%/components/elasticsearch-component/META-INF/MANIFEST.MF
+%%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
 %%TOMCAT_DIR%%/components/emailtemplateservice-pack/META-INF/maven/org.sakaiproject.emailtemplateservice/emailtemplateservice-pack/pom.xml
 %%TOMCAT_DIR%%/components/emailtemplateservice-pack/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/emailtemplateservice-pack/WEB-INF/hibernate-hbms.xml
-%%TOMCAT_DIR%%/components/emailtemplateservice-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/emailtemplateservice-pack/WEB-INF/lib/easymock-1.2_Java1.3.jar
-%%TOMCAT_DIR%%/components/emailtemplateservice-pack/WEB-INF/lib/emailtemplateservice-impl-0.6.3.jar
-%%TOMCAT_DIR%%/components/emailtemplateservice-pack/WEB-INF/lib/freemarker-2.3.18.jar
+%%TOMCAT_DIR%%/components/emailtemplateservice-pack/WEB-INF/lib/emailtemplateservice-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/emailtemplateservice-pack/WEB-INF/lib/freemarker-2.3.20.jar
 %%TOMCAT_DIR%%/components/emailtemplateservice-pack/WEB-INF/lib/generic-dao-0.9.18.jar
 %%TOMCAT_DIR%%/components/emailtemplateservice-pack/WEB-INF/lib/reflectutils-0.9.14.jar
-%%TOMCAT_DIR%%/components/emailtemplateservice-pack/WEB-INF/lib/spring-test-2.5.6.SEC03.jar
 %%TOMCAT_DIR%%/components/emailtemplateservice-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/entitybroker-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/entitybroker-pack/META-INF/maven/org.sakaiproject.entitybroker/entitybroker-pack/pom.properties
 %%TOMCAT_DIR%%/components/entitybroker-pack/META-INF/maven/org.sakaiproject.entitybroker/entitybroker-pack/pom.xml
 %%TOMCAT_DIR%%/components/entitybroker-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/entitybroker-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/entitybroker-pack/WEB-INF/lib/commons-httpclient-3.1.jar
-%%TOMCAT_DIR%%/components/entitybroker-pack/WEB-INF/lib/entitybroker-impl-1.5.3.jar
-%%TOMCAT_DIR%%/components/entitybroker-pack/WEB-INF/lib/entitybroker-utils-1.5.3.jar
+%%TOMCAT_DIR%%/components/entitybroker-pack/WEB-INF/lib/entitybroker-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/entitybroker-pack/WEB-INF/lib/entitybroker-utils-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/entitybroker-pack/WEB-INF/lib/generic-dao-0.9.18.jar
 %%TOMCAT_DIR%%/components/entitybroker-pack/WEB-INF/lib/reflectutils-0.9.19.jar
-%%TOMCAT_DIR%%/components/entitybroker-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/entitybroker-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/entitybroker-pack/WEB-INF/web.xml
+%%TOMCAT_DIR%%/components/external-calendaring-service-pack/META-INF/MANIFEST.MF
+%%TOMCAT_DIR%%/components/external-calendaring-service-pack/META-INF/maven/org.sakaiproject.calendaring/external-calendaring-service-pack/pom.properties
+%%TOMCAT_DIR%%/components/external-calendaring-service-pack/META-INF/maven/org.sakaiproject.calendaring/external-calendaring-service-pack/pom.xml
+%%TOMCAT_DIR%%/components/external-calendaring-service-pack/WEB-INF/components.xml
+%%TOMCAT_DIR%%/components/external-calendaring-service-pack/WEB-INF/lib/external-calendaring-service-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/external-calendaring-service-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/external-calendaring-service-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/gradebook-service-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/gradebook-service-pack/META-INF/maven/org.sakaiproject.edu-services.gradebook/gradebook-service-pack/pom.properties
 %%TOMCAT_DIR%%/components/gradebook-service-pack/META-INF/maven/org.sakaiproject.edu-services.gradebook/gradebook-service-pack/pom.xml
@@ -107,27 +163,59 @@
 %%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/classes/mysql/sakai_gradebook_post_schemaupdate.sql
 %%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/classes/oracle/sakai_gradebook_post_schemaupdate.sql
 %%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/lib/gradebook-service-impl-1.2.3.jar
+%%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/lib/gradebook-service-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/lib/jta-h2.1.8.jar
-%%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/lib/sections-integrationsupport-1.2.3.jar
-%%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/lib/spring-test-2.5.6.SEC03.jar
+%%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/lib/sections-integrationsupport-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/lib/xpp3_min-1.1.3.4.O.jar
 %%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/lib/xstream-1.2.1.jar
 %%TOMCAT_DIR%%/components/gradebook-service-pack/WEB-INF/web.xml
+%%TOMCAT_DIR%%/components/hierarchy-pack/META-INF/MANIFEST.MF
+%%TOMCAT_DIR%%/components/hierarchy-pack/META-INF/maven/org.sakaiproject.hierarchy/hierarchy-pack/pom.properties
+%%TOMCAT_DIR%%/components/hierarchy-pack/META-INF/maven/org.sakaiproject.hierarchy/hierarchy-pack/pom.xml
+%%TOMCAT_DIR%%/components/hierarchy-pack/WEB-INF/components.xml
+%%TOMCAT_DIR%%/components/hierarchy-pack/WEB-INF/lib/generic-dao-0.9.18.jar
+%%TOMCAT_DIR%%/components/hierarchy-pack/WEB-INF/lib/hierarchy-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/hierarchy-pack/WEB-INF/lib/reflectutils-0.9.14.jar
+%%TOMCAT_DIR%%/components/hierarchy-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/hierarchy-pack/WEB-INF/sakai-hibernate.xml
+%%TOMCAT_DIR%%/components/hierarchy-pack/WEB-INF/spring-hibernate.xml
+%%TOMCAT_DIR%%/components/hierarchy-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/import-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/import-pack/META-INF/maven/org.sakaiproject.common/import-pack/pom.properties
 %%TOMCAT_DIR%%/components/import-pack/META-INF/maven/org.sakaiproject.common/import-pack/pom.xml
 %%TOMCAT_DIR%%/components/import-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/import-pack/WEB-INF/lib/common-cartridge-1.2.3.jar
-%%TOMCAT_DIR%%/components/import-pack/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/import-pack/WEB-INF/lib/import-impl-1.2.3.jar
-%%TOMCAT_DIR%%/components/import-pack/WEB-INF/lib/sakai-archive-import-1.2.3.jar
-%%TOMCAT_DIR%%/components/import-pack/WEB-INF/lib/sakai-import-content-1.2.3.jar
-%%TOMCAT_DIR%%/components/import-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/import-pack/WEB-INF/lib/common-cartridge-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/import-pack/WEB-INF/lib/import-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/import-pack/WEB-INF/lib/sakai-archive-import-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/import-pack/WEB-INF/lib/sakai-import-content-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/import-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/import-pack/WEB-INF/lib/saxpath-1.0-FCS.jar
 %%TOMCAT_DIR%%/components/import-pack/WEB-INF/web.xml
+%%TOMCAT_DIR%%/components/lessonbuilder-components/META-INF/MANIFEST.MF
+%%TOMCAT_DIR%%/components/lessonbuilder-components/META-INF/maven/org.sakaiproject.lessonbuilder/lessonbuilder-components/pom.properties
+%%TOMCAT_DIR%%/components/lessonbuilder-components/META-INF/maven/org.sakaiproject.lessonbuilder/lessonbuilder-components/pom.xml
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/db2/simplepage.pre29-to29.sql
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/db2/simplepage.sql
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/hsqldb/simplepage.pre29-to29.sql
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/hsqldb/simplepage.sql
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/mysql/simplepage.for-2.9.2.sql
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/mysql/simplepage.for-2.9.3.sql
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/mysql/simplepage.pre29-to29.sql
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/mysql/simplepage.sql
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/oracle/convert-index-names.sql
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/oracle/simplepage.for-2.9.3.sql
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/oracle/simplepage.pre29-to29.sql
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/oracle/simplepage.sql
+%%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.class
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/classes/org/sakaiproject/lessonbuildertool/service/SimplePageToolService.class
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/components.xml
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/lib/json-simple-1.1.1.jar
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/lessonbuilder-components/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/localization-bundles-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/localization-bundles-pack/META-INF/maven/org.sakaiproject/localization-bundles-pack/pom.properties
 %%TOMCAT_DIR%%/components/localization-bundles-pack/META-INF/maven/org.sakaiproject/localization-bundles-pack/pom.xml
@@ -138,44 +226,40 @@
 %%TOMCAT_DIR%%/components/login-pack/META-INF/maven/org.sakaiproject.login/login-pack/pom.properties
 %%TOMCAT_DIR%%/components/login-pack/META-INF/maven/org.sakaiproject.login/login-pack/pom.xml
 %%TOMCAT_DIR%%/components/login-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/login-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/login-pack/WEB-INF/lib/login-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/login-pack/WEB-INF/lib/oro-2.0.8.jar
-%%TOMCAT_DIR%%/components/login-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/login-pack/WEB-INF/lib/velocity-1.6.3.jar
+%%TOMCAT_DIR%%/components/login-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/login-pack/WEB-INF/lib/velocity-1.6.4.jar
 %%TOMCAT_DIR%%/components/login-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/mailsender-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/mailsender-pack/META-INF/maven/org.sakaiproject.mailsender/mailsender-pack/pom.properties
 %%TOMCAT_DIR%%/components/mailsender-pack/META-INF/maven/org.sakaiproject.mailsender/mailsender-pack/pom.xml
 %%TOMCAT_DIR%%/components/mailsender-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/mailsender-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/mailsender-pack/WEB-INF/lib/commons-email-1.2.jar
 %%TOMCAT_DIR%%/components/mailsender-pack/WEB-INF/lib/jericho-html-3.1.jar
-%%TOMCAT_DIR%%/components/mailsender-pack/WEB-INF/lib/mailsender-impl-1.7.4.jar
-%%TOMCAT_DIR%%/components/mailsender-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/mailsender-pack/WEB-INF/lib/mailsender-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/mailsender-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/mailsender-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/messageforums-components/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/messageforums-components/META-INF/maven/org.sakaiproject.msgcntr/messageforums-components/pom.properties
 %%TOMCAT_DIR%%/components/messageforums-components/META-INF/maven/org.sakaiproject.msgcntr/messageforums-components/pom.xml
 %%TOMCAT_DIR%%/components/messageforums-components/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/messageforums-components/WEB-INF/lib/commons-beanutils-1.7.0.jar
-%%TOMCAT_DIR%%/components/messageforums-components/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/messageforums-components/WEB-INF/lib/messageforums-component-impl-3.0.3.jar
-%%TOMCAT_DIR%%/components/messageforums-components/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/messageforums-components/WEB-INF/lib/messageforums-component-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/messageforums-components/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/messageforums-components/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/osp-common-component/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/osp-common-component/META-INF/maven/org.sakaiproject.osp/osp-common-component/pom.properties
 %%TOMCAT_DIR%%/components/osp-common-component/META-INF/maven/org.sakaiproject.osp/osp-common-component/pom.xml
 %%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/lib/commons-beanutils-1.6.jar
-%%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/lib/commons-digester-1.6.jar
 %%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/lib/osp-common-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/lib/sakai-metaobj-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/lib/sakai-metaobj-tool-lib-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/lib/spring-webmvc-2.5.6.SEC03.jar
+%%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/lib/standard-1.1.2.jar
 %%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/lib/velocity-1.3.1.jar
 %%TOMCAT_DIR%%/components/osp-common-component/WEB-INF/web.xml
@@ -184,15 +268,14 @@
 %%TOMCAT_DIR%%/components/osp-glossary-component/META-INF/maven/org.sakaiproject.osp/osp-glossary-component/pom.xml
 %%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/commons-beanutils-1.6.jar
-%%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/commons-digester-1.6.jar
 %%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/osp-common-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/osp-glossary-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/sakai-metaobj-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/sakai-metaobj-tool-lib-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/spring-webmvc-2.5.6.SEC03.jar
+%%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/standard-1.1.2.jar
 %%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/lib/velocity-1.3.1.jar
 %%TOMCAT_DIR%%/components/osp-glossary-component/WEB-INF/web.xml
@@ -201,15 +284,14 @@
 %%TOMCAT_DIR%%/components/osp-integration-component/META-INF/maven/org.sakaiproject.osp/osp-integration-component/pom.xml
 %%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/commons-beanutils-1.6.jar
-%%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/commons-digester-1.6.jar
 %%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/osp-common-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/osp-integration-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/sakai-metaobj-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/sakai-metaobj-tool-lib-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/spring-webmvc-2.5.6.SEC03.jar
+%%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/standard-1.1.2.jar
 %%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/lib/velocity-1.3.1.jar
 %%TOMCAT_DIR%%/components/osp-integration-component/WEB-INF/web.xml
@@ -218,16 +300,15 @@
 %%TOMCAT_DIR%%/components/osp-matrix-component/META-INF/maven/org.sakaiproject.osp/osp-matrix-component/pom.xml
 %%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/commons-beanutils-1.6.jar
-%%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/commons-digester-1.6.jar
 %%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/osp-common-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/osp-matrix-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/sakai-metaobj-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/sakai-metaobj-tool-lib-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/sakai-site-manage-util-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/spring-webmvc-2.5.6.SEC03.jar
+%%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/standard-1.1.2.jar
 %%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/lib/velocity-1.3.1.jar
 %%TOMCAT_DIR%%/components/osp-matrix-component/WEB-INF/web.xml
@@ -235,16 +316,14 @@
 %%TOMCAT_DIR%%/components/osp-portal-component/META-INF/maven/org.sakaiproject.osp/osp-portal-component/pom.properties
 %%TOMCAT_DIR%%/components/osp-portal-component/META-INF/maven/org.sakaiproject.osp/osp-portal-component/pom.xml
 %%TOMCAT_DIR%%/components/osp-portal-component/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/osp-portal-component/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/osp-portal-component/WEB-INF/lib/osp-portal-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-portal-component/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/osp-portal-component/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-portal-component/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/osp-presentation-component/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/osp-presentation-component/META-INF/maven/org.sakaiproject.osp/osp-presentation-component/pom.properties
 %%TOMCAT_DIR%%/components/osp-presentation-component/META-INF/maven/org.sakaiproject.osp/osp-presentation-component/pom.xml
 %%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/commons-beanutils-1.7.0.jar
-%%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/commons-digester-1.6.jar
 %%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/jsf-api-1.1_02.jar
 %%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/jsf-impl-1.1_02.jar
@@ -254,11 +333,11 @@
 %%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/osp-common-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/osp-common-tool-lib-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/osp-presentation-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/sakai-metaobj-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/sakai-metaobj-tool-lib-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/spring-webmvc-2.5.6.SEC03.jar
+%%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/standard-1.1.2.jar
 %%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/velocity-1.3.1.jar
 %%TOMCAT_DIR%%/components/osp-presentation-component/WEB-INF/lib/websphinx-0.5.jar
@@ -271,16 +350,15 @@
 %%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/glossary-components.xml
 %%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/guidance-components.xml
 %%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/commons-beanutils-1.6.jar
-%%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/commons-digester-1.6.jar
 %%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/osp-common-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/osp-warehouse-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/sakai-metaobj-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/sakai-metaobj-tool-lib-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/sakai-warehouse-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/spring-webmvc-2.5.6.SEC03.jar
+%%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/standard-1.1.2.jar
 %%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/lib/velocity-1.3.1.jar
 %%TOMCAT_DIR%%/components/osp-warehouse-component/WEB-INF/matrix-components.xml
@@ -293,7 +371,6 @@
 %%TOMCAT_DIR%%/components/osp-wizard-components/META-INF/maven/org.sakaiproject.osp/osp-wizard-components/pom.xml
 %%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/commons-beanutils-1.7.0.jar
-%%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/commons-digester-1.6.jar
 %%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/jsf-api-1.1_02.jar
 %%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/jsf-impl-1.1_02.jar
@@ -304,11 +381,11 @@
 %%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/osp-common-tool-lib-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/osp-glossary-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/osp-wizard-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/sakai-metaobj-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/sakai-metaobj-tool-lib-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/spring-webmvc-2.5.6.SEC03.jar
+%%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/standard-1.1.2.jar
 %%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/velocity-1.3.1.jar
 %%TOMCAT_DIR%%/components/osp-wizard-components/WEB-INF/lib/xml-resolver-1.2.jar
@@ -319,46 +396,38 @@
 %%TOMCAT_DIR%%/components/polls-pack/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/polls-pack/WEB-INF/hibernate-hbms.xml
 %%TOMCAT_DIR%%/components/polls-pack/WEB-INF/lib/commons-beanutils-1.7.0.jar
-%%TOMCAT_DIR%%/components/polls-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/polls-pack/WEB-INF/lib/commons-digester-1.6.jar
 %%TOMCAT_DIR%%/components/polls-pack/WEB-INF/lib/commons-validator-1.3.1.jar
 %%TOMCAT_DIR%%/components/polls-pack/WEB-INF/lib/generic-dao-0.9.18.jar
 %%TOMCAT_DIR%%/components/polls-pack/WEB-INF/lib/oro-2.0.8.jar
-%%TOMCAT_DIR%%/components/polls-pack/WEB-INF/lib/polls-impl-1.5.3.jar
+%%TOMCAT_DIR%%/components/polls-pack/WEB-INF/lib/polls-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/polls-pack/WEB-INF/lib/reflectutils-0.9.14.jar
 %%TOMCAT_DIR%%/components/polls-pack/WEB-INF/web.xml
-%%TOMCAT_DIR%%/components/profile-component/META-INF/MANIFEST.MF
-%%TOMCAT_DIR%%/components/profile-component/META-INF/maven/org.sakaiproject.profile/profile-component/pom.properties
-%%TOMCAT_DIR%%/components/profile-component/META-INF/maven/org.sakaiproject.profile/profile-component/pom.xml
-%%TOMCAT_DIR%%/components/profile-component/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/profile-component/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/profile2-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/profile2-pack/META-INF/maven/org.sakaiproject.profile2/profile2-pack/pom.properties
 %%TOMCAT_DIR%%/components/profile2-pack/META-INF/maven/org.sakaiproject.profile2/profile2-pack/pom.xml
 %%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/lib/commons-codec-1.4.jar
 %%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/lib/generic-dao-0.9.18.jar
 %%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/lib/imgscalr-lib-4.2.jar
 %%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/lib/opencsv-2.3.jar
-%%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/lib/profile2-impl-1.5.3.jar
-%%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/lib/profile2-util-1.5.3.jar
+%%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/lib/profile2-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/lib/profile2-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/lib/reflectutils-0.9.14.jar
-%%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/lib/twitter4j-core-3.0.3.jar
+%%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/lib/twitter4j-core-3.0.5.jar
 %%TOMCAT_DIR%%/components/profile2-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-announcement-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-announcement-pack/META-INF/maven/org.sakaiproject.announcement/sakai-announcement-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-announcement-pack/META-INF/maven/org.sakaiproject.announcement/sakai-announcement-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/commons-beanutils-1.7.0.jar
-%%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/commons-digester-1.8.jar
 %%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/oro-2.0.8.jar
 %%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/sakai-announcement-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/sakai-mergedlist-util-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/sakai-message-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/sakai-message-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/sakai-velocity-tool-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/velocity-1.6.4.jar
 %%TOMCAT_DIR%%/components/sakai-announcement-pack/WEB-INF/lib/velocity-tools-1.4.jar
@@ -369,7 +438,7 @@
 %%TOMCAT_DIR%%/components/sakai-anouncement-import/META-INF/maven/org.sakaiproject/sakai-anouncement-import/pom.properties
 %%TOMCAT_DIR%%/components/sakai-anouncement-import/META-INF/maven/org.sakaiproject/sakai-anouncement-import/pom.xml
 %%TOMCAT_DIR%%/components/sakai-anouncement-import/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-anouncement-import/WEB-INF/lib/import-impl-1.2.3.jar
+%%TOMCAT_DIR%%/components/sakai-anouncement-import/WEB-INF/lib/import-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-anouncement-import/WEB-INF/lib/sakai-import-announcement-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-anouncement-import/WEB-INF/lib/saxpath-1.0-FCS.jar
 %%TOMCAT_DIR%%/components/sakai-anouncement-import/WEB-INF/web.xml
@@ -377,32 +446,30 @@
 %%TOMCAT_DIR%%/components/sakai-assignment-pack/META-INF/maven/org.sakaiproject.assignment/sakai-assignment-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-assignment-pack/META-INF/maven/org.sakaiproject.assignment/sakai-assignment-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-assignment-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-assignment-pack/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/sakai-assignment-pack/WEB-INF/lib/commons-lang3-3.0.1.jar
-%%TOMCAT_DIR%%/components/sakai-assignment-pack/WEB-INF/lib/poi-3.7.jar
+%%TOMCAT_DIR%%/components/sakai-assignment-pack/WEB-INF/lib/opencsv-2.3.jar
+%%TOMCAT_DIR%%/components/sakai-assignment-pack/WEB-INF/lib/poi-3.9.jar
 %%TOMCAT_DIR%%/components/sakai-assignment-pack/WEB-INF/lib/sakai-assignment-bundles-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-assignment-pack/WEB-INF/lib/sakai-assignment-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/sakai-assignment-pack/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/sakai-assignment-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-assignment-pack/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-assignment-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-assignment-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/META-INF/maven/org.sakaiproject.calendar/sakai-calendar-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/META-INF/maven/org.sakaiproject.calendar/sakai-calendar-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/components.xml
+%%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/hibernate-hbms.xml
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/avalon-framework-20020627.jar
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/batik-1.5-fop-0.20-5.jar
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/commons-beanutils-1.7.0.jar
-%%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/commons-digester-1.8.jar
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/fop-0.20.5.jar
-%%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/ical4j-1.0-rc2.jar
-%%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/joda-time-2.0.jar
+%%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/joda-time-2.3.jar
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/oro-2.0.8.jar
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/sakai-calendar-bundles-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/sakai-calendar-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/sakai-calendar-util-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/sakai-mergedlist-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/sakai-velocity-tool-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-calendar-pack/WEB-INF/lib/velocity-1.6.4.jar
@@ -412,25 +479,21 @@
 %%TOMCAT_DIR%%/components/sakai-chat-pack/META-INF/maven/org.sakaiproject/sakai-chat-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-chat-pack/META-INF/maven/org.sakaiproject/sakai-chat-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-chat-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-chat-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/sakai-chat-pack/WEB-INF/lib/sakai-chat-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-chat-pack/WEB-INF/lib/sakai-courier-util-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/sakai-chat-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/sakai-chat-pack/WEB-INF/lib/sakai-message-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-chat-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-chat-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-citations-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-citations-pack/META-INF/maven/org.sakaiproject/sakai-citations-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-citations-pack/META-INF/maven/org.sakaiproject/sakai-citations-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/lib/backport-util-concurrent-2.1.jar
-%%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/lib/cql-java-0.7.jar
 %%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/lib/sakai-citations-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/lib/sakai-citations-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/lib/sakai-citations-web2bridge-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/lib/sakai-citations-xserver-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/lib/xpp3_min-1.1.4c.jar
 %%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/lib/xstream-1.3.1.jar
 %%TOMCAT_DIR%%/components/sakai-citations-pack/WEB-INF/web.xml
@@ -439,17 +502,20 @@
 %%TOMCAT_DIR%%/components/sakai-common-components/META-INF/maven/org.sakaiproject.common/sakai-common-components/pom.xml
 %%TOMCAT_DIR%%/components/sakai-common-components/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/sakai-common-components/WEB-INF/lib/commons-beanutils-1.7.0.jar
-%%TOMCAT_DIR%%/components/sakai-common-components/WEB-INF/lib/sakai-common-composite-component-1.2.3.jar
+%%TOMCAT_DIR%%/components/sakai-common-components/WEB-INF/lib/sakai-common-composite-component-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-common-components/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-comp-help/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-comp-help/META-INF/maven/org.sakaiproject/sakai-comp-help/pom.properties
 %%TOMCAT_DIR%%/components/sakai-comp-help/META-INF/maven/org.sakaiproject/sakai-comp-help/pom.xml
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/classes/Tutorial.config
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/classes/TutorialMessages.properties
-%%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/classes/TutorialMessages_ca.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
+%%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/classes/TutorialMessages_zh_CN.properties
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/classes/org/sakaiproject/component/app/help/DefaultGlossary.class
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/classes/org/sakaiproject/component/app/help/HelpManagerImpl$1.class
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/classes/org/sakaiproject/component/app/help/HelpManagerImpl$2.class
@@ -462,19 +528,17 @@
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/sakai-comp-help/WEB-INF/lib/commons-beanutils-1.7.0.jar
 %%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-codec-1.5.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-1.3.3.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
 %%TOMCAT_DIR%%/components/sakai-courier-pack/META-INF/maven/org.sakaiproject.courier/sakai-courier-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-courier-pack/META-INF/maven/org.sakaiproject.courier/sakai-courier-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-courier-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-courier-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/sakai-courier-pack/WEB-INF/lib/sakai-courier-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/sakai-courier-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-courier-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-courier-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-gradebooksample-grade-converter/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-gradebooksample-grade-converter/META-INF/maven/org.sakaiproject/sakai-gradebooksample-grade-converter/pom.properties
@@ -493,27 +557,60 @@
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/conditions-components.xml
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/content-components.xml
-%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/content-jcr-components-jcr.xml
-%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/content-jcr-components.xml
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/db-components.xml
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/email-components.xml
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/entity-components.xml
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/event-components.xml
-%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/antisamy-1.5.2.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/antisamy-1.5.3.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/apache-mime4j-core-0.7.2.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/apache-mime4j-dom-0.7.2.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/asm-debug-all-4.1.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/aspectjrt-1.6.11.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/batik-css-1.7.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/batik-ext-1.7.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/batik-util-1.7.jar
-%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/commons-codec-1.5.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/bcmail-jdk15-1.45.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/bcprov-jdk15-1.45.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/commons-beanutils-1.8.3.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/commons-compress-1.5.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/commons-digester-1.8.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/commons-httpclient-3.1.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/commons-validator-1.4.0.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/fontbox-1.8.4.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/geronimo-stax-api_1.0_spec-1.0.1.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/guava-16.0.1.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/icu4j-4.8.jar
+%%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/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
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/nekohtml-1.9.16.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/netcdf-4.2-min.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/opencsv-2.3.jar
-%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/sakai-kernel-impl-1.3.3.jar
-%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/pdfbox-1.8.4.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/poi-3.10-beta2.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/poi-ooxml-3.10-beta2.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/poi-ooxml-schemas-3.10-beta2.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/poi-scratchpad-3.10-beta2.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/reflectutils-0.9.19.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/rome-0.9.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/sakai-kernel-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/tagsoup-1.2.1.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/tika-core-1.5.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/tika-parsers-1.5.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/vorbis-java-core-0.1-tests.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/vorbis-java-core-0.1.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/vorbis-java-tika-0.1.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/xercesImpl-2.6.2.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/xml-apis-ext-1.3.04.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/xmlParserAPIs-2.6.2.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/xmlbeans-2.3.0.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/xmpcore-5.1.2.jar
+%%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/lib/xz-1.2.jar
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/memory-components.xml
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/messagebundle-components.xml
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/site-components.xml
@@ -521,52 +618,26 @@
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/user-components.xml
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/util-components.xml
 %%TOMCAT_DIR%%/components/sakai-kernel-component/WEB-INF/web.xml
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/META-INF/MANIFEST.MF
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/META-INF/maven/org.sakaiproject.lessonbuilder/sakai-lessonbuildertool-components/pom.properties
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/META-INF/maven/org.sakaiproject.lessonbuilder/sakai-lessonbuildertool-components/pom.xml
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/db2/simplepage.pre29-to29.sql
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/db2/simplepage.sql
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/hsqldb/simplepage.for-%%SAKAI_VER%%.sql
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/hsqldb/simplepage.pre29-to29.sql
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/hsqldb/simplepage.sql
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/mysql/simplepage.for-2.9.2.sql
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/mysql/simplepage.for-%%SAKAI_VER%%.sql
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/mysql/simplepage.pre29-to29.sql
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/mysql/simplepage.sql
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/oracle/convert-index-names.sql
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/oracle/simplepage.for-%%SAKAI_VER%%.sql
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/oracle/simplepage.pre29-to29.sql
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/oracle/simplepage.sql
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl$1.class
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl$2.class
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl.class
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/classes/org/sakaiproject/lessonbuildertool/service/SimplePageToolService.class
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/sakai-lessonbuildertool-components/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-mailarchive-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-mailarchive-pack/META-INF/maven/org.sakaiproject.mailarchive/sakai-mailarchive-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-mailarchive-pack/META-INF/maven/org.sakaiproject.mailarchive/sakai-mailarchive-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-mailarchive-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-mailarchive-pack/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-mailarchive-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-message-impl-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-message-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-mailarchive-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-metaobj-component/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-metaobj-component/META-INF/maven/org.sakaiproject.metaobj/sakai-metaobj-component/pom.properties
 %%TOMCAT_DIR%%/components/sakai-metaobj-component/META-INF/maven/org.sakaiproject.metaobj/sakai-metaobj-component/pom.xml
 %%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/lib/commons-beanutils-1.6.jar
-%%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/lib/commons-digester-1.6.jar
-%%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/lib/sakai-kernel-storage-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/lib/sakai-metaobj-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/lib/sakai-metaobj-tool-lib-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/lib/spring-webmvc-2.5.6.SEC03.jar
+%%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/lib/spring-webmvc-3.2.3.RELEASE.jar
 %%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/lib/standard-1.1.2.jar
 %%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/lib/velocity-1.3.1.jar
 %%TOMCAT_DIR%%/components/sakai-metaobj-component/WEB-INF/web.xml
@@ -574,32 +645,29 @@
 %%TOMCAT_DIR%%/components/sakai-news-pack/META-INF/maven/org.sakaiproject/sakai-news-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-news-pack/META-INF/maven/org.sakaiproject/sakai-news-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-news-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-news-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/sakai-news-pack/WEB-INF/lib/commons-httpclient-3.0.1.jar
 %%TOMCAT_DIR%%/components/sakai-news-pack/WEB-INF/lib/commons-logging-api-1.0.4.jar
 %%TOMCAT_DIR%%/components/sakai-news-pack/WEB-INF/lib/modules-0.3.2.jar
 %%TOMCAT_DIR%%/components/sakai-news-pack/WEB-INF/lib/rome-1.0-sakai.jar
 %%TOMCAT_DIR%%/components/sakai-news-pack/WEB-INF/lib/rome-fetcher-1.0.jar
-%%TOMCAT_DIR%%/components/sakai-news-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-news-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-news-pack/WEB-INF/lib/sakai-news-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-news-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-podcasts-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-podcasts-pack/META-INF/maven/org.sakaiproject/sakai-podcasts-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-podcasts-pack/META-INF/maven/org.sakaiproject/sakai-podcasts-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-podcasts-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-podcasts-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/sakai-podcasts-pack/WEB-INF/lib/itunes-0.3.jar
 %%TOMCAT_DIR%%/components/sakai-podcasts-pack/WEB-INF/lib/rome-1.0-sakai.jar
-%%TOMCAT_DIR%%/components/sakai-podcasts-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-podcasts-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-podcasts-pack/WEB-INF/lib/sakai-podcasts-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-podcasts-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-portal-render-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-portal-render-pack/META-INF/maven/org.sakaiproject.portal/sakai-portal-render-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-portal-render-pack/META-INF/maven/org.sakaiproject.portal/sakai-portal-render-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-portal-render-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-portal-render-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/sakai-portal-render-pack/WEB-INF/lib/jtidy-r938.jar
-%%TOMCAT_DIR%%/components/sakai-portal-render-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-portal-render-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-portal-render-pack/WEB-INF/lib/sakai-portal-render-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-portal-render-pack/WEB-INF/lib/sakai-portal-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-portal-render-pack/WEB-INF/web.xml
@@ -607,8 +675,7 @@
 %%TOMCAT_DIR%%/components/sakai-portal-service-pack/META-INF/maven/org.sakaiproject.portal/sakai-portal-service-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-portal-service-pack/META-INF/maven/org.sakaiproject.portal/sakai-portal-service-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-portal-service-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-portal-service-pack/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/sakai-portal-service-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-portal-service-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-portal-service-pack/WEB-INF/lib/sakai-portal-service-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-portal-service-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-postem-pack/META-INF/MANIFEST.MF
@@ -627,9 +694,8 @@
 %%TOMCAT_DIR%%/components/sakai-privacy-pack/META-INF/maven/org.sakaiproject.common/sakai-privacy-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-privacy-pack/META-INF/maven/org.sakaiproject.common/sakai-privacy-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-privacy-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-privacy-pack/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/sakai-privacy-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/sakai-privacy-pack/WEB-INF/lib/sakai-privacy-impl-1.2.3.jar
+%%TOMCAT_DIR%%/components/sakai-privacy-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-privacy-pack/WEB-INF/lib/sakai-privacy-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-privacy-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-provider-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-provider-pack/META-INF/maven/org.sakaiproject/sakai-provider-pack/pom.properties
@@ -637,35 +703,17 @@
 %%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/components-demo.xml
 %%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/components.xml
 %%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/jldap-beans.xml
-%%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/lib/annotations-1.3.9.jar
-%%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/lib/commons-beanutils-1.8.0.jar
-%%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/lib/ezmorph-1.0.6.jar
-%%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/lib/httpclient-4.0.3.jar
-%%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/lib/httpcore-4.0.1.jar
-%%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/lib/json-lib-2.3-jdk15.jar
 %%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/lib/sakai-coursemanagement-authz-provider-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/lib/sakai-hybrid-provider-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/lib/sakai-hybrid-util-1.2.3.jar
-%%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/lib/sakai-sample-provider-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-provider-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-rights-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-rights-pack/META-INF/maven/org.sakaiproject/sakai-rights-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-rights-pack/META-INF/maven/org.sakaiproject/sakai-rights-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-rights-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-rights-pack/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/sakai-rights-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-rights-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-rights-pack/WEB-INF/lib/sakai-rights-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-rights-pack/WEB-INF/web.xml
-%%TOMCAT_DIR%%/components/sakai-roster-components/META-INF/MANIFEST.MF
-%%TOMCAT_DIR%%/components/sakai-roster-components/META-INF/maven/org.sakaiproject/sakai-roster-components/pom.properties
-%%TOMCAT_DIR%%/components/sakai-roster-components/META-INF/maven/org.sakaiproject/sakai-roster-components/pom.xml
-%%TOMCAT_DIR%%/components/sakai-roster-components/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-roster-components/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/sakai-roster-components/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
-%%TOMCAT_DIR%%/components/sakai-roster-components/WEB-INF/lib/sakai-roster-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/sakai-roster-components/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/META-INF/maven/org.sakaiproject/sakai-rwiki-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/META-INF/maven/org.sakaiproject/sakai-rwiki-pack/pom.xml
@@ -693,6 +741,7 @@
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/batik-ext-1.7.jar
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/batik-extension-1.7.jar
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/batik-gvt-1.7.jar
+%%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/batik-js-1.7.jar
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/batik-parser-1.7.jar
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/batik-script-1.7.jar
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/batik-svg-dom-1.7.jar
@@ -700,13 +749,12 @@
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/batik-transcoder-1.7.jar
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/batik-util-1.7.jar
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/batik-xml-1.7.jar
-%%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/commons-codec-1.5.jar
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/fop-1.0.jar
-%%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/sakai-radeox-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/sakai-rwiki-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/sakai-rwiki-util-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/search-util-1.4.3.jar
+%%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/search-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/xalan-2.6.0.jar
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/xercesImpl-2.6.2.jar
 %%TOMCAT_DIR%%/components/sakai-rwiki-pack/WEB-INF/lib/xml-apis-ext-1.3.04.jar
@@ -719,10 +767,9 @@
 %%TOMCAT_DIR%%/components/sakai-search-adapters-pack/META-INF/maven/org.sakaiproject.mailarchive/sakai-search-adapters-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-search-adapters-pack/META-INF/maven/org.sakaiproject.mailarchive/sakai-search-adapters-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-search-adapters-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-search-adapters-pack/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/sakai-search-adapters-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-search-adapters-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-search-adapters-pack/WEB-INF/lib/sakai-search-adapters-impl-%%SAKAI_VER%%.jar
-%%TOMCAT_DIR%%/components/sakai-search-adapters-pack/WEB-INF/lib/search-util-1.4.3.jar
+%%TOMCAT_DIR%%/components/sakai-search-adapters-pack/WEB-INF/lib/search-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-search-adapters-pack/WEB-INF/messageAdapterComponents.xml
 %%TOMCAT_DIR%%/components/sakai-search-adapters-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-site-manage-group-section-role-helper-pack/META-INF/MANIFEST.MF
@@ -731,49 +778,46 @@
 %%TOMCAT_DIR%%/components/sakai-site-manage-group-section-role-helper-pack/WEB-INF/classes/org/sakaiproject/site/tool/helper/managegroupsectionrole/impl/RoleGroupEventWatcher$1.class
 %%TOMCAT_DIR%%/components/sakai-site-manage-group-section-role-helper-pack/WEB-INF/classes/org/sakaiproject/site/tool/helper/managegroupsectionrole/impl/RoleGroupEventWatcher.class
 %%TOMCAT_DIR%%/components/sakai-site-manage-group-section-role-helper-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-site-manage-group-section-role-helper-pack/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/sakai-site-manage-group-section-role-helper-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-site-manage-group-section-role-helper-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-site-manage-group-section-role-helper-pack/WEB-INF/lib/sakai-site-manage-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-site-manage-group-section-role-helper-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-site-manage-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-site-manage-pack/META-INF/maven/org.sakaiproject.sitemanage/sakai-site-manage-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-site-manage-pack/META-INF/maven/org.sakaiproject.sitemanage/sakai-site-manage-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-site-manage-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-site-manage-pack/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/sakai-site-manage-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-site-manage-pack/WEB-INF/lib/jsf-tool-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-site-manage-pack/WEB-INF/lib/sakai-kernel-storage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-site-manage-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-site-manage-pack/WEB-INF/lib/sakai-site-manage-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-site-manage-pack/WEB-INF/lib/sakai-site-manage-util-%%SAKAI_VER%%.jar
+%%TOMCAT_DIR%%/components/sakai-site-manage-pack/WEB-INF/lib/userauditservice-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-site-manage-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-siteassociation-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-siteassociation-pack/META-INF/maven/org.sakaiproject.sitemanage/sakai-siteassociation-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-siteassociation-pack/META-INF/maven/org.sakaiproject.sitemanage/sakai-siteassociation-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-siteassociation-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-siteassociation-pack/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/sakai-siteassociation-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-siteassociation-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-siteassociation-pack/WEB-INF/lib/sakai-siteassociation-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-siteassociation-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-syllabus-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-syllabus-pack/META-INF/maven/org.sakaiproject/sakai-syllabus-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-syllabus-pack/META-INF/maven/org.sakaiproject/sakai-syllabus-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-syllabus-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-syllabus-pack/WEB-INF/lib/commons-codec-1.3.jar
-%%TOMCAT_DIR%%/components/sakai-syllabus-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-syllabus-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-syllabus-pack/WEB-INF/lib/sakai-syllabus-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-syllabus-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-taggable-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-taggable-pack/META-INF/maven/org.sakaiproject.taggable/sakai-taggable-pack/pom.properties
 %%TOMCAT_DIR%%/components/sakai-taggable-pack/META-INF/maven/org.sakaiproject.taggable/sakai-taggable-pack/pom.xml
 %%TOMCAT_DIR%%/components/sakai-taggable-pack/WEB-INF/components.xml
-%%TOMCAT_DIR%%/components/sakai-taggable-pack/WEB-INF/lib/commons-codec-1.5.jar
-%%TOMCAT_DIR%%/components/sakai-taggable-pack/WEB-INF/lib/sakai-kernel-util-1.3.3.jar
+%%TOMCAT_DIR%%/components/sakai-taggable-pack/WEB-INF/lib/sakai-kernel-util-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-taggable-pack/WEB-INF/lib/sakai-taggable-impl-%%SAKAI_VER%%.jar
 %%TOMCAT_DIR%%/components/sakai-taggable-pack/WEB-INF/web.xml
 %%TOMCAT_DIR%%/components/sakai-usermembership-pack/META-INF/MANIFEST.MF
 %%TOMCAT_DIR%%/components/sakai-usermembership-pack/META-INF/maven/org.sakaiproject/sakai-usermembership-pack/pom.properties

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



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