5 files changed, 342 insertions, 202 deletions

diff --git a/www/cakephp13/Makefile b/www/cakephp13/Makefile
index e2ead565ed73..895d83109eb7 100644
--- a/www/cakephp13/Makefile
+++ b/www/cakephp13/Makefile
@@ -1,29 +1,31 @@
-# New ports collection makefile for:	cakephp-devel
-# Date created:        20 December 2007
-# Whom:                Greg Larkin <glarkin@FreeBSD.org>
+# New ports collection makefile for:	cakephp13
+# Date created:        			19 September 2011
+# Whom:                			Christoph Theis <theis@gmx.at>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cakephp
-PORTVERSION=	1.2.10
+PORTVERSION=	1.3.11
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/tarball/${PORTVERSION}/ \
 		LOCAL/glarkin
 DISTNAME=	${PORTNAME}-${PORTNAME}-${PORTVERSION}-${GITVERSION}
 
-MAINTAINER=	glarkin@FreeBSD.org
+MAINTAINER=	theis@gmx.at
 COMMENT=	A framework for developing PHP web applications
 
-GITVERSION=	0-ge6e50e8
+GITVERSION=	4-g762fcf2
 FETCH_ARGS=	-pRr
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-da67eb8
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-3b830a4
+
+LICENSE=	MIT
 
 PORTDOCS=	README
 
 SLAVE_PORT_MODULES=	rewrite
 
-CONFLICTS=	cakephp-1.[13].*
+CONFLICTS=	cakephp-1.[12].*
 
 NO_BUILD=	yes
 USE_GETTEXT=	yes
diff --git a/www/cakephp13/distinfo b/www/cakephp13/distinfo
index 5fc258ee83ad..93fe96a5fe70 100644
--- a/www/cakephp13/distinfo
+++ b/www/cakephp13/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cakephp-cakephp-1.2.10-0-ge6e50e8.tar.gz) = 6ea54c44406c400c87c39da551284c8aa92ce0ace5c3fb2bd0e18ea22c1598c8
-SIZE (cakephp-cakephp-1.2.10-0-ge6e50e8.tar.gz) = 841546
+SHA256 (cakephp-cakephp-1.3.11-4-g762fcf2.tar.gz) = 7d49129bc3e5637dea2684020fd01db381bbcdb4cb32dbbcbe4a4e8bbdc235b7
+SIZE (cakephp-cakephp-1.3.11-4-g762fcf2.tar.gz) = 983115
diff --git a/www/cakephp13/files/extra-patch-app__config__core.php b/www/cakephp13/files/extra-patch-app__config__core.php
index e5f26ff9da25..d8f43a8e155f 100644
--- a/www/cakephp13/files/extra-patch-app__config__core.php
+++ b/www/cakephp13/files/extra-patch-app__config__core.php
@@ -1,11 +1,11 @@
---- ./app/config/core.php.orig	2008-10-02 00:56:53.000000000 -0400
-+++ ./app/config/core.php	2008-10-08 08:42:15.000000000 -0400
-@@ -56,7 +56,7 @@
+--- ./app/config/core.php.orig	2011-07-26 13:46:14.000000000 -0400
++++ ./app/config/core.php	2011-09-16 14:24:26.000000000 -0400
+@@ -66,7 +66,7 @@
   *
   * And uncomment the App.baseUrl below:
   */
 -	//Configure::write('App.baseUrl', env('SCRIPT_NAME'));
 +	Configure::write('App.baseUrl', env('SCRIPT_NAME'));
