3 files changed, 883 insertions, 551 deletions

diff --git a/www/sakai/Makefile b/www/sakai/Makefile
index c97f24208f6e..6b397f2b1ac9 100644
--- a/www/sakai/Makefile
+++ b/www/sakai/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	sakai
-PORTVERSION=	2.4.1
+PORTVERSION=	2.5.0
 CATEGORIES=	www java
-MASTER_SITES=	http://source.sakaiproject.org/release/2.4.1/sakai_2-4-1/
-DISTNAME=	${PORTNAME}-bin_2-4-1
+MASTER_SITES=	http://source.sakaiproject.org/release/2.5.0/sakai-2-5-0/
+DISTNAME=	${PORTNAME}-bin-2-5-0
 
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Sakai is an online Collaboration and Learning Environment
@@ -20,7 +20,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.5
 
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/${PORTNAME}-bin-${PORTVERSION}
 TOMCAT=		${PREFIX}/tomcat5.5
 TOMCATOWN=	www
 TOMCATGRP=	www
diff --git a/www/sakai/distinfo b/www/sakai/distinfo
index f54ff8bef86f..432a13b0b723 100644
--- a/www/sakai/distinfo
+++ b/www/sakai/distinfo
@@ -1,3 +1,3 @@
-MD5 (sakai-bin_2-4-1.tar.gz) = 1da37e803181e7bb294ce4be8f16e819
-SHA256 (sakai-bin_2-4-1.tar.gz) = a8839a47584125c86cbd8959ce406ccf58060b3e9db69e4915c8ad5a209f1915
-SIZE (sakai-bin_2-4-1.tar.gz) = 183774769
+MD5 (sakai-bin-2-5-0.tar.gz) = 174ab20964b7fdf2d9192a78920662ca
+SHA256 (sakai-bin-2-5-0.tar.gz) = 95ff801b49e3c8786ce1eee4cd349ce812e8cbd977740203e72895a4b7960b68
+SIZE (sakai-bin-2-5-0.tar.gz) = 227068117
diff --git a/www/sakai/pkg-plist b/www/sakai/pkg-plist
index 05274deb4c87..57879d003ce1 100644
--- a/www/sakai/pkg-plist
+++ b/www/sakai/pkg-plist
@@ -1,158 +1,251 @@
 tomcat5.5/ECLv1.txt
+tomcat5.5/common/lib/commons-logging-1.0.4.jar
 tomcat5.5/common/lib/log4j-1.2.8.jar
-tomcat5.5/common/lib/sakai-dav-common-2.4.1.jar
-tomcat5.5/common/lib/sakai-util-log-2.4.1.jar
+tomcat5.5/common/lib/sakai-dav-common-2.5.0.jar
+tomcat5.5/common/lib/sakai-util-log-2.5.0.jar
 tomcat5.5/components/000sakai-portal-service-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/000sakai-portal-service-pack/META-INF/maven/org.sakaiproject/000sakai-portal-service-pack/pom.properties
+tomcat5.5/components/000sakai-portal-service-pack/META-INF/maven/org.sakaiproject/000sakai-portal-service-pack/pom.xml
 tomcat5.5/components/000sakai-portal-service-pack/WEB-INF/components.xml
-tomcat5.5/components/000sakai-portal-service-pack/WEB-INF/lib/sakai-portal-service-impl-2.4.1.jar
+tomcat5.5/components/000sakai-portal-service-pack/WEB-INF/lib/sakai-portal-service-impl-2.5.0.jar
+tomcat5.5/components/000sakai-portal-service-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/000sakai-portal-service-pack/WEB-INF/web.xml
+tomcat5.5/components/entitybroker-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/entitybroker-pack/META-INF/maven/org.sakaiproject.entitybroker/entitybroker-pack/pom.properties
+tomcat5.5/components/entitybroker-pack/META-INF/maven/org.sakaiproject.entitybroker/entitybroker-pack/pom.xml
+tomcat5.5/components/entitybroker-pack/WEB-INF/components.xml
+tomcat5.5/components/entitybroker-pack/WEB-INF/hibernate-hbms.xml
+tomcat5.5/components/entitybroker-pack/WEB-INF/lib/entitybroker-impl-1.2.0.jar
+tomcat5.5/components/entitybroker-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/entitybroker-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/entitybroker-pack/WEB-INF/spring-hibernate.xml
+tomcat5.5/components/entitybroker-pack/WEB-INF/web.xml
 tomcat5.5/components/osp-common-component/META-INF/MANIFEST.MF
+tomcat5.5/components/osp-common-component/META-INF/maven/org.sakaiproject.osp/osp-common-component/pom.properties
+tomcat5.5/components/osp-common-component/META-INF/maven/org.sakaiproject.osp/osp-common-component/pom.xml
 tomcat5.5/components/osp-common-component/WEB-INF/components.xml
+tomcat5.5/components/osp-common-component/WEB-INF/lib/commons-beanutils-1.7.0.jar
 tomcat5.5/components/osp-common-component/WEB-INF/lib/commons-codec-1.2.jar
-tomcat5.5/components/osp-common-component/WEB-INF/lib/osp-common-impl-2.4.1.jar
-tomcat5.5/components/osp-common-component/WEB-INF/lib/sakai-metaobj-impl-2.4.1.jar
-tomcat5.5/components/osp-common-component/WEB-INF/lib/sakai-metaobj-tool-lib-2.4.1.jar
-tomcat5.5/components/osp-common-component/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/osp-common-component/WEB-INF/lib/commons-digester-1.6.jar
+tomcat5.5/components/osp-common-component/WEB-INF/lib/jsf-api-1.1.01.jar
+tomcat5.5/components/osp-common-component/WEB-INF/lib/jsf-impl-1.1.01.jar
+tomcat5.5/components/osp-common-component/WEB-INF/lib/osp-common-impl-2.5.0.jar
+tomcat5.5/components/osp-common-component/WEB-INF/lib/sakai-content-util-2.5.0.jar
+tomcat5.5/components/osp-common-component/WEB-INF/lib/sakai-metaobj-impl-2.5.0.jar
+tomcat5.5/components/osp-common-component/WEB-INF/lib/sakai-metaobj-tool-lib-2.5.0.jar
+tomcat5.5/components/osp-common-component/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/osp-common-component/WEB-INF/lib/standard-1.1.2.jar
+tomcat5.5/components/osp-common-component/WEB-INF/lib/velocity-1.3.1.jar
+tomcat5.5/components/osp-common-component/WEB-INF/web.xml
 tomcat5.5/components/osp-glossary-component/META-INF/MANIFEST.MF
+tomcat5.5/components/osp-glossary-component/META-INF/maven/org.sakaiproject.osp/osp-glossary-component/pom.properties
+tomcat5.5/components/osp-glossary-component/META-INF/maven/org.sakaiproject.osp/osp-glossary-component/pom.xml
 tomcat5.5/components/osp-glossary-component/WEB-INF/components.xml
 tomcat5.5/components/osp-glossary-component/WEB-INF/lib/commons-codec-1.2.jar
-tomcat5.5/components/osp-glossary-component/WEB-INF/lib/osp-common-impl-2.4.1.jar
-tomcat5.5/components/osp-glossary-component/WEB-INF/lib/osp-glossary-impl-2.4.1.jar
-tomcat5.5/components/osp-glossary-component/WEB-INF/lib/sakai-metaobj-impl-2.4.1.jar
-tomcat5.5/components/osp-glossary-component/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/osp-glossary-component/WEB-INF/lib/osp-common-impl-2.5.0.jar
+tomcat5.5/components/osp-glossary-component/WEB-INF/lib/osp-glossary-impl-2.5.0.jar
+tomcat5.5/components/osp-glossary-component/WEB-INF/lib/sakai-content-util-2.5.0.jar
+tomcat5.5/components/osp-glossary-component/WEB-INF/lib/sakai-metaobj-impl-2.5.0.jar
+tomcat5.5/components/osp-glossary-component/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/osp-glossary-component/WEB-INF/web.xml
 tomcat5.5/components/osp-integration-component/META-INF/MANIFEST.MF
+tomcat5.5/components/osp-integration-component/META-INF/maven/org.sakaiproject.osp/osp-integration-component/pom.properties
+tomcat5.5/components/osp-integration-component/META-INF/maven/org.sakaiproject.osp/osp-integration-component/pom.xml
 tomcat5.5/components/osp-integration-component/WEB-INF/components.xml
 tomcat5.5/components/osp-integration-component/WEB-INF/lib/commons-codec-1.2.jar
-tomcat5.5/components/osp-integration-component/WEB-INF/lib/osp-common-impl-2.4.1.jar
-tomcat5.5/components/osp-integration-component/WEB-INF/lib/osp-integration-impl-2.4.1.jar
-tomcat5.5/components/osp-integration-component/WEB-INF/lib/sakai-metaobj-impl-2.4.1.jar
-tomcat5.5/components/osp-integration-component/WEB-INF/lib/sakai-metaobj-tool-lib-2.4.1.jar
-tomcat5.5/components/osp-integration-component/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/osp-integration-component/WEB-INF/lib/osp-common-impl-2.5.0.jar
+tomcat5.5/components/osp-integration-component/WEB-INF/lib/osp-integration-impl-2.5.0.jar
+tomcat5.5/components/osp-integration-component/WEB-INF/lib/sakai-content-util-2.5.0.jar
+tomcat5.5/components/osp-integration-component/WEB-INF/lib/sakai-metaobj-impl-2.5.0.jar
+tomcat5.5/components/osp-integration-component/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/osp-integration-component/WEB-INF/web.xml
 tomcat5.5/components/osp-matrix-component/META-INF/MANIFEST.MF
+tomcat5.5/components/osp-matrix-component/META-INF/maven/org.sakaiproject.osp/osp-matrix-component/pom.properties
+tomcat5.5/components/osp-matrix-component/META-INF/maven/org.sakaiproject.osp/osp-matrix-component/pom.xml
 tomcat5.5/components/osp-matrix-component/WEB-INF/components.xml
 tomcat5.5/components/osp-matrix-component/WEB-INF/lib/commons-codec-1.2.jar
-tomcat5.5/components/osp-matrix-component/WEB-INF/lib/osp-common-impl-2.4.1.jar
-tomcat5.5/components/osp-matrix-component/WEB-INF/lib/osp-matrix-impl-2.4.1.jar
-tomcat5.5/components/osp-matrix-component/WEB-INF/lib/sakai-metaobj-impl-2.4.1.jar
-tomcat5.5/components/osp-matrix-component/WEB-INF/lib/sakai-util-2.4.1.jar
-tomcat5.5/components/osp-migration-component/META-INF/MANIFEST.MF
-tomcat5.5/components/osp-migration-component/WEB-INF/components.xml
-tomcat5.5/components/osp-migration-component/WEB-INF/lib/commons-codec-1.2.jar
-tomcat5.5/components/osp-migration-component/WEB-INF/lib/osp-common-impl-2.4.1.jar
-tomcat5.5/components/osp-migration-component/WEB-INF/lib/osp-migration-impl-2.4.1.jar
-tomcat5.5/components/osp-migration-component/WEB-INF/lib/sakai-metaobj-impl-2.4.1.jar
-tomcat5.5/components/osp-migration-component/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/osp-matrix-component/WEB-INF/lib/osp-common-impl-2.5.0.jar
+tomcat5.5/components/osp-matrix-component/WEB-INF/lib/osp-matrix-impl-2.5.0.jar
+tomcat5.5/components/osp-matrix-component/WEB-INF/lib/sakai-content-util-2.5.0.jar
+tomcat5.5/components/osp-matrix-component/WEB-INF/lib/sakai-metaobj-impl-2.5.0.jar
+tomcat5.5/components/osp-matrix-component/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/osp-matrix-component/WEB-INF/web.xml
 tomcat5.5/components/osp-portal-component/META-INF/MANIFEST.MF
+tomcat5.5/components/osp-portal-component/META-INF/maven/org.sakaiproject.osp/osp-portal-component/pom.properties
+tomcat5.5/components/osp-portal-component/META-INF/maven/org.sakaiproject.osp/osp-portal-component/pom.xml
 tomcat5.5/components/osp-portal-component/WEB-INF/components.xml
-tomcat5.5/components/osp-portal-component/WEB-INF/lib/osp-portal-impl-2.4.1.jar
-tomcat5.5/components/osp-portal-component/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/osp-portal-component/WEB-INF/lib/osp-portal-impl-2.5.0.jar
+tomcat5.5/components/osp-portal-component/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/osp-portal-component/WEB-INF/web.xml
 tomcat5.5/components/osp-presentation-component/META-INF/MANIFEST.MF
+tomcat5.5/components/osp-presentation-component/META-INF/maven/org.sakaiproject.osp/osp-presentation-component/pom.properties
+tomcat5.5/components/osp-presentation-component/META-INF/maven/org.sakaiproject.osp/osp-presentation-component/pom.xml
 tomcat5.5/components/osp-presentation-component/WEB-INF/components.xml
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/commons-beanutils-1.7.0.jar
 tomcat5.5/components/osp-presentation-component/WEB-INF/lib/commons-codec-1.2.jar
-tomcat5.5/components/osp-presentation-component/WEB-INF/lib/osp-common-impl-2.4.1.jar
-tomcat5.5/components/osp-presentation-component/WEB-INF/lib/osp-common-tool-lib-2.4.1.jar
-tomcat5.5/components/osp-presentation-component/WEB-INF/lib/osp-presentation-impl-2.4.1.jar
-tomcat5.5/components/osp-presentation-component/WEB-INF/lib/sakai-metaobj-impl-2.4.1.jar
-tomcat5.5/components/osp-presentation-component/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/commons-digester-1.6.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/jsf-api-1.1.01.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/jsf-impl-1.1.01.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/osp-common-impl-2.5.0.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/osp-common-tool-lib-2.5.0.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/osp-presentation-impl-2.5.0.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/sakai-content-util-2.5.0.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/sakai-jsf-tool-2.5.0.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/sakai-jsf-widgets-2.5.0.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/sakai-jsf-widgets-sun-2.5.0.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/sakai-metaobj-impl-2.5.0.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/sakai-metaobj-tool-lib-2.5.0.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/standard-1.1.2.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/lib/velocity-1.3.1.jar
 tomcat5.5/components/osp-presentation-component/WEB-INF/lib/websphinx-0.5.jar
-tomcat5.5/components/osp-reports-components/META-INF/MANIFEST.MF
-tomcat5.5/components/osp-reports-components/WEB-INF/components.xml
-tomcat5.5/components/osp-reports-components/WEB-INF/lib/commons-codec-1.2.jar
-tomcat5.5/components/osp-reports-components/WEB-INF/lib/osp-common-impl-2.4.1.jar
-tomcat5.5/components/osp-reports-components/WEB-INF/lib/osp-reports-component-shared-2.4.1.jar
-tomcat5.5/components/osp-reports-components/WEB-INF/lib/sakai-metaobj-impl-2.4.1.jar
-tomcat5.5/components/osp-reports-components/WEB-INF/lib/sakai-metaobj-tool-lib-2.4.1.jar
-tomcat5.5/components/osp-reports-components/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/osp-presentation-component/WEB-INF/web.xml
 tomcat5.5/components/osp-warehouse-component/META-INF/MANIFEST.MF
-tomcat5.5/components/osp-warehouse-component/WEB-INF/assignment-components.xml
+tomcat5.5/components/osp-warehouse-component/META-INF/maven/org.sakaiproject.osp/osp-warehouse-component/pom.properties
+tomcat5.5/components/osp-warehouse-component/META-INF/maven/org.sakaiproject.osp/osp-warehouse-component/pom.xml
 tomcat5.5/components/osp-warehouse-component/WEB-INF/components.xml
 tomcat5.5/components/osp-warehouse-component/WEB-INF/glossary-components.xml
 tomcat5.5/components/osp-warehouse-component/WEB-INF/guidance-components.xml
 tomcat5.5/components/osp-warehouse-component/WEB-INF/lib/commons-codec-1.2.jar
-tomcat5.5/components/osp-warehouse-component/WEB-INF/lib/osp-common-impl-2.4.1.jar
-tomcat5.5/components/osp-warehouse-component/WEB-INF/lib/osp-warehouse-impl-2.4.1.jar
+tomcat5.5/components/osp-warehouse-component/WEB-INF/lib/osp-common-impl-2.5.0.jar
+tomcat5.5/components/osp-warehouse-component/WEB-INF/lib/osp-warehouse-impl-2.5.0.jar
+tomcat5.5/components/osp-warehouse-component/WEB-INF/lib/sakai-content-util-2.5.0.jar
+tomcat5.5/components/osp-warehouse-component/WEB-INF/lib/sakai-metaobj-impl-2.5.0.jar
+tomcat5.5/components/osp-warehouse-component/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/osp-warehouse-component/WEB-INF/lib/sakai-warehouse-impl-2.5.0.jar
 tomcat5.5/components/osp-warehouse-component/WEB-INF/matrix-components.xml
 tomcat5.5/components/osp-warehouse-component/WEB-INF/presentation-components.xml
-tomcat5.5/components/osp-warehouse-component/WEB-INF/resource-components.xml
 tomcat5.5/components/osp-warehouse-component/WEB-INF/scaffolding-components.xml
+tomcat5.5/components/osp-warehouse-component/WEB-INF/web.xml
 tomcat5.5/components/osp-warehouse-component/WEB-INF/wizard-components.xml
 tomcat5.5/components/osp-wizard-components/META-INF/MANIFEST.MF
+tomcat5.5/components/osp-wizard-components/META-INF/maven/org.sakaiproject.osp/osp-wizard-components/pom.properties
+tomcat5.5/components/osp-wizard-components/META-INF/maven/org.sakaiproject.osp/osp-wizard-components/pom.xml
 tomcat5.5/components/osp-wizard-components/WEB-INF/components.xml
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/commons-beanutils-1.7.0.jar
 tomcat5.5/components/osp-wizard-components/WEB-INF/lib/commons-codec-1.2.jar
-tomcat5.5/components/osp-wizard-components/WEB-INF/lib/osp-common-impl-2.4.1.jar
-tomcat5.5/components/osp-wizard-components/WEB-INF/lib/osp-glossary-impl-2.4.1.jar
-tomcat5.5/components/osp-wizard-components/WEB-INF/lib/osp-wizard-impl-2.4.1.jar
-tomcat5.5/components/osp-wizard-components/WEB-INF/lib/sakai-metaobj-impl-2.4.1.jar
-tomcat5.5/components/osp-wizard-components/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/commons-digester-1.6.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/jsf-api-1.1.01.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/jsf-impl-1.1.01.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/osp-common-impl-2.5.0.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/osp-common-tool-lib-2.5.0.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/osp-glossary-impl-2.5.0.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/osp-wizard-impl-2.5.0.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/sakai-content-util-2.5.0.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/sakai-jsf-tool-2.5.0.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/sakai-jsf-widgets-2.5.0.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/sakai-jsf-widgets-sun-2.5.0.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/sakai-metaobj-impl-2.5.0.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/sakai-metaobj-tool-lib-2.5.0.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/standard-1.1.2.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/lib/velocity-1.3.1.jar
+tomcat5.5/components/osp-wizard-components/WEB-INF/web.xml
 tomcat5.5/components/sakai-alias-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-alias-pack/META-INF/maven/org.sakaiproject/sakai-alias-pack/pom.properties
+tomcat5.5/components/sakai-alias-pack/META-INF/maven/org.sakaiproject/sakai-alias-pack/pom.xml
 tomcat5.5/components/sakai-alias-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-alias-pack/WEB-INF/lib/sakai-alias-impl-2.4.1.jar
-tomcat5.5/components/sakai-alias-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-alias-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-alias-pack/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-alias-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-alias-pack/WEB-INF/lib/sakai-alias-impl-2.5.0.jar
+tomcat5.5/components/sakai-alias-pack/WEB-INF/lib/sakai-db-storage-2.5.0.jar
+tomcat5.5/components/sakai-alias-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-alias-pack/WEB-INF/lib/sakai-event-util-2.5.0.jar
+tomcat5.5/components/sakai-alias-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-alias-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-announcement-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-announcement-pack/META-INF/maven/org.sakaiproject/sakai-announcement-pack/pom.properties
+tomcat5.5/components/sakai-announcement-pack/META-INF/maven/org.sakaiproject/sakai-announcement-pack/pom.xml
 tomcat5.5/components/sakai-announcement-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-announcement-pack/WEB-INF/lib/sakai-announcement-impl-2.4.1.jar
-tomcat5.5/components/sakai-announcement-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-announcement-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-announcement-pack/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-announcement-pack/WEB-INF/lib/sakai-message-impl-2.4.1.jar
-tomcat5.5/components/sakai-announcement-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-announcement-pack/WEB-INF/lib/sakai-announcement-impl-2.5.0.jar
+tomcat5.5/components/sakai-announcement-pack/WEB-INF/lib/sakai-db-storage-2.5.0.jar
+tomcat5.5/components/sakai-announcement-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-announcement-pack/WEB-INF/lib/sakai-event-util-2.5.0.jar
+tomcat5.5/components/sakai-announcement-pack/WEB-INF/lib/sakai-message-impl-2.5.0.jar
+tomcat5.5/components/sakai-announcement-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-announcement-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-archive-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-archive-pack/META-INF/maven/org.sakaiproject/sakai-archive-pack/pom.properties
+tomcat5.5/components/sakai-archive-pack/META-INF/maven/org.sakaiproject/sakai-archive-pack/pom.xml
 tomcat5.5/components/sakai-archive-pack/WEB-INF/components.xml
 tomcat5.5/components/sakai-archive-pack/WEB-INF/lib/commons-codec-1.3.jar
-tomcat5.5/components/sakai-archive-pack/WEB-INF/lib/sakai-archive-impl-2.4.1.jar
-tomcat5.5/components/sakai-archive-pack/WEB-INF/lib/sakai-archive-impl2-2.4.1.jar
-tomcat5.5/components/sakai-archive-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-archive-pack/WEB-INF/lib/sakai-archive-impl-2.5.0.jar
+tomcat5.5/components/sakai-archive-pack/WEB-INF/lib/sakai-archive-impl2-2.5.0.jar
+tomcat5.5/components/sakai-archive-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-archive-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-assignment-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-assignment-pack/META-INF/maven/org.sakaiproject/sakai-assignment-pack/pom.properties
+tomcat5.5/components/sakai-assignment-pack/META-INF/maven/org.sakaiproject/sakai-assignment-pack/pom.xml
 tomcat5.5/components/sakai-assignment-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-assignment-pack/WEB-INF/lib/poi-2.5.1.jar
-tomcat5.5/components/sakai-assignment-pack/WEB-INF/lib/sakai-assignment-impl-2.4.1.jar
-tomcat5.5/components/sakai-assignment-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-assignment-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-assignment-pack/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-assignment-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-assignment-pack/WEB-INF/lib/poi-2.5.1-final-20040804.jar
+tomcat5.5/components/sakai-assignment-pack/WEB-INF/lib/sakai-assignment-impl-2.5.0.jar
+tomcat5.5/components/sakai-assignment-pack/WEB-INF/lib/sakai-db-conversion-2.5.0.jar
+tomcat5.5/components/sakai-assignment-pack/WEB-INF/lib/sakai-db-storage-2.5.0.jar
+tomcat5.5/components/sakai-assignment-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-assignment-pack/WEB-INF/lib/sakai-event-util-2.5.0.jar
+tomcat5.5/components/sakai-assignment-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-assignment-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-authz-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-authz-pack/META-INF/maven/org.sakaiproject/sakai-authz-pack/pom.properties
+tomcat5.5/components/sakai-authz-pack/META-INF/maven/org.sakaiproject/sakai-authz-pack/pom.xml
 tomcat5.5/components/sakai-authz-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-authz-pack/WEB-INF/lib/sakai-authz-impl-2.4.1.jar
-tomcat5.5/components/sakai-authz-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-authz-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-authz-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-authz-pack/WEB-INF/lib/sakai-authz-impl-2.5.0.jar
+tomcat5.5/components/sakai-authz-pack/WEB-INF/lib/sakai-db-storage-2.5.0.jar
+tomcat5.5/components/sakai-authz-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-authz-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-authz-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-calendar-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-calendar-pack/META-INF/maven/org.sakaiproject/sakai-calendar-pack/pom.properties
+tomcat5.5/components/sakai-calendar-pack/META-INF/maven/org.sakaiproject/sakai-calendar-pack/pom.xml
 tomcat5.5/components/sakai-calendar-pack/WEB-INF/components.xml
 tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/avalon-framework-20020627.jar
-tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/batik-1.5-fop-0.20-5.jar
+tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/batik-batik-1.5-fop-0.20-5.jar
+tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/commons-codec-1.3.jar
 tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/fop-0.20.5.jar
-tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/sakai-calendar-impl-2.4.1.jar
-tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/sakai-calendar-util-2.4.1.jar
-tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/ical4j-0.9.20.jar
+tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/sakai-calendar-impl-2.5.0.jar
+tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/sakai-calendar-util-2.5.0.jar
+tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/sakai-db-storage-2.5.0.jar
+tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-calendar-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-chat-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-chat-pack/META-INF/maven/org.sakaiproject/sakai-chat-pack/pom.properties
+tomcat5.5/components/sakai-chat-pack/META-INF/maven/org.sakaiproject/sakai-chat-pack/pom.xml
 tomcat5.5/components/sakai-chat-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-chat-pack/WEB-INF/lib/sakai-chat-impl-2.4.1.jar
-tomcat5.5/components/sakai-chat-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-chat-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-chat-pack/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-chat-pack/WEB-INF/lib/sakai-message-impl-2.4.1.jar
-tomcat5.5/components/sakai-chat-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-chat-pack/WEB-INF/lib/sakai-chat-impl-2.5.0.jar
+tomcat5.5/components/sakai-chat-pack/WEB-INF/lib/sakai-db-storage-2.5.0.jar
+tomcat5.5/components/sakai-chat-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-chat-pack/WEB-INF/lib/sakai-event-util-2.5.0.jar
+tomcat5.5/components/sakai-chat-pack/WEB-INF/lib/sakai-message-impl-2.5.0.jar
+tomcat5.5/components/sakai-chat-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-chat-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-citations-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-citations-pack/META-INF/maven/org.sakaiproject/sakai-citations-pack/pom.properties
+tomcat5.5/components/sakai-citations-pack/META-INF/maven/org.sakaiproject/sakai-citations-pack/pom.xml
 tomcat5.5/components/sakai-citations-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-citations-pack/WEB-INF/lib/sakai-citations-impl-2.4.1.jar
-tomcat5.5/components/sakai-citations-pack/WEB-INF/lib/sakai-content-util-2.4.1.jar
-tomcat5.5/components/sakai-citations-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-citations-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-citations-pack/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-citations-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-citations-pack/WEB-INF/lib/cql-java-0.7.jar
+tomcat5.5/components/sakai-citations-pack/WEB-INF/lib/sakai-citations-impl-2.5.0.jar
+tomcat5.5/components/sakai-citations-pack/WEB-INF/lib/sakai-citations-util-2.5.0.jar
+tomcat5.5/components/sakai-citations-pack/WEB-INF/lib/sakai-citations-web2bridge-2.5.0.jar
+tomcat5.5/components/sakai-citations-pack/WEB-INF/lib/sakai-citations-xserver-2.5.0.jar
+tomcat5.5/components/sakai-citations-pack/WEB-INF/lib/sakai-content-util-2.5.0.jar
+tomcat5.5/components/sakai-citations-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-citations-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-cluster-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-cluster-pack/META-INF/maven/org.sakaiproject/sakai-cluster-pack/pom.properties
+tomcat5.5/components/sakai-cluster-pack/META-INF/maven/org.sakaiproject/sakai-cluster-pack/pom.xml
 tomcat5.5/components/sakai-cluster-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-cluster-pack/WEB-INF/lib/sakai-cluster-impl-2.4.1.jar
+tomcat5.5/components/sakai-cluster-pack/WEB-INF/lib/sakai-cluster-impl-2.5.0.jar
+tomcat5.5/components/sakai-cluster-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-common-components/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-common-components/META-INF/maven/org.sakaiproject/sakai-common-components/pom.properties
+tomcat5.5/components/sakai-common-components/META-INF/maven/org.sakaiproject/sakai-common-components/pom.xml
 tomcat5.5/components/sakai-common-components/WEB-INF/components.xml
 tomcat5.5/components/sakai-common-components/WEB-INF/lib/commons-beanutils-1.7.0.jar
-tomcat5.5/components/sakai-common-components/WEB-INF/lib/concurrent-1.3.4.jar
-tomcat5.5/components/sakai-common-components/WEB-INF/lib/sakai-common-composite-component-2.4.1.jar
+tomcat5.5/components/sakai-common-components/WEB-INF/lib/sakai-common-composite-component-2.5.0.jar
+tomcat5.5/components/sakai-common-components/WEB-INF/web.xml
 tomcat5.5/components/sakai-comp-help/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-comp-help/META-INF/maven/org.sakaiproject/sakai-comp-help/pom.properties
+tomcat5.5/components/sakai-comp-help/META-INF/maven/org.sakaiproject/sakai-comp-help/pom.xml
 tomcat5.5/components/sakai-comp-help/WEB-INF/classes/org/sakaiproject/component/app/help/DefaultGlossary.class
 tomcat5.5/components/sakai-comp-help/WEB-INF/classes/org/sakaiproject/component/app/help/HelpManagerImpl$1.class
 tomcat5.5/components/sakai-comp-help/WEB-INF/classes/org/sakaiproject/component/app/help/HelpManagerImpl$2.class
@@ -163,184 +256,296 @@ tomcat5.5/components/sakai-comp-help/WEB-INF/classes/org/sakaiproject/component/
 tomcat5.5/components/sakai-comp-help/WEB-INF/classes/org/sakaiproject/component/app/help/SizedList.class
 tomcat5.5/components/sakai-comp-help/WEB-INF/components.xml
 tomcat5.5/components/sakai-comp-help/WEB-INF/lib/lucene-1.4.3.jar
+tomcat5.5/components/sakai-comp-help/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-comp-help/WEB-INF/web.xml
 tomcat5.5/components/sakai-comp-scheduler/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-comp-scheduler/META-INF/maven/org.sakaiproject/sakai-comp-scheduler/pom.properties
+tomcat5.5/components/sakai-comp-scheduler/META-INF/maven/org.sakaiproject/sakai-comp-scheduler/pom.xml
 tomcat5.5/components/sakai-comp-scheduler/WEB-INF/components.xml
+tomcat5.5/components/sakai-comp-scheduler/WEB-INF/web.xml
 tomcat5.5/components/sakai-component-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-component-pack/META-INF/maven/org.sakaiproject/sakai-component-pack/pom.properties
+tomcat5.5/components/sakai-component-pack/META-INF/maven/org.sakaiproject/sakai-component-pack/pom.xml
 tomcat5.5/components/sakai-component-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-component-pack/WEB-INF/lib/sakai-component-impl-2.4.1.jar
-tomcat5.5/components/sakai-component-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-component-pack/WEB-INF/lib/sakai-component-impl-2.5.0.jar
+tomcat5.5/components/sakai-component-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-component-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-content-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-content-pack/META-INF/maven/org.sakaiproject/sakai-content-pack/pom.properties
+tomcat5.5/components/sakai-content-pack/META-INF/maven/org.sakaiproject/sakai-content-pack/pom.xml
 tomcat5.5/components/sakai-content-pack/WEB-INF/components.xml
 tomcat5.5/components/sakai-content-pack/WEB-INF/lib/commons-codec-1.3.jar