+ 
  /**
-  * Uncomment the define below to use CakePHP admin routes.
-  *
+  * Uncomment the define below to use CakePHP prefix routes.
diff --git a/www/cakephp13/files/patch-cake__console__cake b/www/cakephp13/files/patch-cake__console__cake
index ca268e41f821..dbf9ba921362 100644
--- a/www/cakephp13/files/patch-cake__console__cake
+++ b/www/cakephp13/files/patch-cake__console__cake
@@ -1,15 +1,15 @@
---- ./cake/console/cake.orig	2009-04-21 16:16:45.000000000 -0400
-+++ ./cake/console/cake	2009-04-21 16:16:54.000000000 -0400
+--- ./cake/console/cake.orig	2011-07-26 13:46:14.000000000 -0400
++++ ./cake/console/cake	2011-09-19 14:44:33.000000000 -0400
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  ################################################################################
  #
  # Bake is a shell script for running CakePHP bake script
-@@ -24,9 +24,9 @@
+@@ -18,9 +18,9 @@
+ # @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
+ #
  ################################################################################
- clear
- 
 -LIB=${0/%cake/}
 +LIB=${0%cake}
  APP=`pwd`
diff --git a/www/cakephp13/pkg-plist b/www/cakephp13/pkg-plist
index 1d7da6fce83e..2285593db26f 100644
--- a/www/cakephp13/pkg-plist
+++ b/www/cakephp13/pkg-plist
@@ -13,27 +13,24 @@
 @unexec if cmp -s %D/%%WWWDIR%%/app/config/database.php.default %D/%%WWWDIR%%/app/config/database.php; then rm -f %D/%%WWWDIR%%/app/config/database.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/app/config/database.php has not been removed"; fi
 %%WWWDIR%%/app/config/database.php.default
 @exec if [ ! -f %D/%%WWWDIR%%/app/config/database.php ]; then cp -p %D/%F %B/database.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/app/config/database.php has not been overwritten"; fi
-@unexec if cmp -s %D/%%WWWDIR%%/app/config/inflections.php.default %D/%%WWWDIR%%/app/config/inflections.php; then rm -f %D/%%WWWDIR%%/app/config/inflections.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/app/config/inflections.php has not been removed"; fi
-%%WWWDIR%%/app/config/inflections.php.default
-@exec if [ ! -f %D/%%WWWDIR%%/app/config/inflections.php.default ]; then cp -p %B/inflections.php %B/inflections.php.default; fi
 @unexec if cmp -s %D/%%WWWDIR%%/app/config/routes.php.default %D/%%WWWDIR%%/app/config/routes.php; then rm -f %D/%%WWWDIR%%/app/config/routes.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/app/config/routes.php has not been removed"; fi
 %%WWWDIR%%/app/config/routes.php.default
 @exec if [ ! -f %D/%%WWWDIR%%/app/config/routes.php.default ]; then cp -p %B/routes.php %B/routes.php.default; fi
-%%WWWDIR%%/app/config/sql/db_acl.php
-%%WWWDIR%%/app/config/sql/db_acl.sql
-%%WWWDIR%%/app/config/sql/i18n.php
-%%WWWDIR%%/app/config/sql/i18n.sql
-%%WWWDIR%%/app/config/sql/sessions.php
-%%WWWDIR%%/app/config/sql/sessions.sql
+%%WWWDIR%%/app/config/schema/db_acl.php
+%%WWWDIR%%/app/config/schema/i18n.php
+%%WWWDIR%%/app/config/schema/sessions.php
 %%WWWDIR%%/app/index.php
 %%HTACCESS%%%%WWWDIR%%/app/webroot/.htaccess
 %%WWWDIR%%/app/webroot/css.php
 %%WWWDIR%%/app/webroot/css/cake.generic.css
 %%WWWDIR%%/app/webroot/favicon.ico
-%%WWWDIR%%/app/webroot/img/cake.icon.gif
+%%WWWDIR%%/app/webroot/img/cake.icon.png
 %%WWWDIR%%/app/webroot/img/cake.power.gif
+%%WWWDIR%%/app/webroot/img/test-error-icon.png
+%%WWWDIR%%/app/webroot/img/test-fail-icon.png
+%%WWWDIR%%/app/webroot/img/test-pass-icon.png
+%%WWWDIR%%/app/webroot/img/test-skip-icon.png
 %%WWWDIR%%/app/webroot/index.php
-%%WWWDIR%%/app/webroot/js/vendors.php
 %%WWWDIR%%/app/webroot/test.php
 %%WWWDIR%%/cake/LICENSE.txt
 %%WWWDIR%%/cake/VERSION.txt
@@ -69,55 +66,65 @@
 %%WWWDIR%%/cake/console/libs/i18n.php
 %%WWWDIR%%/cake/console/libs/schema.php
 %%WWWDIR%%/cake/console/libs/shell.php
+%%WWWDIR%%/cake/console/libs/tasks/bake.php
 %%WWWDIR%%/cake/console/libs/tasks/controller.php
 %%WWWDIR%%/cake/console/libs/tasks/db_config.php
 %%WWWDIR%%/cake/console/libs/tasks/extract.php
+%%WWWDIR%%/cake/console/libs/tasks/fixture.php
 %%WWWDIR%%/cake/console/libs/tasks/model.php
 %%WWWDIR%%/cake/console/libs/tasks/plugin.php
 %%WWWDIR%%/cake/console/libs/tasks/project.php
+%%WWWDIR%%/cake/console/libs/tasks/template.php
 %%WWWDIR%%/cake/console/libs/tasks/test.php
 %%WWWDIR%%/cake/console/libs/tasks/view.php
-%%HTACCESS%%%%WWWDIR%%/cake/console/libs/templates/skel/.htaccess
-%%WWWDIR%%/cake/console/libs/templates/skel/app_controller.php
-%%WWWDIR%%/cake/console/libs/templates/skel/app_helper.php
-%%WWWDIR%%/cake/console/libs/templates/skel/app_model.php
-%%WWWDIR%%/cake/console/libs/templates/skel/config/acl.ini.php
-%%WWWDIR%%/cake/console/libs/templates/skel/config/bootstrap.php
-%%WWWDIR%%/cake/console/libs/templates/skel/config/core.php
-%%WWWDIR%%/cake/console/libs/templates/skel/config/database.php.default
-%%WWWDIR%%/cake/console/libs/templates/skel/config/inflections.php
-%%WWWDIR%%/cake/console/libs/templates/skel/config/routes.php
-%%WWWDIR%%/cake/console/libs/templates/skel/config/sql/db_acl.php
-%%WWWDIR%%/cake/console/libs/templates/skel/config/sql/db_acl.sql
-%%WWWDIR%%/cake/console/libs/templates/skel/config/sql/i18n.php
-%%WWWDIR%%/cake/console/libs/templates/skel/config/sql/i18n.sql
-%%WWWDIR%%/cake/console/libs/templates/skel/config/sql/sessions.php
-%%WWWDIR%%/cake/console/libs/templates/skel/config/sql/sessions.sql
-%%WWWDIR%%/cake/console/libs/templates/skel/controllers/pages_controller.php
-%%WWWDIR%%/cake/console/libs/templates/skel/index.php
-%%WWWDIR%%/cake/console/libs/templates/skel/views/elements/email/html/default.ctp
-%%WWWDIR%%/cake/console/libs/templates/skel/views/elements/email/text/default.ctp
-%%WWWDIR%%/cake/console/libs/templates/skel/views/layouts/ajax.ctp
-%%WWWDIR%%/cake/console/libs/templates/skel/views/layouts/default.ctp
-%%WWWDIR%%/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
-%%WWWDIR%%/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
-%%WWWDIR%%/cake/console/libs/templates/skel/views/layouts/flash.ctp
-%%WWWDIR%%/cake/console/libs/templates/skel/views/layouts/js/default.ctp
-%%WWWDIR%%/cake/console/libs/templates/skel/views/layouts/rss/default.ctp
-%%WWWDIR%%/cake/console/libs/templates/skel/views/layouts/xml/default.ctp
-%%HTACCESS%%%%WWWDIR%%/cake/console/libs/templates/skel/webroot/.htaccess
-%%WWWDIR%%/cake/console/libs/templates/skel/webroot/css.php
-%%WWWDIR%%/cake/console/libs/templates/skel/webroot/css/cake.generic.css
-%%WWWDIR%%/cake/console/libs/templates/skel/webroot/favicon.ico
-%%WWWDIR%%/cake/console/libs/templates/skel/webroot/img/cake.icon.gif
-%%WWWDIR%%/cake/console/libs/templates/skel/webroot/img/cake.power.gif
-%%WWWDIR%%/cake/console/libs/templates/skel/webroot/index.php
-%%WWWDIR%%/cake/console/libs/templates/skel/webroot/js/vendors.php
-%%WWWDIR%%/cake/console/libs/templates/skel/webroot/test.php
-%%WWWDIR%%/cake/console/libs/templates/views/form.ctp
-%%WWWDIR%%/cake/console/libs/templates/views/home.ctp
-%%WWWDIR%%/cake/console/libs/templates/views/index.ctp
-%%WWWDIR%%/cake/console/libs/templates/views/view.ctp
+%%WWWDIR%%/cake/console/templates/default/actions/controller_actions.ctp
+%%WWWDIR%%/cake/console/templates/default/classes/controller.ctp
+%%WWWDIR%%/cake/console/templates/default/classes/fixture.ctp
+%%WWWDIR%%/cake/console/templates/default/classes/model.ctp
+%%WWWDIR%%/cake/console/templates/default/classes/test.ctp
+%%WWWDIR%%/cake/console/templates/default/views/form.ctp
+%%WWWDIR%%/cake/console/templates/default/views/home.ctp
+%%WWWDIR%%/cake/console/templates/default/views/index.ctp
+%%WWWDIR%%/cake/console/templates/default/views/view.ctp
+%%HTACCESS%%%%WWWDIR%%/cake/console/templates/skel/.htaccess
+%%WWWDIR%%/cake/console/templates/skel/app_controller.php
+%%WWWDIR%%/cake/console/templates/skel/app_helper.php
+%%WWWDIR%%/cake/console/templates/skel/app_model.php
+%%WWWDIR%%/cake/console/templates/skel/config/acl.ini.php
+%%WWWDIR%%/cake/console/templates/skel/config/bootstrap.php
+%%WWWDIR%%/cake/console/templates/skel/config/core.php
+%%WWWDIR%%/cake/console/templates/skel/config/database.php.default
+%%WWWDIR%%/cake/console/templates/skel/config/routes.php
+%%WWWDIR%%/cake/console/templates/skel/config/schema/db_acl.php
+%%WWWDIR%%/cake/console/templates/skel/config/schema/db_acl.sql
+%%WWWDIR%%/cake/console/templates/skel/config/schema/i18n.php
+%%WWWDIR%%/cake/console/templates/skel/config/schema/i18n.sql
+%%WWWDIR%%/cake/console/templates/skel/config/schema/sessions.php
+%%WWWDIR%%/cake/console/templates/skel/config/schema/sessions.sql
+%%WWWDIR%%/cake/console/templates/skel/controllers/pages_controller.php
+%%WWWDIR%%/cake/console/templates/skel/index.php
+%%WWWDIR%%/cake/console/templates/skel/views/elements/email/html/default.ctp
+%%WWWDIR%%/cake/console/templates/skel/views/elements/email/text/default.ctp
+%%WWWDIR%%/cake/console/templates/skel/views/layouts/ajax.ctp
+%%WWWDIR%%/cake/console/templates/skel/views/layouts/default.ctp
+%%WWWDIR%%/cake/console/templates/skel/views/layouts/email/html/default.ctp
+%%WWWDIR%%/cake/console/templates/skel/views/layouts/email/text/default.ctp
+%%WWWDIR%%/cake/console/templates/skel/views/layouts/flash.ctp
+%%WWWDIR%%/cake/console/templates/skel/views/layouts/js/default.ctp
+%%WWWDIR%%/cake/console/templates/skel/views/layouts/rss/default.ctp
+%%WWWDIR%%/cake/console/templates/skel/views/layouts/xml/default.ctp
+%%HTACCESS%%%%WWWDIR%%/cake/console/templates/skel/webroot/.htaccess
+%%WWWDIR%%/cake/console/templates/skel/webroot/css.php
+%%WWWDIR%%/cake/console/templates/skel/webroot/css/cake.generic.css
+%%WWWDIR%%/cake/console/templates/skel/webroot/favicon.ico
+%%WWWDIR%%/cake/console/templates/skel/webroot/img/cake.icon.png
+%%WWWDIR%%/cake/console/templates/skel/webroot/img/cake.power.gif
+%%WWWDIR%%/cake/console/templates/skel/webroot/img/test-error-icon.png
+%%WWWDIR%%/cake/console/templates/skel/webroot/img/test-fail-icon.png
+%%WWWDIR%%/cake/console/templates/skel/webroot/img/test-pass-icon.png
+%%WWWDIR%%/cake/console/templates/skel/webroot/img/test-skip-icon.png
+%%WWWDIR%%/cake/console/templates/skel/webroot/index.php
+%%WWWDIR%%/cake/console/templates/skel/webroot/test.php
 %%WWWDIR%%/cake/console/libs/testsuite.php
 %%WWWDIR%%/cake/dispatcher.php
 %%WWWDIR%%/cake/libs/cache.php
@@ -126,6 +133,8 @@
 %%WWWDIR%%/cake/libs/cache/memcache.php
 %%WWWDIR%%/cake/libs/cache/xcache.php
 %%WWWDIR%%/cake/libs/cake_log.php
+%%WWWDIR%%/cake/libs/cake_session.php
+%%WWWDIR%%/cake/libs/cake_socket.php
 %%WWWDIR%%/cake/libs/class_registry.php
 %%WWWDIR%%/cake/libs/configure.php
 %%WWWDIR%%/cake/libs/controller/app_controller.php
@@ -143,36 +152,31 @@
 %%WWWDIR%%/cake/libs/debugger.php
 %%WWWDIR%%/cake/libs/error.php
 %%WWWDIR%%/cake/libs/file.php
-%%WWWDIR%%/cake/libs/flay.php
 %%WWWDIR%%/cake/libs/folder.php
 %%WWWDIR%%/cake/libs/http_socket.php
 %%WWWDIR%%/cake/libs/i18n.php
 %%WWWDIR%%/cake/libs/inflector.php
 %%WWWDIR%%/cake/libs/l10n.php
 %%WWWDIR%%/cake/libs/magic_db.php
+%%WWWDIR%%/cake/libs/log/file_log.php
 %%WWWDIR%%/cake/libs/model/app_model.php
-%%WWWDIR%%/cake/libs/model/behavior.php
 %%WWWDIR%%/cake/libs/model/behaviors/acl.php
 %%WWWDIR%%/cake/libs/model/behaviors/containable.php
 %%WWWDIR%%/cake/libs/model/behaviors/translate.php
 %%WWWDIR%%/cake/libs/model/behaviors/tree.php
+%%WWWDIR%%/cake/libs/model/cake_schema.php
 %%WWWDIR%%/cake/libs/model/connection_manager.php
 %%WWWDIR%%/cake/libs/model/datasources/datasource.php
-%%WWWDIR%%/cake/libs/model/datasources/dbo/dbo_adodb.php
-%%WWWDIR%%/cake/libs/model/datasources/dbo/dbo_db2.php
-%%WWWDIR%%/cake/libs/model/datasources/dbo/dbo_firebird.php
 %%WWWDIR%%/cake/libs/model/datasources/dbo/dbo_mssql.php
 %%WWWDIR%%/cake/libs/model/datasources/dbo/dbo_mysql.php
 %%WWWDIR%%/cake/libs/model/datasources/dbo/dbo_mysqli.php
-%%WWWDIR%%/cake/libs/model/datasources/dbo/dbo_odbc.php
 %%WWWDIR%%/cake/libs/model/datasources/dbo/dbo_oracle.php
 %%WWWDIR%%/cake/libs/model/datasources/dbo/dbo_postgres.php
 %%WWWDIR%%/cake/libs/model/datasources/dbo/dbo_sqlite.php
-%%WWWDIR%%/cake/libs/model/datasources/dbo/dbo_sybase.php
 %%WWWDIR%%/cake/libs/model/datasources/dbo_source.php
 %%WWWDIR%%/cake/libs/model/db_acl.php
 %%WWWDIR%%/cake/libs/model/model.php
-%%WWWDIR%%/cake/libs/model/schema.php
+%%WWWDIR%%/cake/libs/model/model_behavior.php
 %%WWWDIR%%/cake/libs/multibyte.php
 %%WWWDIR%%/cake/libs/object.php
 %%WWWDIR%%/cake/libs/overloadable.php
@@ -181,16 +185,17 @@
 %%WWWDIR%%/cake/libs/router.php
 %%WWWDIR%%/cake/libs/sanitize.php
 %%WWWDIR%%/cake/libs/security.php
-%%WWWDIR%%/cake/libs/session.php
 %%WWWDIR%%/cake/libs/set.php
-%%WWWDIR%%/cake/libs/socket.php
 %%WWWDIR%%/cake/libs/string.php
 %%WWWDIR%%/cake/libs/validation.php
-%%WWWDIR%%/cake/libs/view/elements/dump.ctp
+%%WWWDIR%%/cake/libs/view/elements/sql_dump.ctp
 %%WWWDIR%%/cake/libs/view/elements/email/html/default.ctp
 %%WWWDIR%%/cake/libs/view/elements/email/text/default.ctp
 %%WWWDIR%%/cake/libs/view/errors/error404.ctp
+%%WWWDIR%%/cake/libs/view/errors/error500.ctp
 %%WWWDIR%%/cake/libs/view/errors/missing_action.ctp
+%%WWWDIR%%/cake/libs/view/errors/missing_behavior_class.ctp
+%%WWWDIR%%/cake/libs/view/errors/missing_behavior_file.ctp
 %%WWWDIR%%/cake/libs/view/errors/missing_component_class.ctp
 %%WWWDIR%%/cake/libs/view/errors/missing_component_file.ctp
 %%WWWDIR%%/cake/libs/view/errors/missing_connection.ctp
@@ -211,9 +216,12 @@
 %%WWWDIR%%/cake/libs/view/helpers/form.php
 %%WWWDIR%%/cake/libs/view/helpers/html.php
 %%WWWDIR%%/cake/libs/view/helpers/javascript.php
+%%WWWDIR%%/cake/libs/view/helpers/jquery_engine.php
 %%WWWDIR%%/cake/libs/view/helpers/js.php
+%%WWWDIR%%/cake/libs/view/helpers/mootools_engine.php
 %%WWWDIR%%/cake/libs/view/helpers/number.php
 %%WWWDIR%%/cake/libs/view/helpers/paginator.php
+%%WWWDIR%%/cake/libs/view/helpers/prototype_engine.php
 %%WWWDIR%%/cake/libs/view/helpers/rss.php
 %%WWWDIR%%/cake/libs/view/helpers/session.php
 %%WWWDIR%%/cake/libs/view/helpers/text.php
@@ -239,11 +247,19 @@
 %%WWWDIR%%/cake/tests/cases/console/cake.test.php
 %%WWWDIR%%/cake/tests/cases/console/libs/acl.test.php
 %%WWWDIR%%/cake/tests/cases/console/libs/api.test.php
+%%WWWDIR%%/cake/tests/cases/console/libs/bake.test.php
 %%WWWDIR%%/cake/tests/cases/console/libs/schema.test.php
 %%WWWDIR%%/cake/tests/cases/console/libs/shell.test.php
+%%WWWDIR%%/cake/tests/cases/console/libs/tasks/controller.test.php
+%%WWWDIR%%/cake/tests/cases/console/libs/tasks/db_config.test.php
 %%WWWDIR%%/cake/tests/cases/console/libs/tasks/extract.test.php
+%%WWWDIR%%/cake/tests/cases/console/libs/tasks/fixture.test.php
 %%WWWDIR%%/cake/tests/cases/console/libs/tasks/model.test.php
+%%WWWDIR%%/cake/tests/cases/console/libs/tasks/plugin.test.php
+%%WWWDIR%%/cake/tests/cases/console/libs/tasks/project.test.php
+%%WWWDIR%%/cake/tests/cases/console/libs/tasks/template.test.php
 %%WWWDIR%%/cake/tests/cases/console/libs/tasks/test.test.php
+%%WWWDIR%%/cake/tests/cases/console/libs/tasks/view.test.php
 %%WWWDIR%%/cake/tests/cases/dispatcher.test.php
 %%WWWDIR%%/cake/tests/cases/libs/cache.test.php
 %%WWWDIR%%/cake/tests/cases/libs/cache/apc.test.php
@@ -251,6 +267,8 @@
 %%WWWDIR%%/cake/tests/cases/libs/cache/memcache.test.php
 %%WWWDIR%%/cake/tests/cases/libs/cache/xcache.test.php
 %%WWWDIR%%/cake/tests/cases/libs/cake_log.test.php
+%%WWWDIR%%/cake/tests/cases/libs/cake_session.test.php
+%%WWWDIR%%/cake/tests/cases/libs/cake_socket.test.php
 %%WWWDIR%%/cake/tests/cases/libs/cake_test_case.test.php
 %%WWWDIR%%/cake/tests/cases/libs/cake_test_fixture.test.php
 %%WWWDIR%%/cake/tests/cases/libs/class_registry.test.php
@@ -271,20 +289,19 @@
 %%WWWDIR%%/cake/tests/cases/libs/debugger.test.php
 %%WWWDIR%%/cake/tests/cases/libs/error.test.php
 %%WWWDIR%%/cake/tests/cases/libs/file.test.php
-%%WWWDIR%%/cake/tests/cases/libs/flay.test.php
 %%WWWDIR%%/cake/tests/cases/libs/folder.test.php
 %%WWWDIR%%/cake/tests/cases/libs/http_socket.test.php
 %%WWWDIR%%/cake/tests/cases/libs/i18n.test.php
 %%WWWDIR%%/cake/tests/cases/libs/inflector.test.php
 %%WWWDIR%%/cake/tests/cases/libs/l10n.test.php
 %%WWWDIR%%/cake/tests/cases/libs/magic_db.test.php
-%%WWWDIR%%/cake/tests/cases/libs/model/behavior.test.php
+%%WWWDIR%%/cake/tests/cases/libs/log/file_log.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/behaviors/acl.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/behaviors/containable.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/behaviors/translate.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/behaviors/tree.test.php
+%%WWWDIR%%/cake/tests/cases/libs/model/cake_schema.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/connection_manager.test.php
-%%WWWDIR%%/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
@@ -294,22 +311,20 @@
 %%WWWDIR%%/cake/tests/cases/libs/model/datasources/dbo_source.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/db_acl.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/model.test.php
+%%WWWDIR%%/cake/tests/cases/libs/model/model_behavior.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/model_delete.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/model_integration.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/model_read.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/model_validation.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/model_write.test.php
 %%WWWDIR%%/cake/tests/cases/libs/model/models.php
-%%WWWDIR%%/cake/tests/cases/libs/model/schema.test.php
 %%WWWDIR%%/cake/tests/cases/libs/multibyte.test.php
 %%WWWDIR%%/cake/tests/cases/libs/object.test.php
 %%WWWDIR%%/cake/tests/cases/libs/overloadable.test.php
 %%WWWDIR%%/cake/tests/cases/libs/router.test.php
 %%WWWDIR%%/cake/tests/cases/libs/sanitize.test.php
 %%WWWDIR%%/cake/tests/cases/libs/security.test.php
-%%WWWDIR%%/cake/tests/cases/libs/session.test.php
 %%WWWDIR%%/cake/tests/cases/libs/set.test.php
-%%WWWDIR%%/cake/tests/cases/libs/socket.test.php
 %%WWWDIR%%/cake/tests/cases/libs/string.test.php
 %%WWWDIR%%/cake/tests/cases/libs/test_manager.test.php
 %%WWWDIR%%/cake/tests/cases/libs/validation.test.php
@@ -319,14 +334,18 @@
 %%WWWDIR%%/cake/tests/cases/libs/view/helpers/form.test.php
 %%WWWDIR%%/cake/tests/cases/libs/view/helpers/html.test.php
 %%WWWDIR%%/cake/tests/cases/libs/view/helpers/javascript.test.php
+%%WWWDIR%%/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
 %%WWWDIR%%/cake/tests/cases/libs/view/helpers/js.test.php
+%%WWWDIR%%/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
 %%WWWDIR%%/cake/tests/cases/libs/view/helpers/number.test.php
 %%WWWDIR%%/cake/tests/cases/libs/view/helpers/paginator.test.php
+%%WWWDIR%%/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
 %%WWWDIR%%/cake/tests/cases/libs/view/helpers/rss.test.php
 %%WWWDIR%%/cake/tests/cases/libs/view/helpers/session.test.php
 %%WWWDIR%%/cake/tests/cases/libs/view/helpers/text.test.php
 %%WWWDIR%%/cake/tests/cases/libs/view/helpers/time.test.php
 %%WWWDIR%%/cake/tests/cases/libs/view/helpers/xml.test.php
+%%WWWDIR%%/cake/tests/cases/libs/view/media.test.php
 %%WWWDIR%%/cake/tests/cases/libs/view/theme.test.php
 %%WWWDIR%%/cake/tests/cases/libs/view/view.test.php
 %%WWWDIR%%/cake/tests/cases/libs/xml.test.php
@@ -409,6 +428,7 @@
 %%WWWDIR%%/cake/tests/fixtures/portfolio_fixture.php
 %%WWWDIR%%/cake/tests/fixtures/post_fixture.php
 %%WWWDIR%%/cake/tests/fixtures/posts_tag_fixture.php
+%%WWWDIR%%/cake/tests/fixtures/prefix_test_fixture.php
 %%WWWDIR%%/cake/tests/fixtures/primary_model_fixture.php
 %%WWWDIR%%/cake/tests/fixtures/product_fixture.php
 %%WWWDIR%%/cake/tests/fixtures/product_update_all_fixture.php
@@ -443,6 +463,8 @@
 %%WWWDIR%%/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
 %%WWWDIR%%/cake/tests/fixtures/uuidportfolio_fixture.php
 %%WWWDIR%%/cake/tests/groups/acl.group.php
+%%WWWDIR%%/cake/tests/groups/bake.group.php
+%%WWWDIR%%/cake/tests/groups/behaviors.group.php
 %%WWWDIR%%/cake/tests/groups/cache.group.php
 %%WWWDIR%%/cake/tests/groups/components.group.php
 %%WWWDIR%%/cake/tests/groups/configure.group.php
@@ -450,6 +472,8 @@
 %%WWWDIR%%/cake/tests/groups/controller.group.php
 %%WWWDIR%%/cake/tests/groups/database.group.php
 %%WWWDIR%%/cake/tests/groups/helpers.group.php
+%%WWWDIR%%/cake/tests/groups/i18n.group.php
+%%WWWDIR%%/cake/tests/groups/javascript.group.php
 %%WWWDIR%%/cake/tests/groups/lib.group.php
 %%WWWDIR%%/cake/tests/groups/model.group.php
 %%WWWDIR%%/cake/tests/groups/no_cross_contamination.group.php
@@ -458,27 +482,35 @@
 %%WWWDIR%%/cake/tests/groups/test_suite.group.php
 %%WWWDIR%%/cake/tests/groups/view.group.php
 %%WWWDIR%%/cake/tests/groups/xml.group.php
-%%WWWDIR%%/cake/tests/lib/cake_reporter.php
 %%WWWDIR%%/cake/tests/lib/cake_test_case.php
 %%WWWDIR%%/cake/tests/lib/cake_test_fixture.php
 %%WWWDIR%%/cake/tests/lib/cake_test_model.php
+%%WWWDIR%%/cake/tests/lib/cake_test_suite_dispatcher.php
 %%WWWDIR%%/cake/tests/lib/cake_web_test_case.php
-%%WWWDIR%%/cake/tests/lib/cli_reporter.php
 %%WWWDIR%%/cake/tests/lib/code_coverage_manager.php
-%%WWWDIR%%/cake/tests/lib/content.php
-%%WWWDIR%%/cake/tests/lib/footer.php
-%%WWWDIR%%/cake/tests/lib/header.php
-%%WWWDIR%%/cake/tests/lib/simpletest.php
+%%WWWDIR%%/cake/tests/lib/reporter/cake_base_reporter.php
+%%WWWDIR%%/cake/tests/lib/reporter/cake_cli_reporter.php
+%%WWWDIR%%/cake/tests/lib/reporter/cake_html_reporter.php
+%%WWWDIR%%/cake/tests/lib/reporter/cake_text_reporter.php
+%%WWWDIR%%/cake/tests/lib/templates/footer.php
+%%WWWDIR%%/cake/tests/lib/templates/header.php
+%%WWWDIR%%/cake/tests/lib/templates/menu.php
+%%WWWDIR%%/cake/tests/lib/templates/simpletest.php
+%%WWWDIR%%/cake/tests/lib/templates/xdebug.php
 %%WWWDIR%%/cake/tests/lib/test_manager.php
-%%WWWDIR%%/cake/tests/lib/xdebug.php
 %%WWWDIR%%/cake/tests/test_app/config/acl.ini.php
 %%WWWDIR%%/cake/tests/test_app/controllers/tests_apps_controller.php
 %%WWWDIR%%/cake/tests/test_app/controllers/tests_apps_posts_controller.php
+%%WWWDIR%%/cake/tests/test_app/libs/cache/test_app_cache.php
+%%WWWDIR%%/cake/tests/test_app/libs/library.php
+%%WWWDIR%%/cake/tests/test_app/libs/log/test_app_log.php
 %%WWWDIR%%/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po
 %%WWWDIR%%/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po
 %%WWWDIR%%/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po
+%%WWWDIR%%/cake/tests/test_app/locale/ja_jp/LC_TIME
 %%WWWDIR%%/cake/tests/test_app/locale/po/LC_MESSAGES/default.po
 %%WWWDIR%%/cake/tests/test_app/locale/po/LC_MONETARY/default.po
+%%WWWDIR%%/cake/tests/test_app/locale/po/LC_TIME
 %%WWWDIR%%/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo
 %%WWWDIR%%/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo
 %%WWWDIR%%/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po
@@ -539,40 +571,63 @@
 %%WWWDIR%%/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo
 %%WWWDIR%%/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po
 %%WWWDIR%%/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po
+%%WWWDIR%%/cake/tests/test_app/locale/time_test/LC_TIME
 %%WWWDIR%%/cake/tests/test_app/models/behaviors/persister_one_behavior.php
 %%WWWDIR%%/cake/tests/test_app/models/behaviors/persister_two_behavior.php
+%%WWWDIR%%/cake/tests/test_app/models/datasources/test/test_local_driver.php
+%%WWWDIR%%/cake/tests/test_app/models/datasources/test2_other_source.php
+%%WWWDIR%%/cake/tests/test_app/models/datasources/test2_source.php
 %%WWWDIR%%/cake/tests/test_app/models/comment.php
 %%WWWDIR%%/cake/tests/test_app/models/persister_one.php
 %%WWWDIR%%/cake/tests/test_app/models/persister_two.php
 %%WWWDIR%%/cake/tests/test_app/models/post.php
-%%WWWDIR%%/cake/tests/test_app/plugins/plugin_js/vendors/js/plugin_js.js
+%%WWWDIR%%/cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js
+%%WWWDIR%%/cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/config/load.php
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/config/more.load.php
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models/datasources/test/test_driver.php
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
-%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/css/test_plugin_asset.css
-%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/img/cake.icon.gif
-%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/js/test_plugin/test.js
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
-%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/themed/test_plugin_theme/layouts/default.ctp
-%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/themed/test_plugin_theme/tests/index.ctp
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf
+%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot/root.js
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
 %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
 %%WWWDIR%%/cake/tests/test_app/tmp/dir_map
@@ -580,18 +635,27 @@
 %%WWWDIR%%/cake/tests/test_app/vendors/Test/hello.php
 %%WWWDIR%%/cake/tests/test_app/vendors/css/test_asset.css
 %%WWWDIR%%/cake/tests/test_app/vendors/img/test.jpg
+%%WWWDIR%%/cake/tests/test_app/vendors/img/test_2.JPG
 %%WWWDIR%%/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
 %%WWWDIR%%/cake/tests/test_app/vendors/shells/sample.php
+%%WWWDIR%%/cake/tests/test_app/vendors/shells/templates/test/classes/test_object.ctp
 %%WWWDIR%%/cake/tests/test_app/vendors/somename/some.name.php
 %%WWWDIR%%/cake/tests/test_app/vendors/welcome.php
+%%WWWDIR%%/cake/tests/test_app/views/elements/email/html/custom.ctp
 %%WWWDIR%%/cake/tests/test_app/views/elements/email/html/default.ctp
+%%WWWDIR%%/cake/tests/test_app/views/elements/email/html/nested_element.ctp
+%%WWWDIR%%/cake/tests/test_app/views/elements/email/text/custom.ctp
 %%WWWDIR%%/cake/tests/test_app/views/elements/email/text/default.ctp
 %%WWWDIR%%/cake/tests/test_app/views/elements/email/text/wide.ctp
+%%WWWDIR%%/cake/tests/test_app/views/elements/html_call.ctp
 %%WWWDIR%%/cake/tests/test_app/views/elements/nocache/contains_nocache.ctp
 %%WWWDIR%%/cake/tests/test_app/views/elements/nocache/plain.ctp
 %%WWWDIR%%/cake/tests/test_app/views/elements/nocache/sub1.ctp
 %%WWWDIR%%/cake/tests/test_app/views/elements/nocache/sub2.ctp
+%%WWWDIR%%/cake/tests/test_app/views/elements/session_helper.ctp
 %%WWWDIR%%/cake/tests/test_app/views/elements/test_element.ctp
+%%WWWDIR%%/cake/tests/test_app/views/elements/type_check.ctp
+%%WWWDIR%%/cake/tests/test_app/views/helpers/banana.php
 %%WWWDIR%%/cake/tests/test_app/views/layouts/ajax.ctp
 %%WWWDIR%%/cake/tests/test_app/views/layouts/ajax2.ctp
 %%WWWDIR%%/cake/tests/test_app/views/layouts/cache_empty_sections.ctp
@@ -604,11 +668,12 @@
 %%WWWDIR%%/cake/tests/test_app/views/layouts/js/default.ctp
 %%WWWDIR%%/cake/tests/test_app/views/layouts/multi_cache.ctp
 %%WWWDIR%%/cake/tests/test_app/views/layouts/rss/default.ctp
-%%WWWDIR%%/cake/tests/test_app/views/layouts/session_helper.ctp
 %%WWWDIR%%/cake/tests/test_app/views/layouts/xml/default.ctp
 %%WWWDIR%%/cake/tests/test_app/views/pages/home.ctp
+%%WWWDIR%%/cake/tests/test_app/views/pages/extract.ctp
 %%WWWDIR%%/cake/tests/test_app/views/posts/cache_empty_sections.ctp
 %%WWWDIR%%/cake/tests/test_app/views/posts/cache_form.ctp
+%%WWWDIR%%/cake/tests/test_app/views/posts/helper_overwrite.ctp
 %%WWWDIR%%/cake/tests/test_app/views/posts/index.ctp
 %%WWWDIR%%/cake/tests/test_app/views/posts/multiple_nocache.ctp
 %%WWWDIR%%/cake/tests/test_app/views/posts/nocache_multiple_element.ctp
@@ -616,18 +681,49 @@
 %%WWWDIR%%/cake/tests/test_app/views/posts/sequencial_nocache.ctp
 %%WWWDIR%%/cake/tests/test_app/views/posts/test_nocache_tags.ctp
 %%WWWDIR%%/cake/tests/test_app/views/tests_apps/index.ctp
+%%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp
 %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/layouts/default.ctp
+%%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp
+%%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp
 %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/posts/index.ctp
+%%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp
+%%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css
+%%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css
+%%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf
+%%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif
+%%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg
+%%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js
+%%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js
+%%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf
+%%WWWDIR%%/cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css
+%%WWWDIR%%/cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css
+%%WWWDIR%%/cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif
+%%WWWDIR%%/cake/tests/test_app/webroot/theme/test_theme/img/test.jpg
 %%WWWDIR%%/index.php
 %%APDEP%%%%CONFDIR%%/cakephp.conf
 @dirrm %%WWWDIR%%/vendors/shells/templates
 @dirrm %%WWWDIR%%/vendors/shells/tasks
 @dirrm %%WWWDIR%%/vendors/shells
-@dirrm %%WWWDIR%%/vendors/js
-@dirrm %%WWWDIR%%/vendors/css
 @dirrm %%WWWDIR%%/vendors
+@dirrm %%WWWDIR%%/cake/tests/test_app/webroot/theme/test_theme/img
+@dirrm %%WWWDIR%%/cake/tests/test_app/webroot/theme/test_theme/css
+@dirrm %%WWWDIR%%/cake/tests/test_app/webroot/theme/test_theme
+@dirrm %%WWWDIR%%/cake/tests/test_app/webroot/theme
+@dirrm %%WWWDIR%%/cake/tests/test_app/webroot
+@dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot/pdfs
+@dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot/js/one
+@dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot/js
+@dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot/img
+@dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot/flash
+@dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot/css
+@dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/webroot
 @dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/posts
+@dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests
+@dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts
+@dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin
+@dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/plugins
 @dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/layouts
+@dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme/elements
 @dirrm %%WWWDIR%%/cake/tests/test_app/views/themed/test_theme
 @dirrm %%WWWDIR%%/cake/tests/test_app/views/themed
 @dirrm %%WWWDIR%%/cake/tests/test_app/views/tests_apps
@@ -650,6 +746,8 @@
 @dirrm %%WWWDIR%%/cake/tests/test_app/views/elements
 @dirrm %%WWWDIR%%/cake/tests/test_app/views
 @dirrm %%WWWDIR%%/cake/tests/test_app/vendors/somename
+@dirrm %%WWWDIR%%/cake/tests/test_app/vendors/shells/templates/test/classes
+@dirrm %%WWWDIR%%/cake/tests/test_app/vendors/shells/templates/test
 @dirrm %%WWWDIR%%/cake/tests/test_app/vendors/shells/templates
 @dirrm %%WWWDIR%%/cake/tests/test_app/vendors/shells/tasks
 @dirrm %%WWWDIR%%/cake/tests/test_app/vendors/shells
@@ -659,44 +757,55 @@
 @dirrm %%WWWDIR%%/cake/tests/test_app/vendors/Test
 @dirrm %%WWWDIR%%/cake/tests/test_app/vendors
 @dirrm %%WWWDIR%%/cake/tests/test_app/tmp
-@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/plugin_js/vendors/js
-@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/plugin_js/vendors
-@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/plugin_js
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/templates
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin_two/vendors/shells
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin_two/vendors
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin_two
-@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/themed/test_plugin_theme/tests
-@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/themed/test_plugin_theme/layouts
-@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/themed/test_plugin_theme
-@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/themed
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot/pdfs
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot/js
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot/img
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot/flash
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot/css
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/webroot
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/tests
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/layouts
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/helpers
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views/elements
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/views
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/shells/templates
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/shells/tasks
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/shells
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/sample
-@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/js/test_plugin
-@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/js
-@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/img
-@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/css
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models/datasources/test
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models/datasources
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models/behaviors
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/models
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/locale/po
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/locale
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/libs/log
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/libs/cache
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/libs
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/controllers/components
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/controllers
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/config/schema
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/config
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins/test_plugin
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/plugin_js/webroot/js/one
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/plugin_js/webroot/js
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/plugin_js/webroot
+@dirrm %%WWWDIR%%/cake/tests/test_app/plugins/plugin_js
 @dirrm %%WWWDIR%%/cake/tests/test_app/plugins
+@dirrm %%WWWDIR%%/cake/tests/test_app/models/datasources/test
 @dirrm %%WWWDIR%%/cake/tests/test_app/models/datasources
 @dirrm %%WWWDIR%%/cake/tests/test_app/models/behaviors
 @dirrm %%WWWDIR%%/cake/tests/test_app/models
+@dirrm %%WWWDIR%%/cake/tests/test_app/locale/time_test
 @dirrm %%WWWDIR%%/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES
 @dirrm %%WWWDIR%%/cake/tests/test_app/locale/rule_9_po
 @dirrm %%WWWDIR%%/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES
@@ -760,13 +869,19 @@
 @dirrm %%WWWDIR%%/cake/tests/test_app/locale/po/LC_MONETARY
 @dirrm %%WWWDIR%%/cake/tests/test_app/locale/po/LC_MESSAGES
 @dirrm %%WWWDIR%%/cake/tests/test_app/locale/po
+@dirrm %%WWWDIR%%/cake/tests/test_app/locale/ja_jp
 @dirrm %%WWWDIR%%/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES
 @dirrm %%WWWDIR%%/cake/tests/test_app/locale/cache_test_po
 @dirrm %%WWWDIR%%/cake/tests/test_app/locale
+@dirrm %%WWWDIR%%/cake/tests/test_app/libs/log
+@dirrm %%WWWDIR%%/cake/tests/test_app/libs/cache
+@dirrm %%WWWDIR%%/cake/tests/test_app/libs
 @dirrm %%WWWDIR%%/cake/tests/test_app/controllers/components
 @dirrm %%WWWDIR%%/cake/tests/test_app/controllers
 @dirrm %%WWWDIR%%/cake/tests/test_app/config
 @dirrm %%WWWDIR%%/cake/tests/test_app
+@dirrm %%WWWDIR%%/cake/tests/lib/templates
+@dirrm %%WWWDIR%%/cake/tests/lib/reporter
 @dirrm %%WWWDIR%%/cake/tests/lib
 @dirrm %%WWWDIR%%/cake/tests/groups
 @dirrm %%WWWDIR%%/cake/tests/fixtures
@@ -776,6 +891,7 @@
 @dirrm %%WWWDIR%%/cake/tests/cases/libs/model/datasources
 @dirrm %%WWWDIR%%/cake/tests/cases/libs/model/behaviors
 @dirrm %%WWWDIR%%/cake/tests/cases/libs/model
+@dirrm %%WWWDIR%%/cake/tests/cases/libs/log
 @dirrm %%WWWDIR%%/cake/tests/cases/libs/controller/components
 @dirrm %%WWWDIR%%/cake/tests/cases/libs/controller
 @dirrm %%WWWDIR%%/cake/tests/cases/libs/cache
@@ -805,65 +921,71 @@
 @dirrm %%WWWDIR%%/cake/libs/model/datasources
 @dirrm %%WWWDIR%%/cake/libs/model/behaviors
 @dirrm %%WWWDIR%%/cake/libs/model
+@dirrm %%WWWDIR%%/cake/libs/log
 @dirrm %%WWWDIR%%/cake/libs/controller/components
 @dirrm %%WWWDIR%%/cake/libs/controller
 @dirrm %%WWWDIR%%/cake/libs/cache
 @dirrm %%WWWDIR%%/cake/libs
-@dirrm %%WWWDIR%%/cake/console/libs/templates/views
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/webroot/js
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/webroot/img
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/webroot/css
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/webroot
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/scaffolds
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/pages
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/layouts/xml
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/layouts/rss
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/layouts/js
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/layouts/email/text
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/layouts/email/html
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/layouts/email
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/layouts
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/helpers
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/errors
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/elements/email/text
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/elements/email/html
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/elements/email
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views/elements
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/views
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/vendors/shells/templates
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/vendors/shells/tasks
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/vendors/shells
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/vendors
-@dirrmtry %%WWWDIR%%/cake/console/libs/templates/skel/tmp/tests
-@dirrmtry %%WWWDIR%%/cake/console/libs/templates/skel/tmp/sessions
-@dirrmtry %%WWWDIR%%/cake/console/libs/templates/skel/tmp/logs
-@dirrmtry %%WWWDIR%%/cake/console/libs/templates/skel/tmp/cache/views
-@dirrmtry %%WWWDIR%%/cake/console/libs/templates/skel/tmp/cache/persistent
-@dirrmtry %%WWWDIR%%/cake/console/libs/templates/skel/tmp/cache/models
-@dirrmtry %%WWWDIR%%/cake/console/libs/templates/skel/tmp/cache
-@dirrmtry %%WWWDIR%%/cake/console/libs/templates/skel/tmp
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/tests/groups
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/tests/fixtures
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/tests/cases/models
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/tests/cases/helpers
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/tests/cases/controllers
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/tests/cases/components
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/tests/cases/behaviors
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/tests/cases
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/tests
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/plugins
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/models/datasources
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/models/behaviors
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/models
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/locale/eng/LC_MESSAGES
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/locale/eng
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/locale
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/controllers/components
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/controllers
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/config/sql
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel/config
-@dirrm %%WWWDIR%%/cake/console/libs/templates/skel
-@dirrm %%WWWDIR%%/cake/console/libs/templates
+@dirrm %%WWWDIR%%/cake/console/templates/skel/webroot/js
+@dirrm %%WWWDIR%%/cake/console/templates/skel/webroot/img
+@dirrm %%WWWDIR%%/cake/console/templates/skel/webroot/css
+@dirrm %%WWWDIR%%/cake/console/templates/skel/webroot
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/scaffolds
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/pages
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/layouts/xml
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/layouts/rss
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/layouts/js
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/layouts/email/text
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/layouts/email/html
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/layouts/email
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/layouts
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/helpers
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/errors
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/elements/email/text
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/elements/email/html
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/elements/email
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views/elements
+@dirrm %%WWWDIR%%/cake/console/templates/skel/views
+@dirrm %%WWWDIR%%/cake/console/templates/skel/vendors/shells/tasks
+@dirrm %%WWWDIR%%/cake/console/templates/skel/vendors/shells
+@dirrm %%WWWDIR%%/cake/console/templates/skel/vendors
+@dirrmtry %%WWWDIR%%/cake/console/templates/skel/tmp/tests
+@dirrmtry %%WWWDIR%%/cake/console/templates/skel/tmp/sessions
+@dirrmtry %%WWWDIR%%/cake/console/templates/skel/tmp/logs
+@dirrmtry %%WWWDIR%%/cake/console/templates/skel/tmp/cache/views
+@dirrmtry %%WWWDIR%%/cake/console/templates/skel/tmp/cache/persistent
+@dirrmtry %%WWWDIR%%/cake/console/templates/skel/tmp/cache/models
+@dirrmtry %%WWWDIR%%/cake/console/templates/skel/tmp/cache
+@dirrmtry %%WWWDIR%%/cake/console/templates/skel/tmp
+@dirrm %%WWWDIR%%/cake/console/templates/skel/tests/groups
+@dirrm %%WWWDIR%%/cake/console/templates/skel/tests/fixtures
+@dirrm %%WWWDIR%%/cake/console/templates/skel/tests/cases/shells
+@dirrm %%WWWDIR%%/cake/console/templates/skel/tests/cases/models
+@dirrm %%WWWDIR%%/cake/console/templates/skel/tests/cases/helpers
+@dirrm %%WWWDIR%%/cake/console/templates/skel/tests/cases/datasources
+@dirrm %%WWWDIR%%/cake/console/templates/skel/tests/cases/controllers
+@dirrm %%WWWDIR%%/cake/console/templates/skel/tests/cases/components
+@dirrm %%WWWDIR%%/cake/console/templates/skel/tests/cases/behaviors
+@dirrm %%WWWDIR%%/cake/console/templates/skel/tests/cases
+@dirrm %%WWWDIR%%/cake/console/templates/skel/tests
+@dirrm %%WWWDIR%%/cake/console/templates/skel/plugins
+@dirrm %%WWWDIR%%/cake/console/templates/skel/models/datasources
+@dirrm %%WWWDIR%%/cake/console/templates/skel/models/behaviors
+@dirrm %%WWWDIR%%/cake/console/templates/skel/models
+@dirrm %%WWWDIR%%/cake/console/templates/skel/locale/eng/LC_MESSAGES
+@dirrm %%WWWDIR%%/cake/console/templates/skel/locale/eng
+@dirrm %%WWWDIR%%/cake/console/templates/skel/locale
+@dirrm %%WWWDIR%%/cake/console/templates/skel/libs
+@dirrm %%WWWDIR%%/cake/console/templates/skel/controllers/components
+@dirrm %%WWWDIR%%/cake/console/templates/skel/controllers
+@dirrm %%WWWDIR%%/cake/console/templates/skel/config/schema
+@dirrm %%WWWDIR%%/cake/console/templates/skel/config
+@dirrm %%WWWDIR%%/cake/console/templates/skel
+@dirrm %%WWWDIR%%/cake/console/templates/default/views
+@dirrm %%WWWDIR%%/cake/console/templates/default/classes
+@dirrm %%WWWDIR%%/cake/console/templates/default/actions
+@dirrm %%WWWDIR%%/cake/console/templates/default
+@dirrm %%WWWDIR%%/cake/console/templates
 @dirrm %%WWWDIR%%/cake/console/libs/tasks
 @dirrm %%WWWDIR%%/cake/console/libs
 @dirrm %%WWWDIR%%/cake/console
@@ -873,15 +995,23 @@
 @dirrm %%WWWDIR%%/cake
 @dirrm %%WWWDIR%%/app/webroot/js
 @dirrm %%WWWDIR%%/app/webroot/img
+@dirrm %%WWWDIR%%/app/webroot/files
 @dirrm %%WWWDIR%%/app/webroot/css
 @dirrm %%WWWDIR%%/app/webroot
 @dirrm %%WWWDIR%%/app/views/scaffolds
 @dirrm %%WWWDIR%%/app/views/layouts/xml
 @dirrm %%WWWDIR%%/app/views/layouts/rss
 @dirrm %%WWWDIR%%/app/views/layouts/js
+@dirrm %%WWWDIR%%/app/views/layouts/email/text
+@dirrm %%WWWDIR%%/app/views/layouts/email/html
+@dirrm %%WWWDIR%%/app/views/layouts/email
 @dirrm %%WWWDIR%%/app/views/layouts
+@dirrm %%WWWDIR%%/app/views/pages
 @dirrm %%WWWDIR%%/app/views/helpers
 @dirrm %%WWWDIR%%/app/views/errors
+@dirrm %%WWWDIR%%/app/views/elements/email/text
+@dirrm %%WWWDIR%%/app/views/elements/email/html
+@dirrm %%WWWDIR%%/app/views/elements/email
 @dirrm %%WWWDIR%%/app/views/elements
 @dirrm %%WWWDIR%%/app/views
 @dirrm %%WWWDIR%%/app/vendors/shells/templates
@@ -912,58 +1042,65 @@
 @dirrm %%WWWDIR%%/app/locale/eng/LC_MESSAGES
 @dirrm %%WWWDIR%%/app/locale/eng
 @dirrm %%WWWDIR%%/app/locale
+@dirrm %%WWWDIR%%/app/libs
 @dirrm %%WWWDIR%%/app/controllers/components
 @dirrm %%WWWDIR%%/app/controllers
-@dirrm %%WWWDIR%%/app/config/sql
+@dirrm %%WWWDIR%%/app/config/schema
 @dirrmtry %%WWWDIR%%/app/config
 @dirrmtry %%WWWDIR%%/app
 @dirrmtry %%WWWDIR%%
 @exec mkdir -p %D/%%WWWDIR%%/vendors/shells/templates
 @exec mkdir -p %D/%%WWWDIR%%/vendors/shells/tasks
-@exec mkdir -p %D/%%WWWDIR%%/vendors/js
-@exec mkdir -p %D/%%WWWDIR%%/vendors/css
+@exec mkdir -p %D/%%WWWDIR%%/plugins
 @exec mkdir -p %D/%%WWWDIR%%/cake/tests/test_app/views/scaffolds
-@exec mkdir -p %D/%%WWWDIR%%/cake/tests/test_app/views/helpers
 @exec mkdir -p %D/%%WWWDIR%%/cake/tests/test_app/views/errors
-@exec mkdir -p %D/%%WWWDIR%%/cake/tests/test_app/vendors/shells/templates
+@exec mkdir -p %D/%%WWWDIR%%/cake/tests/test_app/views/elements
 @exec mkdir -p %D/%%WWWDIR%%/cake/tests/test_app/vendors/shells/tasks
 @exec mkdir -p %D/%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/templates
 @exec mkdir -p %D/%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks
 @exec mkdir -p %D/%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/shells/templates
 @exec mkdir -p %D/%%WWWDIR%%/cake/tests/test_app/plugins/test_plugin/vendors/shells/tasks
-@exec mkdir -p %D/%%WWWDIR%%/cake/tests/test_app/models/datasources
 @exec mkdir -p %D/%%WWWDIR%%/cake/tests/test_app/controllers/components
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/views/scaffolds
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/views/pages
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/views/helpers
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/views/errors
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/vendors/shells/templates
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/vendors/shells/tasks
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/tmp/tests
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/tmp/sessions
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/tmp/logs
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/tmp/cache/views
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/tmp/cache/persistent
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/tmp/cache/models
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/tests/groups
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/tests/fixtures
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/tests/cases/models
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/tests/cases/helpers
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/tests/cases/controllers
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/tests/cases/components
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/tests/cases/behaviors
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/plugins
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/models/datasources
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/models/behaviors
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/locale/eng/LC_MESSAGES
-@exec mkdir -p %D/%%WWWDIR%%/cake/console/libs/templates/skel/controllers/components
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/webroot/js
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/views/scaffolds
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/views/pages
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/views/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/views/errors
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/vendors/shells/tasks
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tmp/tests
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tmp/sessions
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tmp/logs
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tmp/cache/views
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tmp/cache/persistent
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tmp/cache/models
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tests/groups
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tests/fixtures
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tests/cases/shells
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tests/cases/models
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tests/cases/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tests/cases/datasources
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tests/cases/controllers
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tests/cases/components
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/tests/cases/behaviors
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/plugins
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/models/datasources
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/models/behaviors
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/locale/eng/LC_MESSAGES
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/libs
+@exec mkdir -p %D/%%WWWDIR%%/cake/console/templates/skel/controllers/components
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/js
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/files
 @exec mkdir -p %D/%%WWWDIR%%/app/views/scaffolds
+@exec mkdir -p %D/%%WWWDIR%%/app/views/pages
 @exec mkdir -p %D/%%WWWDIR%%/app/views/layouts/xml
 @exec mkdir -p %D/%%WWWDIR%%/app/views/layouts/rss
 @exec mkdir -p %D/%%WWWDIR%%/app/views/layouts/js
+@exec mkdir -p %D/%%WWWDIR%%/app/views/layouts/email/text
+@exec mkdir -p %D/%%WWWDIR%%/app/views/layouts/email/html
 @exec mkdir -p %D/%%WWWDIR%%/app/views/helpers
 @exec mkdir -p %D/%%WWWDIR%%/app/views/errors
-@exec mkdir -p %D/%%WWWDIR%%/app/views/elements
+@exec mkdir -p %D/%%WWWDIR%%/app/views/elements/email/text
+@exec mkdir -p %D/%%WWWDIR%%/app/views/elements/email/html
 @exec mkdir -p %D/%%WWWDIR%%/app/vendors/shells/templates
 @exec mkdir -p %D/%%WWWDIR%%/app/vendors/shells/tasks
 @exec mkdir -p %D/%%WWWDIR%%/app/tmp/tests
@@ -983,4 +1120,5 @@
 @exec mkdir -p %D/%%WWWDIR%%/app/models/datasources
 @exec mkdir -p %D/%%WWWDIR%%/app/models/behaviors
 @exec mkdir -p %D/%%WWWDIR%%/app/locale/eng/LC_MESSAGES
+@exec mkdir -p %D/%%WWWDIR%%/app/libs
 @exec mkdir -p %D/%%WWWDIR%%/app/controllers/components