-tomcat5.5/components/sakai-content-pack/WEB-INF/lib/sakai-content-impl-2.4.1.jar
-tomcat5.5/components/sakai-content-pack/WEB-INF/lib/sakai-content-util-2.4.1.jar
-tomcat5.5/components/sakai-content-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-content-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-content-pack/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-content-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-content-pack/WEB-INF/lib/sakai-content-impl-2.5.0.jar
+tomcat5.5/components/sakai-content-pack/WEB-INF/lib/sakai-content-util-2.5.0.jar
+tomcat5.5/components/sakai-content-pack/WEB-INF/lib/sakai-db-conversion-2.5.0.jar
+tomcat5.5/components/sakai-content-pack/WEB-INF/lib/sakai-db-storage-2.5.0.jar
+tomcat5.5/components/sakai-content-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-content-pack/WEB-INF/lib/sakai-event-util-2.5.0.jar
+tomcat5.5/components/sakai-content-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-content-pack/WEB-INF/web.xml
+tomcat5.5/components/sakai-content-providers-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-content-providers-pack/META-INF/maven/org.sakaiproject/sakai-content-providers-pack/pom.properties
+tomcat5.5/components/sakai-content-providers-pack/META-INF/maven/org.sakaiproject/sakai-content-providers-pack/pom.xml
+tomcat5.5/components/sakai-content-providers-pack/WEB-INF/components.xml
+tomcat5.5/components/sakai-content-providers-pack/WEB-INF/lib/sakai-content-providers-impl-2.5.0.jar
+tomcat5.5/components/sakai-content-providers-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-courier-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-courier-pack/META-INF/maven/org.sakaiproject/sakai-courier-pack/pom.properties
+tomcat5.5/components/sakai-courier-pack/META-INF/maven/org.sakaiproject/sakai-courier-pack/pom.xml
 tomcat5.5/components/sakai-courier-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-courier-pack/WEB-INF/lib/sakai-courier-impl-2.4.1.jar
-tomcat5.5/components/sakai-courier-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-courier-pack/WEB-INF/lib/sakai-courier-impl-2.5.0.jar
+tomcat5.5/components/sakai-courier-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-courier-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-coursemanagement-hibernate-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-coursemanagement-hibernate-pack/META-INF/maven/org.sakaiproject/sakai-coursemanagement-hibernate-pack/pom.properties
+tomcat5.5/components/sakai-coursemanagement-hibernate-pack/META-INF/maven/org.sakaiproject/sakai-coursemanagement-hibernate-pack/pom.xml
 tomcat5.5/components/sakai-coursemanagement-hibernate-pack/WEB-INF/components-demo.xml
 tomcat5.5/components/sakai-coursemanagement-hibernate-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-coursemanagement-hibernate-pack/WEB-INF/lib/sakai-coursemanagement-hibernate-impl-2.4.1.jar
+tomcat5.5/components/sakai-coursemanagement-hibernate-pack/WEB-INF/lib/sakai-coursemanagement-hibernate-impl-2.5.0.jar
+tomcat5.5/components/sakai-coursemanagement-hibernate-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-db-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-db-pack/META-INF/maven/org.sakaiproject/sakai-db-pack/pom.properties
+tomcat5.5/components/sakai-db-pack/META-INF/maven/org.sakaiproject/sakai-db-pack/pom.xml
 tomcat5.5/components/sakai-db-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-db-pack/WEB-INF/lib/sakai-db-impl-2.4.1.jar
-tomcat5.5/components/sakai-discussion-pack/META-INF/MANIFEST.MF
-tomcat5.5/components/sakai-discussion-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-discussion-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-discussion-pack/WEB-INF/lib/sakai-discussion-impl-2.4.1.jar
-tomcat5.5/components/sakai-discussion-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-discussion-pack/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-discussion-pack/WEB-INF/lib/sakai-message-impl-2.4.1.jar
-tomcat5.5/components/sakai-discussion-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-db-pack/WEB-INF/lib/sakai-db-impl-2.5.0.jar
+tomcat5.5/components/sakai-db-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-email-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-email-pack/META-INF/maven/org.sakaiproject/sakai-email-pack/pom.properties
+tomcat5.5/components/sakai-email-pack/META-INF/maven/org.sakaiproject/sakai-email-pack/pom.xml
 tomcat5.5/components/sakai-email-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-email-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-email-pack/WEB-INF/lib/sakai-email-impl-2.4.1.jar
-tomcat5.5/components/sakai-email-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-email-pack/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-email-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-email-pack/WEB-INF/lib/sakai-db-storage-2.5.0.jar
+tomcat5.5/components/sakai-email-pack/WEB-INF/lib/sakai-email-impl-2.5.0.jar
+tomcat5.5/components/sakai-email-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-email-pack/WEB-INF/lib/sakai-event-util-2.5.0.jar
+tomcat5.5/components/sakai-email-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-email-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-entity-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-entity-pack/META-INF/maven/org.sakaiproject/sakai-entity-pack/pom.properties
+tomcat5.5/components/sakai-entity-pack/META-INF/maven/org.sakaiproject/sakai-entity-pack/pom.xml
 tomcat5.5/components/sakai-entity-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-entity-pack/WEB-INF/lib/sakai-entity-impl-2.4.1.jar
-tomcat5.5/components/sakai-entity-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-entity-pack/WEB-INF/lib/sakai-entity-impl-2.5.0.jar
+tomcat5.5/components/sakai-entity-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-entity-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-event-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-event-pack/META-INF/maven/org.sakaiproject/sakai-event-pack/pom.properties
+tomcat5.5/components/sakai-event-pack/META-INF/maven/org.sakaiproject/sakai-event-pack/pom.xml
 tomcat5.5/components/sakai-event-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-event-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-event-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-event-pack/WEB-INF/lib/sakai-event-impl-2.4.1.jar
-tomcat5.5/components/sakai-event-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-event-pack/WEB-INF/lib/sakai-db-storage-2.5.0.jar
+tomcat5.5/components/sakai-event-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-event-pack/WEB-INF/lib/sakai-event-impl-2.5.0.jar
+tomcat5.5/components/sakai-event-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-event-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-gradebook-service-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-gradebook-service-pack/META-INF/maven/org.sakaiproject/sakai-gradebook-service-pack/pom.properties
+tomcat5.5/components/sakai-gradebook-service-pack/META-INF/maven/org.sakaiproject/sakai-gradebook-service-pack/pom.xml
 tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/classes/hsqldb/sakai_gradebook_post_schemaupdate.sql
 tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/classes/mysql/sakai_gradebook_post_schemaupdate.sql
 tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/classes/oracle/sakai_gradebook_post_schemaupdate.sql
 tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/lib/sakai-gradebook-service-impl-2.4.1.jar
+tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/lib/sakai-gradebook-service-impl-2.5.0.jar
+tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/lib/xpp3_min-1.1.3.4.O.jar
 tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/lib/xstream-1.2.1.jar
+tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-gradebooksample-grade-converter/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-gradebooksample-grade-converter/META-INF/maven/org.sakaiproject/sakai-gradebooksample-grade-converter/pom.properties
+tomcat5.5/components/sakai-gradebooksample-grade-converter/META-INF/maven/org.sakaiproject/sakai-gradebooksample-grade-converter/pom.xml
 tomcat5.5/components/sakai-gradebooksample-grade-converter/WEB-INF/classes/org/sakaiproject/gradebooksample/CourseGradesToSpreadsheetConverterSample.class
 tomcat5.5/components/sakai-gradebooksample-grade-converter/WEB-INF/components.xml
+tomcat5.5/components/sakai-gradebooksample-grade-converter/WEB-INF/web.xml
 tomcat5.5/components/sakai-import/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-import/META-INF/maven/org.sakaiproject/sakai-import/pom.properties
+tomcat5.5/components/sakai-import/META-INF/maven/org.sakaiproject/sakai-import/pom.xml
 tomcat5.5/components/sakai-import/WEB-INF/components.xml
-tomcat5.5/components/sakai-import/WEB-INF/lib/activation-1.0.2.jar
-tomcat5.5/components/sakai-import/WEB-INF/lib/jaxen-1.0-FCS-full.jar
-tomcat5.5/components/sakai-import/WEB-INF/lib/sakai-archive-import-2.4.1.jar
-tomcat5.5/components/sakai-import/WEB-INF/lib/sakai-common-cartridge-2.4.1.jar
-tomcat5.5/components/sakai-import/WEB-INF/lib/sakai-import-announcement-2.4.1.jar
-tomcat5.5/components/sakai-import/WEB-INF/lib/sakai-import-content-2.4.1.jar
-tomcat5.5/components/sakai-import/WEB-INF/lib/sakai-import-impl-2.4.1.jar
-tomcat5.5/components/sakai-import/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-import/WEB-INF/lib/sakai-archive-import-2.5.0.jar
+tomcat5.5/components/sakai-import/WEB-INF/lib/sakai-common-cartridge-2.5.0.jar
+tomcat5.5/components/sakai-import/WEB-INF/lib/sakai-import-announcement-2.5.0.jar
+tomcat5.5/components/sakai-import/WEB-INF/lib/sakai-import-content-2.5.0.jar
+tomcat5.5/components/sakai-import/WEB-INF/lib/sakai-import-impl-2.5.0.jar
+tomcat5.5/components/sakai-import/WEB-INF/lib/sakai-util-2.5.0.jar
 tomcat5.5/components/sakai-import/WEB-INF/lib/saxpath-1.0-FCS.jar
+tomcat5.5/components/sakai-import/WEB-INF/web.xml
+tomcat5.5/components/sakai-jackrabbit-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-jackrabbit-pack/META-INF/maven/org.sakaiproject/sakai-jackrabbit-pack/pom.properties
+tomcat5.5/components/sakai-jackrabbit-pack/META-INF/maven/org.sakaiproject/sakai-jackrabbit-pack/pom.xml
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/components.xml
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/concurrent-1.3.4.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/derby-10.2.1.6.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/geronimo-jta_1.0.1B_spec-1.0.1.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/jackrabbit-api-1.3.3.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/jackrabbit-core-1.3.3.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/jackrabbit-jcr-commons-1.3.3.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/jackrabbit-text-extractors-1.3.3.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/lucene-core-2.0.0.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/nekohtml-0.9.4.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/pdfbox-0.6.4.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/poi-2.5.1-final-20040804.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/sakai-jackrabbit-impl-2.5.0.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/slf4j-api-1.3.0.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/slf4j-log4j12-1.0.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib/tm-extractors-0.4.jar
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/preloadcontent.xml
+tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-mailarchive-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-mailarchive-pack/META-INF/maven/org.sakaiproject/sakai-mailarchive-pack/pom.properties
+tomcat5.5/components/sakai-mailarchive-pack/META-INF/maven/org.sakaiproject/sakai-mailarchive-pack/pom.xml
 tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-mailarchive-impl-2.4.1.jar
-tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-message-impl-2.4.1.jar
-tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-db-storage-2.5.0.jar
+tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-event-util-2.5.0.jar
+tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-mailarchive-impl-2.5.0.jar
+tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-message-impl-2.5.0.jar
+tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-memory-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-memory-pack/META-INF/maven/org.sakaiproject/sakai-memory-pack/pom.properties
+tomcat5.5/components/sakai-memory-pack/META-INF/maven/org.sakaiproject/sakai-memory-pack/pom.xml
 tomcat5.5/components/sakai-memory-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-memory-pack/WEB-INF/lib/concurrent-1.3.4.jar
-tomcat5.5/components/sakai-memory-pack/WEB-INF/lib/sakai-memory-impl-2.4.1.jar
+tomcat5.5/components/sakai-memory-pack/WEB-INF/lib/sakai-memory-impl-2.5.0.jar
+tomcat5.5/components/sakai-memory-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-messageforums-components/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-messageforums-components/META-INF/maven/org.sakaiproject/sakai-messageforums-components/pom.properties
+tomcat5.5/components/sakai-messageforums-components/META-INF/maven/org.sakaiproject/sakai-messageforums-components/pom.xml
 tomcat5.5/components/sakai-messageforums-components/WEB-INF/components.xml
 tomcat5.5/components/sakai-messageforums-components/WEB-INF/lib/commons-beanutils-1.7.0.jar
 tomcat5.5/components/sakai-messageforums-components/WEB-INF/lib/commons-codec-1.3.jar
-tomcat5.5/components/sakai-messageforums-components/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-messageforums-components/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-messageforums-components/WEB-INF/lib/sakai-messageforums-component-impl-2.4.1.jar
-tomcat5.5/components/sakai-messageforums-components/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-messageforums-components/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-messageforums-components/WEB-INF/lib/sakai-event-util-2.5.0.jar
+tomcat5.5/components/sakai-messageforums-components/WEB-INF/lib/sakai-messageforums-component-impl-2.5.0.jar
+tomcat5.5/components/sakai-messageforums-components/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-messageforums-components/WEB-INF/web.xml
 tomcat5.5/components/sakai-metaobj-component/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-metaobj-component/META-INF/maven/org.sakaiproject/sakai-metaobj-component/pom.properties
+tomcat5.5/components/sakai-metaobj-component/META-INF/maven/org.sakaiproject/sakai-metaobj-component/pom.xml
 tomcat5.5/components/sakai-metaobj-component/WEB-INF/components.xml
-tomcat5.5/components/sakai-metaobj-component/WEB-INF/datasource-config.xml
-tomcat5.5/components/sakai-metaobj-component/WEB-INF/home-config.xml
 tomcat5.5/components/sakai-metaobj-component/WEB-INF/lib/commons-codec-1.2.jar
-tomcat5.5/components/sakai-metaobj-component/WEB-INF/lib/sakai-content-util-2.4.1.jar
-tomcat5.5/components/sakai-metaobj-component/WEB-INF/lib/sakai-metaobj-impl-2.4.1.jar
-tomcat5.5/components/sakai-metaobj-component/WEB-INF/lib/sakai-util-2.4.1.jar
-tomcat5.5/components/sakai-metaobj-component/WEB-INF/property-config.xml
-tomcat5.5/components/sakai-metaobj-component/WEB-INF/repository-config.xml
-tomcat5.5/components/sakai-metaobj-component/WEB-INF/repository-config_old.xml
-tomcat5.5/components/sakai-metaobj-component/WEB-INF/repository-web-config.xml
-tomcat5.5/components/sakai-metaobj-component/WEB-INF/shared-config.xml
-tomcat5.5/components/sakai-metaobj-component/WEB-INF/shared-web-config.xml
+tomcat5.5/components/sakai-metaobj-component/WEB-INF/lib/sakai-content-util-2.5.0.jar
+tomcat5.5/components/sakai-metaobj-component/WEB-INF/lib/sakai-metaobj-impl-2.5.0.jar
+tomcat5.5/components/sakai-metaobj-component/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-metaobj-component/WEB-INF/web.xml
 tomcat5.5/components/sakai-news-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-news-pack/META-INF/maven/org.sakaiproject/sakai-news-pack/pom.properties
+tomcat5.5/components/sakai-news-pack/META-INF/maven/org.sakaiproject/sakai-news-pack/pom.xml
 tomcat5.5/components/sakai-news-pack/WEB-INF/components.xml
 tomcat5.5/components/sakai-news-pack/WEB-INF/lib/commons-codec-1.3.jar
-tomcat5.5/components/sakai-news-pack/WEB-INF/lib/jdom-1.0.jar
+tomcat5.5/components/sakai-news-pack/WEB-INF/lib/itunes-0.3.jar
 tomcat5.5/components/sakai-news-pack/WEB-INF/lib/rome-0.8.jar
 tomcat5.5/components/sakai-news-pack/WEB-INF/lib/rome-fetcher-0.7.jar
-tomcat5.5/components/sakai-news-pack/WEB-INF/lib/sakai-news-impl-2.4.1.jar
-tomcat5.5/components/sakai-news-pack/WEB-INF/lib/sakai-util-2.4.1.jar
-tomcat5.5/components/sakai-osid-pack/META-INF/MANIFEST.MF
-tomcat5.5/components/sakai-osid-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-osid-pack/WEB-INF/lib/okiRegistry-2005-10-19.jar
-tomcat5.5/components/sakai-osid-pack/WEB-INF/lib/okiSearchAdjusters-2005-10-19.jar
-tomcat5.5/components/sakai-osid-pack/WEB-INF/lib/sakai-osid-impl-2.4.1.jar
+tomcat5.5/components/sakai-news-pack/WEB-INF/lib/sakai-news-impl-2.5.0.jar
+tomcat5.5/components/sakai-news-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-news-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-podcasts-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-podcasts-pack/META-INF/maven/org.sakaiproject/sakai-podcasts-pack/pom.properties
+tomcat5.5/components/sakai-podcasts-pack/META-INF/maven/org.sakaiproject/sakai-podcasts-pack/pom.xml
 tomcat5.5/components/sakai-podcasts-pack/WEB-INF/components.xml
 tomcat5.5/components/sakai-podcasts-pack/WEB-INF/lib/itunes-0.3.jar
-tomcat5.5/components/sakai-podcasts-pack/WEB-INF/lib/jdom-1.0.jar
 tomcat5.5/components/sakai-podcasts-pack/WEB-INF/lib/rome-0.8.jar
-tomcat5.5/components/sakai-podcasts-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-podcasts-pack/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-podcasts-pack/WEB-INF/lib/sakai-podcasts-impl-2.4.1.jar
-tomcat5.5/components/sakai-podcasts-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-podcasts-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-podcasts-pack/WEB-INF/lib/sakai-event-util-2.5.0.jar
+tomcat5.5/components/sakai-podcasts-pack/WEB-INF/lib/sakai-podcasts-impl-2.5.0.jar
+tomcat5.5/components/sakai-podcasts-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-podcasts-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-poll-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-poll-pack/META-INF/maven/org.sakaiproject/sakai-poll-pack/pom.properties
+tomcat5.5/components/sakai-poll-pack/META-INF/maven/org.sakaiproject/sakai-poll-pack/pom.xml
 tomcat5.5/components/sakai-poll-pack/WEB-INF/components.xml
 tomcat5.5/components/sakai-poll-pack/WEB-INF/hibernate-hbms.xml
-tomcat5.5/components/sakai-poll-pack/WEB-INF/lib/sakai-poll-dao-impl-2.4.1.jar
-tomcat5.5/components/sakai-poll-pack/WEB-INF/lib/sakai-poll-logic-impl-2.4.1.jar
+tomcat5.5/components/sakai-poll-pack/WEB-INF/lib/commons-codec-1.3.jar
+tomcat5.5/components/sakai-poll-pack/WEB-INF/lib/sakai-poll-dao-impl-2.5.0.jar
+tomcat5.5/components/sakai-poll-pack/WEB-INF/lib/sakai-poll-logic-impl-2.5.0.jar
 tomcat5.5/components/sakai-poll-pack/WEB-INF/spring-hibernate.xml
+tomcat5.5/components/sakai-poll-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-portal-render-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-portal-render-pack/META-INF/maven/org.sakaiproject/sakai-portal-render-pack/pom.properties
+tomcat5.5/components/sakai-portal-render-pack/META-INF/maven/org.sakaiproject/sakai-portal-render-pack/pom.xml
 tomcat5.5/components/sakai-portal-render-pack/WEB-INF/components.xml
 tomcat5.5/components/sakai-portal-render-pack/WEB-INF/lib/commons-codec-1.3.jar
-tomcat5.5/components/sakai-portal-render-pack/WEB-INF/lib/sakai-portal-render-impl-2.4.1.jar
-tomcat5.5/components/sakai-portal-render-pack/WEB-INF/lib/sakai-portal-util-2.4.1.jar
-tomcat5.5/components/sakai-portal-render-pack/WEB-INF/lib/sakai-tool-util-2.4.1.jar
-tomcat5.5/components/sakai-portal-render-pack/WEB-INF/lib/sakai-user-util-2.4.1.jar
-tomcat5.5/components/sakai-portal-render-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-portal-render-pack/WEB-INF/lib/sakai-portal-render-impl-2.5.0.jar
+tomcat5.5/components/sakai-portal-render-pack/WEB-INF/lib/sakai-portal-util-2.5.0.jar
+tomcat5.5/components/sakai-portal-render-pack/WEB-INF/lib/sakai-tool-util-2.5.0.jar
+tomcat5.5/components/sakai-portal-render-pack/WEB-INF/lib/sakai-user-util-2.5.0.jar
+tomcat5.5/components/sakai-portal-render-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-portal-render-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-postem-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-postem-pack/META-INF/maven/org.sakaiproject/sakai-postem-pack/pom.properties
+tomcat5.5/components/sakai-postem-pack/META-INF/maven/org.sakaiproject/sakai-postem-pack/pom.xml
 tomcat5.5/components/sakai-postem-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-postem-pack/WEB-INF/lib/sakai-postem-impl-2.4.1.jar
+tomcat5.5/components/sakai-postem-pack/WEB-INF/lib/sakai-postem-impl-2.5.0.jar
+tomcat5.5/components/sakai-postem-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-presence-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-presence-pack/META-INF/maven/org.sakaiproject/sakai-presence-pack/pom.properties
+tomcat5.5/components/sakai-presence-pack/META-INF/maven/org.sakaiproject/sakai-presence-pack/pom.xml
 tomcat5.5/components/sakai-presence-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-presence-pack/WEB-INF/lib/sakai-presence-impl-2.4.1.jar
-tomcat5.5/components/sakai-presence-pack/WEB-INF/lib/sakai-privacy-api-2.4.1.jar
+tomcat5.5/components/sakai-presence-pack/WEB-INF/lib/sakai-presence-impl-2.5.0.jar
+tomcat5.5/components/sakai-presence-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-presentation-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-presentation-pack/META-INF/maven/org.sakaiproject/sakai-presentation-pack/pom.properties
+tomcat5.5/components/sakai-presentation-pack/META-INF/maven/org.sakaiproject/sakai-presentation-pack/pom.xml
 tomcat5.5/components/sakai-presentation-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-presentation-pack/WEB-INF/lib/sakai-presentation-impl-2.4.1.jar
+tomcat5.5/components/sakai-presentation-pack/WEB-INF/lib/sakai-presentation-impl-2.5.0.jar
+tomcat5.5/components/sakai-presentation-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-privacy-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-privacy-pack/META-INF/maven/org.sakaiproject/sakai-privacy-pack/pom.properties
+tomcat5.5/components/sakai-privacy-pack/META-INF/maven/org.sakaiproject/sakai-privacy-pack/pom.xml
 tomcat5.5/components/sakai-privacy-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-privacy-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-privacy-pack/WEB-INF/lib/sakai-privacy-impl-2.4.1.jar
-tomcat5.5/components/sakai-privacy-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-privacy-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-privacy-pack/WEB-INF/lib/sakai-privacy-impl-2.5.0.jar
+tomcat5.5/components/sakai-privacy-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-privacy-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-profile-components/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-profile-components/META-INF/maven/org.sakaiproject/sakai-profile-components/pom.properties
+tomcat5.5/components/sakai-profile-components/META-INF/maven/org.sakaiproject/sakai-profile-components/pom.xml
 tomcat5.5/components/sakai-profile-components/WEB-INF/components.xml
+tomcat5.5/components/sakai-profile-components/WEB-INF/web.xml
 tomcat5.5/components/sakai-provider-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-provider-pack/META-INF/maven/org.sakaiproject/sakai-provider-pack/pom.properties
+tomcat5.5/components/sakai-provider-pack/META-INF/maven/org.sakaiproject/sakai-provider-pack/pom.xml
 tomcat5.5/components/sakai-provider-pack/WEB-INF/components-demo.xml
 tomcat5.5/components/sakai-provider-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-provider-pack/WEB-INF/lib/sakai-coursemanagement-authz-provider-impl-2.4.1.jar
-tomcat5.5/components/sakai-provider-pack/WEB-INF/lib/sakai-coursemanagement-cm-provider-impl-2.4.1.jar
-tomcat5.5/components/sakai-provider-pack/WEB-INF/lib/sakai-sample-provider-2.4.1.jar
-tomcat5.5/components/sakai-provider-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-provider-pack/WEB-INF/jldap-beans.xml
+tomcat5.5/components/sakai-provider-pack/WEB-INF/lib/sakai-coursemanagement-authz-provider-impl-2.5.0.jar
+tomcat5.5/components/sakai-provider-pack/WEB-INF/lib/sakai-coursemanagement-cm-provider-impl-2.5.0.jar
+tomcat5.5/components/sakai-provider-pack/WEB-INF/lib/sakai-sample-provider-2.5.0.jar
+tomcat5.5/components/sakai-provider-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-provider-pack/WEB-INF/web.xml
+tomcat5.5/components/sakai-reports-components/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-reports-components/META-INF/maven/org.sakaiproject/sakai-reports-components/pom.properties
+tomcat5.5/components/sakai-reports-components/META-INF/maven/org.sakaiproject/sakai-reports-components/pom.xml
+tomcat5.5/components/sakai-reports-components/WEB-INF/components.xml
+tomcat5.5/components/sakai-reports-components/WEB-INF/lib/commons-beanutils-1.7.0.jar
+tomcat5.5/components/sakai-reports-components/WEB-INF/lib/commons-codec-1.2.jar
+tomcat5.5/components/sakai-reports-components/WEB-INF/lib/commons-digester-1.6.jar
+tomcat5.5/components/sakai-reports-components/WEB-INF/lib/jsf-api-1.1.01.jar
+tomcat5.5/components/sakai-reports-components/WEB-INF/lib/jsf-impl-1.1.01.jar
+tomcat5.5/components/sakai-reports-components/WEB-INF/lib/sakai-content-util-2.5.0.jar
+tomcat5.5/components/sakai-reports-components/WEB-INF/lib/sakai-metaobj-impl-2.5.0.jar
+tomcat5.5/components/sakai-reports-components/WEB-INF/lib/sakai-metaobj-tool-lib-2.5.0.jar
+tomcat5.5/components/sakai-reports-components/WEB-INF/lib/sakai-reports-component-shared-2.5.0.jar
+tomcat5.5/components/sakai-reports-components/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-reports-components/WEB-INF/lib/standard-1.1.2.jar
+tomcat5.5/components/sakai-reports-components/WEB-INF/lib/velocity-1.3.1.jar
+tomcat5.5/components/sakai-reports-components/WEB-INF/web.xml
 tomcat5.5/components/sakai-rights-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-rights-pack/META-INF/maven/org.sakaiproject/sakai-rights-pack/pom.properties
+tomcat5.5/components/sakai-rights-pack/META-INF/maven/org.sakaiproject/sakai-rights-pack/pom.xml
 tomcat5.5/components/sakai-rights-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-rights-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-rights-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-rights-pack/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-rights-pack/WEB-INF/lib/sakai-rights-impl-2.4.1.jar
-tomcat5.5/components/sakai-rights-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-rights-pack/WEB-INF/lib/sakai-db-storage-2.5.0.jar
+tomcat5.5/components/sakai-rights-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-rights-pack/WEB-INF/lib/sakai-event-util-2.5.0.jar
+tomcat5.5/components/sakai-rights-pack/WEB-INF/lib/sakai-rights-impl-2.5.0.jar
+tomcat5.5/components/sakai-rights-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-rights-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-roster-components/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-roster-components/META-INF/maven/org.sakaiproject/sakai-roster-components/pom.properties
+tomcat5.5/components/sakai-roster-components/META-INF/maven/org.sakaiproject/sakai-roster-components/pom.xml
 tomcat5.5/components/sakai-roster-components/WEB-INF/components.xml
+tomcat5.5/components/sakai-roster-components/WEB-INF/lib/sakai-roster-impl-2.5.0.jar
+tomcat5.5/components/sakai-roster-components/WEB-INF/lib/sakai-roster-model-2.5.0.jar
+tomcat5.5/components/sakai-roster-components/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-roster-components/WEB-INF/web.xml
 tomcat5.5/components/sakai-rwiki-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-rwiki-pack/META-INF/maven/org.sakaiproject/sakai-rwiki-pack/pom.properties
+tomcat5.5/components/sakai-rwiki-pack/META-INF/maven/org.sakaiproject/sakai-rwiki-pack/pom.xml
 tomcat5.5/components/sakai-rwiki-pack/WEB-INF/classes/META-INF/services/org.radeox.macro.Macro
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/classes/ehcache.xml
 tomcat5.5/components/sakai-rwiki-pack/WEB-INF/classes/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051017.sql
 tomcat5.5/components/sakai-rwiki-pack/WEB-INF/classes/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051026.sql
 tomcat5.5/components/sakai-rwiki-pack/WEB-INF/classes/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051107.sql
@@ -354,41 +559,40 @@ tomcat5.5/components/sakai-rwiki-pack/WEB-INF/components.xml
 tomcat5.5/components/sakai-rwiki-pack/WEB-INF/coreDaoComponents.xml
 tomcat5.5/components/sakai-rwiki-pack/WEB-INF/coreServiceComponents.xml
 tomcat5.5/components/sakai-rwiki-pack/WEB-INF/datamigrationComponents.xml
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/avalon-framework-api-4.2.0.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/avalon-framework-impl-4.2.0.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-awt-util-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-bridge-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-css-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-dom-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-ext-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-extension-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-gui-util-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-gvt-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-parser-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-rasterizer-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-script-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-svg-dom-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-svggen-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-svgpp-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-transcoder-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-ttf2svg-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-util-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-xml-1.6.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/commons-io-1.1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/avalon-framework-api-4.3.1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/avalon-framework-impl-4.3.1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-awt-util-1.6-1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-bridge-1.6-1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-css-1.6-1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-dom-1.6-1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-ext-1.6-1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-extension-1.6-1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-gui-util-1.6-1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-gvt-1.6-1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-parser-1.6-1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-script-1.6-1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-svg-dom-1.6-1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-transcoder-1.6-1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-util-1.6-1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/batik-xml-1.6-1.jar
 tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/fop-20070301.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/sakai-radeox-2.4.1.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/sakai-rwiki-impl-2.4.1.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/sakai-rwiki-util-2.4.1.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/sakai-util-2.4.1.jar
-tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/sakai-util-api-2.4.1.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/sakai-event-util-2.5.0.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/sakai-radeox-2.5.0.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/sakai-rwiki-impl-2.5.0.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/sakai-rwiki-util-2.5.0.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/sakai-search-util-2.5.0.jar
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/sakai-util-2.5.0.jar
 tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/xalan-2.6.0.jar
 tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/xercesImpl-2.6.2.jar
 tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/xmlParserAPIs-2.6.2.jar
 tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib/xmlgraphics-commons-1.1.jar
 tomcat5.5/components/sakai-rwiki-pack/WEB-INF/messagingComponents.xml
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/rwikiAdapterComponents.xml
+tomcat5.5/components/sakai-rwiki-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-samigo-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-samigo-pack/META-INF/maven/org.sakaiproject/sakai-samigo-pack/pom.properties
+tomcat5.5/components/sakai-samigo-pack/META-INF/maven/org.sakaiproject/sakai-samigo-pack/pom.xml
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/hsqldb/patches/SAK-1659.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/hsqldb/patches/SAK-1894.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/hsqldb/patches/SAK-2179.sql
@@ -401,6 +605,7 @@ tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/hsqldb/patches/SAK-4427.s
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/hsqldb/patches/SAK-5564.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/hsqldb/patches/SAK-5595.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/hsqldb/sakai_samigo.sql
+tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/hsqldb/sakai_samigo_post_schema_update.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/hsqldb/sakai_samigo_tables_v2_1_2.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/hsqldb/sakai_samigo_tables_v2_2.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/hsqldb/sakai_samigo_tables_v2_3.sql
@@ -420,6 +625,7 @@ tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/mysql/patches/SAK-5595.sq
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/mysql/patches/SAK-6790.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/mysql/patches/SAK-8727.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/mysql/sakai_samigo.sql
+tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/mysql/sakai_samigo_post_schema_update.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/mysql/sakai_samigo_tables_v2_1_2.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/mysql/sakai_samigo_tables_v2_2.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/mysql/sakai_samigo_tables_v2_3.sql
@@ -439,6 +645,7 @@ tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/oracle/patches/SAK-5595.s
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/oracle/patches/SAK-6790.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/oracle/patches/SAK-8727.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/oracle/sakai_samigo.sql
+tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/oracle/sakai_samigo_post_schema_update.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/oracle/sakai_samigo_tables_v2_1_2.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/oracle/sakai_samigo_tables_v2_2.sql
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/oracle/sakai_samigo_tables_v2_3.sql
@@ -446,84 +653,128 @@ tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/oracle/sakai_samigo_table
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/org/sakaiproject/tool/assessment/shared/SakaiBootStrap.class
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/components.xml
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/lib/imsqti-1.2.jar
-tomcat5.5/components/sakai-samigo-pack/WEB-INF/lib/jsr173_1.0_api.jar
-tomcat5.5/components/sakai-samigo-pack/WEB-INF/lib/sakai-samlite-impl-2.4.1.jar
-tomcat5.5/components/sakai-samigo-pack/WEB-INF/lib/sakai-util-2.4.1.jar
-tomcat5.5/components/sakai-samigo-pack/WEB-INF/lib/xbean-2.2.jar
+tomcat5.5/components/sakai-samigo-pack/WEB-INF/lib/jsr173-1.0_api.jar
+tomcat5.5/components/sakai-samigo-pack/WEB-INF/lib/sakai-samlite-impl-2.5.0.jar
+tomcat5.5/components/sakai-samigo-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-samigo-pack/WEB-INF/lib/xbean-2.2.0.jar
 tomcat5.5/components/sakai-samigo-pack/WEB-INF/testbeans.xml
+tomcat5.5/components/sakai-samigo-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-sample-impl-access-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-sample-impl-access-pack/META-INF/maven/org.sakaiproject/sakai-sample-impl-access-pack/pom.properties
+tomcat5.5/components/sakai-sample-impl-access-pack/META-INF/maven/org.sakaiproject/sakai-sample-impl-access-pack/pom.xml
 tomcat5.5/components/sakai-sample-impl-access-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-sample-impl-access-pack/WEB-INF/lib/sakai-sample-impl-access-impl-2.4.1.jar
-tomcat5.5/components/sakai-sample-impl-access-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-sample-impl-access-pack/WEB-INF/lib/sakai-sample-impl-access-impl-2.5.0.jar
+tomcat5.5/components/sakai-sample-impl-access-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-sample-impl-access-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-search-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-search-pack/META-INF/maven/org.sakaiproject/sakai-search-pack/pom.properties
+tomcat5.5/components/sakai-search-pack/META-INF/maven/org.sakaiproject/sakai-search-pack/pom.xml
 tomcat5.5/components/sakai-search-pack/WEB-INF/components.xml
 tomcat5.5/components/sakai-search-pack/WEB-INF/contentAdapterComponents.xml
 tomcat5.5/components/sakai-search-pack/WEB-INF/coreSearchComponents.xml
 tomcat5.5/components/sakai-search-pack/WEB-INF/lib/commons-codec-1.3.jar
 tomcat5.5/components/sakai-search-pack/WEB-INF/lib/commons-httpclient-3.0.jar
-tomcat5.5/components/sakai-search-pack/WEB-INF/lib/commons-id-0.1-dev.jar
 tomcat5.5/components/sakai-search-pack/WEB-INF/lib/jtidy-4aug2000r7-dev.jar
 tomcat5.5/components/sakai-search-pack/WEB-INF/lib/lucene-core-1.9.1.jar
-tomcat5.5/components/sakai-search-pack/WEB-INF/lib/lucene-misc-1.9.1.jar
 tomcat5.5/components/sakai-search-pack/WEB-INF/lib/pdfbox-0.7.1.jar
 tomcat5.5/components/sakai-search-pack/WEB-INF/lib/poi-3.0-alpha3-20070301.jar
 tomcat5.5/components/sakai-search-pack/WEB-INF/lib/poi-scratchpad-3.0-alpha3-20070301.jar
-tomcat5.5/components/sakai-search-pack/WEB-INF/lib/sakai-rwiki-util-2.4.1.jar
-tomcat5.5/components/sakai-search-pack/WEB-INF/lib/sakai-search-impl-2.4.1.jar
-tomcat5.5/components/sakai-search-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-search-pack/WEB-INF/lib/sakai-search-impl-2.5.0.jar
+tomcat5.5/components/sakai-search-pack/WEB-INF/lib/sakai-search-model-2.5.0.jar
+tomcat5.5/components/sakai-search-pack/WEB-INF/lib/sakai-search-util-2.5.0.jar
+tomcat5.5/components/sakai-search-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-search-pack/WEB-INF/lib/tm-extractors-0.4.jar
 tomcat5.5/components/sakai-search-pack/WEB-INF/messageAdapterComponents.xml
-tomcat5.5/components/sakai-search-pack/WEB-INF/rwikiAdapterComponents.xml
+tomcat5.5/components/sakai-search-pack/WEB-INF/parallelIndexComponents.xml
+tomcat5.5/components/sakai-search-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-sections-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-sections-pack/META-INF/maven/org.sakaiproject/sakai-sections-pack/pom.properties
+tomcat5.5/components/sakai-sections-pack/META-INF/maven/org.sakaiproject/sakai-sections-pack/pom.xml
 tomcat5.5/components/sakai-sections-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-sections-pack/WEB-INF/lib/sakai-sections-impl-2.4.1.jar
+tomcat5.5/components/sakai-sections-pack/WEB-INF/lib/sakai-sections-impl-2.5.0.jar
+tomcat5.5/components/sakai-sections-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-site-manage-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-site-manage-pack/META-INF/maven/org.sakaiproject/sakai-site-manage-pack/pom.properties
+tomcat5.5/components/sakai-site-manage-pack/META-INF/maven/org.sakaiproject/sakai-site-manage-pack/pom.xml
 tomcat5.5/components/sakai-site-manage-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-site-manage-pack/WEB-INF/lib/sakai-site-manage-impl-2.4.1.jar
-tomcat5.5/components/sakai-site-manage-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-site-manage-pack/WEB-INF/lib/sakai-site-manage-impl-2.5.0.jar
+tomcat5.5/components/sakai-site-manage-pack/WEB-INF/lib/sakai-site-manage-util-2.5.0.jar
+tomcat5.5/components/sakai-site-manage-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-site-manage-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-site-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-site-pack/META-INF/maven/org.sakaiproject/sakai-site-pack/pom.properties
+tomcat5.5/components/sakai-site-pack/META-INF/maven/org.sakaiproject/sakai-site-pack/pom.xml
 tomcat5.5/components/sakai-site-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-site-pack/WEB-INF/lib/concurrent-1.3.4.jar
-tomcat5.5/components/sakai-site-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-site-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-site-pack/WEB-INF/lib/sakai-site-impl-2.4.1.jar
-tomcat5.5/components/sakai-site-pack/WEB-INF/lib/sakai-tool-util-2.4.1.jar
-tomcat5.5/components/sakai-site-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-site-pack/WEB-INF/lib/sakai-db-storage-2.5.0.jar
+tomcat5.5/components/sakai-site-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-site-pack/WEB-INF/lib/sakai-site-impl-2.5.0.jar
+tomcat5.5/components/sakai-site-pack/WEB-INF/lib/sakai-tool-util-2.5.0.jar
+tomcat5.5/components/sakai-site-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-site-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-syllabus-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-syllabus-pack/META-INF/maven/org.sakaiproject/sakai-syllabus-pack/pom.properties
+tomcat5.5/components/sakai-syllabus-pack/META-INF/maven/org.sakaiproject/sakai-syllabus-pack/pom.xml
 tomcat5.5/components/sakai-syllabus-pack/WEB-INF/components.xml
 tomcat5.5/components/sakai-syllabus-pack/WEB-INF/lib/commons-codec-1.3.jar
-tomcat5.5/components/sakai-syllabus-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-syllabus-pack/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-syllabus-pack/WEB-INF/lib/sakai-syllabus-impl-2.4.1.jar
-tomcat5.5/components/sakai-syllabus-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-syllabus-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-syllabus-pack/WEB-INF/lib/sakai-event-util-2.5.0.jar
+tomcat5.5/components/sakai-syllabus-pack/WEB-INF/lib/sakai-syllabus-impl-2.5.0.jar
+tomcat5.5/components/sakai-syllabus-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-syllabus-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-tool-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-tool-pack/META-INF/maven/org.sakaiproject/sakai-tool-pack/pom.properties
+tomcat5.5/components/sakai-tool-pack/META-INF/maven/org.sakaiproject/sakai-tool-pack/pom.xml
 tomcat5.5/components/sakai-tool-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-tool-pack/WEB-INF/lib/concurrent-1.3.4.jar
-tomcat5.5/components/sakai-tool-pack/WEB-INF/lib/sakai-tool-impl-2.4.1.jar
-tomcat5.5/components/sakai-tool-pack/WEB-INF/lib/sakai-tool-util-2.4.1.jar
-tomcat5.5/components/sakai-tool-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-tool-pack/WEB-INF/lib/sakai-tool-impl-2.5.0.jar
+tomcat5.5/components/sakai-tool-pack/WEB-INF/lib/sakai-tool-util-2.5.0.jar
+tomcat5.5/components/sakai-tool-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-tool-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-user-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-user-pack/META-INF/maven/org.sakaiproject/sakai-user-pack/pom.properties
+tomcat5.5/components/sakai-user-pack/META-INF/maven/org.sakaiproject/sakai-user-pack/pom.xml
 tomcat5.5/components/sakai-user-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-user-pack/WEB-INF/lib/sakai-db-storage-2.4.1.jar
-tomcat5.5/components/sakai-user-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-user-pack/WEB-INF/lib/sakai-user-impl-2.4.1.jar
-tomcat5.5/components/sakai-user-pack/WEB-INF/lib/sakai-user-util-2.4.1.jar
-tomcat5.5/components/sakai-user-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-user-pack/WEB-INF/lib/sakai-db-storage-2.5.0.jar
+tomcat5.5/components/sakai-user-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-user-pack/WEB-INF/lib/sakai-user-impl-2.5.0.jar
+tomcat5.5/components/sakai-user-pack/WEB-INF/lib/sakai-user-util-2.5.0.jar
+tomcat5.5/components/sakai-user-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-user-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-usermembership-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-usermembership-pack/META-INF/maven/org.sakaiproject/sakai-usermembership-pack/pom.properties
+tomcat5.5/components/sakai-usermembership-pack/META-INF/maven/org.sakaiproject/sakai-usermembership-pack/pom.xml
 tomcat5.5/components/sakai-usermembership-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-usermembership-pack/WEB-INF/lib/sakai-usermembership-impl-2.4.1.jar
-tomcat5.5/components/sakai-usermembership-pack/WEB-INF/lib/sakai-util-2.4.1.jar
+tomcat5.5/components/sakai-usermembership-pack/WEB-INF/lib/sakai-usermembership-impl-2.5.0.jar
+tomcat5.5/components/sakai-usermembership-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-usermembership-pack/WEB-INF/web.xml
 tomcat5.5/components/sakai-util-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-util-pack/META-INF/maven/org.sakaiproject/sakai-util-pack/pom.properties
+tomcat5.5/components/sakai-util-pack/META-INF/maven/org.sakaiproject/sakai-util-pack/pom.xml
 tomcat5.5/components/sakai-util-pack/WEB-INF/components.xml
-tomcat5.5/components/sakai-util-pack/WEB-INF/lib/commons-id-0.1-dev.jar
-tomcat5.5/components/sakai-util-pack/WEB-INF/lib/sakai-util-2.4.1.jar
-tomcat5.5/components/sakai-util-pack/WEB-INF/lib/sakai-util-impl-2.4.1.jar
+tomcat5.5/components/sakai-util-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-util-pack/WEB-INF/lib/sakai-util-impl-2.5.0.jar
+tomcat5.5/components/sakai-util-pack/WEB-INF/web.xml
+tomcat5.5/components/sakai-warehouse-component/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-warehouse-component/META-INF/maven/org.sakaiproject/sakai-warehouse-component/pom.properties
+tomcat5.5/components/sakai-warehouse-component/META-INF/maven/org.sakaiproject/sakai-warehouse-component/pom.xml
+tomcat5.5/components/sakai-warehouse-component/WEB-INF/assignment-components.xml
+tomcat5.5/components/sakai-warehouse-component/WEB-INF/components.xml
+tomcat5.5/components/sakai-warehouse-component/WEB-INF/lib/commons-codec-1.2.jar
+tomcat5.5/components/sakai-warehouse-component/WEB-INF/lib/sakai-content-util-2.5.0.jar
+tomcat5.5/components/sakai-warehouse-component/WEB-INF/lib/sakai-metaobj-impl-2.5.0.jar
+tomcat5.5/components/sakai-warehouse-component/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-warehouse-component/WEB-INF/lib/sakai-warehouse-impl-2.5.0.jar
+tomcat5.5/components/sakai-warehouse-component/WEB-INF/resource-components.xml
+tomcat5.5/components/sakai-warehouse-component/WEB-INF/web.xml
 tomcat5.5/components/sakai-web-pack/META-INF/MANIFEST.MF
+tomcat5.5/components/sakai-web-pack/META-INF/maven/org.sakaiproject/sakai-web-pack/pom.properties
+tomcat5.5/components/sakai-web-pack/META-INF/maven/org.sakaiproject/sakai-web-pack/pom.xml
 tomcat5.5/components/sakai-web-pack/WEB-INF/components.xml
 tomcat5.5/components/sakai-web-pack/WEB-INF/lib/commons-codec-1.3.jar
-tomcat5.5/components/sakai-web-pack/WEB-INF/lib/sakai-entity-util-2.4.1.jar
-tomcat5.5/components/sakai-web-pack/WEB-INF/lib/sakai-event-util-2.4.1.jar
-tomcat5.5/components/sakai-web-pack/WEB-INF/lib/sakai-util-2.4.1.jar
-tomcat5.5/components/sakai-web-pack/WEB-INF/lib/sakai-web-impl-2.4.1.jar
+tomcat5.5/components/sakai-web-pack/WEB-INF/lib/sakai-entity-util-2.5.0.jar
+tomcat5.5/components/sakai-web-pack/WEB-INF/lib/sakai-event-util-2.5.0.jar
+tomcat5.5/components/sakai-web-pack/WEB-INF/lib/sakai-util-2.5.0.jar
+tomcat5.5/components/sakai-web-pack/WEB-INF/lib/sakai-web-impl-2.5.0.jar
+tomcat5.5/components/sakai-web-pack/WEB-INF/web.xml
 tomcat5.5/licenses/LGPL2.1.license.txt
 tomcat5.5/licenses/MIT.license.txt
 tomcat5.5/licenses/OKI-SPRING-HIBERNATE.license.txt
@@ -560,6 +811,7 @@ tomcat5.5/licenses/dnsjava-1.2.3.license.txt
 tomcat5.5/licenses/dom4j.license.txt
 tomcat5.5/licenses/ehcache.license.txt
 tomcat5.5/licenses/excaliber.license.txt
+tomcat5.5/licenses/fckeditor.license.txt
 tomcat5.5/licenses/fop.license.txt
 tomcat5.5/licenses/hibernate-2.1.license.txt
 tomcat5.5/licenses/hibernate.pdf
@@ -580,6 +832,7 @@ tomcat5.5/licenses/jing.license.txt
 tomcat5.5/licenses/jsf-api.license.txt
 tomcat5.5/licenses/jsf-impl.license.txt
 tomcat5.5/licenses/jsp-api.license.txt
+tomcat5.5/licenses/jsr170-api.license.txt
 tomcat5.5/licenses/jstl.license.txt
 tomcat5.5/licenses/jta.license.txt
 tomcat5.5/licenses/junit-3.8.1.license.txt
@@ -611,161 +864,165 @@ tomcat5.5/licenses/xercesImpl-2.5.0.license.txt
 tomcat5.5/licenses/xml-apis.license.txt
 tomcat5.5/licenses/xmlform.license.txt
 tomcat5.5/licenses/xpp3-1.1.3.4.G.license.txt
-tomcat5.5/server/lib/sakai-dav-server-2.4.1.jar
+tomcat5.5/server/lib/sakai-dav-server-2.5.0.jar
 tomcat5.5/shared/lib/OkiOSID-2.0.jar
 tomcat5.5/shared/lib/activation-1.0.2.jar
-tomcat5.5/shared/lib/antlr-2.7.6rc1.jar
+tomcat5.5/shared/lib/antlr-2.7.6.jar
 tomcat5.5/shared/lib/castor-1.0.jar
 tomcat5.5/shared/lib/cglib-nodep-2.1_3.jar
-tomcat5.5/shared/lib/commons-collections-3.1.jar
-tomcat5.5/shared/lib/commons-dbcp-1.2.1.jar
+tomcat5.5/shared/lib/commons-collections-3.2.jar
+tomcat5.5/shared/lib/commons-dbcp-1.2.2.jar
 tomcat5.5/shared/lib/commons-fileupload-1.1.1.jar
 tomcat5.5/shared/lib/commons-io-1.2.jar
 tomcat5.5/shared/lib/commons-lang-2.1.jar
-tomcat5.5/shared/lib/commons-logging-1.0.4.jar
 tomcat5.5/shared/lib/commons-math-1.0.jar
 tomcat5.5/shared/lib/commons-pool-1.3.jar
-tomcat5.5/shared/lib/cql-java-0.7.jar
 tomcat5.5/shared/lib/dom4j-1.6.1.jar
-tomcat5.5/shared/lib/ehcache-1.2.4.jar
-tomcat5.5/shared/lib/hibernate-3.1.3.jar
-tomcat5.5/shared/lib/hsqldb-1.8.0.5.jar
+tomcat5.5/shared/lib/ehcache-1.3.0.jar
+tomcat5.5/shared/lib/entitybroker-api-1.2.0.jar
+tomcat5.5/shared/lib/generic-dao-0.9.1.jar
+tomcat5.5/shared/lib/geronimo-spec-jms-1.1-rc4.jar
+tomcat5.5/shared/lib/hibernate-3.2.5.ga.jar
+tomcat5.5/shared/lib/hsqldb-1.8.0.7.jar
 tomcat5.5/shared/lib/jaxen-1.1-beta-10.jar
+tomcat5.5/shared/lib/jcr-1.0.jar
 tomcat5.5/shared/lib/jdbc2_0-stdext-h2.1.8.jar
 tomcat5.5/shared/lib/jdom-1.0.jar
 tomcat5.5/shared/lib/jstl-1.1.2.jar
 tomcat5.5/shared/lib/jta-h2.1.8.jar
 tomcat5.5/shared/lib/mail-1.3.1.jar
-tomcat5.5/shared/lib/osp-common-api-2.4.1.jar
-tomcat5.5/shared/lib/osp-glossary-api-2.4.1.jar
-tomcat5.5/shared/lib/osp-integration-api-2.4.1.jar
-tomcat5.5/shared/lib/osp-matrix-api-2.4.1.jar
-tomcat5.5/shared/lib/osp-migration-api-2.4.1.jar
-tomcat5.5/shared/lib/osp-portal-api-2.4.1.jar
-tomcat5.5/shared/lib/osp-presentation-api-2.4.1.jar
-tomcat5.5/shared/lib/osp-reports-api-2.4.1.jar
-tomcat5.5/shared/lib/osp-warehouse-api-2.4.1.jar
-tomcat5.5/shared/lib/osp-wizard-api-2.4.1.jar
+tomcat5.5/shared/lib/osp-common-api-2.5.0.jar
+tomcat5.5/shared/lib/osp-glossary-api-2.5.0.jar
+tomcat5.5/shared/lib/osp-glossary-help-2.5.0.jar
+tomcat5.5/shared/lib/osp-integration-api-2.5.0.jar
+tomcat5.5/shared/lib/osp-matrix-api-2.5.0.jar
+tomcat5.5/shared/lib/osp-matrix-help-2.5.0.jar
+tomcat5.5/shared/lib/osp-portal-api-2.5.0.jar
+tomcat5.5/shared/lib/osp-presentation-api-2.5.0.jar
+tomcat5.5/shared/lib/osp-presentation-help-2.5.0.jar
+tomcat5.5/shared/lib/osp-styles-help-2.5.0.jar
+tomcat5.5/shared/lib/osp-wizard-api-2.5.0.jar
+tomcat5.5/shared/lib/osp-wizard-help-2.5.0.jar
 tomcat5.5/shared/lib/pluto-container-1.1.2.jar
 tomcat5.5/shared/lib/pluto-descriptor-api-1.1.2.jar
 tomcat5.5/shared/lib/pluto-descriptor-impl-1.1.2.jar
 tomcat5.5/shared/lib/pluto-taglib-1.1.2.jar
 tomcat5.5/shared/lib/portlet-api-1.0.jar
 tomcat5.5/shared/lib/quartz-1.5.2.jar
-tomcat5.5/shared/lib/sakai-alias-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-announcement-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-announcement-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-archive-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-assignment-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-assignment-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-authz-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-calendar-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-calendar-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-chat-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-chat-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-citations-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-citations-util-2.4.1.jar
-tomcat5.5/shared/lib/sakai-citations-web2bridge-2.4.1.jar
-tomcat5.5/shared/lib/sakai-citations-xserver-2.4.1.jar
-tomcat5.5/shared/lib/sakai-cluster-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-common-composite-component-data-2.4.1.jar
-tomcat5.5/shared/lib/sakai-common-edu-person-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-common-manager-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-common-type-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-comp-shared-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-comp-shared-scheduler-2.4.1.jar
-tomcat5.5/shared/lib/sakai-component-2.4.1.jar
-tomcat5.5/shared/lib/sakai-component-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-content-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-content-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-content-lock-hbm-2.4.1.jar
-tomcat5.5/shared/lib/sakai-contentreview-logic-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-contentreview-model-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-contentreview-service-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-courier-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-coursemanagement-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-coursemanagement-hibernate-model-2.4.1.jar
-tomcat5.5/shared/lib/sakai-db-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-db-ext-2.4.1.jar
-tomcat5.5/shared/lib/sakai-discussion-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-discussion-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-email-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-entity-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-event-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-gradebook-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-gradebook-service-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-gradebook-service-hibernate-2.4.1.jar
-tomcat5.5/shared/lib/sakai-help-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-help-content-2.4.1.jar
-tomcat5.5/shared/lib/sakai-import-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-mailarchive-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-mailarchive-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-mailtool-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-memory-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-message-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-messageforums-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-messageforums-hbm-2.4.1.jar
-tomcat5.5/shared/lib/sakai-messageforums-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-metaobj-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-news-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-podcasts-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-podcasts-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-poll-hbm-2.4.1.jar
-tomcat5.5/shared/lib/sakai-poll-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-poll-logic-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-poll-model-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-portal-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-portal-render-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-postem-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-postem-hbm-2.4.1.jar
-tomcat5.5/shared/lib/sakai-postem-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-presence-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-presentation-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-presentation-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-privacy-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-privacy-hbm-2.4.1.jar
-tomcat5.5/shared/lib/sakai-profile-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-profile-component-shared-2.4.1.jar
-tomcat5.5/shared/lib/sakai-rights-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-roster-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-roster-component-shared-2.4.1.jar
-tomcat5.5/shared/lib/sakai-roster-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-rwiki-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-rwiki-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-rwiki-model-2.4.1.jar
-tomcat5.5/shared/lib/sakai-samigo-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-samigo-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-samigo-hibernate-2.4.1.jar
-tomcat5.5/shared/lib/sakai-samigo-services-2.4.1.jar
-tomcat5.5/shared/lib/sakai-scheduler-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-search-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-search-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-search-model-2.4.1.jar
-tomcat5.5/shared/lib/sakai-sections-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-sections-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-sections-model-2.4.1.jar
-tomcat5.5/shared/lib/sakai-site-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-site-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-site-manage-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-site-manage-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-syllabus-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-syllabus-hbm-2.4.1.jar
-tomcat5.5/shared/lib/sakai-syllabus-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-tool-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-tool-servlet-2.4.1.jar
-tomcat5.5/shared/lib/sakai-user-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-usermembership-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-usermembership-help-2.4.1.jar
-tomcat5.5/shared/lib/sakai-util-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-util-id-hbm-2.4.1.jar
-tomcat5.5/shared/lib/sakai-velocity-tool-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-web-api-2.4.1.jar
-tomcat5.5/shared/lib/sakai-web-help-2.4.1.jar
-tomcat5.5/shared/lib/spring-1.2.8.jar
+tomcat5.5/shared/lib/sakai-alias-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-announcement-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-announcement-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-archive-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-assignment-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-assignment-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-authz-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-calendar-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-calendar-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-chat-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-chat-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-citations-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-cluster-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-common-composite-component-data-2.5.0.jar
+tomcat5.5/shared/lib/sakai-common-edu-person-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-common-manager-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-common-type-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-comp-shared-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-comp-shared-scheduler-2.5.0.jar
+tomcat5.5/shared/lib/sakai-component-2.5.0.jar
+tomcat5.5/shared/lib/sakai-component-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-content-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-content-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-content-lock-hbm-2.5.0.jar
+tomcat5.5/shared/lib/sakai-contentreview-logic-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-contentreview-model-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-contentreview-service-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-courier-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-coursemanagement-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-coursemanagement-hibernate-model-2.5.0.jar
+tomcat5.5/shared/lib/sakai-db-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-db-ext-2.5.0.jar
+tomcat5.5/shared/lib/sakai-email-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-entity-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-event-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-gradebook-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-gradebook-service-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-gradebook-service-hibernate-2.5.0.jar
+tomcat5.5/shared/lib/sakai-help-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-help-content-2.5.0.jar
+tomcat5.5/shared/lib/sakai-import-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-jcr-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-mailarchive-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-mailarchive-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-mailtool-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-memory-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-message-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-messageforums-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-messageforums-hbm-2.5.0.jar
+tomcat5.5/shared/lib/sakai-messageforums-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-metaobj-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-metaobj-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-news-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-podcasts-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-podcasts-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-poll-hbm-2.5.0.jar
+tomcat5.5/shared/lib/sakai-poll-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-poll-logic-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-poll-model-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-portal-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-portal-render-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-postem-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-postem-hbm-2.5.0.jar
+tomcat5.5/shared/lib/sakai-postem-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-presence-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-presentation-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-presentation-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-privacy-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-privacy-hbm-2.5.0.jar
+tomcat5.5/shared/lib/sakai-profile-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-profile-component-shared-2.5.0.jar
+tomcat5.5/shared/lib/sakai-reports-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-reset-pass-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-rights-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-roster-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-roster-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-rwiki-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-rwiki-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-rwiki-model-2.5.0.jar
+tomcat5.5/shared/lib/sakai-samigo-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-samigo-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-samigo-hibernate-2.5.0.jar
+tomcat5.5/shared/lib/sakai-samigo-services-2.5.0.jar
+tomcat5.5/shared/lib/sakai-scheduler-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-search-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-search-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-search-model-2.5.0.jar
+tomcat5.5/shared/lib/sakai-sections-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-sections-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-sections-model-2.5.0.jar
+tomcat5.5/shared/lib/sakai-site-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-site-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-site-manage-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-site-manage-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-syllabus-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-syllabus-hbm-2.5.0.jar
+tomcat5.5/shared/lib/sakai-syllabus-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-tool-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-tool-servlet-2.5.0.jar
+tomcat5.5/shared/lib/sakai-user-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-usermembership-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-usermembership-help-2.5.0.jar
+tomcat5.5/shared/lib/sakai-util-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-util-id-hbm-2.5.0.jar
+tomcat5.5/shared/lib/sakai-velocity-tool-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-warehouse-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-web-api-2.5.0.jar
+tomcat5.5/shared/lib/sakai-web-help-2.5.0.jar
+tomcat5.5/shared/lib/spring-2.0.6.jar
 tomcat5.5/webapps/access.war
 tomcat5.5/webapps/authn.war
 tomcat5.5/webapps/courier.war
 tomcat5.5/webapps/dav.war
+tomcat5.5/webapps/direct.war
 tomcat5.5/webapps/library.war
 tomcat5.5/webapps/mailtool.war
 tomcat5.5/webapps/mercury.war
@@ -777,7 +1034,6 @@ tomcat5.5/webapps/osp-matrix-tool.war
 tomcat5.5/webapps/osp-portal-tool.war
 tomcat5.5/webapps/osp-portal.war
 tomcat5.5/webapps/osp-presentation-tool.war
-tomcat5.5/webapps/osp-reports-tool.war
 tomcat5.5/webapps/osp-wizard-tool.war
 tomcat5.5/webapps/podcasts.war
 tomcat5.5/webapps/portal-render.war
@@ -794,12 +1050,10 @@ tomcat5.5/webapps/sakai-calendar-tool.war
 tomcat5.5/webapps/sakai-chat-tool.war
 tomcat5.5/webapps/sakai-citations-tool.war
 tomcat5.5/webapps/sakai-content-tool.war
-tomcat5.5/webapps/sakai-discussion-tool.war
 tomcat5.5/webapps/sakai-fck-connector.war
 tomcat5.5/webapps/sakai-gradebook-testservice.war
 tomcat5.5/webapps/sakai-gradebook-tool.war
 tomcat5.5/webapps/sakai-help-tool.war
-tomcat5.5/webapps/sakai-jsf-example.war
 tomcat5.5/webapps/sakai-jsf-resource.war
 tomcat5.5/webapps/sakai-login-tool.war
 tomcat5.5/webapps/sakai-mailarchive-james.war
@@ -809,13 +1063,14 @@ tomcat5.5/webapps/sakai-message-tool.war
 tomcat5.5/webapps/sakai-messageforums-tool.war
 tomcat5.5/webapps/sakai-metaobj-tool.war
 tomcat5.5/webapps/sakai-news-tool.war
-tomcat5.5/webapps/sakai-osid-unit-test.war
 tomcat5.5/webapps/sakai-podcasts.war
 tomcat5.5/webapps/sakai-poll-tool.war
 tomcat5.5/webapps/sakai-postem-tool.war
 tomcat5.5/webapps/sakai-presence-tool.war
 tomcat5.5/webapps/sakai-presentation-tool.war
 tomcat5.5/webapps/sakai-profile-tool.war
+tomcat5.5/webapps/sakai-reports-tool.war
+tomcat5.5/webapps/sakai-reset-pass.war
 tomcat5.5/webapps/sakai-rights-tool.war
 tomcat5.5/webapps/sakai-roster-tool.war
 tomcat5.5/webapps/sakai-rutgers-linktool.war
@@ -839,74 +1094,94 @@ tomcat5.5/webapps/samigo.war
 tomcat5.5/webapps/savecite.war
 tomcat5.5/webapps/tool.war
 tomcat5.5/webapps/web.war
+tomcat5.5/webapps/xsl-portal.war
+@dirrm tomcat5.5/shared/lib
+@dirrm tomcat5.5/shared
 @dirrm tomcat5.5/licenses
-@dirrm tomcat5.5/components/sakai-web-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-web-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-web-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-web-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-web-pack/META-INF/maven/org.sakaiproject/sakai-web-pack
+@dirrm tomcat5.5/components/sakai-web-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-web-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-web-pack/META-INF
 @dirrm tomcat5.5/components/sakai-web-pack
-@dirrm tomcat5.5/components/sakai-util-pack/WEB-INF/tld
+@dirrm tomcat5.5/components/sakai-warehouse-component/WEB-INF/lib
+@dirrm tomcat5.5/components/sakai-warehouse-component/WEB-INF
+@dirrm tomcat5.5/components/sakai-warehouse-component/META-INF/maven/org.sakaiproject/sakai-warehouse-component
+@dirrm tomcat5.5/components/sakai-warehouse-component/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-warehouse-component/META-INF/maven
+@dirrm tomcat5.5/components/sakai-warehouse-component/META-INF
+@dirrm tomcat5.5/components/sakai-warehouse-component
 @dirrm tomcat5.5/components/sakai-util-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-util-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-util-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-util-pack/META-INF/maven/org.sakaiproject/sakai-util-pack
+@dirrm tomcat5.5/components/sakai-util-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-util-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-util-pack/META-INF
 @dirrm tomcat5.5/components/sakai-util-pack
-@dirrm tomcat5.5/components/sakai-usermembership-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-usermembership-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-usermembership-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-usermembership-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-usermembership-pack/META-INF/maven/org.sakaiproject/sakai-usermembership-pack
+@dirrm tomcat5.5/components/sakai-usermembership-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-usermembership-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-usermembership-pack/META-INF
 @dirrm tomcat5.5/components/sakai-usermembership-pack
-@dirrm tomcat5.5/components/sakai-user-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-user-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-user-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-user-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-user-pack/META-INF/maven/org.sakaiproject/sakai-user-pack
+@dirrm tomcat5.5/components/sakai-user-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-user-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-user-pack/META-INF
 @dirrm tomcat5.5/components/sakai-user-pack
-@dirrm tomcat5.5/components/sakai-tool-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-tool-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-tool-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-tool-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-tool-pack/META-INF/maven/org.sakaiproject/sakai-tool-pack
+@dirrm tomcat5.5/components/sakai-tool-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-tool-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-tool-pack/META-INF
 @dirrm tomcat5.5/components/sakai-tool-pack
-@dirrm tomcat5.5/components/sakai-syllabus-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-syllabus-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-syllabus-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-syllabus-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-syllabus-pack/META-INF/maven/org.sakaiproject/sakai-syllabus-pack
+@dirrm tomcat5.5/components/sakai-syllabus-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-syllabus-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-syllabus-pack/META-INF
 @dirrm tomcat5.5/components/sakai-syllabus-pack
-@dirrm tomcat5.5/components/sakai-site-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-site-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-site-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-site-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-site-pack/META-INF/maven/org.sakaiproject/sakai-site-pack
+@dirrm tomcat5.5/components/sakai-site-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-site-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-site-pack/META-INF
 @dirrm tomcat5.5/components/sakai-site-pack
-@dirrm tomcat5.5/components/sakai-site-manage-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-site-manage-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-site-manage-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-site-manage-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-site-manage-pack/META-INF/maven/org.sakaiproject/sakai-site-manage-pack
+@dirrm tomcat5.5/components/sakai-site-manage-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-site-manage-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-site-manage-pack/META-INF
 @dirrm tomcat5.5/components/sakai-site-manage-pack
-@dirrm tomcat5.5/components/sakai-sections-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-sections-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-sections-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-sections-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-sections-pack/META-INF/maven/org.sakaiproject/sakai-sections-pack
+@dirrm tomcat5.5/components/sakai-sections-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-sections-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-sections-pack/META-INF
 @dirrm tomcat5.5/components/sakai-sections-pack
-@dirrm tomcat5.5/components/sakai-search-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-search-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-search-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-search-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-search-pack/META-INF/maven/org.sakaiproject/sakai-search-pack
+@dirrm tomcat5.5/components/sakai-search-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-search-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-search-pack/META-INF
 @dirrm tomcat5.5/components/sakai-search-pack
-@dirrm tomcat5.5/components/sakai-sample-impl-access-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-sample-impl-access-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-sample-impl-access-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-sample-impl-access-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-sample-impl-access-pack/META-INF/maven/org.sakaiproject/sakai-sample-impl-access-pack
+@dirrm tomcat5.5/components/sakai-sample-impl-access-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-sample-impl-access-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-sample-impl-access-pack/META-INF
 @dirrm tomcat5.5/components/sakai-sample-impl-access-pack
-@dirrm tomcat5.5/components/sakai-samigo-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-samigo-pack/WEB-INF/lib
 @dirrm tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/org/sakaiproject/tool/assessment/shared
 @dirrm tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/org/sakaiproject/tool/assessment
@@ -921,9 +1196,11 @@ tomcat5.5/webapps/web.war
 @dirrm tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes/hsqldb
 @dirrm tomcat5.5/components/sakai-samigo-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-samigo-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-samigo-pack/META-INF/maven/org.sakaiproject/sakai-samigo-pack
+@dirrm tomcat5.5/components/sakai-samigo-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-samigo-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-samigo-pack/META-INF
 @dirrm tomcat5.5/components/sakai-samigo-pack
-@dirrm tomcat5.5/components/sakai-rwiki-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-rwiki-pack/WEB-INF/lib
 @dirrm tomcat5.5/components/sakai-rwiki-pack/WEB-INF/classes/uk/ac/cam/caret/sakai/rwiki/model/bundle/oracle
 @dirrm tomcat5.5/components/sakai-rwiki-pack/WEB-INF/classes/uk/ac/cam/caret/sakai/rwiki/model/bundle/mysql
@@ -940,195 +1217,233 @@ tomcat5.5/webapps/web.war
 @dirrm tomcat5.5/components/sakai-rwiki-pack/WEB-INF/classes/META-INF
 @dirrm tomcat5.5/components/sakai-rwiki-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-rwiki-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-rwiki-pack/META-INF/maven/org.sakaiproject/sakai-rwiki-pack
+@dirrm tomcat5.5/components/sakai-rwiki-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-rwiki-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-rwiki-pack/META-INF
 @dirrm tomcat5.5/components/sakai-rwiki-pack
-@dirrm tomcat5.5/components/sakai-roster-components/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-roster-components/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-roster-components/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-roster-components/WEB-INF
+@dirrm tomcat5.5/components/sakai-roster-components/META-INF/maven/org.sakaiproject/sakai-roster-components
+@dirrm tomcat5.5/components/sakai-roster-components/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-roster-components/META-INF/maven
 @dirrm tomcat5.5/components/sakai-roster-components/META-INF
 @dirrm tomcat5.5/components/sakai-roster-components
-@dirrm tomcat5.5/components/sakai-rights-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-rights-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-rights-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-rights-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-rights-pack/META-INF/maven/org.sakaiproject/sakai-rights-pack
+@dirrm tomcat5.5/components/sakai-rights-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-rights-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-rights-pack/META-INF
 @dirrm tomcat5.5/components/sakai-rights-pack
-@dirrm tomcat5.5/components/sakai-provider-pack/WEB-INF/tld
+@dirrm tomcat5.5/components/sakai-reports-components/WEB-INF/lib
+@dirrm tomcat5.5/components/sakai-reports-components/WEB-INF
+@dirrm tomcat5.5/components/sakai-reports-components/META-INF/maven/org.sakaiproject/sakai-reports-components
+@dirrm tomcat5.5/components/sakai-reports-components/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-reports-components/META-INF/maven
+@dirrm tomcat5.5/components/sakai-reports-components/META-INF
+@dirrm tomcat5.5/components/sakai-reports-components
 @dirrm tomcat5.5/components/sakai-provider-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-provider-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-provider-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-provider-pack/META-INF/maven/org.sakaiproject/sakai-provider-pack
+@dirrm tomcat5.5/components/sakai-provider-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-provider-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-provider-pack/META-INF
 @dirrm tomcat5.5/components/sakai-provider-pack
-@dirrm tomcat5.5/components/sakai-profile-components/WEB-INF/tld
-@dirrm tomcat5.5/components/sakai-profile-components/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-profile-components/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-profile-components/WEB-INF
+@dirrm tomcat5.5/components/sakai-profile-components/META-INF/maven/org.sakaiproject/sakai-profile-components
+@dirrm tomcat5.5/components/sakai-profile-components/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-profile-components/META-INF/maven
 @dirrm tomcat5.5/components/sakai-profile-components/META-INF
 @dirrm tomcat5.5/components/sakai-profile-components
-@dirrm tomcat5.5/components/sakai-privacy-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-privacy-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-privacy-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-privacy-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-privacy-pack/META-INF/maven/org.sakaiproject/sakai-privacy-pack
+@dirrm tomcat5.5/components/sakai-privacy-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-privacy-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-privacy-pack/META-INF
 @dirrm tomcat5.5/components/sakai-privacy-pack
-@dirrm tomcat5.5/components/sakai-presentation-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-presentation-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-presentation-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-presentation-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-presentation-pack/META-INF/maven/org.sakaiproject/sakai-presentation-pack
+@dirrm tomcat5.5/components/sakai-presentation-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-presentation-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-presentation-pack/META-INF
 @dirrm tomcat5.5/components/sakai-presentation-pack
-@dirrm tomcat5.5/components/sakai-presence-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-presence-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-presence-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-presence-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-presence-pack/META-INF/maven/org.sakaiproject/sakai-presence-pack
+@dirrm tomcat5.5/components/sakai-presence-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-presence-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-presence-pack/META-INF
 @dirrm tomcat5.5/components/sakai-presence-pack
-@dirrm tomcat5.5/components/sakai-postem-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-postem-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-postem-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-postem-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-postem-pack/META-INF/maven/org.sakaiproject/sakai-postem-pack
+@dirrm tomcat5.5/components/sakai-postem-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-postem-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-postem-pack/META-INF
 @dirrm tomcat5.5/components/sakai-postem-pack
-@dirrm tomcat5.5/components/sakai-portal-render-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-portal-render-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-portal-render-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-portal-render-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-portal-render-pack/META-INF/maven/org.sakaiproject/sakai-portal-render-pack
+@dirrm tomcat5.5/components/sakai-portal-render-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-portal-render-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-portal-render-pack/META-INF
 @dirrm tomcat5.5/components/sakai-portal-render-pack
-@dirrm tomcat5.5/components/sakai-poll-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-poll-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-poll-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-poll-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-poll-pack/META-INF/maven/org.sakaiproject/sakai-poll-pack
+@dirrm tomcat5.5/components/sakai-poll-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-poll-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-poll-pack/META-INF
 @dirrm tomcat5.5/components/sakai-poll-pack
-@dirrm tomcat5.5/components/sakai-podcasts-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-podcasts-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-podcasts-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-podcasts-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-podcasts-pack/META-INF/maven/org.sakaiproject/sakai-podcasts-pack
+@dirrm tomcat5.5/components/sakai-podcasts-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-podcasts-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-podcasts-pack/META-INF
 @dirrm tomcat5.5/components/sakai-podcasts-pack
-@dirrm tomcat5.5/components/sakai-osid-pack/WEB-INF/tld
-@dirrm tomcat5.5/components/sakai-osid-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-osid-pack/WEB-INF/classes
-@dirrm tomcat5.5/components/sakai-osid-pack/WEB-INF
-@dirrm tomcat5.5/components/sakai-osid-pack/META-INF
-@dirrm tomcat5.5/components/sakai-osid-pack
-@dirrm tomcat5.5/components/sakai-news-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-news-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-news-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-news-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-news-pack/META-INF/maven/org.sakaiproject/sakai-news-pack
+@dirrm tomcat5.5/components/sakai-news-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-news-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-news-pack/META-INF
 @dirrm tomcat5.5/components/sakai-news-pack
-@dirrm tomcat5.5/components/sakai-metaobj-component/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-metaobj-component/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-metaobj-component/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-metaobj-component/WEB-INF
+@dirrm tomcat5.5/components/sakai-metaobj-component/META-INF/maven/org.sakaiproject/sakai-metaobj-component
+@dirrm tomcat5.5/components/sakai-metaobj-component/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-metaobj-component/META-INF/maven
 @dirrm tomcat5.5/components/sakai-metaobj-component/META-INF
 @dirrm tomcat5.5/components/sakai-metaobj-component
-@dirrm tomcat5.5/components/sakai-messageforums-components/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-messageforums-components/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-messageforums-components/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-messageforums-components/WEB-INF
+@dirrm tomcat5.5/components/sakai-messageforums-components/META-INF/maven/org.sakaiproject/sakai-messageforums-components
+@dirrm tomcat5.5/components/sakai-messageforums-components/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-messageforums-components/META-INF/maven
 @dirrm tomcat5.5/components/sakai-messageforums-components/META-INF
 @dirrm tomcat5.5/components/sakai-messageforums-components
-@dirrm tomcat5.5/components/sakai-memory-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-memory-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-memory-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-memory-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-memory-pack/META-INF/maven/org.sakaiproject/sakai-memory-pack
+@dirrm tomcat5.5/components/sakai-memory-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-memory-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-memory-pack/META-INF
 @dirrm tomcat5.5/components/sakai-memory-pack
-@dirrm tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-mailarchive-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-mailarchive-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-mailarchive-pack/META-INF/maven/org.sakaiproject/sakai-mailarchive-pack
+@dirrm tomcat5.5/components/sakai-mailarchive-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-mailarchive-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-mailarchive-pack/META-INF
 @dirrm tomcat5.5/components/sakai-mailarchive-pack
-@dirrm tomcat5.5/components/sakai-import/WEB-INF/tld
+@dirrm tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF/lib
+@dirrm tomcat5.5/components/sakai-jackrabbit-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-jackrabbit-pack/META-INF/maven/org.sakaiproject/sakai-jackrabbit-pack
+@dirrm tomcat5.5/components/sakai-jackrabbit-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-jackrabbit-pack/META-INF/maven
+@dirrm tomcat5.5/components/sakai-jackrabbit-pack/META-INF
+@dirrm tomcat5.5/components/sakai-jackrabbit-pack
 @dirrm tomcat5.5/components/sakai-import/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-import/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-import/WEB-INF
+@dirrm tomcat5.5/components/sakai-import/META-INF/maven/org.sakaiproject/sakai-import
+@dirrm tomcat5.5/components/sakai-import/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-import/META-INF/maven
 @dirrm tomcat5.5/components/sakai-import/META-INF
 @dirrm tomcat5.5/components/sakai-import
-@dirrm tomcat5.5/components/sakai-gradebooksample-grade-converter/WEB-INF/tld
-@dirrm tomcat5.5/components/sakai-gradebooksample-grade-converter/WEB-INF/lib
 @dirrm tomcat5.5/components/sakai-gradebooksample-grade-converter/WEB-INF/classes/org/sakaiproject/gradebooksample
 @dirrm tomcat5.5/components/sakai-gradebooksample-grade-converter/WEB-INF/classes/org/sakaiproject
 @dirrm tomcat5.5/components/sakai-gradebooksample-grade-converter/WEB-INF/classes/org
 @dirrm tomcat5.5/components/sakai-gradebooksample-grade-converter/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-gradebooksample-grade-converter/WEB-INF
+@dirrm tomcat5.5/components/sakai-gradebooksample-grade-converter/META-INF/maven/org.sakaiproject/sakai-gradebooksample-grade-converter
+@dirrm tomcat5.5/components/sakai-gradebooksample-grade-converter/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-gradebooksample-grade-converter/META-INF/maven
 @dirrm tomcat5.5/components/sakai-gradebooksample-grade-converter/META-INF
 @dirrm tomcat5.5/components/sakai-gradebooksample-grade-converter
-@dirrm tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/lib
 @dirrm tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/classes/oracle
 @dirrm tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/classes/mysql
 @dirrm tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/classes/hsqldb
 @dirrm tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-gradebook-service-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-gradebook-service-pack/META-INF/maven/org.sakaiproject/sakai-gradebook-service-pack
+@dirrm tomcat5.5/components/sakai-gradebook-service-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-gradebook-service-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-gradebook-service-pack/META-INF
 @dirrm tomcat5.5/components/sakai-gradebook-service-pack
-@dirrm tomcat5.5/components/sakai-event-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-event-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-event-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-event-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-event-pack/META-INF/maven/org.sakaiproject/sakai-event-pack
+@dirrm tomcat5.5/components/sakai-event-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-event-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-event-pack/META-INF
 @dirrm tomcat5.5/components/sakai-event-pack
-@dirrm tomcat5.5/components/sakai-entity-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-entity-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-entity-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-entity-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-entity-pack/META-INF/maven/org.sakaiproject/sakai-entity-pack
+@dirrm tomcat5.5/components/sakai-entity-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-entity-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-entity-pack/META-INF
 @dirrm tomcat5.5/components/sakai-entity-pack
-@dirrm tomcat5.5/components/sakai-email-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-email-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-email-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-email-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-email-pack/META-INF/maven/org.sakaiproject/sakai-email-pack
+@dirrm tomcat5.5/components/sakai-email-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-email-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-email-pack/META-INF
 @dirrm tomcat5.5/components/sakai-email-pack
-@dirrm tomcat5.5/components/sakai-discussion-pack/WEB-INF/tld
-@dirrm tomcat5.5/components/sakai-discussion-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-discussion-pack/WEB-INF/classes
-@dirrm tomcat5.5/components/sakai-discussion-pack/WEB-INF
-@dirrm tomcat5.5/components/sakai-discussion-pack/META-INF
-@dirrm tomcat5.5/components/sakai-discussion-pack
-@dirrm tomcat5.5/components/sakai-db-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-db-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-db-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-db-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-db-pack/META-INF/maven/org.sakaiproject/sakai-db-pack
+@dirrm tomcat5.5/components/sakai-db-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-db-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-db-pack/META-INF
 @dirrm tomcat5.5/components/sakai-db-pack
-@dirrm tomcat5.5/components/sakai-coursemanagement-hibernate-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-coursemanagement-hibernate-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-coursemanagement-hibernate-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-coursemanagement-hibernate-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-coursemanagement-hibernate-pack/META-INF/maven/org.sakaiproject/sakai-coursemanagement-hibernate-pack
+@dirrm tomcat5.5/components/sakai-coursemanagement-hibernate-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-coursemanagement-hibernate-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-coursemanagement-hibernate-pack/META-INF
 @dirrm tomcat5.5/components/sakai-coursemanagement-hibernate-pack
-@dirrm tomcat5.5/components/sakai-courier-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-courier-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-courier-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-courier-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-courier-pack/META-INF/maven/org.sakaiproject/sakai-courier-pack
+@dirrm tomcat5.5/components/sakai-courier-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-courier-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-courier-pack/META-INF
 @dirrm tomcat5.5/components/sakai-courier-pack
-@dirrm tomcat5.5/components/sakai-content-pack/WEB-INF/tld
+@dirrm tomcat5.5/components/sakai-content-providers-pack/WEB-INF/lib
+@dirrm tomcat5.5/components/sakai-content-providers-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-content-providers-pack/META-INF/maven/org.sakaiproject/sakai-content-providers-pack
+@dirrm tomcat5.5/components/sakai-content-providers-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-content-providers-pack/META-INF/maven
+@dirrm tomcat5.5/components/sakai-content-providers-pack/META-INF
+@dirrm tomcat5.5/components/sakai-content-providers-pack
 @dirrm tomcat5.5/components/sakai-content-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-content-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-content-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-content-pack/META-INF/maven/org.sakaiproject/sakai-content-pack
+@dirrm tomcat5.5/components/sakai-content-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-content-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-content-pack/META-INF
 @dirrm tomcat5.5/components/sakai-content-pack
-@dirrm tomcat5.5/components/sakai-component-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-component-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-component-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-component-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-component-pack/META-INF/maven/org.sakaiproject/sakai-component-pack
+@dirrm tomcat5.5/components/sakai-component-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-component-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-component-pack/META-INF
 @dirrm tomcat5.5/components/sakai-component-pack
-@dirrm tomcat5.5/components/sakai-comp-scheduler/WEB-INF/tld
-@dirrm tomcat5.5/components/sakai-comp-scheduler/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-comp-scheduler/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-comp-scheduler/WEB-INF
+@dirrm tomcat5.5/components/sakai-comp-scheduler/META-INF/maven/org.sakaiproject/sakai-comp-scheduler
+@dirrm tomcat5.5/components/sakai-comp-scheduler/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-comp-scheduler/META-INF/maven
 @dirrm tomcat5.5/components/sakai-comp-scheduler/META-INF
 @dirrm tomcat5.5/components/sakai-comp-scheduler
-@dirrm tomcat5.5/components/sakai-comp-help/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-comp-help/WEB-INF/lib
 @dirrm tomcat5.5/components/sakai-comp-help/WEB-INF/classes/org/sakaiproject/component/app/help
 @dirrm tomcat5.5/components/sakai-comp-help/WEB-INF/classes/org/sakaiproject/component/app
@@ -1137,132 +1452,149 @@ tomcat5.5/webapps/web.war
 @dirrm tomcat5.5/components/sakai-comp-help/WEB-INF/classes/org
 @dirrm tomcat5.5/components/sakai-comp-help/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-comp-help/WEB-INF
+@dirrm tomcat5.5/components/sakai-comp-help/META-INF/maven/org.sakaiproject/sakai-comp-help
+@dirrm tomcat5.5/components/sakai-comp-help/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-comp-help/META-INF/maven
 @dirrm tomcat5.5/components/sakai-comp-help/META-INF
 @dirrm tomcat5.5/components/sakai-comp-help
-@dirrm tomcat5.5/components/sakai-common-components/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-common-components/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-common-components/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-common-components/WEB-INF
+@dirrm tomcat5.5/components/sakai-common-components/META-INF/maven/org.sakaiproject/sakai-common-components
+@dirrm tomcat5.5/components/sakai-common-components/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-common-components/META-INF/maven
 @dirrm tomcat5.5/components/sakai-common-components/META-INF
 @dirrm tomcat5.5/components/sakai-common-components
-@dirrm tomcat5.5/components/sakai-cluster-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-cluster-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-cluster-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-cluster-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-cluster-pack/META-INF/maven/org.sakaiproject/sakai-cluster-pack
+@dirrm tomcat5.5/components/sakai-cluster-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-cluster-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-cluster-pack/META-INF
 @dirrm tomcat5.5/components/sakai-cluster-pack
-@dirrm tomcat5.5/components/sakai-citations-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-citations-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-citations-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-citations-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-citations-pack/META-INF/maven/org.sakaiproject/sakai-citations-pack
+@dirrm tomcat5.5/components/sakai-citations-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-citations-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-citations-pack/META-INF
 @dirrm tomcat5.5/components/sakai-citations-pack
-@dirrm tomcat5.5/components/sakai-chat-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-chat-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-chat-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-chat-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-chat-pack/META-INF/maven/org.sakaiproject/sakai-chat-pack
+@dirrm tomcat5.5/components/sakai-chat-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-chat-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-chat-pack/META-INF
 @dirrm tomcat5.5/components/sakai-chat-pack
-@dirrm tomcat5.5/components/sakai-calendar-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-calendar-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-calendar-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-calendar-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-calendar-pack/META-INF/maven/org.sakaiproject/sakai-calendar-pack
+@dirrm tomcat5.5/components/sakai-calendar-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-calendar-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-calendar-pack/META-INF
 @dirrm tomcat5.5/components/sakai-calendar-pack
-@dirrm tomcat5.5/components/sakai-authz-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-authz-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-authz-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-authz-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-authz-pack/META-INF/maven/org.sakaiproject/sakai-authz-pack
+@dirrm tomcat5.5/components/sakai-authz-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-authz-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-authz-pack/META-INF
 @dirrm tomcat5.5/components/sakai-authz-pack
-@dirrm tomcat5.5/components/sakai-assignment-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-assignment-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-assignment-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-assignment-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-assignment-pack/META-INF/maven/org.sakaiproject/sakai-assignment-pack
+@dirrm tomcat5.5/components/sakai-assignment-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-assignment-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-assignment-pack/META-INF
 @dirrm tomcat5.5/components/sakai-assignment-pack
-@dirrm tomcat5.5/components/sakai-archive-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-archive-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-archive-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-archive-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-archive-pack/META-INF/maven/org.sakaiproject/sakai-archive-pack
+@dirrm tomcat5.5/components/sakai-archive-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-archive-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-archive-pack/META-INF
 @dirrm tomcat5.5/components/sakai-archive-pack
-@dirrm tomcat5.5/components/sakai-announcement-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-announcement-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-announcement-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-announcement-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-announcement-pack/META-INF/maven/org.sakaiproject/sakai-announcement-pack
+@dirrm tomcat5.5/components/sakai-announcement-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-announcement-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-announcement-pack/META-INF
 @dirrm tomcat5.5/components/sakai-announcement-pack
-@dirrm tomcat5.5/components/sakai-alias-pack/WEB-INF/tld
 @dirrm tomcat5.5/components/sakai-alias-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/sakai-alias-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/sakai-alias-pack/WEB-INF
+@dirrm tomcat5.5/components/sakai-alias-pack/META-INF/maven/org.sakaiproject/sakai-alias-pack
+@dirrm tomcat5.5/components/sakai-alias-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/sakai-alias-pack/META-INF/maven
 @dirrm tomcat5.5/components/sakai-alias-pack/META-INF
 @dirrm tomcat5.5/components/sakai-alias-pack
-@dirrm tomcat5.5/components/osp-wizard-components/WEB-INF/tld
 @dirrm tomcat5.5/components/osp-wizard-components/WEB-INF/lib
-@dirrm tomcat5.5/components/osp-wizard-components/WEB-INF/classes
 @dirrm tomcat5.5/components/osp-wizard-components/WEB-INF
+@dirrm tomcat5.5/components/osp-wizard-components/META-INF/maven/org.sakaiproject.osp/osp-wizard-components
+@dirrm tomcat5.5/components/osp-wizard-components/META-INF/maven/org.sakaiproject.osp
+@dirrm tomcat5.5/components/osp-wizard-components/META-INF/maven
 @dirrm tomcat5.5/components/osp-wizard-components/META-INF
 @dirrm tomcat5.5/components/osp-wizard-components
-@dirrm tomcat5.5/components/osp-warehouse-component/WEB-INF/tld
 @dirrm tomcat5.5/components/osp-warehouse-component/WEB-INF/lib
-@dirrm tomcat5.5/components/osp-warehouse-component/WEB-INF/classes
 @dirrm tomcat5.5/components/osp-warehouse-component/WEB-INF
+@dirrm tomcat5.5/components/osp-warehouse-component/META-INF/maven/org.sakaiproject.osp/osp-warehouse-component
+@dirrm tomcat5.5/components/osp-warehouse-component/META-INF/maven/org.sakaiproject.osp
+@dirrm tomcat5.5/components/osp-warehouse-component/META-INF/maven
 @dirrm tomcat5.5/components/osp-warehouse-component/META-INF
 @dirrm tomcat5.5/components/osp-warehouse-component
-@dirrm tomcat5.5/components/osp-reports-components/WEB-INF/tld
-@dirrm tomcat5.5/components/osp-reports-components/WEB-INF/lib
-@dirrm tomcat5.5/components/osp-reports-components/WEB-INF/classes
-@dirrm tomcat5.5/components/osp-reports-components/WEB-INF
-@dirrm tomcat5.5/components/osp-reports-components/META-INF
-@dirrm tomcat5.5/components/osp-reports-components
-@dirrm tomcat5.5/components/osp-presentation-component/WEB-INF/tld
 @dirrm tomcat5.5/components/osp-presentation-component/WEB-INF/lib
-@dirrm tomcat5.5/components/osp-presentation-component/WEB-INF/classes
 @dirrm tomcat5.5/components/osp-presentation-component/WEB-INF
+@dirrm tomcat5.5/components/osp-presentation-component/META-INF/maven/org.sakaiproject.osp/osp-presentation-component
+@dirrm tomcat5.5/components/osp-presentation-component/META-INF/maven/org.sakaiproject.osp
+@dirrm tomcat5.5/components/osp-presentation-component/META-INF/maven
 @dirrm tomcat5.5/components/osp-presentation-component/META-INF
 @dirrm tomcat5.5/components/osp-presentation-component
-@dirrm tomcat5.5/components/osp-portal-component/WEB-INF/tld
 @dirrm tomcat5.5/components/osp-portal-component/WEB-INF/lib
-@dirrm tomcat5.5/components/osp-portal-component/WEB-INF/classes
 @dirrm tomcat5.5/components/osp-portal-component/WEB-INF
+@dirrm tomcat5.5/components/osp-portal-component/META-INF/maven/org.sakaiproject.osp/osp-portal-component
+@dirrm tomcat5.5/components/osp-portal-component/META-INF/maven/org.sakaiproject.osp
+@dirrm tomcat5.5/components/osp-portal-component/META-INF/maven
 @dirrm tomcat5.5/components/osp-portal-component/META-INF
 @dirrm tomcat5.5/components/osp-portal-component
-@dirrm tomcat5.5/components/osp-migration-component/WEB-INF/tld
-@dirrm tomcat5.5/components/osp-migration-component/WEB-INF/lib
-@dirrm tomcat5.5/components/osp-migration-component/WEB-INF/classes
-@dirrm tomcat5.5/components/osp-migration-component/WEB-INF
-@dirrm tomcat5.5/components/osp-migration-component/META-INF
-@dirrm tomcat5.5/components/osp-migration-component
-@dirrm tomcat5.5/components/osp-matrix-component/WEB-INF/tld
 @dirrm tomcat5.5/components/osp-matrix-component/WEB-INF/lib
-@dirrm tomcat5.5/components/osp-matrix-component/WEB-INF/classes
 @dirrm tomcat5.5/components/osp-matrix-component/WEB-INF
+@dirrm tomcat5.5/components/osp-matrix-component/META-INF/maven/org.sakaiproject.osp/osp-matrix-component
+@dirrm tomcat5.5/components/osp-matrix-component/META-INF/maven/org.sakaiproject.osp
+@dirrm tomcat5.5/components/osp-matrix-component/META-INF/maven
 @dirrm tomcat5.5/components/osp-matrix-component/META-INF
 @dirrm tomcat5.5/components/osp-matrix-component
-@dirrm tomcat5.5/components/osp-integration-component/WEB-INF/tld
 @dirrm tomcat5.5/components/osp-integration-component/WEB-INF/lib
-@dirrm tomcat5.5/components/osp-integration-component/WEB-INF/classes
 @dirrm tomcat5.5/components/osp-integration-component/WEB-INF
+@dirrm tomcat5.5/components/osp-integration-component/META-INF/maven/org.sakaiproject.osp/osp-integration-component
+@dirrm tomcat5.5/components/osp-integration-component/META-INF/maven/org.sakaiproject.osp
+@dirrm tomcat5.5/components/osp-integration-component/META-INF/maven
 @dirrm tomcat5.5/components/osp-integration-component/META-INF
 @dirrm tomcat5.5/components/osp-integration-component
-@dirrm tomcat5.5/components/osp-glossary-component/WEB-INF/tld
 @dirrm tomcat5.5/components/osp-glossary-component/WEB-INF/lib
-@dirrm tomcat5.5/components/osp-glossary-component/WEB-INF/classes
 @dirrm tomcat5.5/components/osp-glossary-component/WEB-INF
+@dirrm tomcat5.5/components/osp-glossary-component/META-INF/maven/org.sakaiproject.osp/osp-glossary-component
+@dirrm tomcat5.5/components/osp-glossary-component/META-INF/maven/org.sakaiproject.osp
+@dirrm tomcat5.5/components/osp-glossary-component/META-INF/maven
 @dirrm tomcat5.5/components/osp-glossary-component/META-INF
 @dirrm tomcat5.5/components/osp-glossary-component
-@dirrm tomcat5.5/components/osp-common-component/WEB-INF/tld
 @dirrm tomcat5.5/components/osp-common-component/WEB-INF/lib
-@dirrm tomcat5.5/components/osp-common-component/WEB-INF/classes
 @dirrm tomcat5.5/components/osp-common-component/WEB-INF
+@dirrm tomcat5.5/components/osp-common-component/META-INF/maven/org.sakaiproject.osp/osp-common-component
+@dirrm tomcat5.5/components/osp-common-component/META-INF/maven/org.sakaiproject.osp
+@dirrm tomcat5.5/components/osp-common-component/META-INF/maven
 @dirrm tomcat5.5/components/osp-common-component/META-INF
 @dirrm tomcat5.5/components/osp-common-component
-@dirrm tomcat5.5/components/000sakai-portal-service-pack/WEB-INF/tld
+@dirrm tomcat5.5/components/entitybroker-pack/WEB-INF/lib
+@dirrm tomcat5.5/components/entitybroker-pack/WEB-INF
+@dirrm tomcat5.5/components/entitybroker-pack/META-INF/maven/org.sakaiproject.entitybroker/entitybroker-pack
+@dirrm tomcat5.5/components/entitybroker-pack/META-INF/maven/org.sakaiproject.entitybroker
+@dirrm tomcat5.5/components/entitybroker-pack/META-INF/maven
+@dirrm tomcat5.5/components/entitybroker-pack/META-INF
+@dirrm tomcat5.5/components/entitybroker-pack
 @dirrm tomcat5.5/components/000sakai-portal-service-pack/WEB-INF/lib
-@dirrm tomcat5.5/components/000sakai-portal-service-pack/WEB-INF/classes
 @dirrm tomcat5.5/components/000sakai-portal-service-pack/WEB-INF
+@dirrm tomcat5.5/components/000sakai-portal-service-pack/META-INF/maven/org.sakaiproject/000sakai-portal-service-pack
+@dirrm tomcat5.5/components/000sakai-portal-service-pack/META-INF/maven/org.sakaiproject
+@dirrm tomcat5.5/components/000sakai-portal-service-pack/META-INF/maven
 @dirrm tomcat5.5/components/000sakai-portal-service-pack/META-INF
 @dirrm tomcat5.5/components/000sakai-portal-service-pack
 @dirrm tomcat5.5/components