diff --git a/README b/README
new file mode 100644
index 00000000..ce013625
--- /dev/null
+++ b/README
@@ -0,0 +1 @@
+hello
diff --git a/README.md b/README.md
deleted file mode 100644
index 8fe2feb0..00000000
--- a/README.md
+++ /dev/null
@@ -1,75 +0,0 @@
-基于最新的windframework开发的phpwind9请点击-> https://github.com/phpwind/nextwind
-
-##关于框架
-
-windframework是一个轻量级的php开源框架。它以组件工厂为核心，提供了像MVC，数据持久化，视图模板引擎等应用技术。此外`windframework`采取了一种组件化的开发模式。虽然目前的组件库还不算丰富健壮，但是基于这种开发模式，使组件的扩展变得非常的容易。`windframework`拥有一个强健的内核，它实现了基于配置的Ioc控制反转技术。开发者只需要简单的配置，就可以实现类的依赖注入，完全实现了类与类的松耦合。当然它的美妙之处还不仅于此。
-
-经典的`hello world`应用实例，用一个非常熟悉的应用来开启一个新框架的学习应用吧！这个应用实例会一如既往的在浏览器窗口打印`Hello World`字样。完成这个应用我们将了解到：
-
-* 如何获取windframework框架源码
-
-* windframework框架环境需求
-
-* windframework基础的目录结构和默认运行规则
-
-* 你还会创建自己的第一个action controller
-	
-当然这个应用非常的简单，我们应该可以很快的完成这个应用并看到`hello world`的输出。我想这应该快速的拉近了我们之间的距离，但是想要做出强大的应用只是这样还远远不够。
-
-##获取源码
-
-通过[https://github.com/phpwind/windframework/]([https://github.com/phpwind/windframework, "windframework")获取源码。
-
-##环境要求：
-
-* php5.1.2及以上版本。
-* 可发布的web环境，apache或nginx
-
-##开始我们的helloworld之旅
-
-###创建应用目录文件
-
-我们在web的根目录（`/var/www`或者其他地方）创建一个文件夹，命名为helloworld。将下载好的框架解压并放到该应用目录下。创建好的目录结构如下：
-
-	/var/www/helloworld/
-	wind/					            框架目录
-	controller/				            应用控制器目录，业务代码放在该目录下
-	controller/IndexController.php		默认访问的应用控制器
-	template/				            页面模板目录
-	template/index.htm			        模板文件
-	index.php				            入口脚本文件
-
-
-###编辑入口脚本index.php
-
-在应用目录下创建入口脚本index.php，它的主要工作是加载框架并启动应用。代码如下：
-
-	require_once ('../../wind/Wind.php');
-	Wind::application()->run();
-
-*PS:当然也可以同时在index.php中设置错误级别，WIND_DEBUG模式等。相关内容后面会介绍*
-
-###创建IndexController.php
-
-在应用目录下创建controller/目录。controller目录是windframework默认定义的应用控制器存放的目录，我们也可以通过手动配置的方式来改变应用的访问路径。在我们创建的 controller/ 目录下创建IndexController.php类文件。文件内容如下：
-
-	<?php
-	/**
-	* the last known user to change this file in the repository  <$LastChangedBy: long.shi $>
-	* @author Qiong Wu <papa0924@gmail.com>
-	* @version $Id: IndexController.php 2806 2011-09-23 03:28:55Z long.shi $
-	* @package 
-	*/
-	class IndexController extends WindController {
-
-		public function run()  {
-			echo 'hello world';
-		}
-	}
-	?>
-
-*在windframework中文件名和类名是相同的，这一点有点类似于java。windframework提供了两个应用控制器的类型‘WindSimpleController’，‘WindController’。在这里我们继承自‘WindController’，这两个应用控制器的区别，在后面会具体介绍。*
-
-至此，我们的`hello world` 应用已经完成。快通过浏览器访问下我们的`hello world`吧:
-
-	http://localhost/helloworld/index.php 
diff --git a/_compile/config/components_config.xml b/_compile/config/components_config.xml
index 7731caeb..a38a8f12 100644
--- a/_compile/config/components_config.xml
+++ b/_compile/config/components_config.xml
@@ -15,9 +15,10 @@
 			<property name='handlerAdapter' ref='router' />
 		</properties>
 	</component>
-	<component name='windToken' path='WIND:token.WindSecurityToken' scope='singleton'>
+	<component name='windToken' path='WIND:token.WindSecurityToken'
+		scope='singleton'>
 		<properties>
-			<property name='tokenContainer' ref='windCookie'/>
+			<property name='tokenContainer' ref='windCookie' />
 		</properties>
 	</component>
 	<component name='windLogger' path='WIND:log.WindLogger'
diff --git a/_compile/lib/CompileCmdHelp.php b/_compile/lib/CompileCmdHelp.php
deleted file mode 100644
index c1896c26..00000000
--- a/_compile/lib/CompileCmdHelp.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * @author Qiong Wu <papa0924@gmail.com>
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.phpwind.com/license.php
- * @version $Id$
- * @package wind
- */
-class CompileCmdHelp {
-
-	/**
-	 * 获取用户输入信息
-	 * 
-	 * @param string $message
-	 * @return string
-	 */
-	static public function getInput($message) {
-		echo $message;
-		return str_replace(array("\r", "\n"), '', fgets(STDIN));
-	}
-
-	/**
-	 * 显示提示信息
-	 *
-	 * @param string $message
-	 */
-	static public function showMessge($message) {
-		if (is_array($message)) {
-			foreach ($message as $key => $value) {
-				echo "'" . $key . "' => '" . $value . "',\r\n";
-			}
-		} else
-			echo $message;
-	}
-
-	/**
-	 * 显示系统错误信息
-	 *
-	 * @param string $message
-	 * @param string $cmd
-	 */
-	static public function showError($message, $cmd = 'pack') {
-		$_msg = "Error: " . $message . "\r\n";
-		$_msg .= "Try: " . $cmd . " help for usage\r\n";
-		exit($_msg);
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/_compile/lib/CompilePack.php b/_compile/lib/CompilePack.php
deleted file mode 100644
index f6cca8d5..00000000
--- a/_compile/lib/CompilePack.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * wind工具库，编译打包类
- *
- * @author Qiong Wu <papa0924@gmail.com>
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.phpwind.com/license.php
- * @version $Id$
- * @package wind
- */
-class CompilePack {
-	private $extensions = 'php';
-	private $_r = false;
-	private $_p = false;
-	public $fileList = array();
-	public $imports = array();
-	public $classes = array();
-	public $namespace = array();
-
-	/**
-	 * 默认为 r,p 都为 true
-	 *
-	 * @param boolean $r 是否递归文件夹
-	 * @param boolean $p 是否生成打包
-	 */
-	public function __construct($r = false, $p = false) {
-		$this->_r = $r;
-		$this->_p = $p;
-	}
-
-	/**
-	 * 将一组文件列表合并为一个文件列表
-	 *
-	 * @param array $files 文件/文件夹列表
-	 * @param string $packPath 打包文件存放路径
-	 * @param $boolean
-	 */
-	public function pack($files, $packPath = '', $namespace = '') {
-		$namespace = explode(' ', $namespace);
-		$i = 0;
-		foreach ($files as $filePath) {
-			if (!$filePath = realpath($filePath)) continue;
-			$_dir = dirname($filePath);
-			$_n = isset($namespace[$i]) ? $namespace[$i] : basename($_dir);
-			$_n = array(strtoupper($_n), $_dir . '/');
-			$this->_import($filePath, $_n);
-			$i++;
-		}
-		if ($this->_p && $this->fileList) {
-			Wind::import('WIND:utility.WindPack');
-			$pack = new WindPack();
-			$pack->setContentInjectionCallBack(array($this, 'injectionImports'));
-			if (!$pack->packFromFileList($this->fileList, $packPath, WindPack::STRIP_PHP, true)) throw new Exception(
-				'failed to create pack file (' . $packPath . ')');
-		}
-	}
-
-	/**
-	 * 向打包好的文件头部注入 import 信息
-	 */
-	public function injectionImports() {
-		$_content = WindString::varToString($this->imports);
-		$_content = str_replace(array("\r\n", "\t", " "), '', $_content);
-		return 'Wind::$_imports += ' . $_content . ';';
-	}
-
-	/**
-	 * @param string $filePath
-	 * @throws Exception
-	 */
-	private function _import($filePath, $namespace) {
-		if (is_dir($filePath)) {
-			if (false === ($files = scandir($filePath, 0))) throw new Exception(
-				'the file ' . $filePath . ' open failed!');
-			foreach ($files as $file) {
-				if (!$file || $file[0] === '.') continue;
-				if (!$this->_r && is_dir($filePath . '/' . $file)) continue;
-				$this->_import($filePath . '/' . $file, $namespace);
-			}
-		} elseif (is_file($filePath)) {
-			$_info = pathinfo($filePath);
-			if ($_info['extension'] !== 'php') return;
-			$this->fileList[$_info['filename']] = $filePath;
-			$_file = $_info['dirname'] . '/' . $_info['filename'];
-			$_key = str_replace(array($namespace[1], '/'), array($namespace[0] . ':', '.'), $_file);
-			$this->imports[$_key] = $_info['filename'];
-			$this->classes[$_info['filename']] = str_replace($namespace[1], '', $_file);
-			$this->namespace[$namespace[0]] = $namespace[1];
-			Wind::$_classes[$_info['filename']] = $_file;
-		} else
-			throw new Exception($filePath . ': No such file or directory');
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/_compile/tools/pack.php b/_compile/tools/pack.php
deleted file mode 100644
index faf1ce16..00000000
--- a/_compile/tools/pack.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * 命令行方式打包工具
- * 
- * 支持参数<code>
- * -r	是否递归的方式打包文件夹
- * -p	将所列文件夹打包，合并成一个文件（去除空格，注释等）
- * example:
- * pack -pci /var/www/wind/utility /var/www/wind/base
- * 这个例子中包含两个文件夹utility、base(支持文件，文件夹；支持一个或者多个)。打包工具将这两个文件夹下面的文件打包到同一个文件下。
- * 并将 /var/www/wind/ 以WIND别名注册为系统目录别名
- * </code>
- * @author Qiong Wu <papa0924@gmail.com> 2010-11-2
- * @link http://www.phpwind.com
- * @copyright Copyright &copy; 2003-2010 phpwind.com
- * @license http://www.phpwind.com/license.php
- */
-include '../../wind/Wind.php';
-Wind::register(dirname(dirname(__FILE__)), '_COMPILE');
-Wind::import('_COMPILE:lib.*');
-
-$args = isset($_SERVER['argv']) ? $_SERVER['argv'] : array();
-if (count($args) < 2) CompileCmdHelp::showError('Not enough arguments provided');
-unset($args[0]);
-$files = array();
-$params = '';
-foreach ($args as $value) {
-	if (!$value) continue;
-	if ($value[0] === '-')
-		$params .= trim($value, '-');
-	else
-		$files[] = $value;
-}
-empty($files) && CompileCmdHelp::showError('Not enough arguments provided');
-
-$params = '-' . $params;
-$_p = strpos($params, 'p');
-$_r = strpos($params, 'r');
-
-$packFile = $namespace = '';
-if ($_p) {
-	$packFile = CompileCmdHelp::getInput("Enter folder in which to save the pack file (default: /home/you/):");
-	if (!$packFile) {
-		$processUser = posix_getpwuid(posix_geteuid());
-		$packFile = '/home/' . $processUser['name'] . '/wind_basic.php';
-	}
-	$namespace = CompileCmdHelp::getInput("Enter namespace for folder (default: folder name):");
-}
-
-try {
-	$pack = new CompilePack($_r, $_p);
-	$pack->pack($files, $packFile, $namespace);
-} catch (Exception $e) {
-	CompileCmdHelp::showError($e->getMessage());
-}
-
-CompileCmdHelp::showMessge("Operation was successful！\r\n");
-$_p && CompileCmdHelp::showMessge(
-	"Your pack file has been saved in: " . $packFile . " (" . filesize($packFile) . ")\r\n");
-if ($pack->namespace) {
-	CompileCmdHelp::showMessge(
-		"If use the parameters (i or c), You need the 'wind_basic.php' is loaded before the registration of the following information to the system.\r\n");
-	CompileCmdHelp::showMessge($pack->namespace);
-}
-
-do {
-	$_op = CompileCmdHelp::getInput("Show Details(i/c/p):");
-	switch ($_op) {
-		case 'i':
-			CompileCmdHelp::showMessge("The imports list:\r\n");
-			CompileCmdHelp::showMessge($pack->imports);
-			break;
-		case 'c':
-			CompileCmdHelp::showMessge("The classes list:\r\n");
-			CompileCmdHelp::showMessge($pack->classes);
-			break;
-		case 'p':
-			CompileCmdHelp::showMessge("The pack file list:\r\n");
-			CompileCmdHelp::showMessge($pack->fileList);
-			break;
-		default:
-			$_op = '';
-			break;
-	}
-} while ($_op);
-
-exit();
-
-
-
-
-
-
-
-
diff --git a/_compile/tools/readme b/_compile/tools/readme
deleted file mode 100644
index 632562b8..00000000
--- a/_compile/tools/readme
+++ /dev/null
@@ -1,5 +0,0 @@
-Performance tools 性能优化工具
-
-1. pack
-	打包工具，用于将一组文件打包成一个文件，并去除注释和空格。
-	通过打包，可以有效的减少字节，减少文件加载数，以及文件名处理时间。
diff --git a/demos/blog/compile/template/index.tpl b/demos/blog/compile/template/index.tpl
new file mode 100644
index 00000000..adaa7580
--- /dev/null
+++ b/demos/blog/compile/template/index.tpl
@@ -0,0 +1,72 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf8" />
+<title>首页</title>
+<link href="<?php echo WindSecurity::escapeHTML(Wind::getApp()->getResponse()->getData('G','images'));?>/core.css" rel="stylesheet" />
+<link href="<?php echo WindSecurity::escapeHTML(Wind::getApp()->getResponse()->getData('G','images'));?>/css.css" rel="stylesheet" />
+</head>
+<body>
+	<div class="wrap">
+		<div id="header" class="mb10">
+			<div class="header">
+				<table width="100%"><tr>
+					<td><h2 class="fl logo"><a href="<?php echo WindSecurity::escapeHTML(WindUrlHelper::createUrl('default/index/run'));?>"><img src="<?php echo WindSecurity::escapeHTML(Wind::getApp()->getResponse()->getData('G','images'));?>/logo.png" width="198" height="80" class="fl" /></a></h2></td>
+					<td align="right">
+						<div class="login_header fr">
+							<dl class="cc login_dlA">
+								<dt></dt>
+								<dd></dd>
+								<dd>&nbsp;</dd>
+							</dl>
+							<dl class="cc login_dlA">
+								<dt><?php echo WindSecurity::escapeHTML(Wind::getApp()->getResponse()->getData('index_run','userInfo','username'));?></dt>
+							</dl>
+						</div>
+					</td>
+				</tr></table>
+				<div id="navA">
+					<div class="navA">
+						<ul class="cc">
+							<li class="current"><a href="<?php echo WindSecurity::escapeHTML(WindUrlHelper::createUrl('default/index/run'));?>">首页</a></li>
+							<li><a href="<?php echo WindSecurity::escapeHTML(WindUrlHelper::createUrl('default/index/run'));?>">关于本demo</a></li>
+							<li class="tail">&nbsp;</li>
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="main">
+			<div class="grid cc mb10">
+	<div class="bA">
+		<div class="content">
+<?php if($userInfo):?>
+			<div class="mb10 f16 b">Hi, <?php echo WindSecurity::escapeHTML($userInfo->getUsername());?> 欢迎您!</div>
+			<div class="mb10 f14"><a href="<?php echo WindSecurity::escapeHTML(WindUrlHelper::createUrl('logout'));?>">&rsaquo;&rsaquo;退出</a></div>
+<?php else:?>
+			<div class="mb10 f16 b">用户登录</div>
+			<form name="login" action="<?php echo WindSecurity::escapeHTML(WindUrlHelper::createUrl('login'));?>" method="post">
+			<dl class="mb10">
+				<dt>姓名<span class="s1">*</span></dt>
+				<dd><input name="username" type="text" class="input" ></dd>
+			</dl>
+			<dl class="mb10">
+				<dt>密码<span class="s1">*</span></dt>
+				<dd><input name="password" type="text" class="input"></dd>
+			</dl>
+			<span class="btn" style="margin:0 0;"><span><button type="submit">提 交</button></span></span>
+			<span class="bt" style="margin:0 0;"><span><button type="button"  onclick="javascript:document.location.href='<?php echo WindSecurity::escapeHTML(WindUrlHelper::createUrl('reg'));?>';">注册</button></span></span>
+			</form>
+<?php endif;?>
+		</div>
+	</div>
+</div>
+		</div>
+<div id="footer">
+			<div class="footer">
+				<p class="f10">Powered by phpwind windframework group &copy;2003-2103 http://www.windframework.com</p>
+			</div>
+		</div>
+	</div>
+</body>
+</html>	
\ No newline at end of file
diff --git a/demos/blog/compile/template/layout.tpl b/demos/blog/compile/template/layout.tpl
new file mode 100644
index 00000000..9afc98ab
--- /dev/null
+++ b/demos/blog/compile/template/layout.tpl
@@ -0,0 +1,49 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf8" />
+<title>首页</title>
+<link href="<?php echo WindSecurity::escapeHTML(Wind::getApp()->getResponse()->getData('G','images'));?>/core.css" rel="stylesheet" />
+<link href="<?php echo WindSecurity::escapeHTML(Wind::getApp()->getResponse()->getData('G','images'));?>/css.css" rel="stylesheet" />
+</head>
+<body>
+	<div class="wrap">
+		<div id="header" class="mb10">
+			<div class="header">
+				<table width="100%"><tr>
+					<td><h2 class="fl logo"><a href="<?php echo WindSecurity::escapeHTML(WindUrlHelper::createUrl('default/index/run'));?>"><img src="<?php echo WindSecurity::escapeHTML(Wind::getApp()->getResponse()->getData('G','images'));?>/logo.png" width="198" height="80" class="fl" /></a></h2></td>
+					<td align="right">
+						<div class="login_header fr">
+							<dl class="cc login_dlA">
+								<dt></dt>
+								<dd></dd>
+								<dd>&nbsp;</dd>
+							</dl>
+							<dl class="cc login_dlA">
+								<dt><?php echo WindSecurity::escapeHTML(Wind::getApp()->getResponse()->getData('index_run','userInfo','username'));?></dt>
+							</dl>
+						</div>
+					</td>
+				</tr></table>
+				<div id="navA">
+					<div class="navA">
+						<ul class="cc">
+							<li class="current"><a href="<?php echo WindSecurity::escapeHTML(WindUrlHelper::createUrl('default/index/run'));?>">首页</a></li>
+							<li><a href="<?php echo WindSecurity::escapeHTML(WindUrlHelper::createUrl('default/index/run'));?>">关于本demo</a></li>
+							<li class="tail">&nbsp;</li>
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="main">
+			<?php $this->content();?>
+		</div>
+<div id="footer">
+			<div class="footer">
+				<p class="f10">Powered by phpwind windframework group &copy;2003-2103 http://www.windframework.com</p>
+			</div>
+		</div>
+	</div>
+</body>
+</html>	
\ No newline at end of file
diff --git a/demos/blog/conf/config.php b/demos/blog/conf/config.php
deleted file mode 100644
index 848d10c9..00000000
--- a/demos/blog/conf/config.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-return array(
-	//重载了系统组件中的db组件的定义，将db组件的config指向应用根目录下的db_config.php
-	//我们可以通过这种方式重载任何系统组件的定义，也可以定义新的组件。组件名称不能重复。
-	//支持resource的配置方式
-	'components' => array(
-		'db' => array(
-			'config' =>  array(
-				'resource' => 'conf.db_config.php',
-			)
-		)
-	),
-	//应用配置，支持多个应用配置。一个应用支持多个modules（业务模块），每个modules都有一个别名用于访问。
-	//当不输入任何modules时访问‘default’默认模块
-	'web-apps' => array(
-		'blog' => array(
-			'modules' => array(
-				'default' => array(
-					//应用控制器访问路径定义，当前定义的路径是当前应用根目录下的‘controller/’
-					'controller-path' => 'controller', 
-					//应用控制器后缀定义
-					'controller-suffix' => 'Controller', 
-					//模板目录定义
-					'template-path' => 'template',
-					//编译文件目录定义
-					'compile-path' => 'data.compile',
-					//错误处理句柄定义
-					'error-handler' => 'controller.ErrorController',
-				)
-			), 
-			//过滤器配置，在这里部署了一个form表单过滤器
-			'filters' => array(
-				'user' => array(
-					'class' => 'WIND:web.filter.WindFormFilter', 
-					'pattern' => 'default/Index/(login|dreg)', 
-					'form' => 'service.UserForm'
-				)
-			)
-		)
-	)
-);
diff --git a/demos/blog/config/config.php b/demos/blog/config/config.php
new file mode 100644
index 00000000..2269e507
--- /dev/null
+++ b/demos/blog/config/config.php
@@ -0,0 +1,29 @@
+<?php
+return array(
+	'components' => array(
+		'db' => array(
+			'config' => array(
+				'resource' => 'config.db_config.php'
+			)
+		)
+	),
+	'web-apps' => array(
+		'blog' => array(
+			'modules' => array(
+				'default' => array(
+					'controller-path' => 'controller', 
+					'controller-suffix' => 'Controller', 
+					'error-handler' => 'BLOG:controller.ErrorController',
+				)
+			), 
+			'filters' => array(
+				'user' => array(
+					'class' => 'WIND:web.filter.WindFormFilter', 
+					'pattern' => 'default/Index/(login|dreg)', 
+					'form' => 'BLOG:model.UserForm'
+				)
+			)
+		)
+	),
+	//'router' => array('config' => array('resource' => 'BLOG:config.route_config.php')),
+);
\ No newline at end of file
diff --git a/demos/blog/conf/db_config.php b/demos/blog/config/db_config.php
similarity index 83%
rename from demos/blog/conf/db_config.php
rename to demos/blog/config/db_config.php
index ce429f3c..729c9421 100644
--- a/demos/blog/conf/db_config.php
+++ b/demos/blog/config/db_config.php
@@ -1,7 +1,7 @@
 <?php
-
 return array(
 	'dsn' => 'mysql:host=localhost;dbname=test', 
 	'user' => 'root', 
 	'pwd' => 'phpwind.net', 
-	'charset' => 'utf8');
\ No newline at end of file
+	'charset' => 'utf8'
+);
\ No newline at end of file
diff --git a/demos/blog/config/route_config.php b/demos/blog/config/route_config.php
new file mode 100644
index 00000000..4d35bc01
--- /dev/null
+++ b/demos/blog/config/route_config.php
@@ -0,0 +1,9 @@
+<?php
+return array(
+      'routes' => array(
+		   'WindRoute' => array(
+	            'class'   => 'WIND:router.route.WindRewriteRoute',
+			    //'default' => true,
+		   ),
+	   ),
+);
\ No newline at end of file
diff --git a/demos/blog/conf/user.sql b/demos/blog/config/user.sql
similarity index 100%
rename from demos/blog/conf/user.sql
rename to demos/blog/config/user.sql
diff --git a/demos/blog/controller/ErrorController.php b/demos/blog/controller/ErrorController.php
index 8a37de1a..75c217d1 100644
--- a/demos/blog/controller/ErrorController.php
+++ b/demos/blog/controller/ErrorController.php
@@ -16,8 +16,8 @@ class ErrorController extends WindErrorHandler {
 	 */
 	public function run() {
 		$this->setLayout('layout');
-		$this->setGlobal($this->getRequest()->getBaseUrl(true) . '/template/images', 'images');
-		$this->setGlobal($this->getRequest()->getBaseUrl(true) . '/template/images', 'css');
+		$this->setGlobal($this->getRequest()->getBaseUrl(true) . '/static/images', 'images');
+		$this->setGlobal($this->getRequest()->getBaseUrl(true) . '/static/images', 'css');
 		$topic = "Blog Error";
 		$this->setOutput($topic, "errorHeader");
 		$this->setOutput($this->urlReferer, "baseUrl");
diff --git a/demos/blog/controller/IndexController.php b/demos/blog/controller/IndexController.php
index bb2b1185..b2b53f89 100644
--- a/demos/blog/controller/IndexController.php
+++ b/demos/blog/controller/IndexController.php
@@ -1,4 +1,5 @@
 <?php
+Wind::import('model.UserForm');
 /**
  * 默认的 controller
  *
@@ -9,60 +10,77 @@
  * @package demos.blog.controller
  */
 class IndexController extends WindController {
+	/**
+	 * @var UserForm
+	 */
+	private $userInfo;
+	/**
+	 * @var WindSession
+	 */
+	private $session;
 
 	/* (non-PHPdoc)
 	 * @see WindSimpleController::beforeAction()
 	 */
 	public function beforeAction($handlerAdapter) {
 		parent::beforeAction($handlerAdapter);
+		$this->session = $this->getSystemFactory()->getInstance('windSession');
+		$this->userInfo = $this->session->get('user');
 		$this->setLayout('layout');
+		$this->setGlobal($this->getRequest()->getBaseUrl(true) . '/static/images', 'images');
+		$this->setGlobal($this->getRequest()->getBaseUrl(true) . '/static/images', 'css');
 		$this->setOutput('utf8', 'charset');
-		$this->setGlobal($this->getRequest()->getBaseUrl(true) . '/template/images', 'images');
-		$this->setGlobal($this->getRequest()->getBaseUrl(true) . '/template/images', 'css');
 	}
 
 	/* (non-PHPdoc)
 	 * @see WindController::run()
 	 */
 	public function run() {
-		Wind::import('service.UserForm');
-		$userService = $this->load();
-		$userInfo = $userService->isLogin();
-		$this->setOutput($userInfo, 'userInfo');
+		$this->setOutput($this->userInfo, 'userInfo');
 		$this->setTemplate('index');
 	}
 
-	/**
-	 * 访问用户注册页面
-	 */
-	public function regAction() {
-		$this->setTemplate('reg');
-	}
-
 	/**
 	 * 用户登录
 	 */
 	public function loginAction() {
-		$userService = $this->load();
-		$userInfo = $userService->isLogin();
-		if ($userInfo) $this->showMessage('已登录~');
-		
+		if ($this->userInfo) $this->showMessage('已登录，请先注销.');
 		/* @var $userForm UserForm */
 		$userForm = $this->getInput("userForm");
 		if (!$userForm) $this->showMessage('获取用户登录数据失败');
 		
-		if (!$userService->login($userForm)) $this->showMessage('登录失败.');
+		/* @var $db WindConnection */
+		$db = $this->getSystemFactory()->getInstance('db');
+		$stmt = $db->createStatement('SELECT userid FROM user WHERE username=:username AND password =:password');
+		if (!$stmt->getValue(array('username' => $userForm->getUsername(), 'password' => $userForm->getPassword()))) {
+			$this->showMessage('登录失败.');
+		}
+		$this->session->set('user', $userForm);
 		$this->forwardRedirect(WindUrlHelper::createUrl('run'));
 	}
 
+	/**
+	 * 访问用户注册页面
+	 */
+	public function regAction() {
+		$this->setTemplate('reg');
+	}
+
 	/**
 	 * 处理用户注册表单
 	 */
 	public function dregAction() {
-		$userService = $this->load();
-		$userForm = $this->getInput("userForm");
-		if (!$userService->register($userForm)) $this->showMessage('注册失败.');
-		$this->setOutput($userForm, 'userInfo');
+		$this->session->destroy();
+		if ($userForm = $this->getInput("userForm")) {
+			$db = $this->getSystemFactory()->getInstance('db');
+			$stmt = $db->createStatement('SELECT * FROM user WHERE username=:username');
+			if ($stmt->getOne(array(':username' => $userForm->getUsername()))) $this->showMessage('该用户已经注册.');
+			if (!$db->execute(
+				"INSERT INTO user SET " . $db->sqlSingle(
+					array('username' => $userForm->getUsername(), 'password' => $userForm->getPassword())))) $this->showMessage(
+				'注册失败.');
+			$this->setOutput($userForm, 'userInfo');
+		}
 		$this->setTemplate('reg');
 	}
 
@@ -70,14 +88,7 @@ public function dregAction() {
 	 * 用户退出
 	 */
 	public function logoutAction() {
-		$this->load()->logout();
+		$this->session->destroy();
 		$this->forwardRedirect(WindUrlHelper::createUrl('run'));
 	}
-
-	/**
-	 * @return UserService
-	 */
-	private function load() {
-		return Wind::getApp()->getWindFactory()->createInstance(Wind::import('service.UserService'));
-	}
 }
\ No newline at end of file
diff --git a/demos/blog/index.php b/demos/blog/index.php
index db46cc83..66613c81 100644
--- a/demos/blog/index.php
+++ b/demos/blog/index.php
@@ -2,5 +2,6 @@
 error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
 define('WIND_DEBUG', 1);
 require_once '../../wind/Wind.php';
-Wind::application('blog', 'conf/config.php')->run();
+
+Wind::application('blog', 'config/config.php')->run();
 
diff --git a/demos/blog/service/UserForm.php b/demos/blog/model/UserForm.php
similarity index 100%
rename from demos/blog/service/UserForm.php
rename to demos/blog/model/UserForm.php
diff --git a/demos/blog/service/UserService.php b/demos/blog/service/UserService.php
deleted file mode 100644
index cc8a3bc8..00000000
--- a/demos/blog/service/UserService.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-Wind::import('WIND:utility.WindCookie');
-/**
- * @author Qiong Wu <papa0924@gmail.com> 2012-3-15
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.windframework.com
- * @version $Id$
- * @package demos
- * @subpackage blog.service
- */
-class UserService {
-	protected $cookieName = 'blogloginUser';
-
-	/**
-	 * 判断用户是否登录
-	 * 
-	 * @return boolean|UserForm
-	 */
-	public function isLogin() {
-		/* @var $user UserForm */
-		$user = WindCookie::get($this->cookieName);
-		if (!$user) return false;
-		$stmt = $this->_getConnecion()->createStatement('SELECT * FROM user WHERE username=:username');
-		if (!$stmt->getValue(array('username' => $user->getUsername()))) return false;
-		
-		return $user;
-	}
-
-	/**
-	 * 用户退出
-	 * 
-	 * @return boolean
-	 */
-	public function logout() {
-		return WindCookie::set($this->cookieName, '', -1);
-	}
-
-	/**
-	 * 用户登录服务
-	 * 
-	 * @param UserForm $userInfo
-	 * @return boolean
-	 */
-	public function login($userInfo) {
-		$db = $this->_getConnecion();
-		$stmt = $db->createStatement('SELECT * FROM user WHERE username=:username AND password =:password');
-		if (!$stmt->getValue(array('username' => $userInfo->getUsername(), 'password' => $userInfo->getPassword()))) {
-			return false;
-		}
-		return WindCookie::set($this->cookieName, $userInfo);
-	}
-
-	/**
-	 * 用户注册服务
-	 * 
-	 *@param UserForm $userInfo
-	 *@return boolean
-	 */
-	public function register($userInfo) {
-		$db = $this->_getConnecion();
-		$stmt = $db->createStatement('SELECT * FROM user WHERE username=:username');
-		if ($stmt->getOne(array(':username' => $userInfo->getUsername()))) $this->showMessage('该用户已经注册.');
-		return $db->execute(
-			"INSERT INTO user SET " . $db->sqlSingle(
-				array('username' => $userInfo->getUsername(), 'password' => $userInfo->getPassword())));
-	}
-
-	/**
-	 * @return WindConnection
-	 */
-	private function _getConnecion() {
-		return Wind::getApp()->getWindFactory()->getInstance('db');
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/demos/blog/static/images/bg.jpg b/demos/blog/static/images/bg.jpg
new file mode 100644
index 00000000..da9392cd
Binary files /dev/null and b/demos/blog/static/images/bg.jpg differ
diff --git a/demos/blog/static/images/bgA.png b/demos/blog/static/images/bgA.png
new file mode 100644
index 00000000..882d05b1
Binary files /dev/null and b/demos/blog/static/images/bgA.png differ
diff --git a/demos/blog/static/images/breadEm.png b/demos/blog/static/images/breadEm.png
new file mode 100644
index 00000000..e0bd839f
Binary files /dev/null and b/demos/blog/static/images/breadEm.png differ
diff --git a/demos/blog/static/images/button.png b/demos/blog/static/images/button.png
new file mode 100644
index 00000000..e47ce4cf
Binary files /dev/null and b/demos/blog/static/images/button.png differ
diff --git a/demos/blog/static/images/core.css b/demos/blog/static/images/core.css
new file mode 100644
index 00000000..a0be2b6a
--- /dev/null
+++ b/demos/blog/static/images/core.css
@@ -0,0 +1,197 @@
+/*-------------------------------------
+#Description:      pw_core.css
+#Version:          v1.0
+#Author:           2010-12-3
+#Recent:           2010-12-3
+-------------------------------------*/
+/*初始化结构*/
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,form,p,blockquote,th,td{margin: 0;padding: 0;}
+ol,ul,li{list-style: none;}
+table {border-collapse: collapse;border-spacing: 0;}
+th{text-align: left;}
+td,th,div{word-break:break-all;word-wrap:break-word;}
+form{display:inline;}
+*{outline:none}
+img{border:0;}
+/*模型补丁*/
+.mb5{margin-bottom:5px;}
+.mb10{margin-bottom:10px;}
+.mb15{margin-bottom:15px;}
+.mb20{margin-bottom:20px;}
+.mr5{margin-right:5px;}
+.mr10{margin-right:10px;}
+.mr15{margin-right:15px;}
+.mr20{margin-right:20px;}
+.p5{padding:5px;}
+.p10{padding:10px;}
+.p15{padding:15px;}
+.p20{padding:20px;}
+/*清楚浮动*/
+.cc{*zoom:1;}
+.cc:after{content:'\20';display:block;height:0;clear:both;visibility: hidden;}
+.c{clear:both;font:0px/0px Arial;overflow:hidden;height:0;width:0;}
+/*通用样式*/
+.b,b,strong{ font-weight:700;}
+.w{white-space:nowrap;}
+.tal{text-align:left;}
+.tac{text-align:center;}
+.tar{text-align:right;}
+.fr{float:right;}
+.fl{float:left;}
+.pr{position:relative;}
+.cp{cursor:pointer;}
+.vt{vertical-align:top;}
+.link_down span{padding:0 10px 0 0;background:url(icon/down.png) center right no-repeat; display:inline-block; cursor:pointer;}
+/*通用字体*/
+.f10,small,.small{font-size:10px;-webkit-text-size-adjust:none;}
+.f12{font-size:12px}
+.f14{font-size:14px}
+.f16{font-size:16px;}
+.f20{font-size:20px;}
+.f24{font-size:24px;}
+.fn,.fn a{font-weight:normal}
+/**/
+html{ overflow-y:scroll; font-size:12px;}
+.bgA{background:#f7fbff;}
+/* span color*/
+.s1{color:#ff0000;}
+.s2{color:#ff6600;}
+.s3{color:#008800;}
+.s4{color:#014c90;}
+.s5{color:#000;}
+.s6{color:#666;}
+.gray{color:#999;}
+/*link*/
+a{color:#0e6caa; text-decoration:none;}
+/*提示信息*/
+.tipsA,.tipsB{background:url(tips/tips.png) 999px 999px no-repeat;border:1px solid #7eb8e5;background-color:#eff8ff;color:#0c4b7b;}
+.tipsA{ background-position:-200px 0;padding:10px 20px 10px 50px;font:14px/25px Arial;}
+.tipsB{ background-position:-200px -300px; padding:5px 20px 5px 30px;line-height:18px;}
+.successA,.successB{background-color:#eff9e5;border:1px solid #6ac20f;color:#008800;}
+.confirmA,.confirmB{border:1px solid #e2a73f;background-color:#fff7e8;color:#ff6600;}
+.errorA,.errorB{border:1px solid #fe5301;background-color:#ffe5d8;color:#902800;}
+.successA{ background-position:-150px -50px;}
+.successB{ background-position:-150px -350px;}
+.confirmA{ background-position:-100px -100px;}
+.confirmB{ background-position:-100px -400px;}
+.errorA{ background-position:-50px -150px;}
+.errorB{ background-position:-50px -450px;}
+/*弹窗*/
+.popoutContent{background:#ffffff;border:1px solid #bbbbbb;}
+.bgcorner1,.bgcorner2,.bgcorner3,.bgcorner4,.pobg1,.pobg2,.pobg3,.pobg4{filter:Alpha(opacity=39);_filter:Alpha(opacity=39);opacity:.39;overflow:hidden;z-index:1005;line-height:0 }
+.bgcorner1,.bgcorner2,.bgcorner3,.bgcorner4{width:5px;height:5px;background:#bbbbbb;}
+.pobg1,.pobg2,.pobg3,.pobg4{ background:#bbbbbb;}
+.pobg1{height:5px; }
+.pobg2{width:5px;}
+.pobg3{height:5px;}
+.pobg4{width:5px;}
+.popTop{padding:5px 10px 4px;font-weight:700;font-size:14px;color:#333;border-bottom:1px solid #d9e5f2;background:#eaf2fa;height:21px;_height:16px;}
+.popTop select,.popTop input{ font-size:12px;}
+.popBottom{padding:5px 10px;background:#f7f7f7;border-top:1px solid #e4e4e4;text-align:center;}
+.popCont{padding:30px 50px;line-height:2;color:#333; text-align:center;}
+.popTop .adel{margin-top:4px;}
+.popTop ul{margin:1px 0 -4px -1px;*margin:6px 0 -5px -1px;_margin:1px 0 -5px -1px;_position:relative;height:23px;}
+.popTop li{float:left;}
+.popTop li a{line-height:24px;height:24px;padding:0 10px;float:left;color:#1b72af;font-size:12px; text-decoration:none; white-space:nowrap;}
+.popTop li a:hover{ text-decoration:none;}
+.popTop .current a{border:1px solid #d9e5f2;background:#ffffff;border-bottom:0;color:#333;}
+.popoutContent table{width:100%; table-layout:fixed;}
+.popoutContent th{width:80px; font-weight:100;}
+.popoutContent th,.popoutContent td{padding:5px;border-top:1px solid #ebf4fc;}
+.popoutContent .bgA{background:#f7fbff;}
+.popoutContent label input{padding:0;margin:0 4px 3px 0;}
+.popoutContent .s1{color:#ff0000;font-family:Simsun;padding:0 3px;}
+/*关闭删除操作*/
+.adel,.aedit,.g_photosbox .updel{background:url(del.png) 9999px 9999px no-repeat;width:12px;height:13px;text-indent:-2000em;display:block;overflow:hidden;float:right;padding:0;-webkit-transition: all 0.2s ease-out;}
+.adel,.g_photosbox .updel{ background-position:0 -15px}
+.adel:hover,.g_photosbox .updel:hover{ background-position:-34px -15px;}
+.aedit{ background-position:0 0;}
+.aedit:hover{ background-position:-34px 0;}
+/*全局按钮*/
+span.btn ,span.bt ,span.btn2 ,span.bt2 ,span.bts ,span.btn span ,span.bt span ,span.btn2 span ,span.bt2 span ,span.bts span{background:url(button.png) 9999px 9999px;}
+span.btn ,span.bt ,span.btn2 ,span.bt2 ,span.bts {padding:0 2px 0 0;zoom: 1;display: inline-block;vertical-align: middle; cursor: pointer; _display: inline;margin:0 3px;}
+span.btn button ,span.bt button ,span.btn2 button ,span.bt2 button ,span.bts button{display:block;overflow:visible;width:auto;_width:0;border:0 none;background:none;text-decoration:none;vertical-align:middle;white-space:nowrap;cursor:pointer;}
+span.btn span,span.bt span,span.bts span{display: block;padding:0 11px 0 13px;*padding:0 13px 0 15px;}
+span.btn button,span.bt button,span.bts button{height:27px;margin:0 -15px;padding:0 17px;line-height:27px;font-size:14px;font-weight:700;padding-bottom:4px;_padding-bottom:0px;}
+span.btn2 span,span.bt2 span{display: block;padding:0 5px 0 7px;*padding:0 7px 0 9px;}
+span.btn2 button,span.bt2 button{height:21px;margin:0 -9px;padding:0 10px;line-height:23px;padding-bottom:2px;_padding-bottom:0px;}
+span.btn{background-position:right 0;}
+span.btn span{background-position:0 0;}
+span.btn2{background-position:right -60px;}
+span.btn2 span{background-position:0 -60px;}
+span.bt{ background-position:right -30px;}
+span.bt span{ background-position:left -30px;}
+span.bt2{ background-position:right -85px;}
+span.bt2 span{ background-position:left -85px;}
+span.bts{ background-position:right -110px;}
+span.bts span{ background-position:0 -110px;}
+span.btn button,span.btn2 button{color:#ffffff;}
+span.bt button,span.bt2 button{color:#555555;}
+span.bts button{color:#cd4604;}
+/*表单*/
+input{padding:0;margin:0; vertical-align:middle;}
+textarea,.input,select{font:12px Arial;vertical-align:middle;border:1px solid; border-color: #999999 #e1e1e1 #e1e1e1 #999999;background:#fff;color:#000;}
+textarea{padding:3px;overflow:auto;line-height:1.3;}
+select{padding:1px;}
+.input{padding:2px 3px;font-size:1em;}
+.input:hover,.textareaA:hover,select:hover{border:1px solid #23a6dd;-webkit-box-shadow:0 0 5px #9fe3ff;-moz-box-shadow:0 0 5px #9fe3ff;box-shadow:0 0 5px #9fe3ff;}
+.textareaA{width:332px;height:62px;}
+.input{width:152px;}
+.selectA{width:340px;}
+/*下拉*/
+.pw_menu{border:1px solid #a6cbe7;background:#fff; position:absolute;-webkit-box-shadow:3px 3px 0 #e4e4e4;-moz-box-shadow:3px 3px 0 #e4e4e4;box-shadow:3px 3px 0 #e4e4e4;}
+/*时间控件*/
+.timeSelect{padding:1px solid #fff;width:180px;color:#333;line-height:18px;}
+.timeSelect .input{width:20px;margin:0 5px;}
+.timeSelect table{margin-bottom:5px;}
+.timeSelect td,.timeSelect th{border-right:1px solid #d9e5f2;border-bottom:1px solid #d9e5f2; text-align:center; font-weight:100; font-family:Simsun;}
+.timeSelect th{background:#f7fbff;}
+.timeSelect td:hover{}
+.timeSelect .sun{color:#f50;}
+.timeSelect .sat{border-right:0 none;color:#080;}
+.timeSelect .current,.timeSelect .current:hover{background:#308cb2;color:#fff;}
+.timeSelect td span{display:block;border:1px solid #fff; cursor:pointer;-webkit-transition: all 0.5s ease-out;transition: all 0.2s ease-out;}
+.timeSelect td span:hover{background:#dfeaf5;}
+/*select 模拟下拉*/
+.selectDiv{border:1px solid; border-color: #999999 #e1e1e1 #e1e1e1 #999999;background:#fff;color:#000;padding-right:5px;outline:none;font:100 12px/1.5 Simsun;float:left}
+.selectDiv h6{ font-size:12px; font-weight:100;padding:0 10px 0 5px;display:block;margin:0;background:url(icon/down.gif) no-repeat right center;cursor:default;}
+.selectDiv:hover,.selectDiv:hover dl{border:1px solid #23a6dd;}
+.selectDiv:hover dl{ display:block;}
+.selectDiv * {-moz-user-select:none;}
+.selectDiv dl{position:absolute;border:1px solid; border-color: #999999 #e1e1e1 #e1e1e1 #999999;background:#fff;margin-left:-1px;display:none;}
+.selectDiv dd a{ text-decoration:none;color:#333;display:block;height:18px;padding:0 15px 0 5px;overflow:hidden;}
+.selectDiv dd a:hover,.selectDiv dd.over a{background:#23a6dd;color:#fff;}
+/*统一头像*/
+.img_50{display:block;float:left;background:url(tips/facebg.png) no-repeat;width:54px;height:54px;}
+.img_50:hover{ text-decoration:none;}
+.img_50 img{width:48px;height:48px;margin:3px 0 0 3px;}
+/*自适应 Nature dl 55*/
+.nadlA dt{float:left;width:65px;margin-right:-65px;}
+.nadlA dd,.nadlB dd{float:left;width:100%;}
+.nadlA .nadlCon{margin-left:65px; position:relative;}
+/*自适应 Nature dl 120*/
+.nadlB dt{float:left;width:110px;margin-right:-110px;}
+.nadlB .nadlCon{margin-left:120px;position:relative;}
+/*相册*/
+.albumbg{float:left;width:110px;height:114px;background:url(tips/albumbg.png) no-repeat;display:block;overflow:hidden;}
+.albumbg img{float:left;width:100px;height:100px;margin:5px 0 0 5px;}
+.albumList .nadlCon{padding:10px 0 0 5px;}
+.albumList .nadlCon div{margin-bottom:3px;}
+.albumList dl{margin-bottom:10px;}
+/*新鲜事*/
+.conFeed dl{border-bottom:1px dotted #ccc;padding:10px 2px;}
+.conFeed .title{ font-size:14px;margin-bottom:5px;}
+.conFeed .opera{color:#bbb; font-family:Simsun;}
+.conFeed .opera a{margin:0 3px;}
+.conFeed .num,.conFeed .num a{color:#999;}
+/*名片*/
+.popCard{width:278px;}
+.popCard .popBottom{text-align:left;}
+.popCard .popBottom a{margin:0 15px 0 0;padding-left:18px;display:inline-block;color:#333;}
+.add_mes{ background:url(icon/mail.png) no-repeat;}
+.add_fol{ background:url(icon/follow.png) no-repeat;}
+.add_fri{ background:url(icon/friends.png) no-repeat;}
+
+
+
+
diff --git a/demos/blog/static/images/css.css b/demos/blog/static/images/css.css
new file mode 100644
index 00000000..3e1c9070
--- /dev/null
+++ b/demos/blog/static/images/css.css
@@ -0,0 +1,95 @@
+/*body*/
+body{ font:12px/1.5 Arial;color:#444;background:url(bg.jpg)  center -40px repeat-x;}
+
+/*link*/
+a{color:#333; text-decoration:none;}
+a:hover{color:#014c90;}
+
+/*layout*/
+.header,.main,.footer{width:960px;margin-left:auto;margin-right:auto;}
+
+/*grid*/
+.cm{float:left;width:100%;min-height:1px;}
+.cw{position:relative;}
+.sd{width:250px;float:left;}
+.md{width:250px;float:left;}
+.grid_2 .cw{margin-right:260px;}
+.grid_2 .sd{margin-left:-250px;}
+.grid_2r .cw{margin-left:260px;}
+.grid_2r .sd{margin-right:-260px;}
+.grid_3 .cw{margin:0 260px;}
+.grid_3 .md{width:250px;margin-right:-250px;}
+.grid_3 .sd{margin-left:-250px;}
+.grid_3r .cw{margin-right:520px;}
+.grid_3r .sd{margin-left:-510px;}
+.grid_3r .md{margin-left:-250px;}
+
+/*nav*/
+#navA{background:#176eac;border:1px solid #085e9c;}
+.navA{border:1px solid #2580c1;height:33px;border-left:0;}
+.navA ul{}
+.navA li{float:left;border-right:1px solid #085e9c;border-left:1px solid #2580c1;}
+.navA li a{display:block;float:left;height:33px;padding:0 15px;color:#fff; font:bold 14px/33px Arial;}
+.navA li.current a,.navA li a:hover{background:#085e9c;}
+.navA li.tail{height:33px;border-right:0;width:2px;overflow:hidden;}
+.navB{background:#f7f7f7;border:1px solid #ccc;border-top:0 none;}
+.navB ul{padding:5px 5px 3px;}
+.navB li{float:left;}
+.navB li a{display:block;float:left;height:25px;padding:0 10px; font:12px/25px Arial; white-space:nowrap;}
+
+/*login header*/
+.login_header{ text-align:left;padding-top:5px;}
+.login_dlA{margin-bottom:5px;}
+.login_dlA dt,.login_dlA dd{float:left;margin-left:5px;}
+.login_dlA dd{width:60px;}
+.login_dlA .input{width:100px;}
+.login_dlA .bt2,.login_dlA .btn2{margin:0;}
+.login_dlA .bt2 button,.login_dlA .btn2 button{width:60px;}
+
+/*footer*/
+.footer{border-top:1px solid #ccc;padding:10px 0; text-align:center;color:#999;}
+.bottom{margin-bottom:5px;}
+.bottom li{ display:inline-block;}
+.bottom li a{margin:0 8px 0 5px;}
+
+/*boxA*/
+.bA{background:#ffffff;border:1px solid #c0d8ea;border-top:2px solid #065792;}
+.bB{border:1px solid #e4e4e4;background:#ffffff;}
+
+/*head title*/
+.hdA,.hdB{line-height:26px;height:26px;padding:0 10px;font-size:12px;}
+.hdA{border-bottom:1px solid #ccc;background:#f7f7f7;}
+.hdB{border-bottom:1px solid #e4e4e4;background:#f7f7f7 url(hdB.png) 0 -26px repeat-x;padding-left:24px;}
+
+/*tags*/
+.tags li{float:left;margin-right:10px; white-space:nowrap;}
+
+/*dome_dlA*/
+.dome_dlA {padding-bottom:40px;}
+.dome_dlA dl{padding:25px 30px;border-bottom:1px dotted #ccc;}
+.dome_dlA dt a{ text-decoration:underline;}
+.dome_dlA dd { font-family:Simsun;}
+.dome_dlA dd cite{ font-style:normal;color:#008800;margin-right:10px;}
+.dome_dlA dd a{color:#014c90;}
+
+/*breadCrumb*/
+#breadCrumb{zoom:1; border:1px solid #c1d8ea;background:#f5fafe;padding:0 5px 0 10px;margin-bottom:10px;border-top:0;}
+#breadCrumb a{line-height:30px;float:left;}
+#breadCrumb em{height:30px;background:url(breadEm.png) 0 0 no-repeat;width:10px;overflow:hidden;margin:0 5px;float:left;}
+#breadCrumb img.breadHome{float:left;margin:6px 5px 0 0;}
+
+
+/*content*/
+.content{padding:20px 30px 100px;min-height:300px;_height:300px;line-height:1.8em;}
+.content h1{ font-size:22px;color:#014c90; text-align:center;padding:5px 0;}
+.content h3{background:#eaf2fa;color:#333;padding:3px 10px;border-left:3px solid #d9e5f2;}
+.content h4{padding:5px 0 5px 15px;}
+.content ol{list-style-type:decimal;margin-left:40px;}
+.content ol li{list-style-type:decimal;}
+
+.input_320{width:332px;}
+.input_err,.input_err:hover{background:#f8e6e6;border:1px solid #d1aaaa;}
+.read_info{ text-align:center;border-bottom:1px dotted #ccc;padding:10px 0 5px; font-family:Simsun;margin-bottom:20px;}
+.read_info a{color:#014c90;}
+
+
diff --git a/demos/blog/static/images/del.png b/demos/blog/static/images/del.png
new file mode 100644
index 00000000..285698b8
Binary files /dev/null and b/demos/blog/static/images/del.png differ
diff --git a/demos/blog/static/images/hdB.png b/demos/blog/static/images/hdB.png
new file mode 100644
index 00000000..2654a078
Binary files /dev/null and b/demos/blog/static/images/hdB.png differ
diff --git a/demos/blog/static/images/home.gif b/demos/blog/static/images/home.gif
new file mode 100644
index 00000000..95fd38b3
Binary files /dev/null and b/demos/blog/static/images/home.gif differ
diff --git a/demos/blog/static/images/logo.png b/demos/blog/static/images/logo.png
new file mode 100644
index 00000000..ab101a8f
Binary files /dev/null and b/demos/blog/static/images/logo.png differ
diff --git a/demos/blog/template/error.htm b/demos/blog/template/error.htm
index 8abc46dc..bd5b5e35 100644
--- a/demos/blog/template/error.htm
+++ b/demos/blog/template/error.htm
@@ -1,16 +1,17 @@
 <div class="grid cc mb10">
 	<div class="bA">
 		<div class="content">
-<ol>
+<ul>
 	<!--#foreach ($errors as $key => $error):
+		$key = $key + 1;
 		if(!WIND_DEBUG)
 			$error = str_replace(Wind::getRootPath(Wind::getAppName()), '~/', $error);#-->
-	<li>{$error}</li>
+	<li>{$key}. {$error}</li>
 	<!--#endforeach;#-->
-</ol>
+</ul>
 <br>
-<div class="mb10 f14"><a href="{@WindUrlHelper::createUrl('run')}">&rsaquo;&rsaquo;返回首页</a></div>
-<h2 class="h"><strong>You Can Get Help In:</strong></h2>
+<div class="mb10 f14"><a href='{@WindUrlHelper::createUrl('run')}'>&rsaquo;&rsaquo;返回首页</a></div>
+<h2 class="f14 b">You Can Get Help In:</h2>
 <p><?php echo "The server encountered an internal error and failed to process your request. 
 Please try again later. If this error is temporary, reloading the page might resolve the problem.
 \nIf you are able to contact the administrator report this error message.
diff --git a/demos/blog/template/images/bg.png b/demos/blog/template/images/bg.png
deleted file mode 100755
index cfbab345..00000000
Binary files a/demos/blog/template/images/bg.png and /dev/null differ
diff --git a/demos/blog/template/images/down.png b/demos/blog/template/images/down.png
deleted file mode 100755
index 9b3aee5c..00000000
Binary files a/demos/blog/template/images/down.png and /dev/null differ
diff --git a/demos/blog/template/images/head.png b/demos/blog/template/images/head.png
deleted file mode 100755
index 1d89a729..00000000
Binary files a/demos/blog/template/images/head.png and /dev/null differ
diff --git a/demos/blog/template/images/hr.png b/demos/blog/template/images/hr.png
deleted file mode 100755
index fb200d3c..00000000
Binary files a/demos/blog/template/images/hr.png and /dev/null differ
diff --git a/demos/blog/template/images/logo.png b/demos/blog/template/images/logo.png
deleted file mode 100644
index 319865cf..00000000
Binary files a/demos/blog/template/images/logo.png and /dev/null differ
diff --git a/demos/blog/template/images/num.png b/demos/blog/template/images/num.png
deleted file mode 100755
index 82fa18b1..00000000
Binary files a/demos/blog/template/images/num.png and /dev/null differ
diff --git a/demos/blog/template/images/style.css b/demos/blog/template/images/style.css
deleted file mode 100755
index 7960f719..00000000
--- a/demos/blog/template/images/style.css
+++ /dev/null
@@ -1,447 +0,0 @@
-@charset "utf-8";
-/*
-===================
-@copyright: Copyright 2012,phpwind.com
-@author: yanchixia@aliyun-inc.com
-===================
-*/
-/*
-===================
-初始化【请勿修改】
-===================
-*/
-html,body, 
-div, dl, dt, dd, ul, p, th, td,
-h1, h2, h3, h4, h5, h6, 
-pre, code, form, 
-fieldset, legend{
-	margin: 0;
-	padding: 0;
-}
-cite, 
-em, 
-strong, 
-th {
-	font-style: normal;
-}
-td, 
-th, 
-div {
-	word-break:break-all;
-	word-wrap:break-word;
-}
-table {
-	border-collapse: collapse;
-	border-spacing:0;
-}
-th {
-	text-align: left;
-	font-weight:100;
-}
-ol li {
-	list-style: decimal outside;
-}
-ol{
-	padding:0 0 0 18px;
-	margin:0;
-}
-li {
-	list-style:none;
-}
-img {
-	border: 0;
-}
-html {
-	-webkit-text-size-adjust:none;
-}
-
-/*
-===================
-清除浮动【请勿修改】
->>	cc	作用于父模型
->>	c		作用于浮动模型后，父模型区域里
-===================
-*/
-.cc{
-	zoom:1;
-}
-.cc:after{
-	content:'\20';
-	display:block;
-	height:0;
-	clear:both;
-	visibility: hidden;
-}
-
-/*
-===================
-结构
-===================
-*/
-html{
-	overflow-y:scroll;
-}
-body{
-	background:url(bg.png);
-	font:14px/1.5 Arial "Microsoft Yahei";
-}
-.head_wrap{
-	background:url(head.png);
-	height:90px;
-}
-.main_wrap{
-	border-top:1px solid #ffffff;
-	min-height:600px;
-}
-.head,
-.main{
-	width:800px;
-	margin:0 auto;
-}
-.main{
-	padding:20px 0;
-}
-a{
-	color:#3a7cbb;
-	text-decoration:none;
-}
-a:hover{
-	text-decoration:underline;
-}
-
-/*
-===================
-logo
-===================
-*/
-.logo{
-	float:left;
-	margin:25px 0 0 0;
-}
-
-/*
-===================
-导航
-===================
-*/
-.nav{
-	float:right;
-	padding-top:42px;
-}
-.nav li{
-	float:left;
-	margin-left:30px;
-	padding:15px 0;
-	position:relative;
-}
-.nav li a{
-	color:#fff;
-	font-size:14px;
-	font-weight:700;
-	text-decoration:none;
-}
-.nav li.current em{
-	position:absolute;
-	width:0;
-	height:0;
-	padding:0;
-	bottom:0;
-	left:50%;
-	margin-left:-8px;
-	border-bottom:8px #fff solid;
-	border-top:8px transparent dashed;
-	border-right:8px transparent dashed;
-	border-left:8px transparent dashed;
-	overflow:hidden;
-}
-
-/*
-===================
-底部
-===================
-*/
-.footer_wrap{
-	background:#000;
-	padding:5px;
-	color:#999;
-	text-align:center;
-	font-size:12px;
-}
-
-/*
-===================
-通用标题
-===================
-*/
-.h{
-	font-size:16px;
-	font-weight:400;
-	padding:10px 0;
-	background:url(hr.png) 0 bottom repeat-x;
-}
-
-/*
-===================
-首页框架简介
-===================
-*/
-.home_info{
-	padding:15px 0;
-	font-size:14px;
-	color:#666;
-	line-height:1.8;
-}
-
-/*
-===================
-下载
-===================
-*/
-.home_down{
-	padding:15px 0;
-	color:#666;
-}
-.home_down .downlink{
-	height:56px;
-	margin-bottom:15px;
-}
-.home_down .other{
-	padding-bottom:10px;
-}
-.home_down .other a{
-	margin-right:20px;
-}
-
-/*
-===================
-下载按钮
-===================
-*/
-.zip_down,
-.tar_down{
-	float:left;
-	height:56px;
-	width:211px;
-	overflow:hidden;
-	text-indent:-2000em;
-	background:url(down.png) no-repeat;
-	margin-right:20px;
-}
-.zip_down:hover{
-	background-position:0 -56px;
-}
-.tar_down{
-	background-position:0 -112px;
-}
-.tar_down:hover{
-	background-position:0 -168px;
-}
-
-/*
-===================
-优点
-===================
-*/
-.home_actor{
-	padding:15px 0;
-}
-.home_actor li{
-	float:left;
-	width:49.8%;
-	height:120px;
-	padding:15px 0 0;
-	font-size:16px;
-	color:#666;
-}
-.home_actor li span{
-	overflow:hidden;
-	float:left;
-	width:280px;
-}
-.home_actor li:hover span{
-	color:#115cb7;
-}
-.home_actor li p{
-	float:left;
-	width:300px;
-	font-size:12px;
-	color:#999;
-}
-.home_actor li:hover p{
-	color:#333;
-}
-.home_actor li em{
-	width:30px;
-	height:30px;
-	float:left;
-	margin-right:15px;
-	background:url(num.png) no-repeat;
-	text-indent:-2000em;
-	overflow:hidden;
-}
-.home_actor li em.num_1{
-	background-position:0 0;
-}
-.home_actor li em.num_2{
-	background-position:-30px 0;
-}
-.home_actor li em.num_3{
-	background-position:-60px 0;
-}
-.home_actor li em.num_4{
-	background-position:-90px 0;
-}
-.home_actor li em.num_5{
-	background-position:-120px 0;
-}
-.home_actor li em.num_6{
-	background-position:-150px 0;
-}
-.home_actor li em.num_7{
-	background-position:-180px 0;
-}
-.home_actor li em.num_8{
-	background-position:-210px 0;
-}
-.home_actor li em.num_9{
-	background-position:-240px 0;
-}
-.home_actor li em.num_10{
-	background-position:-270px 0;
-}
-.home_actor li em.num_11{
-	background-position:-300px 0;
-}
-.home_actor li em.num_12{
-	background-position:-330px 0;
-}
-.home_actor li em.num_13{
-	background-position:-360px 0;
-}
-.home_actor li em.num_14{
-	background-position:-390px 0;
-}
-.home_actor li em.num_15{
-	background-position:-420px 0;
-}
-.home_actor li em.num_16{
-	background-position:-450px 0;
-}
-.home_actor li em.num_17{
-	background-position:-480px 0;
-}
-.home_actor li:hover{
-	color:#333;
-}
-
-/*
-===================
-项目背景
-===================
-*/
-.project_bg{
-	padding:20px 0;
-	color:#444;
-}
-.project_bg p{
-	padding:0 0 20px;
-	line-height:1.8;
-	text-indent:2em;
-}
-
-/*
-===================
-框架介绍
-===================
-*/
-.framework_info{
-	padding:0;
-	color:#444;
-}
-.framework_info h3{
-	padding-top:20px;
-	font-size:16px;
-	margin-bottom:10px;
-	color:#074179;
-}
-.framework_info h4{
-	font-size:14px;
-	margin-bottom:10px;
-	color:#5183b2;
-}
-.framework_info p{
-	padding:0 0 20px;
-	line-height:1.8;
-	text-indent:2em;
-}
-.framework_info .thumb{
-	padding:10px;
-	background:#fff;
-	border:1px solid #e4e4e4;
-	text-align:center;
-	margin-bottom:10px;
-	overflow:hidden;
-}
-.framework_info .thumb p{
-	padding:10px 0 0;
-}
-.framework_info ol{
-	margin-left:3em;
-	margin-bottom:20px;
-}
-
-.code{
-	border:1px solid #e4e4e4;
-	min-height:200px;
-	margin-bottom:20px;
-	background:#fff;
-}
-
-
-
-
-
-
-
-.login{
-	padding:50px 20px;
-}
-.login dd{
-	padding:5px 0 20px;
-}
-.login .input{
-	padding:4px 4px;
-	font-size:100%;
-	line-height:18px;
-	border:1px solid #ccc;
-	background-color:#fff;
-	box-shadow:2px 2px 2px #f0f0f0 inset;
-	vertical-align: middle;
-  margin: 0;
-	font-family: inherit;
-	color:#333;
-	width:200px;
-}
-.input:focus{
-	outline:1px solid #99d8f5;
-	border-color:#99d8f5;
-}
-.login button{
-	overflow:visible;
-	padding:0 0px;
-	cursor:pointer;
-	height:30px;
-	text-align:center;
-	width:80px;
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/demos/blog/template/index.htm b/demos/blog/template/index.htm
index a006e1b4..4acecb4f 100644
--- a/demos/blog/template/index.htm
+++ b/demos/blog/template/index.htm
@@ -1,23 +1,24 @@
-
+<div class="grid cc mb10">
+	<div class="bA">
+		<div class="content">
 <!--#if($userInfo):#-->
 			<div class="mb10 f16 b">Hi, {$userInfo->getUsername()} 欢迎您!</div>
 			<div class="mb10 f14"><a href="{@WindUrlHelper::createUrl('logout')}">&rsaquo;&rsaquo;退出</a></div>
 <!--#else:#-->
-<h2 class="h"><strong>用户登录</strong></h2>
-<form name="login" action="{@WindUrlHelper::createUrl('login')}" method="post">
-			<div class="login">
-			<dl>
-				<dt><label>帐号</label></dt>
+			<div class="mb10 f16 b">用户登录</div>
+			<form name="login" action="{@WindUrlHelper::createUrl('login')}" method="post">
+			<dl class="mb10">
+				<dt>姓名<span class="s1">*</span></dt>
 				<dd><input name="username" type="text" class="input" ></dd>
 			</dl>
-			<dl>
-				<dt><label>密码</label></dt>
+			<dl class="mb10">
+				<dt>密码<span class="s1">*</span></dt>
 				<dd><input name="password" type="text" class="input"></dd>
 			</dl>
-			<dl>
-				<dd><button type="submit">登陆</button>
-				<button type="button" onclick="javascript:document.location.href='{@WindUrlHelper::createUrl('reg')}';">注册</button></dd>
-			</dl>
-			</div>
+			<span class="btn" style="margin:0 0;"><span><button type="submit">提 交</button></span></span>
+			<span class="bt" style="margin:0 0;"><span><button type="button"  onclick="javascript:document.location.href='{@WindUrlHelper::createUrl('reg')}';">注册</button></span></span>
 			</form>
 <!--#endif;#-->
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/demos/blog/template/layout.htm b/demos/blog/template/layout.htm
index 7c01dd66..3836b80c 100644
--- a/demos/blog/template/layout.htm
+++ b/demos/blog/template/layout.htm
@@ -1,32 +1,49 @@
 <!doctype html>
 <html>
 <head>
-<meta charset="utf-8" />
+<meta charset="utf8" />
 <title>首页</title>
-<link href="{@G:images}/style.css" rel="stylesheet" />
+<link href="{@G:images}/core.css" rel="stylesheet" />
+<link href="{@G:images}/css.css" rel="stylesheet" />
 </head>
 <body>
-	<div class="head_wrap">
-		<div class="head">
-			<div class="logo"><img src="{@G:images}/logo.png"></div>
-			<div class="nav">
-				<ul class="cc">
-					<li class="current"><a href="{@WindUrlHelper::createUrl('run')}">首页</a><em></em></li>
-					<li><a href="">关于框架</a><em></em></li>
-					<li><a href="">FAQ</a><em></em></li>
-				</ul>
+	<div class="wrap">
+		<div id="header" class="mb10">
+			<div class="header">
+				<table width="100%"><tr>
+					<td><h2 class="fl logo"><a href="{@WindUrlHelper::createUrl('default/index/run')}"><img src="{@G:images}/logo.png" width="198" height="80" class="fl" /></a></h2></td>
+					<td align="right">
+						<div class="login_header fr">
+							<dl class="cc login_dlA">
+								<dt></dt>
+								<dd></dd>
+								<dd>&nbsp;</dd>
+							</dl>
+							<dl class="cc login_dlA">
+								<dt>{@index_run:userInfo.username}</dt>
+							</dl>
+						</div>
+					</td>
+				</tr></table>
+				<div id="navA">
+					<div class="navA">
+						<ul class="cc">
+							<li class="current"><a href="{@WindUrlHelper::createUrl('default/index/run')}">首页</a></li>
+							<li><a href="{@WindUrlHelper::createUrl('default/index/run')}">关于本demo</a></li>
+							<li class="tail">&nbsp;</li>
+						</ul>
+					</div>
+				</div>
 			</div>
 		</div>
-	</div>
-	<div class="main_wrap">
 		<div class="main">
 			<!--#$this->content();#-->
 		</div>
-	</div>
-	<div class="footer_wrap">
-		<div class="footer">
-			&copy; 2012 windframework
+<div id="footer">
+			<div class="footer">
+				<p class="f10">Powered by phpwind windframework group &copy;2003-2103 http://www.windframework.com</p>
+			</div>
 		</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>	
\ No newline at end of file
diff --git a/demos/blog/template/reg.htm b/demos/blog/template/reg.htm
index b9f3059d..60a227a3 100644
--- a/demos/blog/template/reg.htm
+++ b/demos/blog/template/reg.htm
@@ -1,23 +1,24 @@
-
-<!--#if($userInfo):#-->
+<div class="grid cc mb10">
+	<div class="bA">
+		<div class="content">
+<!--#if(isset($userInfo)):#-->
 			<div class="mb10 f16 b">恭喜您,注册成功!</div>
 			<div class="mb10 f14">&rsaquo;&rsaquo;<a href="{@WindUrlHelper::createUrl('run')}">返回登录</a></div>
 <!--#else:#-->
-<h2 class="h"><strong>用户注册</strong></h2>
-<form name="reg" action="{@WindUrlHelper::createUrl('dreg')}" method="post">
-			<div class="login">
-			<dl>
-				<dt><label>帐号</label></dt>
+			<div class="mb10 f16 b">用户注册</div>
+			<form name="reg" action="{@WindUrlHelper::createUrl('dreg')}" method="post">
+			<dl class="mb10">
+				<dt>姓名<span class="s1">*</span></dt>
 				<dd><input name="username" type="text" class="input" ></dd>
 			</dl>
-			<dl>
-				<dt><label>密码</label></dt>
+			<dl class="mb10">
+				<dt>密码<span class="s1">*</span></dt>
 				<dd><input name="password" type="text" class="input"></dd>
 			</dl>
-			<dl>
-				<dd><button type="submit">提 交</button>
-				<button type="button" onclick="javascript:document.location.href='{@WindUrlHelper::createUrl('run')}';">返回登录</button></dd>
-			</dl>
-			</div>
+			<span class="btn" style="margin:0 0;"><span><button type="submit">提 交</button></span></span>
+			<span class="bt" style="margin:0 0;"><span><button type="button"  onclick="javascript:document.location.href='{@WindUrlHelper::createUrl('run')}';">返回登录</button></span></span>
 			</form>
 <!--#endif;#-->
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/docs/config/cache_config.xml b/docs/config/cache_config.xml
index 9a122031..0e698d4c 100644
--- a/docs/config/cache_config.xml
+++ b/docs/config/cache_config.xml
@@ -86,64 +86,4 @@
 			<port>11212</port>
 		</server>
 	</servers>
-</WIND>
-
-
-<!-- 
-=======================================================================================
-======================redis缓存配置==================================================
-=======================================================================================
--->
-<!-- redis配置 -->
-<WIND>
-	<!-- 缓存文件的过期时间 -->
-	<expires>0</expires>
-	<!-- 缓存key的前缀 -->
-	<key-prefix></key-prefix>
-	<!-- 缓存key安全盐码 -->
-	<security-code></security-code>
-	
-	<!-- 压缩的级次 -->
-	<auth></auth>
-   <!-- redis服务器相关配置 可以配置多个-->
-	<servers>
-		<server name='test1'>
-			<!-- redis主机ip -->
-			<host>127.0.0.1</host>
-			<!-- redis端口 -->
-			<port>11211</port>
-			<!-- 是否使用长连 -->
-			<pconn>true</pconn>
-			<!-- 连接持续（超时）时间（单位秒） -->
-			<timeout>1</timeout>
-			<!-- 如果是长链接，则会存在一个长链接的ID号 -->
-			<persistent_id></persistent_id>
-		</server>
-		<server name='test2'>
-			<host>127.0.0.1</host>
-			<port>11212</port>
-		</server>
-	</servers>
-</WIND>
-
-
-
-<!-- 
-=======================================================================================
-======================xcache缓存配置======================================================
-=======================================================================================
--->
-<!-- 文件缓存配置 -->
-<WIND>
-	<!-- 缓存文件的过期时间 -->
-	<expires>0</expires>
-	<!-- 缓存key的前缀 -->
-	<key-prefix></key-prefix>
-	<!-- 缓存key安全盐码 -->
-	<security-code></security-code>
-	
-	<!-- 验证用户名 -->
-	<user></user>
-	<!-- 验证用户密码 -->
-	<pwd></pwd>
 </WIND>
\ No newline at end of file
diff --git a/docs/config/ini/cache_config.ini b/docs/config/ini/cache_config.ini
index c0a4e352..62f1e5f2 100644
--- a/docs/config/ini/cache_config.ini
+++ b/docs/config/ini/cache_config.ini
@@ -67,44 +67,3 @@ test2.host=127.0.0.1 ;memcache主机ip
 test2.port=11212 	 ;memcache端口
 test2.weight=1	 	 ;为此服务器创建的桶的数量，用来控制此服务器被选中的权重
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;redis缓存配置格式：;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;redis配置:
-
-;;缓存文件的过期时间
-expires=0
-;;缓存key的前缀
-key-prefix=''
-;;缓存key安全盐码
-security-code=''
-
-;;验证信息
-auth=''
-;;redis服务器相关配置 可以配置多个
-[servers]
-;;例如配置test1和test2两台主机
-test1.host=127.0.0.1 ;memcache主机ip
-test1.port=6379 	 ;memcache端口
-test1.pconn='true'	 ;是否使用长连
-test1.timeout=1		 ;连接持续（超时）时间（单位秒）
-persistent_id=''	 ;如果是长链接，则会存在一个长链接的ID号
-test2.host=127.0.0.1 ;redis主机ip
-test2.port=11212 	 ;redis端口
-test2.weight=1	 	 ;为此服务器创建的桶的数量，用来控制此服务器被选中的权重
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;xcache缓存配置格式：;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;文件缓存配置
-;;缓存文件的过期时间
-expires=0
-;;缓存key的前缀
-key-prefix=''
-;;缓存key安全盐码
-security-code=''
-
-;;验证用户名
-user=''
-;;验证用户密码
-pwd=''
diff --git a/docs/config/ini/router_config.ini b/docs/config/ini/router_config.ini
index ecbba3f4..1eac00c7 100644
--- a/docs/config/ini/router_config.ini
+++ b/docs/config/ini/router_config.ini
@@ -1,9 +1,5 @@
 ;路由规则配置
 ;MVC 配置，url-param：配置访问的别名，default-value:配置缺省值
-;当开启多应用时候，路由组件指向WindMultiAppRouter时候，可配置路径中app的规则
-[app]
-url-param=p
-default-value=default
 [module]
 url-param=m
 default-value=default
@@ -20,17 +16,19 @@ default-value=run
 ;每个路由有唯一的一个名字,以下是框架提供的一个路由的规则配置
 ;;比例如 配置框架提供的路由规则
 ;;路由的实现 
-WindRoute.class=WIND:router.route.WindRewriteRoute
+WindRoute.class=WIND:router.route.WindRoute
 ;;路由的正则匹配
-WindRoute.pattern=^http[s]?:\/\/[^\/]+(\/\w+)?(\/\w+)?(\/\w+)?.*$
+WindRoute.pattern=^([\w-_\.]+\.\w+[\?\/]{1,2}|\?)*(\w+)(\/\w+)?(\/\w+)?(\/|\/?&.*)*$
 ;;参数匹配设置，针对正则中的每个匹配项
-;;;参数的名字:a,  map:匹配上述正则中的子匹配的位置, default:缺省的值
+;;;参数的名字:script,  map:匹配上述正则中的子匹配的位置, default:缺省的值
+WindRoute.params.script.map=1
+WindRoute.params.script.default='index.php'
 ;;参数匹配：针对MVC的参数名字，需要注意和MVC配置中的别名一一对应，否则不能正确进行路由 
-WindRoute.params.a.map=3
+WindRoute.params.a.map=2
 WindRoute.params.a.default=run
-WindRoute.params.c.map=2
-WindRoute.params.m.map=1
+WindRoute.params.c.map=3
+WindRoute.params.m.map=4
 ;;普通参数的链接分隔符，支持两个字符的配置，第一个字符为参数之间的配置，第二个字符为参数key-value之间的分隔符，默认为&=
-WindRoute.separator='&='
+WindRoute.separator='$='
 ;;build的格式，将会依次根据params中配置的map的顺序依次替换%s占位符，普通变量将会跟在其之后
-WindRoute.reverse='/%s'
\ No newline at end of file
+WindRoute.reverse='%s/%s/%s/%s/'
\ No newline at end of file
diff --git a/docs/config/ini/view_config.ini b/docs/config/ini/view_config.ini
index 5fba5d04..54c8e62d 100644
--- a/docs/config/ini/view_config.ini
+++ b/docs/config/ini/view_config.ini
@@ -17,7 +17,7 @@ compile-ext=tpl
 ;;布局文件配置
 layout=''
 ;;主题包位置
-theme-package=''
+theme=''
 ;;是否开启对输出模板变量进行过滤
 htmlspecialchars='true'
 
diff --git a/docs/config/ini/wind_config.ini b/docs/config/ini/wind_config.ini
index ceaa4532..df83536b 100644
--- a/docs/config/ini/wind_config.ini
+++ b/docs/config/ini/wind_config.ini
@@ -1,74 +1,66 @@
-;站点是否关闭设置
-isclose=1
+;应用配置
+;应用的名字
+[default]
+;应用的实现组件
+class=windWebApp
 
-;站点关闭后转向的模板路径
-isclose-tpl=TEST:template.closed.htm
+;default应用的编码
+charset=utf-8
 
 ;组件的配置
 ;组件个性配置，一下的组件配置将会替换掉compontents_config下的对应的组件的配置，同时这里也可以增加自己的组件
-[components]
+;components
 ;;比如配置一个db组件
 ;;db相关配置，如果设置了resource则系统会默认找到resource指向的文件作为db配置信息.DB的配置config内容参照DOCS下的db_config配置
-db.config.resource=db_config.php
+;components.db.config.resource=db_config.php
 ;;比如配置一个router组件
-;当开启多应用时候，路由组件需指向WindMultiAppRouter
-router.path=WIND:router.WindMultiAppRouter
 ;;router组件主要允许用户配置module/controller/action的访问别名及各自缺省值，同时允许设置urlWrite规则
-;当开启多应用时候，可配置路径中app的规则
-router.config.app.url-param=p
-router.config.app.default-value=default
-router.config.module.url-param=m
-router.config.module.default-value=default
-router.config.controller.url-param=c
-router.config.controller.default-value=index
-router.config.action.url-param=a
-router.config.action.default-value=run
+;components.router.config.module.url-param=m
+;components.router.config.module.default-value=default
+;components.router.config.controller.url-param=c
+;components.router.config.controller.default-value=index
+;components.router.config.action.url-param=a
+;components.router.config.action.default-value=run
 ;;以下为url路由规则的配置
-router.config.routes.WindRoute.class=WIND:router.route.WindRewriteRoute
-router.config.routes.WindRoute.pattern=^http[s]?:\/\/[^\/]+(\/\w+)?(\/\w+)?(\/\w+)?.*$
-router.config.routes.WindRoute.params.a.map=3
-router.config.routes.WindRoute.params.a.default=run
-router.config.routes.WindRoute.params.c.map=2
-router.config.routes.WindRoute.params.m.map=1
-
-;应用配置
-[web-apps]
-;default应用的配置
-;应用的实现组件
-default.class=windWebApp
-
-;default应用的编码
-default.charset=utf-8
-
-
+;components.router.config.routes.WindRoute.class=WIND:router.route.WindRoute
+;components.router.config.routes.WindRoute.params.script.map=1
+;components.router.config.routes.WindRoute.params.script.default=index.php
+;components.router.config.routes.WindRoute.params.a.map=2
+;components.router.config.routes.WindRoute.params.a.default=run
+;components.router.config.routes.WindRoute.params.c.map=3
+;components.router.config.routes.WindRoute.params.m.map=4
 
 ;iscache属性控制windCache组件是否可用，如果关闭则windCache组件将不可用,通过Wind::getApp()->getComponent('windCache');
-default.iscache=1
+iscache=1
+
+;charset属性控制输出的编码方式
+charset=utf-8
 
 ;过滤链配置，可以配置通用的，同时也可以配置Module级别的，controller级别的，action级别的； class: 配置过滤链的实现
 ;过滤器配置
 ;name: 过滤器的名字：唯一
 ;class: 过滤器的实现：
 ;pattern：*：则所有的请求都将会应用该过滤器
-;	module/*: 则所有module模块的请求都将会应用该过滤器
-;	module/index/*: 则module模块下的indexController下的所有Action请求都将会应用该过滤器
-;	module/index/add: 则module模块下的indexController下的addAction将会应用该过滤器
+;	module*: 则所有module模块的请求都将会应用该过滤器
+;	module_index*: 则module模块下的indexController下的所有Action请求都将会应用该过滤器
+;	module_index_add*: 则module模块下的indexController下的addAction将会应用该过滤器
 ;form: 使用框架提供的formFilter的时候配置给该filter指明需要使用的form
 ;其他配置项：将会传递给配置的filter相同配置项的属性
-default.filters.formfilter.class=WIND:web.filter.WindFormFilter
-default.filters.formfilter.pattern=*
-default.filters.formfilter.form=Myform
+filters.class=WIND:filter.WindFilterChain
+filters.filter.class=WIND:web.filter.WindFormFilter
+filters.filter.pattern=*
+filters.filter.form=
 
 
-;模块配置： 
+;模块配置： 可以通过设定多个<module></module>来设置多组模块配置，每组模块以name来相互区分
 ;;如下配置一个名为default的模块:
 ;;controller-path: 模块的路径（采用命名空间的方式) 
-default.modules.default.controller-path=controller
+modules.default.controller-path=controller
 ;controller-suffix: 模块的controller后缀信息
-default.modules.default.controller-suffix=Controller
+modules.default.controller-suffix=Controller
 ;error-handler: 模块的错误处理类
-default.modules.default.error-handler=WIND:web.WindErrorHandler
+modules.default.error-handler=WIND:web.WindErrorHandler
 ;template-dir: 模块的模板目录，支持命名空间的方式如DEFAULT:template
-default.modules.default.template-dir=template
+modules.default.template-dir=template
 ;compile-dir: 模块的模板编译文件保存的目录，支持命名空间的方式如DEFAULT:compile.template
-default.modules.default.compile-dir=data.template
\ No newline at end of file
+modules.default.compile-dir=data.template
\ No newline at end of file
diff --git a/docs/config/php/cache_config.php b/docs/config/php/cache_config.php
index 29878a99..7eee8562 100644
--- a/docs/config/php/cache_config.php
+++ b/docs/config/php/cache_config.php
@@ -8,7 +8,7 @@
 ###################################################################
 #######db缓存配置格式：############################################
 return array(
-	//缓存的过期时间
+	//缓存文件的过期时间
     'expires' => '0',  
 	//缓存key的前缀
     'key-prefix' => '',
@@ -29,7 +29,7 @@
 ###################################################################
 #######File缓存配置格式：############################################
 return array(
-	//缓存的过期时间
+	//缓存文件的过期时间
     'expires' => '0',
 	//缓存key的前缀
     'key-prefix' => '',
@@ -48,7 +48,7 @@
 ###################################################################
 ######Memcache缓存配置格式：############################################
 return array(
-	//缓存的过期时间
+	//缓存文件的过期时间
     'expires' => '0',
 	//缓存key的前缀
     'key-prefix' => '',
@@ -71,47 +71,4 @@
 		), 
 		'test2' => array('host' => '127.0.0.1', 'port' => '11212', 'weight' => 1)
     ),
-);
-
-
-
-###################################################################
-######redis缓存配置格式：############################################
-return array(
-	//缓存的过期时间
-    'expires' => '0',
-	//缓存key的前缀
-    'key-prefix' => '',
-	//缓存key安全盐码
- 	'security-code' => '',
- 	/*验证信息*/
-    'auth' => '',
-     /*redis服务器相关配置 可以配置多个*/
-    'servers' => array(
-		//例如配置test1和test2两台主机
-    	'test1' => array(
-    		'host' => '127.0.0.1',  #redis主机ip
-    		'port' => '6379', 		#redis端口
-			'pconn' => true,		#是否使用长链接
-			'timeout' => 1,			#连接持续（超时）时间（单位秒）
-			'persistent_id' => '', 	#如果是长链接，则会存在一个长链接的ID号
-		), 
-		'test2' => array('host' => '127.0.0.1', 'port' => '6380')
-    ),
-);
-
-
-###################################################################
-######xcache缓存配置格式：############################################
-return array(
-	//缓存的过期时间
-    'expires' => '0',
-	//缓存key的前缀
-    'key-prefix' => '',
-	//缓存key安全盐码
- 	'security-code' => '',
- 	/*验证用户名*/
-    'user' => '',
-	/*验证用户密码*/
-	'pwd' => ''
 );
\ No newline at end of file
diff --git a/docs/config/php/router_config.php b/docs/config/php/router_config.php
index 3c724df6..a333f71e 100644
--- a/docs/config/php/router_config.php
+++ b/docs/config/php/router_config.php
@@ -9,46 +9,42 @@
 return array(
 	/*配置default应用的路由规则*/
 	//MVC 配置，url-param：配置访问的别名，default-value:配置缺省值
-    /*当开启多应用时候，路由组件指向WindMultiAppRouter时候，可配置路径中app的规则*/
-    'app' => array(
-		'url-param' => 'p',
-		'default-value' => 'default',
-	),
-	/*配置路径中module的规则*/
-	'module' => array(
-		'url-param' => 'm',
-		'default-value' => 'default',
-	),
-	/*配置路径中controller的规则*/
-	'controller' => array(
-		'url-param' => 'c',
-		'default-value' => 'index',
-	),
-	/*配置路径中action的规则*/
-	'action' => array(
-		'url-param' => 'a',
-		'default-value' => 'run',
-	),
-	//路由规则配置
-	/*用户可以轻易的实现自己的route，继承AbstractWindRoute，同时配置到routes下即可，所有的route下的规则根据自己的实现进行更改调整config*/
-	/*正则匹配*/
-	'routes' => array(
-		'WindRoute' => array(
-			//路由的实现
-			'class' 	=> 'WIND:router.route.WindRewriteRoute',
-			/*正则匹配规则*/
-			'pattern' 	=> '^http[s]?:\/\/[^\/]+(\/\w+)?(\/\w+)?(\/\w+)?.*$',
-			//参数匹配设置，针对正则中的每个匹配项
-			'params' 	=> array(
-				//参数的名字:a,  map:匹配上述正则中的子匹配的位置, default:缺省的值
-				'a'	=> array('map'  => 3, 'default' => 'run'),
-				'c'	=> array('map'	=> 2),
-				'm'	=> array('map'  => 1),
-			),
-			//普通参数的链接分隔符，支持两个字符的配置，第一个字符为参数之间的配置，第二个字符为参数key-value之间的分隔符，默认为&= 
-			'separator' => '&=',
-			//build的格式，将会依次根据params中配置的map的顺序依次替换%s占位符，普通变量将会跟在其之后 
-			'reverse' => '/%s',
-		),
-	),
+    /*配置路径中module的规则*/
+    'module' => array(
+         'url-param' => 'm',
+         'default-value' => 'default',
+     ),
+    /*配置路径中controller的规则*/
+     'controller' => array(
+         'url-param' => 'c',
+         'default-value' => 'index',
+     ),
+     /*配置路径中action的规则*/
+     'action' => array(
+          'url-param' => 'a',
+          'default-value' => 'run',
+      ),
+      //路由规则配置
+      /*用户可以轻易的实现自己的额route，继承AbstractWindRoute，同时配置到routes下即可，所有的route下的规则根据自己的实现进行更改调整config*/
+      /*正则匹配*/
+      'routes' => array(
+		   'WindRoute' => array(
+      			//路由的实现
+	           'class' 	=> 'WIND:router.route.WindRoute',
+      			//路由的正则匹配
+      			'pattern' => '^([\w-_\.]+\.\w+[\?\/]{1,2}|\?)*(\w+)(\/\w+)?(\/\w+)?(\/|\/?&.*)*$',
+      			//参数匹配设置，针对正则中的每个匹配项
+                'params' 	=> array(
+      				//参数script,  map:匹配上述正则中的子匹配的位置, default:缺省的值
+	                 'script' => array('map' => 1, 'default' => 'index.php'),
+	                 'a'	=> array('map'  => 2, 'default' => 'run'),
+	                 'c'	=> array('map'	=> 3),
+	                 'm'	=> array('map'  => 4),
+	            ),
+	            //普通参数的链接分隔符，支持两个字符的配置，第一个字符为参数之间的配置，第二个字符为参数key-value之间的分隔符，默认为&= 
+	            'separator' => '&=',
+	            //build的格式，将会依次根据params中配置的map的顺序依次替换%s占位符，普通变量将会跟在其之后 
+	            'reverse' => '%s/%s/%s/%s/',
+		   ),
+	   ),
 );
\ No newline at end of file
diff --git a/docs/config/php/view_config.php b/docs/config/php/view_config.php
index 0b1311ba..c381fec3 100644
--- a/docs/config/php/view_config.php
+++ b/docs/config/php/view_config.php
@@ -5,7 +5,7 @@
  * 第二部分是模板编译标签的配置,用户可以配置自己定义的编译解析规则
  */
 
-//第一部分：视图组件的配置
+//第一部分：试图组件的配置
 return array(
 	//指定模板路径
 	'template-dir' => 'template',
@@ -20,7 +20,7 @@
 	//布局文件配置
 	'layout' => '',
 	//主题包位置
-	'theme-package' => '',
+	'theme' => '',
 	//是否开启对输出模板变量进行过滤
 	'htmlspecialchars' => true,
 	
diff --git a/docs/config/php/wind_config.php b/docs/config/php/wind_config.php
index 0281796c..1e3494f1 100644
--- a/docs/config/php/wind_config.php
+++ b/docs/config/php/wind_config.php
@@ -1,113 +1,95 @@
 <?php
 return array(
+     /*配置应用项名为default*/
+	'default' => array(
+		'class' => 'windWebApp',
 
-	/*站点是否关闭设置*/
-	'isclose' => '1',
-
-	/*站点关闭后转向的模板路径*/
-	'isclose-tpl' => 'TEST:template.closed.htm',
-
-	/*组件配置：
-	* 组件的配置将会覆盖框架提供的组件的默认配置行为*/
-	'components' => array(
-		/*可以根据自己的需求重新配置组件的相关项*/
-		/** 比如我配置db组件 **/
-		/*db相关配置，如果设置了resource则系统会默认找到resource指向的文件作为db配置信息.DB的配置config内容参照DOCS下的db_config配置*/
-		'db' => array(
-			'config' => array(
-				'resource' => 'db_config.ini'
-			),
+		/*过滤链配置，可以配置通用的，同时也可以配置Module级别的，controller级别的，action级别的；*/
+		'filters' => array(
+			/*过滤器的配置*/
+			'formfilter' => array(
+				/*过滤器实现*/
+				'class' => 'WIND:web.filter.WindFormFilter',
+				/*过滤器适用的范围：
+		    	 * *：则所有的请求都将会应用该过滤器
+		    	 * module*: 则所有module模块的请求都将会应用该过滤器
+		    	 * module_index*: 则module模块下的indexController下的所有Action请求都将会应用该过滤器
+		    	 * module_index_add*: 则module模块下的indexController下的addAction将会应用该过滤器
+		    	*/
+				'pattern' => '*',
+				/*使用框架提供的formFilter的时候配置给该filter指明需要使用的form*/
+				'form' => 'MyForm',
+				/*其他配置项：将会传递给配置的filter相同配置项的属性*/
+			)
 		),
-		/** 比如路由的组件配置 **/
-		/*配置default应用的路由规则*/
-		'router' => array(
-			/*当开启多应用时候，路由组件需指向WindMultiAppRouter*/
-			'path' => 'WIND:router.WindMultiAppRouter',
-            'config' => array(
-				/*当开启多应用时候，可配置路径中app的规则*/
-			    'app' => array(
-			         'url-param' => 'p',
-			         'default-value' => 'default',
-			     ),
-				/*配置路径中module的规则*/
-				'module' => array(
-					'url-param' => 'm',
-					'default-value' => 'default',
-					),
-				/*配置路径中controller的规则*/
-				'controller' => array(
-					'url-param' => 'c',
-					'default-value' => 'index',
-					),
-				/*配置路径中action的规则*/
-				'action' => array(
-					'url-param' => 'a',
-					'default-value' => 'run',
+		
+		/*组件配置：
+		 * 组件的配置将会覆盖框架提供的组件的默认配置行为*/
+		'components' => array(
+			/** 比如我配置db组件 **/
+			/*db相关配置，如果设置了resource则系统会默认找到resource指向的文件作为db配置信息.DB的配置config内容参照DOCS下的db_config配置*/
+			'db' => array(
+				'config' => array(
+					'resource' => 'db_config.ini'
 				),
-				/*路由协议配置*/
-				'routes' => array(
-					'WindRoute' => array(
-						'class' 	=> 'WIND:router.route.WindRewriteRoute',
-						/*正则匹配*/
-						'pattern' 	=> '^http[s]?:\/\/[^\/]+(\/\w+)?(\/\w+)?(\/\w+)?.*$',
-						'params' 	=> array(
-							'a'	=> array('map'  => 3, 'default' => 'run'),
-							'c'	=> array('map'	=> 2),
-							'm'	=> array('map'  => 1),
+			),
+			/** 比如路由的组件配置 **/
+			/*配置default应用的路由规则*/
+			'router' => array(
+                'config' => array(
+                    /*配置路径中module的规则*/
+                     'module' => array(
+                        'url-param' => 'm',
+                        'default-value' => 'default',
+                     ),
+                    /*配置路径中controller的规则*/
+                     'controller' => array(
+                        'url-param' => 'c',
+                        'default-value' => 'index',
+                     ),
+                    /*配置路径中action的规则*/
+                     'action' => array(
+                        'url-param' => 'a',
+                        'default-value' => 'run',
+                     ),
+                     /*正则匹配*/
+                     'routes' => array(
+						'WindRoute' => array(
+                     		'class' 	=> 'WIND:router.route.WindRoute',
+                     		'params' 	=> array(
+                     			'script' => array('map' => 1, 'default' => 'index.php'),
+                     			'a'	=> array('map'  => 2, 'default' => 'run'),
+                     			'c'	=> array('map'	=> 3),
+                     			'm'	=> array('map'  => 4),
+                     		),
 						),
 					),
-				),
+                ),
 			),
+			/*可以根据自己的需求重新配置组件的相关项*/
 		),
-	),
-	
-	/*应用配置*/
-	'web-apps' => array(
-		/*配置应用项名为default*/
-		/*name为default的应用将会作为缺省的应用配置，其他应用的配置将会和default配置进行merge；*/
-		'default' => array(
-			'class' => 'windApplication',
-			/*过滤链配置，可以配置通用的，同时也可以配置Module级别的，controller级别的，action级别的；*/
-			'filters' => array(
-				/*过滤器的配置*/
-				'formfilter' => array(
-					/*过滤器实现*/
-					'class' => 'WIND:web.filter.WindFormFilter',
-					/*过滤器适用的范围：
-			    	 * *：则所有的请求都将会应用该过滤器
-			    	 * module/*: 则所有module模块的请求都将会应用该过滤器
-			    	 * module/index/*: 则module模块下的indexController下的所有Action请求都将会应用该过滤器
-			    	 * module/index/add: 则module模块下的indexController下的addAction将会应用该过滤器
-			    	*/
-					'pattern' => '*',
-					/*使用框架提供的formFilter的时候配置给该filter指明需要使用的form*/
-					'form' => 'MyForm',
-					/*其他配置项：将会传递给配置的filter相同配置项的属性*/
-				)
-			),
-			
-			/*iscache属性控制windCache组件是否可用，如果关闭则windCache组件将不可用,通过Wind::getApp()->getComponent('windCache');*/
-			'iscache' => 1,
-			
-			/*输出编码设置*/
-			'charset' => 'utf-8',
-			
-			/*模块配置： 可以通过设定多个module来设置多组模块配置，每组模块以name来相互区分*/
-			'modules' => array(
-				/** 比如配置default模块 **/
-				/*模块名称为default*/
-				'default' => array(
-				    /*default模块的路径*/
-					'controller-path' => 'controller',  
-				    /*default模块的中controller的后缀*/
-					'controller-suffix' => 'Controller',
-					/*配置该模块的error处理的action controller类*/
-					'error-handler' => 'WIND:web.WindErrorHandler',
-					/*default模块的视图目录配置*/
-					'template-dir' => 'template',
-					/*default模块的编译目录配置*/
-					'compile-dir' => 'data.template',
-				),
+		
+		/*iscache属性控制windCache组件是否可用，如果关闭则windCache组件将不可用,通过Wind::getApp()->getComponent('windCache');*/
+		'iscache' => 1,
+		
+		/*输出编码设置*/
+		'charset' => 'utf-8',
+		
+		/*模块配置： 可以通过设定多个module来设置多组模块配置，每组模块以name来相互区分*/
+		'modules' => array(
+			 /** 比如配置default模块 **/
+			/*模块名称为default*/
+			'default' => array(
+			    /*default模块的路径*/
+				'controller-path' => 'controller',  
+			    /*default模块的中controller的后缀*/
+				'controller-suffix' => 'Controller',
+				/*配置该模块的error处理的action controller类*/
+				'error-handler' => 'WIND:web.WindErrorHandler',
+				/*default模块的视图目录配置*/
+				'template-dir' => 'template',
+				/*default模块的编译目录配置*/
+				'compile-dir' => 'data.template',
 			),
 		),
 	),
diff --git a/docs/config/properties/cache_config.properties b/docs/config/properties/cache_config.properties
index 99c76172..289a70da 100644
--- a/docs/config/properties/cache_config.properties
+++ b/docs/config/properties/cache_config.properties
@@ -67,44 +67,3 @@ test2.host=127.0.0.1 #memcache主机ip
 test2.port=11212 	 #memcache端口
 test2.weight=1	 	 #为此服务器创建的桶的数量，用来控制此服务器被选中的权重
 
-###################################################################
-######redis缓存配置格式：############################################
-#redis配置:
-
-##缓存文件的过期时间
-expires=0
-##缓存key的前缀
-key-prefix=''
-##缓存key安全盐码
-security-code=''
-
-##验证信息
-auth=''
-##redis服务器相关配置 可以配置多个
-[servers]
-##例如配置test1和test2两台主机
-test1.host=127.0.0.1 #memcache主机ip
-test1.port=6379 	 #memcache端口
-test1.pconn='true'	 #是否使用长连
-test1.timeout=1		 #连接持续（超时）时间（单位秒）
-persistent_id=''	 #如果是长链接，则会存在一个长链接的ID号
-test2.host=127.0.0.1 #redis主机ip
-test2.port=11212 	 #redis端口
-test2.weight=1	 	 #为此服务器创建的桶的数量，用来控制此服务器被选中的权重
-
-
-
-###################################################################
-#######xcache缓存配置格式：############################################
-#文件缓存配置
-##缓存文件的过期时间
-expires=0
-##缓存key的前缀
-key-prefix=''
-##缓存key安全盐码
-security-code=''
-
-##验证用户名
-user=''
-##验证用户密码
-pwd=''
diff --git a/docs/config/properties/router_config.properties b/docs/config/properties/router_config.properties
index 4167eff7..e24d02c3 100644
--- a/docs/config/properties/router_config.properties
+++ b/docs/config/properties/router_config.properties
@@ -1,9 +1,5 @@
 #路由规则配置
 #MVC 配置，url-param：配置访问的别名，default-value:配置缺省值
-#当开启多应用时候，路由组件指向WindMultiAppRouter时候，可配置路径中app的规则
-[app]
-url-param=p
-default-value=default
 [module]
 url-param=m
 default-value=default
@@ -20,17 +16,19 @@ default-value=run
 #每个路由有唯一的一个名字,以下是框架提供的一个路由的规则配置
 ##比例如 配置框架提供的路由规则
 ##路由的实现 
-WindRoute.class=WIND:router.route.WindRewriteRoute
+WindRoute.class=WIND:router.route.WindRoute
 ##路由的正则匹配
-WindRoute.pattern=^http[s]?:\/\/[^\/]+(\/\w+)?(\/\w+)?(\/\w+)?.*$
+WindRoute.pattern=^([\w-_\.]+\.\w+[\?\/]{1,2}|\?)*(\w+)(\/\w+)?(\/\w+)?(\/|\/?&.*)*$
 ##参数匹配设置，针对正则中的每个匹配项
-###参数的名字:a,  map:匹配上述正则中的子匹配的位置, default:缺省的值
+###参数的名字:script,  map:匹配上述正则中的子匹配的位置, default:缺省的值
+WindRoute.params.script.map=1
+WindRoute.params.script.default='index.php'
 ##参数匹配：针对MVC的参数名字，需要注意和MVC配置中的别名一一对应，否则不能正确进行路由 
-WindRoute.params.a.map=3
+WindRoute.params.a.map=2
 WindRoute.params.a.default=run
-WindRoute.params.c.map=2
-WindRoute.params.m.map=1
+WindRoute.params.c.map=3
+WindRoute.params.m.map=4
 ##普通参数的链接分隔符，支持两个字符的配置，第一个字符为参数之间的配置，第二个字符为参数key-value之间的分隔符，默认为&=
-WindRoute.separator='&='
+WindRoute.separator='$='
 ##build的格式，将会依次根据params中配置的map的顺序依次替换%s占位符，普通变量将会跟在其之后
-WindRoute.reverse='/%s'
\ No newline at end of file
+WindRoute.reverse='%s/%s/%s/%s/'
\ No newline at end of file
diff --git a/docs/config/properties/view_config.properties b/docs/config/properties/view_config.properties
index 5dac01c6..1c3b6a14 100644
--- a/docs/config/properties/view_config.properties
+++ b/docs/config/properties/view_config.properties
@@ -15,11 +15,11 @@ is-compile=0
 ##编译模板的后缀配置
 compile-ext=tpl
 ##布局文件配置
-layout=''
+layout=
 ##主题包位置
-theme-package=''
+theme=
 ##是否开启对输出模板变量进行过滤
-htmlspecialchars='true'
+htmlspecialchars=true
 
 
 
@@ -27,8 +27,8 @@ htmlspecialchars='true'
 [support-tags]
 #比如配置：标签tag1
 ##标签定义
-#tag1.tag=''
+#tag1.tag=
 ##标签匹配表达式
-#tag1.pattern=''
+#tag1.pattern=
 ##标签的解析类文件
-#tag1.compiler=''
\ No newline at end of file
+#tag1.compiler=
\ No newline at end of file
diff --git a/docs/config/properties/wind_config.properties b/docs/config/properties/wind_config.properties
index 9c3bca96..15aff96d 100644
--- a/docs/config/properties/wind_config.properties
+++ b/docs/config/properties/wind_config.properties
@@ -1,74 +1,66 @@
-#站点是否关闭设置
-isclose=1
+#应用配置
+#应用的名字
+[default]
+#应用的实现组件
+class=windWebApp
 
-#站点关闭后转向的模板路径
-isclose-tpl=TEST:template.closed.htm
+#default应用的编码
+charset=utf-8
 
 #组件的配置
 #组件个性配置，一下的组件配置将会替换掉compontents_config下的对应的组件的配置，同时这里也可以增加自己的组件
-[components]
+#components
 ##比如配置一个db组件
 ##db相关配置，如果设置了resource则系统会默认找到resource指向的文件作为db配置信息.DB的配置config内容参照DOCS下的db_config配置
-db.config.resource=db_config.php
+#components.db.config.resource=db_config.php
 ##比如配置一个router组件
-#当开启多应用时候，路由组件需指向WindMultiAppRouter
-router.path=WIND:router.WindMultiAppRouter
 ##router组件主要允许用户配置module/controller/action的访问别名及各自缺省值，同时允许设置urlWrite规则
-#当开启多应用时候，可配置路径中app的规则
-router.config.app.url-param=p
-router.config.app.default-value=default
-router.config.module.url-param=m
-router.config.module.default-value=default
-router.config.controller.url-param=c
-router.config.controller.default-value=index
-router.config.action.url-param=a
-router.config.action.default-value=run
+#components.router.config.module.url-param=m
+#components.router.config.module.default-value=default
+#components.router.config.controller.url-param=c
+#components.router.config.controller.default-value=index
+#components.router.config.action.url-param=a
+#components.router.config.action.default-value=run
 ##以下为url路由规则的配置
-router.config.routes.WindRoute.class=WIND:router.route.WindRewriteRoute
-router.config.routes.WindRoute.pattern=^http[s]?:\/\/[^\/]+(\/\w+)?(\/\w+)?(\/\w+)?.*$
-router.config.routes.WindRoute.params.a.map=3
-router.config.routes.WindRoute.params.a.default=run
-router.config.routes.WindRoute.params.c.map=2
-router.config.routes.WindRoute.params.m.map=1
-
-#应用配置
-[web-apps]
-#default应用的配置
-#应用的实现组件
-default.class=windWebApp
-
-#default应用的编码
-default.charset=utf-8
-
+#components.router.config.routes.WindRoute.class=WIND:router.route.WindRoute
+#components.router.config.routes.WindRoute.params.script.map=1
+#components.router.config.routes.WindRoute.params.script.default=index.php
+#components.router.config.routes.WindRoute.params.a.map=2
+#components.router.config.routes.WindRoute.params.a.default=run
+#components.router.config.routes.WindRoute.params.c.map=3
+#components.router.config.routes.WindRoute.params.m.map=4
 
+#iscache属性控制windCache组件是否可用，如果关闭则windCache组件将不可用,通过Wind::getApp()->getComponent('windCache');
+iscache=1
 
-#iscache属性控制windCache组件是否可用，如果关闭则windCache组件将不可用,通过Wind::getApp()->getComponent('windCache')#
-default.iscache=1
+#charset属性控制输出的编码方式
+charset=utf-8
 
 #过滤链配置，可以配置通用的，同时也可以配置Module级别的，controller级别的，action级别的； class: 配置过滤链的实现
 #过滤器配置
 #name: 过滤器的名字：唯一
 #class: 过滤器的实现：
 #pattern：*：则所有的请求都将会应用该过滤器
-#	module/*: 则所有module模块的请求都将会应用该过滤器
-#	module/index/*: 则module模块下的indexController下的所有Action请求都将会应用该过滤器
-#	module/index/add: 则module模块下的indexController下的addAction将会应用该过滤器
+#	module*: 则所有module模块的请求都将会应用该过滤器
+#	module_index*: 则module模块下的indexController下的所有Action请求都将会应用该过滤器
+#	module_index_add*: 则module模块下的indexController下的addAction将会应用该过滤器
 #form: 使用框架提供的formFilter的时候配置给该filter指明需要使用的form
 #其他配置项：将会传递给配置的filter相同配置项的属性
-default.filters.formfilter.class=WIND:web.filter.WindFormFilter
-default.filters.formfilter.pattern=*
-default.filters.formfilter.form=Myform
+filters.class=WIND:filter.WindFilterChain
+filters.filter.class=WIND:web.filter.WindFormFilter
+filters.filter.pattern=*
+filters.filter.form=
 
 
-#模块配置： 
+#模块配置： 可以通过设定多个<module></module>来设置多组模块配置，每组模块以name来相互区分
 ##如下配置一个名为default的模块:
 ##controller-path: 模块的路径（采用命名空间的方式) 
-default.modules.default.controller-path=controller
+modules.default.controller-path=controller
 #controller-suffix: 模块的controller后缀信息
-default.modules.default.controller-suffix=Controller
+modules.default.controller-suffix=Controller
 #error-handler: 模块的错误处理类
-default.modules.default.error-handler=WIND:web.WindErrorHandler
+modules.default.error-handler=WIND:web.WindErrorHandler
 #template-dir: 模块的模板目录，支持命名空间的方式如DEFAULT:template
-default.modules.default.template-dir=template
+modules.default.template-dir=template
 #compile-dir: 模块的模板编译文件保存的目录，支持命名空间的方式如DEFAULT:compile.template
-default.modules.default.compile-dir=data.template
\ No newline at end of file
+modules.default.compile-dir=data.template
\ No newline at end of file
diff --git a/docs/config/router_config.xml b/docs/config/router_config.xml
index c1c0c747..ddb57eba 100644
--- a/docs/config/router_config.xml
+++ b/docs/config/router_config.xml
@@ -2,8 +2,6 @@
 <!-- router规则配置及mvc配置 -->
 <WIND>
 	<!-- MVC 配置，url-param：配置访问的别名，default-value:配置缺省值 -->
-	<!-- 当开启多应用时候，路由组件指向WindMultiAppRouter时候，可配置路径中app的规则 -->
-	<app url-param='p' default-value='default' />
 	<module url-param='m' default-value='default' />
 	<controller url-param='c' default-value='index' />
 	<action url-param='a' default-value='run' />
@@ -14,30 +12,36 @@
 		<!-- 每个路由有唯一的一个名字,以下是框架提供的一个路由的规则配置 -->
 	   	<route name='WindRoute'>
 	   		<!-- 路由的实现 -->
-	   		<class>WIND:router.route.WindRewriteRoute</class>
+	   		<class>WIND:router.route.WindRoute</class>
 	   		<!-- 路由的正则匹配-->
-	   		<pattern>^http[s]?:\/\/[^\/]+(\/\w+)?(\/\w+)?(\/\w+)?.*$</pattern>
+	   		<pattern>^([\w-_\.]+\.\w+[\?\/]{1,2}|\?)*(\w+)(\/\w+)?(\/\w+)?(\/|\/?&.*)*$</pattern>
 	   		<!-- 参数匹配设置，针对正则中的每个匹配项 -->
 	   		<params>
-	   			<!-- 参数名称:a,  map:匹配上述正则中的子匹配的位置, default:缺省的值-->
+	   			<!-- 参数script,  map:匹配上述正则中的子匹配的位置, default:缺省的值-->
+	   			<param name='script'>
+	   				<!-- 匹配上述正则中的子匹配的位置 -->
+	   				<map>1</map>
+	   				<!-- 缺省的值 -->
+	   				<default>index.php</default>
+	   			</param>
 	   			<!-- 参数匹配：针对MVC的参数名字，需要注意和MVC配置中的别名一一对应，否则不能正确进行路由 -->
 	   			<param name="a">
-	   				<map>3</map>
+	   				<map>2</map>
 	   				<default>run</default>
 	   			</param>
 	   			<param name='c'>
-					<map>2</map>
+					<map>3</map>
 	   				<default>index</default>
 				</param>
 	   			<param name="m">
-	   				<map>1</map>
+	   				<map>4</map>
 	   				<default>default</default>
 	   			</param>
 	   		</params>
 	   		<!-- 普通参数的链接分隔符，支持两个字符的配置，第一个字符为参数之间的配置，第二个字符为参数key-value之间的分隔符，默认为&= -->
 	   		<separator>&=</separator>
 	   		<!-- build的格式，将会依次根据params中配置的map的顺序依次替换%s占位符，普通变量将会跟在其之后 -->
-	   		<reverse>/%s</reverse>
+	   		<reverse>%s/%s/%s/%s/</reverse>
 		</route>
 	</routes>
 </WIND>
\ No newline at end of file
diff --git a/docs/config/view_config.xml b/docs/config/view_config.xml
index 3daf78a8..0ef64c1f 100644
--- a/docs/config/view_config.xml
+++ b/docs/config/view_config.xml
@@ -14,7 +14,7 @@
 	<!-- 布局文件配置 -->
 	<layout></layout>
 	<!-- 主题包位置 -->
-	<theme-package></theme-package>
+	<theme></theme>
 	<!-- 是否开启对输出模板变量进行过滤 -->
 	<htmlspecialchars>true</htmlspecialchars>
 </WIND>
diff --git a/docs/config/wind_config.xml b/docs/config/wind_config.xml
index 4cc27d9f..e3260e25 100644
--- a/docs/config/wind_config.xml
+++ b/docs/config/wind_config.xml
@@ -1,98 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <WIND>
-
-	<!-- 站点是否关闭设置 -->
-	<isclose>1</isclose>
-	<!-- 站点关闭后转向的模板路径 -->
-	<isclose-tpl>TEST:template.closed.htm</isclose-tpl>
-	
-	<!-- 组件个性配置，一下的组件配置将会替换掉compontents_config下的对应的组件的配置，同时这里也可以增加自己的组件 -->
-	<components>
-	    <!-- 比如配置一个db组件 -->
-		<!-- db相关配置，如果设置了resource则系统会默认找到resource指向的文件作为db配置信息.DB的配置config内容参照DOCS下的db_config配置 -->
-		<component name='db'>
-			<config resource="db_config.php" />
-		</component>
-		<!-- 比如配置一个router组件 -->
-		<!-- router组件主要允许用户配置module/controller/action的访问别名及各自缺省值，同时允许设置urlWrite规则 -->
-		<component name='router'>
-			<config>
-				<!-- 当开启多应用时候，可配置路径中app的规则 -->
-				<app>
-					<url-param>p</url-param>
-					<default-value>default</default-value>
-				</app>
-				<module>
-					<url-param>m</url-param>
-					<default-value>default</default-value>
-				</module>
-				<controller>
-					<url-param>c</url-param>
-					<default-value>index</default-value>
-				</controller>
-				<action>
-					<url-param>a</url-param>
-					<default-value>run</default-value>
-				</action>
-				<routes>
-					<route name='WindRoute'>
-						<class>WIND:router.route.WindRewriteRoute</class> 
-						<pattern>^http[s]?:\/\/[^\/]+(\/\w+)?(\/\w+)?(\/\w+)?.*$</pattern>
-						<params>
-							<param name='a' map='3' defualt='run' />
-							<param name='c' map='2'/>
-							<param name='m' map='1'/>
-						</params> 
-					</route>
-				</routes>
-			</config>
-		</component>
-	</components>
-		
 	<!-- 应用配置:
 	     name: 保证每个应用唯一性，同时，name为default的应用将会作为缺省的应用配置，其他应用的配置将会和default配置进行merge；
 	     class: 指向components中的name -->
-	<web-apps>
-		<web-app name='default' class='windApplication'>
+	<web-app name='default' class='windWebApp'>
+		<!-- 组件个性配置，一下的组件配置将会替换掉compontents_config下的对应的组件的配置，同时这里也可以增加自己的组件 -->
+		<components>
+		    <!-- 比如配置一个db组件 -->
+			<!-- db相关配置，如果设置了resource则系统会默认找到resource指向的文件作为db配置信息.DB的配置config内容参照DOCS下的db_config配置 -->
+			<component name='db'>
+				<config resource="db_config.php" />
+			</component>
+			<!-- 比如配置一个router组件 -->
+			<!-- router组件主要允许用户配置module/controller/action的访问别名及各自缺省值，同时允许设置urlWrite规则 -->
+			<component name='router'>
+				<config>
+					<module>
+						<url-param>m</url-param>
+						<default-value>default</default-value>
+					</module>
+					<controller>
+						<url-param>c</url-param>
+						<default-value>index</default-value>
+					</controller>
+					<action>
+						<url-param>a</url-param>
+						<default-value>run</default-value>
+					</action>
+					<routes>
+						<route name='WindRoute'>
+							<class>WIND:router.route.WindRoute</class> 
+							<params>
+								<param name='script'>
+									<map>1</map>
+									<default>index.php</default>
+								</param>
+								<param name='a' map='2' defualt='run' />
+								<param name='c' map='3'/>
+								<param name='m' map='4'/>
+							</params> 
+						</route>
+					</routes>
+				</config>
+			</component>
+		</components>
+		
+		<!-- iscache属性控制windCache组件是否可用，如果关闭则windCache组件将不可用,通过Wind::getApp()->getComponent('windCache'); -->
+		<iscache>1</iscache>
+		
+		<!-- charset属性控制输出的编码方式 -->
+		<charset>utf-8</charset>
+	    
+	    <!-- 过滤链配置，可以配置通用的，同时也可以配置Module级别的，controller级别的，action级别的 ；
+	         class: 配置过滤链的实现 -->
+		<filters class='WIND:filter.WindFilterChain'>
+		    <!-- 过滤器配置
+		    	name: 过滤器的名字：唯一
+		    	class: 过滤器的实现：
+		    	pattern：*：则所有的请求都将会应用该过滤器
+		    	         module*: 则所有module模块的请求都将会应用该过滤器
+		    	         module_index*: 则module模块下的indexController下的所有Action请求都将会应用该过滤器
+		    	         module_index_add*: 则module模块下的indexController下的addAction将会应用该过滤器
+		    	form: 使用框架提供的formFilter的时候配置给该filter指明需要使用的form
+		    	其他配置项：将会传递给配置的filter相同配置项的属性
+		    -->
+			<filter name='filter' class='WIND:web.filter.WindFormFilter' pattern='*' form=""/>
+		</filters>
 		
-			<!-- iscache属性控制windCache组件是否可用，如果关闭则windCache组件将不可用,通过Wind::getApp()->getComponent('windCache'); -->
-			<iscache>1</iscache>
-			
-			<!-- charset属性控制输出的编码方式 -->
-			<charset>utf-8</charset>
-		    
-		    <!-- 过滤链配置，可以配置通用的，同时也可以配置Module级别的，controller级别的，action级别的 ；
-		         class: 配置过滤链的实现 -->
-			<filters class='WIND:filter.WindFilterChain'>
-			    <!-- 过滤器配置
-			    	name: 过滤器的名字：唯一
-			    	class: 过滤器的实现：
-			    	pattern：*：则所有的请求都将会应用该过滤器
-			    	         module/*: 则所有module模块的请求都将会应用该过滤器
-			    	         module/index/*: 则module模块下的indexController下的所有Action请求都将会应用该过滤器
-			    	         module/index/add: 则module模块下的indexController下的addAction将会应用该过滤器
-			    	form: 使用框架提供的formFilter的时候配置给该filter指明需要使用的form
-			    	其他配置项：将会传递给配置的filter相同配置项的属性
-			    -->
-				<filter name='filter' class='WIND:web.filter.WindFormFilter' pattern='*' form=""/>
-			</filters>
-			
-			<!-- 模块配置： 可以通过设定多个<module></module>来设置多组模块配置，每组模块以name来相互区分 -->
-			<modules>
-				<!-- name: 模块的名字 path: 模块的路径（采用命名空间的方式) -->
-				<module name='default'>
-					<controller-path>controller</controller-path>
-					<!-- 指定该模块下的controller的后缀格式 -->
-					<controller-suffix>Controller</controller-suffix>
-					<!-- 配置该模块的error处理的action controller类 -->
-					<error-handler>WIND:web.WindErrorHandler</error-handler>
-					<!-- 指定模板路径 -->
-					<template-dir>template</template-dir>
-					<!-- 模板编译文件存放路径 -->
-					<compile-dir>data.template</compile-dir>
-				</module>
-			</modules>
-		</web-app>
-	</web-apps>
-	
+		<!-- 模块配置： 可以通过设定多个<module></module>来设置多组模块配置，每组模块以name来相互区分 -->
+		<modules>
+			<!-- name: 模块的名字 path: 模块的路径（采用命名空间的方式) -->
+			<module name='default'>
+				<controller-path>controller</controller-path>
+				<!-- 指定该模块下的controller的后缀格式 -->
+				<controller-suffix>Controller</controller-suffix>
+				<!-- 配置该模块的error处理的action controller类 -->
+				<error-handler>WIND:web.WindErrorHandler</error-handler>
+				<!-- 指定模板路径 -->
+				<template-dir>template</template-dir>
+				<!-- 模板编译文件存放路径 -->
+				<compile-dir>data.template</compile-dir>
+			</module>
+		</modules>
+	</web-app>
 </WIND>
\ No newline at end of file
diff --git a/docs/wind_config.xml b/docs/wind_config.xml
new file mode 100644
index 00000000..31dffddc
--- /dev/null
+++ b/docs/wind_config.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WIND>
+	<isclose></isclose>
+	<isclose-tpl></isclose-tpl>
+	<components></components>
+	<web-apps>
+		<web-app>
+			<iscache></iscache>
+			<charset></charset>
+			<filters></filters>
+			<modules></modules>
+		</web-app>
+	</web-apps>
+</WIND>
diff --git a/tool/compiler/pack.php b/tool/compiler/pack.php
deleted file mode 100644
index a2eec8ba..00000000
--- a/tool/compiler/pack.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * 动态编译脚本,开发环境执行此文件,动态生成过程文件
- * @author wuq
- **/
-error_reporting(E_ALL);
-
-define('WIND_DEBUG', 1);
-define('EXT', '.php');
-define('_COMPILE_PATH', dirname(__FILE__) . '/');
-include '../../wind/Wind.php';
-
-//检查是否在命令行下以及目录是否可写
-if (!$_SERVER['argv']) e('Script should be run at command line');
-if (!is_writable(WIND_PATH)) e('WIND_PATH not writable');
-
-//检查输入的路径
-$folders = array_slice($_SERVER['argv'], 1);
-if (empty($folders) || in_array('--help', $folders)) {
-	$message = <<<EOA
-	这是一个动态编译脚本，你可以输入需要打包的文件夹进行打包。\n
-	每一个输入的目录可被注册为命名空间，你可以通过这个命令空间来引入这个目录里打包好的类。\n
-	例如：php compile.php ../wind/base ../wind/cache [...] \n
-	对于'../wind/base'默认将用'BASE:'作为别名，你也可以输入自定义的'WIND:base'来作为这个目录的别名 \n
-	注：此处的别名必须是你使用Wind::import方法导入类将使用的真实目录别名
-EOA;
-	e($message);
-}
-
-//遍历各个路径
-$classes = $imports = $fileList = array();
-foreach ($folders as $folder) {
-	$alias = '';
-	if (!is_dir($folder)) e("'$folder' is not a real directory!\n");
-	$alias = strtoupper(basename($folder)) . ':';
-	$r = getLine("'$folder' is to be register as '$alias' ? (Y|N) ");
-	if (strtolower($r[0]) != 'y') $alias = getLine(
-		'Please input the relative path using namespace: ');
-	$fileList += readRecur(realpath($folder), $alias);
-}
-
-/* 载入需要的文件信息 */
-Wind::import('WIND:utility.WindPack');
-
-/* 打包 */
-$pack = new WindPack();
-$pack->packFromFileList($fileList, _COMPILE_PATH . 'wind_basic.php', WindPack::STRIP_PHP, true);
-$message = array();
-$message[] = "COMPILE: pack core file successful~";
-
-/*装载imports和classes*/
-$data = '<?php Wind::$_imports += ' . var_export($imports, true) . ';' . 'Wind::$_classes += ' . var_export(
-	$classes, true) . ';';
-WindFile::write(_COMPILE_PATH . 'wind_imports.php', $data);
-$message[] = "COMPILE: wind_imports.php successful~";
-$message[] = '';
-exit(implode("\n", $message));
-
-/**
- * 递归目录
- *
- * @param string $dir
- * @return array
- */
-function readRecur($dir, $alias) {
-	static $fileList = array();
-	if (false === ($files = scandir($dir, 0))) e("$dir opened failed\n");
-	foreach ($files as $file) {
-		if ($file[0] === '.') continue;
-		$pos = strrpos($file, '.');
-		if ($pos !== false && substr($file, $pos) === EXT) {
-			$fileName = substr($file, 0, $pos);
-			$fileList[$dir . '/' . $file] = array('', $fileName);
-			$classpath = getAlias($alias) . $fileName;
-			$GLOBALS['imports'] += array($classpath => $fileName);
-			$GLOBALS['classes'] += array($fileName => $dir . '/' . $fileName);
-		} else if (is_dir($dir . '/' . $file)) {
-			readRecur($dir . '/' . $file, $alias . '.' . $file);
-		}
-	}
-	return $fileList;
-}
-
-/**
- * 输出错误信息
- *
- * @param string $message
- */
-function e($message) {
-	exit($message);
-}
-
-/**
- * 交互信息
- *
- * @param string $message
- * @return string
- */
-function getLine($message) {
-	echo $message;
-	return fgets(STDIN);
-}
-
-/**
- * 处理目录别名
- *
- * @param string $alias
- * @return Ambigous <string, unknown>
- */
-function getAlias($alias) {
-	return substr($alias, '-1') == ':' ? $alias : $alias . '.';
-}
diff --git a/tool/generator/command b/tool/generator/command
deleted file mode 100644
index 75b95375..00000000
--- a/tool/generator/command
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * php command [-p projName]
- * 
- * @author Shi Long <long.shi@alibaba-inc.com> 2010-11-2
- * @link http://www.phpwind.com
- * @copyright Copyright &copy; 2003-2010 phpwind.com
- * @license
- */
-error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-//为了兼容类似php generator/command 统一使用绝对路径
-require_once dirname(dirname(__DIR__)) . '/wind/Wind.php';
-Wind::register(dirname(dirname(__DIR__)), 'PROJ');
-Wind::application('command', __DIR__ . '/conf/config.php', 'Command')->run();
\ No newline at end of file
diff --git a/tool/generator/conf/config.php b/tool/generator/conf/config.php
deleted file mode 100644
index 8eb67ead..00000000
--- a/tool/generator/conf/config.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-return array(
-	'web-apps' => array(
-		'command' => array(
-			'root-path' => dirname(__DIR__),
-			'modules' => array(
-				'default' => array(
-					'controller-path' => 'COMMAND:src.controller',
-					'controller-suffix' => 'Command'
-				)
-			),
-		),
-		'web' => array(
-			'root-path' => dirname(__DIR__),
-			'modules' => array(
-				'default' => array(
-					'controller-path' => 'WEB:src.controller',
-				)
-			),
-		)
-	)
-);
\ No newline at end of file
diff --git a/tool/generator/conf/project.default b/tool/generator/conf/project.default
deleted file mode 100644
index 96cc9355..00000000
--- a/tool/generator/conf/project.default
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-return array(
-	'dataDir' => 'data',
-	'templateDir' => 'template',
-	'srcDir' => 'src/controller',
-	'confDir' => 'conf',
-	'wwwDir' => 'www'
-);
\ No newline at end of file
diff --git a/tool/generator/install.php b/tool/generator/install.php
deleted file mode 100644
index 07bbe78c..00000000
--- a/tool/generator/install.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * @author Shi Long <long.shi@alibaba-inc.com>
- * @link http://www.phpwind.com
- * @copyright Copyright &copy; 2003-2010 phpwind.com
- * @license
- */
-error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-require_once dirname(dirname(__DIR__)) . '/wind/Wind.php';
-Wind::register(dirname(dirname(__DIR__)), 'PROJ');
-Wind::application('web', __DIR__ . '/conf/config.php')->run();
\ No newline at end of file
diff --git a/tool/generator/src/WindGenerateProject.php b/tool/generator/src/WindGenerateProject.php
deleted file mode 100644
index c170a4aa..00000000
--- a/tool/generator/src/WindGenerateProject.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-Wind::import('WIND:utility.WindFolder');
-Wind::import('WIND:utility.WindFile');
-/**
- * 生成工程流程
- *
- * @author Shi Long <long.shi@alibaba-inc.com>
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.windframework.com
- * @version $Id$
- * @package tool
- * @subpackage generator
- */
-class WindGenerateProject {
-	
-	/**
-	 * 工程目录
-	 */
-	public $dir;
-	/**
-	 * 工程名称
-	 */
-	public $name;
-	/**
-	 * 工程缓存目录 
-	 */
-	public $dataDir;
-	/**
-	 * 工程模板目录
-	 */
-	public $templateDir;
-	/**
-	 * 工程业务逻辑目录
-	 */
-	public $srcDir;
-	/**
-	 * 工程配置目录
-	 */
-	public $confDir;
-	/**
-	 * 工程可访问资源目录
-	 */
-	public $wwwDir;
-	
-	private $confFile;
-	
-	/**
-	 * 创建工程接口
-	 *
-	 */
-	public function generate() {
-		WindFolder::mkRecur($this->dir);
-		if (!is_writable($this->dir)) return false;
-		$result = $this->generateData()
-			   && $this->generateTemplate()
-			   && $this->generateSrc()
-			   && $this->generateConf()
-			   && $this->generateWww();
-		return $result;
-	}
-	
-	/**
-	 * 解析配置文件
-	 *
-	 * @param string $config
-	 */
-	public function setConfig($config) {
-		if (is_string($config)) $config = @include Wind::getRealPath($config, true);
-		$this->dataDir = $config['dataDir'];
-		$this->templateDir = $config['templateDir'];
-		$this->srcDir = $config['srcDir'];
-		$this->confDir = $config['confDir'];
-		$this->wwwDir = $config['wwwDir'];
-	}
-	
-	/**
-	 * 生成data目录
-	 *
-	 */
-	protected function generateData() {
-		WindFolder::mkRecur($this->dir . '/' . $this->dataDir);
-		$this->dataDir = $this->_resolveDirName($this->dataDir);
-		return true;
-	}
-	
-	/**
-	 * 生成模板目录
-	 *
-	 */
-	protected function generateTemplate() {
-		WindFolder::mkRecur($this->dir . '/' . $this->templateDir);
-		$this->templateDir = $this->_resolveDirName($this->templateDir);
-		return true;
-	}
-	
-	/**
-	 * 生成src目录及IndexController.php
-	 *
-	 */
-	protected function generateSrc() {
-		$content = <<<EOF
-<?php
-	
-class IndexController extends WindController {
-	
-	public function run() {
-		//TODO insert your code here
-		echo 'hello, wind Framework!';
-	}
-	
-}
-?>
-EOF;
-		$dir = $this->dir . '/' . $this->srcDir;
-		WindFolder::mkRecur($dir);
-		if (!WindFile::write($dir . '/IndexController.php', $content)) return false;
-		$this->srcDir = $this->_resolveDirName($this->srcDir);
-		return true;
-	}
-	
-	/**
-	 * 生成conf目录及config.php
-	 *
-	 */
-	protected function generateConf() {
-		$content = <<<EOD
-<?php
-return array(
-	'web-apps' => array(
-		'%s' => array(
-			'modules' => array(
-				'default' => array(
-					'controller-path' => '%s',
-					'controller-suffix' => '%s',
-					'template-dir' => '%s',
-					'compile-dir' => '%s',
-				)
-			)
-		)
-	)
-);
-EOD;
-		$alias = strtoupper($this->name) . ':';
-		$content = sprintf($content,
-			$this->name,
-			$alias . $this->srcDir,
-			'Controller',
-			$alias . $this->templateDir,
-			$alias . $this->dataDir . '.compile'
-		);
-		$dir = $this->dir . '/' . $this->confDir;
-		WindFolder::mkRecur($dir);
-		$this->confFile = $dir . '/config.php';
-		if (!WindFile::write($this->confFile, $content)) return false;
-		return true;
-	}
-	
-	/**
-	 * 生成www目录及index.php
-	 *
-	 */
-	protected function generateWww() {
-		$content = <<<EOS
-<?php
-error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
-define('WIND_DEBUG', 1);
-require_once '%s';
-Wind::register(realpath('%s'), '%s');
-Wind::application('%s', '%s')->run();
-EOS;
-		$dir = $this->dir . '/' . $this->wwwDir;
-		WindFolder::mkRecur($dir);
-		$content = sprintf($content,
-			$this->_resolveRelativePath($dir, Wind::getRealPath('WIND:Wind.php', true)) ,
-			$this->_resolveRelativePath($dir, $this->dir),
-			strtoupper($this->name),
-			$this->name,
-			$this->_resolveRelativePath($dir, $this->confFile));
-		if (!WindFile::write($dir . '/index.php', $content)) return false;
-		return true;
-	}
-	
-	/**
-	 * 处理路径
-	 *
-	 * @param string $dir
-	 * @return string
-	 */
-	private function _resolveDirName($dir) {
-		return str_replace('/', '.', $dir);
-	}
-	
-	/**
-	 * 计算路径1对于路径2的相对路径
-	 *
-	 * @param string $sourcePath
-	 * @param string $targetPath
-	 * @return string
-	 */
-	private function _resolveRelativePath($sourcePath, $targetPath) {
-		list($sourcePath, $targetPath) = array(realpath($sourcePath), realpath($targetPath));
-		$src_paths = explode('/', $sourcePath);
-		$tgt_paths = explode('/', $targetPath);
-		$src_count = count($src_paths);
-		$tgt_count = count($tgt_paths);
-	
-		$relative_path = '';
-		//默认把不同点设在最后一个
-		$break_point = $src_count;
-		$i = 0;
-		//计算两个路径不相同的点，然后开始往上数..
-		for ($i = 0; $i < $src_count; $i++) {
-			if ($src_paths[$i] == $tgt_paths[$i]) continue;
-			$relative_path .= '../';
-			$break_point == $src_count && $break_point = $i;
-		}
-		$relative_path || $relative_path = './';
-	
-		//往上..后，继续算目标路径的接下来的path
-		for ($i = $break_point; $i < $tgt_count; $i++) {
-			$relative_path .= $tgt_paths[$i] . '/';
-		}
-		return rtrim($relative_path, '/');
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/tool/generator/src/controller/IndexCommand.php b/tool/generator/src/controller/IndexCommand.php
deleted file mode 100644
index acd1337b..00000000
--- a/tool/generator/src/controller/IndexCommand.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-Wind::import('WIND:command.WindCommandController');
-Wind::import('WEB:src.WindGenerateProject');
-/**
- * 快速创建工程
- *
- * @author Shi Long <long.shi@alibaba-inc.com>
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.phpwind.com
- * @version $Id$
- * @package tool
- * @subpackage generator
- */
-class IndexCommand extends WindCommandController {
-	/**
-	 * @var WindGenerateProject
-	 */
-	private $project;
-	private $config = 'COMMAND:conf.project.default';
-	/*
-	 * 主流程 (non-PHPdoc) 
-	 * 
-	 * @see WindCommandController::run()
-	 */
-	public function run($projName = 'test') {
-		list($projName, $dir) = $this->_checkDir($projName);
-		$this->project = new WindGenerateProject();
-		$this->chooseMode();
-		$this->project->name = $projName;
-		$this->project->dir = $dir;
-		
-		$result = $this->project->generate();
-		if ($result === false) {
-			$this->setOutput(<<<EOB
-Generate Project $projName fail! 
-The possible reason : write file failed.				
-EOB
-				);
-		} else {
-			$this->setOutput(<<<EOT
-Generate Project $projName success! 
-You can find it under {$this->project->dir}
-EOT
-			);
-		}
-	}
-	
-	/**
-	 * 选择标准或者自定义模式
-	 *
-	 * @param WindGenerateProject $project
-	 */
-	protected function chooseMode() {
-		$r = $this->getLine(<<<EOA
-		欢迎使用wind framework 快速创建工具！
-		分为‘自定义’、‘标准’两种模式。
-		自定义模式：您可以自定义：目录结构、目录名称等
-		标准模式：将会自动生成标准的工程目录
-		请选择模式 (标准模式[Y] | 自定义模式[N]) ：
-EOA
-		);
-		if (strtolower($r[0]) == 'y') {
-			$this->project->setConfig($this->config);
-		} else {
-			$this->project->dataDir = $this->getLine('请输入你想要指定的缓存目录，默认是待创建工程目录下的data目录[data]：');
-			$this->project->templateDir = $this->getLine('请输入你想要指定的模板目录，默认是待创建工程目录下的template目录[template]：');
-			$this->project->srcDir = $this->getLine(
-				'请输入你想要指定的业务逻辑处理目录，默认是待创建工程目录下的src/controller目录[src/controller]：');
-			$this->project->confDir = $this->getLine('请输入你想要指定的配置目录，默认是待创建工程目录下的conf目录[conf]：');
-			$this->project->wwwDir = $this->getLine('请输入你想要指定的web可访问资源目录，默认是待创建工程目录下的www目录[www]：');
-		}
-	}
-
-	
-
-	/**
-	 * 检测路径
-	 *
-	 * @param string $projName        	
-	 * @return string
-	 */
-	private function _checkDir($projName) {
-		static $dir = '', $name = '';
-		$name = $projName;
-		$dir = Wind::getRealDir('PROJ:' . $name);
-		if (is_dir($dir)) {
-			$r = $this->getLine(
-				"The Project Folder [$dir] Already Exist, Are you sure to override it?(Yes|No)");
-			if (strtolower($r[0]) != 'y') {
-				$name = $this->getLine('Please input the project name：');
-				$this->_checkDir($name);
-			}
-		}
-		return array($name, $dir);
-	}
-	
-}
-
-?>
\ No newline at end of file
diff --git a/tool/generator/src/controller/IndexController.php b/tool/generator/src/controller/IndexController.php
deleted file mode 100644
index ed964f4f..00000000
--- a/tool/generator/src/controller/IndexController.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-Wind::import('WEB:src.WindGenerateProject');
-/**
- * web模式
- *
- * @author Shi Long <long.shi@alibaba-inc.com>
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.windframework.com
- * @version $Id$
- * @package tool
- * @subpackage generator
- */
-class IndexController extends WindController {
-	/**
-	 * @var WindGenerateProject
-	 */
-	private $project;
-	private $config = 'WEB:conf.project.default';
-	
-	/* (non-PHPdoc)
-	 * @see WindController::run()
-	 */
-	public function run() {
-		$this->project = new WindGenerateProject();
-		$this->project->name = 'test';
-		$this->project->dir = Wind::getRealDir('PROJ:' . $this->project->name);
-		$this->project->setConfig($this->config);
-		$r = $this->project->generate();
-		if (!$r) echo 'generate fail';
-		else echo 'generate success';
-	}
-	
-	public function doRun() {
-		
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/tool/readme b/tool/readme
deleted file mode 100644
index 8ae3db3d..00000000
--- a/tool/readme
+++ /dev/null
@@ -1,29 +0,0 @@
-Wind Tool：
-
-wind tool工具包，包含了一组工程工具。用于快速创建wind框架工程、自定义方式创建wind框架工程、效率优化等。
-支持命令行模式（cmd，sh），web可视化模式等。
-
-快速工程创建：
-install.php\sh
-系统将会自动生成工程目录、启动脚本（index.php）、应用配置文件（config.php）、默认controller等，如下：
-/wind						---框架目录
-/data						---缓存目录
-/template					---模板目录
-/src/controller				---业务逻辑处理
-	IndexController.php
-/conf						---配置目录
-	config.php
-/www						---web可访问资源目录
-	index.php
-
-注： 默认情况下生成的配置文件为php格式
-
-分为‘自定义’、‘标准’两种模式。
-自定义模式：
-用户可以自定义：
-1. 目录结构
-2. 目录名称
-...
-
-1. 快速创建wind工程，支持自定义工程目录结构
-2. 效率优化,支持'预加载处理'、'核心打包加载'
diff --git a/wind/Wind.php b/wind/Wind.php
index 1d29d5bb..3acb5f55 100644
--- a/wind/Wind.php
+++ b/wind/Wind.php
@@ -17,12 +17,15 @@
  * @version $Id$
  */
 class Wind {
-	public static $_imports = array();
-	public static $_classes = array();
 	private static $_extensions = 'php';
+	private static $_imports = array();
+	private static $_classes = array();
 	private static $_isAutoLoad = true;
 	private static $_namespace = array();
 	private static $_includePaths = array();
+	/**
+	 * @var WindFrontController
+	 */
 	private static $_frontController = null;
 
 	/**
@@ -31,11 +34,9 @@ class Wind {
 	 * @param WindFactory $factory
 	 * @return WindFrontController
 	 */
-	public static function application($appName = '', $config = array(), $type = 'Web') {
+	public static function application($appName = '', $config = array()) {
 		if (self::$_frontController === null) {
-			$_className = 'Wind' . $type . 'FrontController';
-			self::$_classes[$_className] = strtolower($type) . '/Wind' . $type . 'FrontController';
-			self::$_frontController = new $_className($appName, $config);
+			self::$_frontController = new WindWebFrontController($appName, $config);
 		}
 		return self::$_frontController;
 	}
@@ -56,9 +57,9 @@ public static function getAppName() {
 	 * @see WindFrontController::getApp()
 	 * @return WindWebApplication
 	 */
-	public static function getApp() {
+	public static function getApp($appName = '') {
 		if (self::$_frontController === null) return null;
-		return self::$_frontController->getApp();
+		return self::$_frontController->getApp($appName);
 	}
 
 	/**
@@ -73,9 +74,10 @@ public static function getApp() {
 	 * 加载一个包的参数方式：'WIND:base.*'
 	 * 
 	 * @param string $filePath | 文件路径信息 或者className
+	 * @param boolean $recursivePackage | 当需要加载的路径为文件夹时是否递归它
 	 * @return string|null
 	 */
-	public static function import($filePath) {
+	public static function import($filePath, $recursivePackage = false) {
 		if (!$filePath) return;
 		if (isset(self::$_imports[$filePath])) return self::$_imports[$filePath];
 		if (($pos = strrpos($filePath, '.')) !== false)
@@ -88,7 +90,16 @@ public static function import($filePath) {
 		if ($isPackage) {
 			$filePath = substr($filePath, 0, $pos + 1);
 			$dirPath = self::getRealPath(trim($filePath, '.'), false);
-			self::register($dirPath, '', true);
+			if (false === ($files = scandir($dirPath, 0))) throw new Exception(
+				'[Wind.import] the file ' . $dirPath . ' open failed!');
+			foreach ($files as $file) {
+				if ($file === '.' || $file === '..' || ($pos = strrpos($file, '.')) === 0) continue;
+				if ($pos !== false && substr($file, $pos + 1) === self::$_extensions) {
+					$fileName = substr($file, 0, $pos);
+					self::_setImport($fileName, $filePath . $fileName);
+				} elseif ($recursivePackage && is_dir($dirPath . '/' . $file))
+					self::import($filePath . $file . '.' . '*', $recursivePackage);
+			}
 		} else
 			self::_setImport($fileName, $filePath);
 		return $fileName;
@@ -105,8 +116,8 @@ public static function import($filePath) {
 	 */
 	public static function register($path, $alias = '', $includePath = false, $reset = false) {
 		if (!$path) return;
+		$alias = strtolower($alias);
 		if (!empty($alias)) {
-			$alias = strtolower($alias);
 			if (!isset(self::$_namespace[$alias]) || $reset) self::$_namespace[$alias] = rtrim($path, '/') . '/';
 		}
 		if ($includePath) {
@@ -140,10 +151,24 @@ public static function getRootPath($namespace) {
 	public static function autoLoad($className, $path = '') {
 		if ($path)
 			include $path . '.' . self::$_extensions;
-		elseif (isset(self::$_classes[$className])) {
+		elseif (isset(self::$_classes[$className]))
 			include self::$_classes[$className] . '.' . self::$_extensions;
-		} else
-			include $className . '.' . self::$_extensions;
+	}
+
+	/**
+	 * @param string $key
+	 * @return string|array
+	 */
+	public static function getImports($key = '') {
+		return $key ? self::$_imports[$key] : self::$_imports;
+	}
+
+	/**
+	 * 设置imports信息
+	 * @param array $imports
+	 */
+	public static function setImports($imports) {
+		self::$_imports = array_merge(self::$_imports, $imports);
 	}
 
 	/**
@@ -200,6 +225,15 @@ function_exists('date_default_timezone_set') && date_default_timezone_set('Etc/G
 		self::_loadBaseLib();
 	}
 
+	/**
+	 * 清理Wind import变量信息
+	 * @return void
+	 */
+	public static function clear() {
+		self::$_imports = array();
+		self::$_classes = array();
+	}
+
 	/**
 	 * @param string $className
 	 * @param string $classPath
@@ -222,11 +256,9 @@ private static function _setImport($className, $classPath) {
 	 */
 	private static function _loadBaseLib() {
 		self::$_classes = array(
-			'AbstractWindFrontController' => 'base/AbstractWindFrontController', 
+			'WindFrontController' => 'base/WindFrontController', 
 			'IWindApplication' => 'base/IWindApplication', 
 			'IWindFactory' => 'base/IWindFactory', 
-			'IWindRequest' => 'base/IWindRequest', 
-			'IWindResponse' => 'base/IWindResponse', 
 			'WindActionException' => 'base/WindActionException', 
 			'WindClassProxy' => 'base/WindClassProxy', 
 			'WindEnableValidateModule' => 'base/WindEnableValidateModule', 
@@ -240,11 +272,37 @@ private static function _loadBaseLib() {
 			'WindActionFilter' => 'filter/WindActionFilter', 
 			'WindHandlerInterceptor' => 'filter/WindHandlerInterceptor', 
 			'WindHandlerInterceptorChain' => 'filter/WindHandlerInterceptorChain', 
-			'WindUtility' => 'utility/WindUtility', 
-			'WindString' => 'utility/WindString', 
+			'WindFormFilter' => 'web/filter/WindFormFilter', 
+			'WindController' => 'web/WindController', 
+			'WindDispatcher' => 'web/WindDispatcher', 
+			'WindErrorHandler' => 'web/WindErrorHandler', 
+			'WindForward' => 'web/WindForward', 
+			'WindWebFrontController' => 'web/WindWebFrontController', 
+			'WindSimpleController' => 'web/WindSimpleController', 
+			'WindUrlHelper' => 'web/WindUrlHelper', 
+			'WindWebApplication' => 'web/WindWebApplication', 
+			'AbstractWindRouter' => 'router/AbstractWindRouter', 
+			'AbstractWindRoute' => 'router/route/AbstractWindRoute', 
+			'WindRewriteRoute' => 'router/route/WindRewriteRoute', 
+			'WindRouter' => 'router/WindRouter', 
+			'IWindRequest' => 'http/request/IWindRequest', 
+			'WindHttpRequest' => 'http/request/WindHttpRequest', 
+			'IWindResponse' => 'http/response/IWindResponse', 
+			'WindHttpResponse' => 'http/response/WindHttpResponse', 
+			'WindArray' => 'utility/WindArray', 
+			'WindConvert' => 'utility/WindConvert', 
+			'WindCookie' => 'utility/WindCookie', 
+			'WindDate' => 'utility/WindDate', 
 			'WindFile' => 'utility/WindFile', 
+			'WindFolder' => 'utility/WindFolder', 
+			'WindGeneralDate' => 'utility/WindGeneralDate', 
+			'WindImage' => 'utility/WindImage', 
 			'WindJson' => 'utility/WindJson', 
-			'WindSecurity' => 'utility/WindSecurity');
+			'WindPack' => 'utility/WindPack', 
+			'WindSecurity' => 'utility/WindSecurity', 
+			'WindString' => 'utility/WindString', 
+			'WindUtility' => 'utility/WindUtility', 
+			'WindValidator' => 'utility/WindValidator');
 	}
 }
 
diff --git a/wind/base/AbstractWindFrontController.php b/wind/base/AbstractWindFrontController.php
deleted file mode 100644
index b3af0ea7..00000000
--- a/wind/base/AbstractWindFrontController.php
+++ /dev/null
@@ -1,401 +0,0 @@
-<?php
-/**
- * 前端控制器定义
- * 
- * 初始化系统信息,初始化请求对象、组件工厂、应用实例对象等。加载系统配置、组件配置，并进行解析。
- * @author Qiong Wu <papa0924@gmail.com> 2011-12-27
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.windframework.com
- * @version $$Id$$
- * @package base
- */
-abstract class AbstractWindFrontController {
-	/**
-	 * request类型定义
-	 * 
-	 * @var string
-	 */
-	protected $_request = null;
-	/**
-	 * 组件工程实例对象
-	 * 
-	 * @var WindFactory
-	 */
-	protected $_factory = null;
-	/**
-	 * 应用配置
-	 * 
-	 * @var array
-	 */
-	protected $_config = array();
-	/**
-	 * 当前app名称
-	 *
-	 * @var string
-	 */
-	protected $_appName;
-	/**
-	 * 应用对象数组
-	 *
-	 * @var WindWebApplication
-	 */
-	private $_app = null;
-	/**
-	 * @var WindHandlerInterceptorChain
-	 */
-	private $_chain = null;
-	/**
-	 * @var AbstractWindCache
-	 */
-	private $_cache = null;
-	private $_cached = false;
-	protected $_errPage = 'error';
-
-	/**
-	 * @param string $appName 默认app名称
-	 * @param Array|string $config 应用配置信息,支持为空或多应用配置
-	 */
-	public function __construct($appName, $config) {
-		set_error_handler(array($this, '_errorHandle'), error_reporting());
-		set_exception_handler(array($this, '_exceptionHandle'));
-		$appName && $this->_appName = $appName;
-		$this->_config = $config;
-	}
-
-	/**
-	 * 创建并返回应用对象实例
-	 *
-	 * @return WindWebApplication
-	 */
-	abstract protected function _createApplication();
-
-	/**
-	 * 预加载系统文件,返回预加载系统文件数据
-	 * 
-	 * 预加载系统文件格式如下，键值为类名=>值为类的includePath，可以是相对的（如果includePath中已经包含了该地址）
-	 * 也可以是绝对地址，但不能是wind的命名空间形式的地址<pre>
-	 * return array(
-	 * 		'WindController' => 'web/WindController', 
-	 *		'WindDispatcher' => 'web/WindDispatcher'
-	 * </pre>
-	 * @return void
-	 * @return array
-	 */
-	abstract protected function _loadBaseLib();
-
-	/**
-	 * 返回组建定义信息
-	 * 
-	 * 组件的配置标签说明：
-	 * name: 		组件的名字，唯一用于在应用中获取对应组件的对象实例
-	 * path: 		该组件的实现
-	 * scope: 		组件对象的范围： {singleton: 单例; application: 整个应用； prototype: 当前使用}
-	 * initMethod: 在应用对象生成时执行的方法
-	 * destroy： 	在应用结束的时候执行的操作
-	 * proxy：	 	组件是否用代理的方式调用
-	 *
-	 * constructor-args：构造方法的参数
-	 *	constructor-arg：
-	 *		name：参数的位置,起始位置从0开始，第一个参数为0，第二个参数为1
-	 *		参数的值的表示方式有一下几种：
-	 *		ref: 该属性是一个对象，ref的值对应着组件的名字
-	 *		value: 一个字串值
-	 *		path: path指向的类的实例将会被创建传递给该属性
-	 *		
-	 * properties: 属性的配置，表现为组件中的类属性
-	 *	property: 
-	 *		name:属性名称
-	 *		属性值的表示方式有以下几种：
-	 *		ref: 该属性是一个对象，ref的值对应着组件的名字，表现为在组件中获取方式为“_get+属性名()”称来获取
-	 *		value: 一个字串值
-	 *		path: path指向的类的实例将会被创建传递给该属性
-	 * 
-	 *
-	 * config： 组件的配置-该值对应的配置会通过setConfig接口传递给组件；
-	 *	resource: 指定一个外部地址，将会去包含该文件
-	 * 
-	 * @return array()
-	 */
-	abstract protected function _components();
-
-	/**
-	 * 创建并返回应用实例
-	 * 
-	 * @deprecated
-	 * @return WindWebApplication
-	 */
-	public function createApplication() {
-		if ($this->_app === null) {
-			$application = $this->_createApplication();
-			/* @var $application WindWebApplication */
-			if (!empty($this->_config['web-apps'][$this->_appName])) {
-				if ($this->_appName !== 'default' && isset($this->_config['web-apps']['default']) && !isset(
-					$this->_config['web-apps'][$this->_appName]['_merged'])) {
-					$this->_config['web-apps'][$this->_appName] = WindUtility::mergeArray(
-						$this->_config['web-apps']['default'], $this->_config['web-apps'][$this->_appName]);
-					$this->_config['web-apps'][$this->_appName]['_merged'] = true;
-				}
-				$application->setConfig($this->_config['web-apps'][$this->_appName]);
-			}
-			$this->_app = $application;
-		}
-		return $this->_app;
-	}
-
-	/**
-	 * 创建并执行当前应用,单应用访问入口
-	 */
-	public function run() {
-		$this->initConfig();
-		
-		$this->_appName || $this->_appName = 'default';
-		/* @var $router WindRouter */
-		$router = $this->getFactory()->getInstance('router');
-		$router->route($this->getRequest());
-		$this->_run();
-	}
-
-	/**
-	 * 注册过滤器,监听Application Run
-	 *
-	 * @param WindHandlerInterceptor $filter
-	 */
-	public function registeFilter($filter) {
-		if (!$filter instanceof WindHandlerInterceptor) return;
-		if ($this->_chain === null) {
-			Wind::import("WIND:filter.WindHandlerInterceptorChain");
-			$this->_chain = new WindHandlerInterceptorChain();
-		}
-		$this->_chain->addInterceptors($filter);
-	}
-
-	/**
-	 * 注册组件对象
-	 * 
-	 * @param object $componentInstance
-	 * @param string $componentName
-	 * @param string $scope 默认值为 'application'
-	 */
-	public function registeComponent($componentInstance, $componentName, $scope = 'application') {
-		switch ($componentName) {
-			case 'windCache':
-				$this->_cache = $componentInstance;
-				$this->_cache->setKeyPrefix($this->_appName . '_system_');
-				$this->getFactory()->registInstance($this->_cache, $componentName, 'application');
-				break;
-			case 'request':
-				$this->_request = $componentInstance;
-				break;
-			default:
-				$this->getFactory()->registInstance($componentInstance, $componentName, $scope);
-				break;
-		}
-	}
-
-	/**
-	 * 返回当前app应用名称
-	 * 
-	 * @return string
-	 */
-	public function getAppName() {
-		return $this->_appName;
-	}
-
-	/**
-	 * 返回当前的app应用
-	 * 
-	 * @param string $appName
-	 * @return WindWebApplication
-	 */
-	public function getApp() {
-		return $this->_app;
-	}
-
-	/**
-	 * @return WindHttpRequest
-	 */
-	public function getRequest() {
-		if ($this->_request === null) {
-			$this->_request = WindFactory::createInstance('WindHttpRequest');
-		}
-		return $this->_request;
-	}
-
-	/**
-	 * @return WindFactory
-	 */
-	public function getFactory() {
-		if ($this->_factory === null) {
-			if ($this->_cache !== null && ($classes = $this->_cache->get('classes'))) {
-				$imports = $this->_cache->get('imports');
-				$classes && Wind::$_classes += $classes;
-				$imports && Wind::$_imports += $imports;
-				$this->_factory = $this->_cache->get('factory');
-				$this->_config = $this->_cache->get('config');
-				$this->_cached = true;
-			}
-			if (!$this->_factory) {
-				$this->_loadBaseLib();
-				$this->_factory = new WindFactory($this->_components());
-			}
-		}
-		return $this->_factory;
-	}
-
-	/**
-	 * 异常处理句柄
-	 *
-	 * @param Exception $exception
-	 */
-	public function _exceptionHandle($exception) {
-		restore_error_handler();
-		restore_exception_handler();
-		$trace = $exception->getTrace();
-		if (@$trace[0]['file'] == '') {
-			unset($trace[0]);
-			$trace = array_values($trace);
-		}
-		$file = @$trace[0]['file'];
-		$line = @$trace[0]['line'];
-		$this->showErrorMessage($exception->getMessage(), $file, $line, $trace, $exception->getCode());
-	}
-
-	/**
-	 * 错误处理句柄
-	 *
-	 * @param int $errno
-	 * @param string $errstr
-	 * @param string $errfile
-	 * @param int $errline
-	 */
-	public function _errorHandle($errno, $errstr, $errfile, $errline) {
-		restore_error_handler();
-		restore_exception_handler();
-		$trace = debug_backtrace();
-		unset($trace[0]["function"], $trace[0]["args"]);
-		$this->showErrorMessage($this->_friendlyErrorType($errno) . ': ' . $errstr, $errfile, $errline, $trace, $errno);
-	}
-
-	/**
-	 * 错误处理
-	 * 
-	 * @param string $message
-	 * @param string $file 异常文件
-	 * @param int $line 错误发生的行
-	 * @param array $trace
-	 * @param int $errorcode 错误代码
-	 * @throws WindFinalException
-	 */
-	protected function showErrorMessage($message, $file, $line, $trace, $errorcode) {
-		if (WIND_DEBUG & 2) {
-			$log = $message . "\r\n" . $file . ":" . $line . "\r\n";
-			list($fileLines, $trace) = WindUtility::crash($file, $line, $trace);
-			foreach ($trace as $key => $value) {
-				$log .= $value . "\r\n";
-			}
-			Wind::getApp()->getComponent('windLogger')->error($log, 'error', true);
-		}
-	}
-
-	/**
-	 * 创建并运行当前应用
-	 * 
-	 * 配合过滤链策略部署,可以通过{@see AbstractWindFrontController::registeFilter}
-	 * 方法注册过滤器,当应用被执行时会判断当前时候有初始化过滤链对象,并选择是否是通过过滤链方式执行应用
-	 * @return void
-	 */
-	protected function _run() {
-		$application = $this->createApplication();
-		if ($this->_chain !== null) {
-			$this->_chain->setCallBack(array($application, 'run'), array(true));
-			$this->_chain->getHandler()->handle($this);
-		} else
-			$application->run($application->getConfig('filters'));
-		restore_error_handler();
-		restore_exception_handler();
-		$this->_app->getResponse()->sendResponse();
-		$this->_app->getWindFactory()->executeDestroyMethod();
-		if ($this->_cache !== null && $this->_cached === false) {
-			$this->_cache->set('factory', $this->_factory);
-			$this->_cache->set('classes', Wind::$_classes);
-			$this->_cache->set('imports', Wind::$_imports);
-			$this->_cache->set('config', $this->_config);
-		}
-	}
-
-	/**
-	 * 初始化配置信息
-	 *
-	 * @param array $config
-	 */
-	protected function initConfig() {
-		if (!$this->_config) return;
-		if (is_string($this->_config)) {
-			$this->_config = $this->getFactory()->getInstance('configParser')->parse($this->_config);
-		}
-		if (isset($this->_config['isclosed']) && $this->_config['isclosed']) {
-			if ($this->_config['isclosed-tpl'])
-				$this->_errPage = $this->_config['isclosed-tpl'];
-			else
-				$this->_errPage = 'close';
-			throw new Exception('Sorry, Site has been closed!');
-		}
-		if (!empty($this->_config['components'])) {
-			if (!empty($this->_config['components']['resource'])) {
-				$this->_config['components'] += $this->getFactory()->getInstance('configParser')->parse(
-					Wind::getRealPath($this->_config['components']['resource'], true, true));
-			}
-			$this->getFactory()->loadClassDefinitions($this->_config['components']);
-			unset($this->_config['components']);
-		}
-		if (empty($this->_config['web-apps'])) return;
-		foreach ($this->_config['web-apps'] as $key => $value) {
-			$rootPath = empty($value['root-path']) ? dirname($_SERVER['SCRIPT_FILENAME']) : Wind::getRealPath(
-				$value['root-path'], false);
-			Wind::register($rootPath, $key, true);
-		}
-	}
-
-	/**
-	 * 返回友好的错误类型名
-	 *
-	 * @param int $type
-	 * @return string|unknown
-	 */
-	private function _friendlyErrorType($type) {
-		switch ($type) {
-			case E_ERROR:
-				return 'E_ERROR';
-			case E_WARNING:
-				return 'E_WARNING';
-			case E_PARSE:
-				return 'E_PARSE';
-			case E_NOTICE:
-				return 'E_NOTICE';
-			case E_CORE_ERROR:
-				return 'E_CORE_ERROR';
-			case E_CORE_WARNING:
-				return 'E_CORE_WARNING';
-			case E_CORE_ERROR:
-				return 'E_COMPILE_ERROR';
-			case E_CORE_WARNING:
-				return 'E_COMPILE_WARNING';
-			case E_USER_ERROR:
-				return 'E_USER_ERROR';
-			case E_USER_WARNING:
-				return 'E_USER_WARNING';
-			case E_USER_NOTICE:
-				return 'E_USER_NOTICE';
-			case E_STRICT:
-				return 'E_STRICT';
-			case E_RECOVERABLE_ERROR:
-				return 'E_RECOVERABLE_ERROR';
-			case E_DEPRECATED:
-				return 'E_DEPRECATED';
-			case E_USER_DEPRECATED:
-				return 'E_USER_DEPRECATED';
-		}
-		return $type;
-	}
-}
-?>
\ No newline at end of file
diff --git a/wind/base/IWindRequest.php b/wind/base/IWindRequest.php
deleted file mode 100644
index 3b5b4a7c..00000000
--- a/wind/base/IWindRequest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * request接口定义
- *
- * @author Qiong Wu <papa0924@gmail.com>
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.windframework.com
- * @version $Id$
- * @package http
- * @subpackage request
- */
-interface IWindRequest {
-	/**
-	 * 返回包含由客户端提供的、跟在真实脚本名称之后并且在查询语句（query string）之前的路径信息
-	 *
-	 * @return string
-	 * @throws WindException
-	 */
-	public function getPathInfo();
-
-	/**
-	 * 获得请求类型
-	 *
-	 * 如果是web请求将返回web
-	 * @return string
-	 */
-	public function getRequestType();
-
-	/**
-	 * 获得主机信息，包含协议信息，主机名，访问端口信息
-	 *
-	 * @return string
-	 * @throws WindException 获取主机信息失败的时候抛出异常
-	 */
-	public function getHostInfo();
-
-	/**
-	 * 返回当前运行脚本所在的服务器的主机名。
-	 *
-	 * 如果脚本运行于虚拟主机中
-	 * 该名称是由那个虚拟主机所设置的值决定
-	 * @return string
-	 */
-	public function getServerName();
-
-	/**
-	 * 返回服务端口号
-	 *
-	 * https链接的默认端口号为443
-	 * http链接的默认端口号为80
-	 * @return int
-	 */
-	public function getServerPort();
-
-	/**
-	 * @return IWindResponse
-	 */
-	public function getResponse();
-
-	/**
-	 * 返回客户端程序期望服务器返回哪个国家的语言文档
-	 *
-	 * Accept-Language: en-us,zh-cn
-	 * @return string
-	 */
-	public function getAcceptLanguage();
-
-	/**
-	 * 设置属性数据
-	 *
-	 * @param string|array|object $data 需要设置的数据
-	 * @param string $key 设置的数据保存用的key,默认为空,当数组和object类型的时候将会执行array_merge操作
-	 * @return void
-	 */
-	public function setAttribute($data, $key = '');
-
-	/**
-	 * 根据名称获得服务器和执行环境信息
-	 *
-	 * 主要获取的依次顺序为：_attribute、$_GET、$_POST、$_COOKIE、$_REQUEST、$_ENV、$_SERVER
-	 * @param string $name 获取数据的key值
-	 * @param string $defaultValue 设置缺省值,当获取值失败的时候返回缺省值,默认该值为空字串
-	 * @return string|object|array 返回获得值
-	 */
-	public function getAttribute($key, $defaultValue = '');
-}
-
-
-
-
diff --git a/wind/base/IWindResponse.php b/wind/base/IWindResponse.php
deleted file mode 100644
index c0f03eb4..00000000
--- a/wind/base/IWindResponse.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * response的接口定义
- *
- * @author Qiong Wu <papa0924@gmail.com> 2010-11-7
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.windframework.com
- * @version $Id$
- * @package http
- * @subpackage response
- */
-interface IWindResponse {
-
-	/**
-	 * 获得保存输出数据
-	 *
-	 * @param string $var
-	 * @return mixed
-	 */
-	public function getData();
-
-	/**
-	 * 设置保存输出数据
-	 *
-	 * @param mixed $data 待保存的输出数据
-	 * @param string $key 输出数据的key名称,默认为空
-	 */
-	public function setData($data, $key = '');
-
-	/**
-	 * 获得输出的编码方式
-	 *
-	 * @return string
-	 */
-	public function getCharset();
-
-	/**
-	 * 设置输出的编码方式
-	 *
-	 * @param string $_charset 编码方式
-	 * @return void
-	 */
-	public function setCharset($_charset);
-
-	/**
-	 * 设置响应内容
-	 *
-	 * @param string $content 响应内容信息
-	 * @param string $name 相应内容片段名字,默认为null
-	 * @return void
-	 */
-	public function setBody($content, $name = 'default');
-
-	/**
-	 * 发送一个错误的响应信息
-	 *
-	 * @param int $status 错误码,默认为404
-	 * @param string $message 错误信息,默认为空
-	 * @return void
-	 */
-	public function sendError($status = self::W_NOT_FOUND, $message = '');
-
-	/**
-	 * 发送响应内容
-	 *
-	 * @return void
-	 */
-	public function sendBody();
-
-	/**
-	 * 发送响应头部信息
-	 *
-	 * @return void
-	 */
-	public function sendHeaders();
-
-	/**
-	 * 发送响应信息
-	 *
-	 * 依次发送响应头和响应内容
-	 * @return void
-	 */
-	public function sendResponse();
-
-}
\ No newline at end of file
diff --git a/wind/base/WindErrorMessage.php b/wind/base/WindErrorMessage.php
index bb7da027..dc0cc573 100644
--- a/wind/base/WindErrorMessage.php
+++ b/wind/base/WindErrorMessage.php
@@ -94,7 +94,7 @@ public function setErrorAction($errorAction) {
 /**
  * 错误消息类接口定义
  * 
- * the last known user to change this file in the repository  <$LastChangedBy: yishuo $>
+ * the last known user to change this file in the repository  <$LastChangedBy$>
  * @author Qiong Wu <papa0924@gmail.com>
  * @version $Id$
  * @package 
diff --git a/wind/base/WindFactory.php b/wind/base/WindFactory.php
index 683e4a5d..373d8d23 100644
--- a/wind/base/WindFactory.php
+++ b/wind/base/WindFactory.php
@@ -22,7 +22,6 @@ class WindFactory implements IWindFactory {
 	protected $instances = array();
 	protected $prototype = array();
 	protected $destories = array();
-	protected $singleton = array();
 
 	/**
 	 * 初始化工厂类
@@ -32,7 +31,7 @@ class WindFactory implements IWindFactory {
 	public function __construct($classDefinitions = array()) {
 		if (is_array($classDefinitions)) $this->classDefinitions = $classDefinitions;
 	}
-	
+
 	/* (non-PHPdoc)
 	 * @see IWindFactory::getInstance()
 	 */
@@ -44,10 +43,9 @@ public function getInstance($alias, $args = array()) {
 			if (isset($definition['destroy'])) $this->destories[] = array($instance, $definition['destroy']);
 		} elseif (isset($this->instances[$alias])) {
 			$instance = $this->instances[$alias];
-		} elseif (isset($this->singleton[$alias])) {
-			$instance = $this->singleton[$alias];
 		} else {
-			if (!$definition) return null;
+			if (!$definition) throw new WindException(
+				'[factory.WindFactory.getInstance] component \'' . $alias . '\' is not exist.');
 			if (isset($definition['constructor-args']) && !$args) $this->buildArgs($definition['constructor-args'], 
 				$args);
 			if (!isset($definition['className'])) $definition['className'] = Wind::import(@$definition['path']);
@@ -62,12 +60,13 @@ public function getInstance($alias, $args = array()) {
 		if (isset($definition['proxy'])) $instance = $this->setProxyForClass($definition['proxy'], $instance);
 		return $instance;
 	}
-	
+
 	/* (non-PHPdoc)
 	 * @see IWindFactory::createInstance()
 	 */
 	static public function createInstance($className, $args = array()) {
 		try {
+			if (!$className || !class_exists($className)) throw new WindException('class is not exist.');
 			if (empty($args)) {
 				return new $className();
 			} else {
@@ -155,8 +154,6 @@ public function executeDestroyMethod() {
 		try {
 			foreach ($this->destories as $call)
 				call_user_func_array($call, array());
-			$this->instances = array();
-			$this->destories = array();
 		} catch (Exception $e) {
 			throw new WindException($e->getMessage());
 		}
@@ -207,7 +204,7 @@ protected function setScope($alias, $scope, $instance) {
 				$this->instances[$alias] = $instance;
 				break;
 			case 'singleton':
-				$this->singleton[$alias] = $instance;
+				$this->instances[$alias] = $instance;
 				break;
 			default:
 				break;
@@ -227,10 +224,10 @@ protected function setScope($alias, $scope, $instance) {
 	 * @return void
 	 */
 	protected function resolveConfig($config, $alias, $instance) {
-		if (!empty($config['resource'])) {
+		if (isset($config['resource'])) {
 			$_configPath = Wind::getRealPath($config['resource'], true, true);
-			$config = $this->getInstance('configParser')->parse($_configPath, $alias, 'components_config', 
-				(!empty($this->instances['windCache']) ? $this->instances['windCache'] : null));
+			$configParser = $this->getInstance('configParser');
+			$config = $configParser->parse($_configPath, $alias, false);
 		}
 		if ($config && method_exists($instance, 'setConfig')) $instance->setConfig($config);
 	}
@@ -267,7 +264,8 @@ protected function executeInitMethod($initMethod, $instance) {
 	protected function setProxyForClass($proxy, $instance) {
 		if (!$proxy) return $instance;
 		if (true === $proxy) $proxy = $this->proxyType;
-		$proxy = self::createInstance(Wind::import($proxy));
+		$this->addClassDefinitions($proxy, array('path' => $proxy, 'scope' => 'prototype'));
+		$proxy = $this->getInstance($proxy);
 		$proxy->registerTargetObject($instance);
 		$instance->_proxy = $proxy;
 		return $proxy;
diff --git a/wind/base/WindFrontController.php b/wind/base/WindFrontController.php
new file mode 100644
index 00000000..5d5c3d1a
--- /dev/null
+++ b/wind/base/WindFrontController.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * 前端控制器定义
+ *
+ * @author Qiong Wu <papa0924@gmail.com> 2011-12-27
+ * @copyright ©2003-2103 phpwind.com
+ * @license http://www.windframework.com
+ * @version $Id$
+ * @package base
+ */
+class WindFrontController {
+	/**
+	 * @var string
+	 */
+	protected $componentConfig = 'WIND:components_config.php';
+	/**
+	 * @var WindHttpRequest
+	 */
+	protected $request = null;
+	/**
+	 * @var WindFactory
+	 */
+	protected $factory = null;
+	
+	/**
+	 * 应用配置
+	 * 
+	 * @var array
+	 */
+	protected $_config = array();
+	/**
+	 * 当前app名称
+	 *
+	 * @var string
+	 */
+	protected $_appName;
+	/**
+	 * 应用对象数组
+	 *
+	 * @var array
+	 */
+	protected $_app = array();
+	/**
+	 * 当前应用app名称数组
+	 * 
+	 * @var array
+	 */
+	private $_appActiveQueue = array();
+	/**
+	 * @var WindHandlerInterceptorChain
+	 */
+	private $_chain = null;
+
+	/**
+	 * @param string $appName 默认app名称
+	 * @param Array|string $config 应用配置信息,支持为空或多应用配置
+	 */
+	public function __construct($appName, $config) {
+		$appName && $this->_appName = $appName;
+		$this->factory = new WindFactory(@include (Wind::getRealPath($this->componentConfig, true)));
+		if ($config) {
+			is_string($config) && $config = $this->factory->getInstance('configParser')->parse($config);
+			if (isset($config['isclosed']) && $config['isclosed']) {
+				WindHelper::triggerError('Sorry, Site has been closed!', 
+					(!empty($config['isclosed-tpl']) ? $config['isclosed-tpl'] : ''));
+			}
+			if (!empty($config['components'])) {
+				if (!empty($config['components']['resource'])) {
+					$config['components'] = $this->factory->getInstance('configParser')->parse(
+						Wind::getRealPath($config['components']['resource'], true, true));
+				}
+				$this->factory->loadClassDefinitions($config['components']);
+			}
+			$this->initConfig($config);
+		}
+	}
+
+	/**
+	 * 初始化配置信息
+	 * 
+	 * @param array $config
+	 */
+	protected function initConfig($config) {
+		foreach ($config['web-apps'] as $key => $value) {
+			$rootPath = empty($value['root-path']) ? dirname($_SERVER['SCRIPT_FILENAME']) : Wind::getRealPath(
+				$value['root-path'], false);
+			Wind::register($rootPath, $key, true);
+			$this->_config[$key] = $value;
+		}
+	}
+
+	/**
+	 * 创建并执行当前应用,单应用访问入口
+	 */
+	public function run() {
+		$this->_appName || $this->_appName = 'default';
+		$this->request || $this->request = new WindHttpRequest();
+		/* @var $router WindRouter */
+		$router = $this->factory->getInstance('router');
+		$router->route($this->request);
+		$this->_run($this->createApplication());
+	}
+
+	/**
+	 * 创建并返回应用
+	 * 
+	 * @return WindWebApplication
+	 */
+	public function createApplication() {
+		if (!isset($this->_app[$this->_appName])) {
+			/* @var $application WindWebApplication */
+			$application = $this->factory->getInstance('windApplication', 
+				array($this->request, new WindHttpResponse(), $this->factory));
+			if (!empty($this->_config[$this->_appName])) {
+				$application->setConfig($this->_config[$this->_appName]);
+			}
+			$this->_app[$this->_appName] = $application;
+		}
+		return $this->_app[$this->_appName];
+	}
+
+	/**
+	 * 注册过滤器,监听Application Run
+	 *
+	 * @param WindHandlerInterceptor $filter
+	 */
+	public function registeFilter($filter) {
+		if (!$filter instanceof WindHandlerInterceptor) return;
+		if ($this->_chain === null) {
+			Wind::import("WIND:filter.WindHandlerInterceptorChain");
+			$this->_chain = new WindHandlerInterceptorChain();
+		}
+		$this->_chain->addInterceptors($filter);
+	}
+
+	/**
+	 * 注册组件对象
+	 * 
+	 * @param object $componentInstance
+	 * @param string $componentName
+	 * @param string $scope 默认值为 'application'
+	 */
+	public function registeComponent($componentInstance, $componentName, $scope = 'application') {
+		switch ($componentName) {
+			case 'request':
+				$this->request = $componentInstance;
+				break;
+			default:
+				$this->factory->registInstance($componentInstance, $componentName, $scope);
+				break;
+		}
+	}
+
+	/**
+	 * 返回当前app应用名称
+	 * 
+	 * @return string
+	 */
+	public function getAppName() {
+		return $this->_appName;
+	}
+
+	/**
+	 * 返回当前的app应用
+	 * 
+	 * @param string $appName
+	 * @return WindWebApplication
+	 */
+	public function getApp($appName = '') {
+		$appName || $appName = $this->_appName;
+		if (isset($this->_app[$appName])) return $this->_app[$appName];
+		return null;
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function afterRun() {
+		restore_error_handler();
+		restore_exception_handler();
+		$this->getApp()->getResponse()->sendResponse();
+		$this->getApp()->getWindFactory()->executeDestroyMethod();
+	}
+
+	/**
+	 * application run 的前置操作,重置当前环境为当前应用信息
+	 * 
+	 * @param appName
+	 * @return void
+	 */
+	protected function beforRun() {
+		set_error_handler('WindHelper::errorHandle');
+		set_exception_handler('WindHelper::exceptionHandle');
+	}
+
+	/**
+	 * 创建并运行当前应用
+	 * 
+	 * 配合过滤链策略部署,可以通过{@see AbstractWindFrontController::registeFilter}
+	 * 方法注册过滤器,当应用被执行时会判断当前时候有初始化过滤链对象,并选择是否是通过过滤链方式执行应用
+	 * @param WindWebApplication $application
+	 * @return void
+	 */
+	protected function _run($application) {
+		array_push($this->_appActiveQueue, $this->_appName);
+		$this->beforRun();
+		if ($this->_chain !== null) {
+			$this->_chain->setCallBack(array($application, 'run'), array());
+			$this->_chain->getHandler()->handle();
+		} else
+			$application->run();
+		$this->afterRun();
+		array_pop($this->_appActiveQueue);
+		$this->_appName = end($this->_appActiveQueue);
+	}
+}
+?>
\ No newline at end of file
diff --git a/wind/base/WindHelper.php b/wind/base/WindHelper.php
new file mode 100644
index 00000000..79fe8710
--- /dev/null
+++ b/wind/base/WindHelper.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * 基础帮助类,提供框架错误处理基础操作
+ * 
+ * @author Qiong Wu <papa0924@gmail.com>
+ * @copyright ©2003-2103 phpwind.com
+ * @license http://www.windframework.com
+ * @version $Id$
+ * @package base
+ */
+class WindHelper {
+	const INTERNAL_LOCATION = "~Internal Location~";
+	/**
+	 * 默认错误视图位置
+	 * 
+	 * 默认错误视图位置,可以通过应用配置进行重定义<code>
+	 * <errorpage>WIND:web.view</errorpage></code>
+	 * @var string
+	 */
+	protected static $errorDir = 'WIND:web.view';
+
+	/**
+	 * 错误处理句柄
+	 * 
+	 * @param string $errno
+	 * @param string $errstr
+	 * @param string $errfile
+	 * @param string $errline
+	 * @return void
+	 */
+	public static function errorHandle($errno, $errstr, $errfile, $errline) {
+		if ($errno & error_reporting()) {
+			restore_error_handler();
+			restore_exception_handler();
+			$trace = debug_backtrace();
+			unset($trace[0]["function"], $trace[0]["args"]);
+			self::crash(self::getErrorName($errno) . ':' . $errstr, $errfile, $errline, $trace);
+		}
+	}
+
+	/**
+	 * 以静态错误页面终结请求
+	 *
+	 * @param string $message
+	 * @param string $template
+	 * @param WindHttpResponse $response
+	 * @param int $status
+	 */
+	public static function triggerError($message, $template) {
+		$message = substr($message, 0, 8000);
+		if ($template) {
+			$file = Wind::getRealPath($template, true);
+			ob_start();
+			include $file;
+			$message = ob_get_clean();
+		}
+		die($message);
+	}
+
+	/**
+	 * 异常处理句柄
+	 * 
+	 * @param Exception $exception
+	 * @return void
+	 */
+	public static function exceptionHandle($exception) {
+		restore_error_handler();
+		restore_exception_handler();
+		$trace = $exception->getTrace();
+		if (@$trace[0]['file'] == '') {
+			unset($trace[0]);
+			$trace = array_values($trace);
+		}
+		$file = @$trace[0]['file'];
+		$line = @$trace[0]['line'];
+		self::crash($exception->getMessage(), $file, $line, $trace, $exception->getCode());
+	}
+
+	/**
+	 * 错误信息处理方法
+	 * 
+	 * @param string $message
+	 * @param string $file
+	 * @param string $line
+	 * @param array $trace
+	 */
+	protected static function crash($message, $file, $line, $trace, $status = 0) {
+		$errmessage = substr($message, 0, 8000);
+		$_headers = Wind::getApp()->getResponse()->getHeaders();
+		$_errhtml = false;
+		foreach ($_headers as $_header) {
+			if (strtolower($_header['name']) == strtolower('Content-type')) {
+				$_errhtml = strpos(strtolower($_header['value']), strtolower('text/html')) !== false;
+				break;
+			}
+		}
+		$msg = '';
+		if (WIND_DEBUG) {
+			$_errorPage = 'error.htm';
+			$count = count($trace);
+			$padLen = strlen($count);
+			foreach ($trace as $key => $call) {
+				if (!isset($call['file']) || $call['file'] == '') {
+					$call['file'] = self::INTERNAL_LOCATION;
+					$call['line'] = 'N/A';
+				}
+				$traceLine = '#' . str_pad(($count - $key), $padLen, "0", STR_PAD_LEFT) . '  ' . self::getCallLine(
+					$call);
+				$trace[$key] = $traceLine;
+			}
+			$fileLines = array();
+			if (is_file($file)) {
+				$currentLine = $line - 1;
+				$fileLines = explode("\n", file_get_contents($file, null, null, 0, 10000000));
+				$topLine = $currentLine - 5;
+				$fileLines = array_slice($fileLines, $topLine > 0 ? $topLine : 0, 10, true);
+				if (($count = count($fileLines)) > 0) {
+					$padLen = strlen($count);
+					foreach ($fileLines as $line => &$fileLine)
+						$fileLine = " " . htmlspecialchars(
+							str_pad($line + 1, $padLen, "0", STR_PAD_LEFT) . ": " . str_replace("\t", "    ", 
+								rtrim($fileLine)), null, "UTF-8");
+				}
+			}
+			$msg .= "$file\n" . implode("\n", $fileLines) . "\n" . implode("\n", $trace);
+		} else
+			$_errorPage = '404.htm';
+		if ($status >= 400 && $status <= 505) {
+			$_statusMsg = ucwords(Wind::getApp()->getResponse()->codeMap($status));
+			$topic = "$status - " . $_statusMsg . "\n";
+		} else
+			$topic = "Wind Framework - Error Caught";
+		$msg = "$topic\n$errmessage\n" . $msg;
+		if (WIND_DEBUG & 2) {
+			Wind::getApp()->getComponent('windLogger')->error($msg, 'wind.error', 'core.error', true);
+		}
+		if ($_errhtml) {
+			ob_start();
+			$errDir = Wind::getApp()->getConfig('errorpage');
+			$errDir || $errDir = self::$errorDir;
+			if (isset($_statusMsg)) {
+				header('HTTP/1.x ' . $status . ' ' . $_statusMsg);
+				header('Status: ' . $status . ' ' . $_statusMsg);
+				is_file(Wind::getRealPath($errDir) . '.' . $status . '.htm') && $_errorPage = $status . '.htm';
+			}
+			require Wind::getRealPath(($errDir ? $errDir : self::$errorDir) . '.' . $_errorPage, true);
+			$msg = ob_get_clean();
+		}
+		$msg = str_replace(Wind::getRootPath(Wind::getAppName()), '~/', $msg);
+		die($msg);
+	}
+
+	/**
+	 * @param array $call
+	 * @return string
+	 */
+	private static function getCallLine($call) {
+		$call_signature = "";
+		if (isset($call['file'])) $call_signature .= $call['file'] . " ";
+		if (isset($call['line'])) $call_signature .= "(" . $call['line'] . ") ";
+		if (isset($call['function'])) {
+			$call_signature .= $call['function'] . "(";
+			if (isset($call['args'])) {
+				foreach ($call['args'] as $arg) {
+					if (is_string($arg))
+						$arg = '"' . (strlen($arg) <= 64 ? $arg : substr($arg, 0, 64) . "…") . '"';
+					else if (is_object($arg))
+						$arg = "[Instance of '" . get_class($arg) . "']";
+					else if ($arg === true)
+						$arg = "true";
+					else if ($arg === false)
+						$arg = "false";
+					else if ($arg === null)
+						$arg = "null";
+					else
+						$arg = strval($arg);
+					$call_signature .= $arg . ',';
+				}
+			}
+			$call_signature = trim($call_signature, ',') . ")";
+		}
+		return $call_signature;
+	}
+
+	/**
+	 * 错误代码和错误信息映射方法,接受一个错误代码返回相对应错误代码的错误名称
+	 * 
+	 * @param int $errorNumber 错误代码 必填
+	 * @return string
+	 */
+	protected static function getErrorName($errorNumber) {
+		$errorMap = array(
+			E_ERROR => "E_ERROR", 
+			E_WARNING => "E_WARNING", 
+			E_PARSE => "E_PARSE", 
+			E_NOTICE => "E_NOTICE ", 
+			E_CORE_ERROR => "E_CORE_ERROR", 
+			E_CORE_WARNING => "E_CORE_WARNING", 
+			E_COMPILE_ERROR => "E_COMPILE_ERROR", 
+			E_COMPILE_WARNING => "E_COMPILE_WARNING", 
+			E_USER_ERROR => "E_USER_ERROR", 
+			E_USER_WARNING => "E_USER_WARNING", 
+			E_USER_NOTICE => "E_USER_NOTICE", 
+			E_STRICT => "E_STRICT", 
+			E_RECOVERABLE_ERROR => "E_RECOVERABLE_ERROR", 
+			E_ALL => "E_ALL");
+		return isset($errorMap[$errorNumber]) ? $errorMap[$errorNumber] : 'E_UNKNOWN';
+	}
+}
+?>
\ No newline at end of file
diff --git a/wind/base/WindModule.php b/wind/base/WindModule.php
index 5dcf4c07..1de1a24f 100644
--- a/wind/base/WindModule.php
+++ b/wind/base/WindModule.php
@@ -24,12 +24,19 @@ class WindModule {
 	 * @var array
 	 */
 	protected $_config = array();
+	/**
+	 * 是否进行类型验证
+	 * 
+	 * @deprecated
+	 * @var boolean
+	 */
+	protected $_typeValidation = false;
 	/**
 	 * 在延迟加载策略中使用,保存需要延迟加载的属性配置信息
 	 * 
 	 * @var array
 	 */
-	protected $_delayAttributes = array();
+	private $_delayAttributes = array();
 
 	/**
 	 * 重载了魔术方法__set
@@ -79,15 +86,14 @@ public function __call($methodName, $args) {
 				if (isset($_property['value'])) {
 					$_value = $_property['value'];
 				} elseif (isset($_property['ref'])) {
-					$_value = Wind::getApp()->getWindFactory()->getInstance($_property['ref'], 
-						$args);
+					$_value = $this->getSystemFactory()->getInstance($_property['ref'], $args);
 				} elseif (isset($_property['path'])) {
 					$_className = Wind::import($_property['path']);
-					$_value = WindFactory::createInstance($_className, $args);
+					$_value = $this->getSystemFactory()->createInstance($_className, $args);
 				}
 				$this->$_propertyName = $_value;
-				
-			/*unset($this->delayAttributes[$_propertyName]);*/
+			
+		//unset($this->delayAttributes[$_propertyName]);
 			}
 			return $this->$_propertyName;
 		} elseif ($_prefix == '_set') {
@@ -95,6 +101,20 @@ public function __call($methodName, $args) {
 		}
 	}
 
+	/**
+	 * 重载魔术方法__clone
+	 * 
+	 * 当clone类对象时该方法被调用,通过配置白名单选择是否clone类中的属性对象.
+	 * @deprecated
+	 * @return void
+	 */
+	public function __clone() {
+		foreach ($this->writeTableCloneProperty() as $value) {
+			if (!is_object($this->$value) || !isset($this->$value)) continue;
+			$this->$value = clone $this->$value;
+		}
+	}
+
 	/**
 	 * 返回该对象的数组类型
 	 * 
@@ -141,8 +161,8 @@ public function getConfig($configName = '', $subConfigName = '', $default = '',
 	public function setConfig($config) {
 		if ($config) {
 			if (is_string($config)) {
-				$config = Wind::getApp()->getComponent('configParser')->parse($config, 
-					get_class($this), false, Wind::getApp()->getComponent('windCache'));
+				$config = Wind::getApp()->getComponent('configParser')->parse($config, get_class($this), false, 
+					Wind::getApp()->getComponent('windCache'));
 			}
 			if (!empty($this->_config)) {
 				$this->_config = array_merge($this->_config, (array) $config);
@@ -151,6 +171,25 @@ public function setConfig($config) {
 		}
 	}
 
+	/**
+	 * 类对象clone白名单
+	 * 
+	 * 当类对象被clone时,会访问该方法,该方法返回该类中需要被同时clone的类属性名称,默认返回空数组
+	 * @return array
+	 */
+	protected function writeTableCloneProperty() {
+		return array();
+	}
+
+	/**
+	 * 返回当前应用的WindFactory对象
+	 * 
+	 * @return WindFactory
+	 */
+	protected function getSystemFactory() {
+		return Wind::getApp()->getWindFactory();
+	}
+
 	/**
 	 * 返回当前应用的WindHttpRequest对象
 	 * 
diff --git a/wind/cache/AbstractWindCache.php b/wind/cache/AbstractWindCache.php
index 390cdc79..7b590a26 100644
--- a/wind/cache/AbstractWindCache.php
+++ b/wind/cache/AbstractWindCache.php
@@ -14,7 +14,7 @@
  * </ul>
  * 该基类支持三个配置项{@link setConfig()}，所有继承该类的子类都拥有对该三个配置项的配置。
  * 
- * the last known user to change this file in the repository  <$LastChangedBy: yishuo $>
+ * the last known user to change this file in the repository  <$LastChangedBy$>
  * @author Su Qian <aoxue.1988.su.qian@163.com> 
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
@@ -39,7 +39,7 @@ abstract class AbstractWindCache extends WindModule {
 	 * 
 	 * @var int
 	 */
-	private $expire = 0;
+	private $expire = '';
 	/**
 	 * 缓存依赖的类名称
 	 * 
@@ -273,7 +273,7 @@ protected function buildData($value, $expires = 0, IWindCacheDependency $depende
 			self::DEPENDENCYCLASS => '');
 		if (null !== $dependency) {
 			$dependency->injectDependent(self::EXPIRE);
-			$data[self::DEPENDENCY] = $dependency;
+			$data[self::DEPENDENCY] = serialize($dependency);
 			$data[self::DEPENDENCYCLASS] = get_class($dependency);
 		}
 		return $data;
@@ -308,7 +308,7 @@ protected function formatData($key, $value) {
 	 */
 	protected function hasChanged($key, array $data) {
 		if ($data[self::DEPENDENCY]) {
-			$dependency = $data[self::DEPENDENCY];
+			$dependency = unserialize($data[self::DEPENDENCY]);
 			if (!$dependency->hasChanged($this, $key, $data[self::EXPIRE])) return false;
 		} elseif ($data[self::EXPIRE]) {
 			$_overTime = $data[self::EXPIRE] + $data[self::STORETIME];
@@ -326,8 +326,8 @@ protected function hasChanged($key, array $data) {
 	 * @return string 加入安全码计算之后返回的保存key
 	 */
 	protected function buildSecurityKey($key) {
-		$this->keyPrefix && $key = $this->keyPrefix . '_' . $key;
-		return $key . $this->getSecurityCode();
+		return md5(
+			$this->getKeyPrefix() ? $this->getKeyPrefix() . '_' . $key . $this->getSecurityCode() : $key . $this->getSecurityCode());
 	}
 
 	/**
diff --git a/wind/cache/dependency/WindResolvedCrashDependency.php b/wind/cache/dependency/WindResolvedCrashDependency.php
index e7c784b9..7fff26fc 100644
--- a/wind/cache/dependency/WindResolvedCrashDependency.php
+++ b/wind/cache/dependency/WindResolvedCrashDependency.php
@@ -11,7 +11,7 @@
  * @author xiaoxia.xu <xiaoxia.xuxx@aliyun-inc.com>
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
- * @version $Id$
+ * @version $Id: WindResolvedCrashDependency.php 2849 2011-09-26 02:18:30Z xiaoxia.xuxx $
  * @package cache
  * @subpackage dependency
  */
diff --git a/wind/cache/exception/WindCacheException.php b/wind/cache/exception/WindCacheException.php
index 56a3c0db..9ccdd149 100644
--- a/wind/cache/exception/WindCacheException.php
+++ b/wind/cache/exception/WindCacheException.php
@@ -2,7 +2,7 @@
 /**
  * 缓存的异常类
  * 
- * the last known user to change this file in the repository  <$LastChangedBy: yishuo $>
+ * the last known user to change this file in the repository  <$LastChangedBy$>
  * @author Qiong Wu <papa0924@gmail.com>
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
diff --git a/wind/cache/strategy/WindApcCache.php b/wind/cache/strategy/WindApcCache.php
index ab4b1a42..884cb879 100644
--- a/wind/cache/strategy/WindApcCache.php
+++ b/wind/cache/strategy/WindApcCache.php
@@ -60,6 +60,19 @@
  */
 class WindApcCache extends AbstractWindCache {
 
+	/**
+	 * 构造函数
+	 * 
+	 * 判断是否有安装apc扩展,如果没有安装将会抛出cache异常
+	 * 
+	 * @throws WindCacheException 当没有安装apc扩展的时候
+	 */
+	public function __construct() {
+		if (!extension_loaded('apc')) {
+			throw new WindCacheException('The apc extension must be loaded !');
+		}
+	}
+
 	/* (non-PHPdoc)
 	 * @see AbstractWindCache::setValue()
 	 */
diff --git a/wind/cache/strategy/WindDbCache.php b/wind/cache/strategy/WindDbCache.php
index 1109f98c..49232360 100644
--- a/wind/cache/strategy/WindDbCache.php
+++ b/wind/cache/strategy/WindDbCache.php
@@ -145,17 +145,15 @@ protected function getValue($key) {
 	 * @see AbstractWindCache::batchGet()
 	 */
 	public function batchGet(array $keys) {
-		$_temp = array();
-		foreach ($keys as $value) {
-			$_temp[$value] = $this->buildSecurityKey($value);
+		foreach ($keys as $key => $value) {
+			$keys[$key] = $this->buildSecurityKey($value);
 		}
 		list($sql, $result) = array('', array());
 		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE `' . $this->keyField . '` IN ' . $this->getConnection()->quoteArray(
-		$_temp) . ' AND (`' . $this->expireField . '`=0 OR `' . $this->expireField . '`>?)';
+		$keys) . ' AND (`' . $this->expireField . '`=0 OR `' . $this->expireField . '`>?)';
 		$data = $this->getConnection()->createStatement($sql)->queryAll(array(time()));
-		$_keys = array_flip($_temp);
 		foreach ($data as $tmp) {
-			$result[$_keys[$tmp[$this->keyField]]] = $this->formatData($_keys[$tmp[$this->keyField]], $tmp[$this->valueField]);
+			$result[] = $this->formatData(array_search($tmp[$this->keyField], $keys), $tmp[$this->valueField]);
 		}
 		return $result;
 	}
diff --git a/wind/cache/strategy/WindMemCache.php b/wind/cache/strategy/WindMemCache.php
index 963dba09..9171f6bb 100644
--- a/wind/cache/strategy/WindMemCache.php
+++ b/wind/cache/strategy/WindMemCache.php
@@ -88,6 +88,14 @@ class WindMemCache extends AbstractWindCache {
 	 * @var WindMemcache 
 	 */
 	protected $memcache = null;
+	
+	/**
+	 * 标志是否是memcached
+	 *
+	 * @var boolean
+	 */
+	private $isMemcached = false;
+	
 	/**
 	 * 是否对缓存采取压缩存储
 	 * 
@@ -104,70 +112,91 @@ class WindMemCache extends AbstractWindCache {
 	 * @throws WindCacheException 如果没有安装memcache扩展则抛出异常
 	 */
 	public function __construct() {
-		$this->memcache = new Memcached();
+		if (extension_loaded('Memcached')) {
+			$this->memcache = new Memcached();
+			$this->isMemcached = true;
+		} elseif (extension_loaded('Memcache')) {
+			$this->memcache = new Memcache();
+			$this->isMemcached = false;
+		} else {
+			throw new WindCacheException('WindMemCache requires PHP `Memcache` extension to be loaded !');
+		}
 	}
-	
+
 	/* (non-PHPdoc)
 	 * @see AbstractWindCache::setValue()
 	 */
 	protected function setValue($key, $value, $expire = 0) {
-		return $this->memcache->set($key, $value, (int) $expire);
+		return $this->isMemcached ? $this->memcache->set($key, $value, (int) $expire) : $this->memcache->set($key, 
+			$value, $this->compress, (int) $expire);
 	}
-	
+
 	/* (non-PHPdoc)
 	 * @see AbstractWindCache::addValue()
 	 */
 	protected function addValue($key, $value, $expires = 0) {
-		return $this->memcache->add($key, $value, (int) $expires);
+		return $this->isMemcached ? $this->memcache->add($key, $value, (int) $expires) : $this->memcache->add($key, 
+			$value, $this->compress, (int) $expires);
 	}
-	
+
 	/* (non-PHPdoc)
 	 * @see AbstractWindCache::getValue()
 	 */
 	protected function getValue($key) {
-		return $this->memcache->get($key);
+		return $this->isMemcached ? $this->memcache->get($key) : $this->memcache->get($key, $this->compress);
 	}
-	
+
 	/* (non-PHPdoc)
 	 * @see AbstractWindCache::deleteValue()
 	 */
 	protected function deleteValue($key) {
 		return $this->memcache->delete($key);
 	}
-	
+
 	/* (non-PHPdoc)
 	 * @see AbstractWindCache::clear()
 	 */
 	public function clear() {
 		return $this->memcache->flush();
 	}
-	
+
 	/* (non-PHPdoc)
 	 * @see AbstractWindCache::increment()
 	 */
 	public function increment($key, $step = 1) {
 		return $this->memcache->increment($this->buildSecurityKey($key), $step);
 	}
-	
+
 	/* (non-PHPdoc)
 	 * @see AbstractWindCache::decrement()
 	 */
 	public function decrement($key, $step = 1) {
 		return $this->memcache->decrement($this->buildSecurityKey($key), $step);
 	}
-	
+
 	/* (non-PHPdoc)
 	 * @see AbstractWindCache::setConfig()
 	 */
 	public function setConfig($config) {
 		parent::setConfig($config);
+		$this->compress = $this->getConfig('compress', '', '0');
 		$servers = $this->getConfig('servers', '', array());
+		$defaultServer = array(
+			'host' => '', 
+			'port' => '', 
+			'pconn' => true, 
+			'weight' => 1, 
+			'timeout' => 1, 
+			'retry' => 15, 
+			'status' => true, 
+			'fcallback' => null);
 		foreach ((array) $servers as $server) {
 			if (!is_array($server)) throw new WindException('The memcache config is incorrect');
 			if (!isset($server['host'])) throw new WindException('The memcache server ip address is not exist');
 			if (!isset($server['port'])) throw new WindException('The memcache server port is not exist');
-			$this->memcache->addServer($server['host'], $server['port'], 
-				isset($server['weight']) ? $server['weight'] : null);
+			$args = array_merge($defaultServer, $server);
+			$args = $this->isMemcached ? array($args['host'], $args['port'], $args['weight']) : array_values($args);
+			call_user_func_array(array($this->memcache, 'addServer'), $args);
 		}
 	}
 }
\ No newline at end of file
diff --git a/wind/cache/strategy/WindRedisCache.php b/wind/cache/strategy/WindRedisCache.php
index 42ff24d6..af2c003b 100644
--- a/wind/cache/strategy/WindRedisCache.php
+++ b/wind/cache/strategy/WindRedisCache.php
@@ -54,7 +54,7 @@
  * 		),
  * ),
  * //使用：
- * $redis = Wind::getApp()->getComponent('redisCache');
+ * $redis = $this->getSystemFactory()->getInstance('redisCache');
  * $redis->set('name', 'windFramework');
  * echo $redis->get('name');
  * </code>
@@ -86,6 +86,10 @@ class WindRedisCache extends AbstractWindCache {
 	 * @throws WindCacheException
 	 */
 	public function __construct() {
+		if (!extension_loaded('redis')) {
+			throw new WindCacheException(
+				'WindMemCache requires PHP `Memcache` extension to be loaded !');
+		}
 		$this->redis = new Redis();
 	}
 
diff --git a/wind/cache/strategy/WindWinCache.php b/wind/cache/strategy/WindWinCache.php
index 6ecfd0fd..befead5e 100644
--- a/wind/cache/strategy/WindWinCache.php
+++ b/wind/cache/strategy/WindWinCache.php
@@ -60,6 +60,19 @@
  */
 class WindWinCache extends AbstractWindCache {
 
+	/**
+	 * 构造函数
+	 * 
+	 * 如果没有安装wincache扩展,则抛出异常
+	 * 
+	 * @throws WindCacheException 当没有安装winCache扩展的时候抛出
+	 */
+	public function __construct() {
+		if (!function_exists('wincache_ucache_get')) {
+			throw new WindCacheException('The wincache extension must be loaded !');
+		}
+	}
+
 	/* (non-PHPdoc)
 	 * @see AbstractWindCache::setValue()
 	 */
diff --git a/wind/cache/strategy/WindXCache.php b/wind/cache/strategy/WindXCache.php
index a9b9921c..41e80177 100644
--- a/wind/cache/strategy/WindXCache.php
+++ b/wind/cache/strategy/WindXCache.php
@@ -77,6 +77,19 @@ class WindXCache extends AbstractWindCache {
 	 */
 	private $authPwd = '';
 
+	/**
+	 * 构造函数
+	 * 
+	 * 如果没有安装xcache扩展则抛出异常
+	 * 
+	 * @throws WindCacheException 如果没有安装xcache扩展
+	 */
+	public function __construct() {
+		if (!extension_loaded('xcache')) {
+			throw new WindCacheException('The xcache extension must be loaded !');
+		}
+	}
+
 	/* (non-PHPdoc)
 	 * @see AbstractWindCache::setValue()
 	 */
diff --git a/wind/cache/strategy/WindZendCache.php b/wind/cache/strategy/WindZendCache.php
index dd6971cd..aec2ea10 100644
--- a/wind/cache/strategy/WindZendCache.php
+++ b/wind/cache/strategy/WindZendCache.php
@@ -60,6 +60,19 @@
  */
 class WindZendCache extends AbstractWindCache {
 
+	/**
+	 * 构造函数
+	 * 
+	 * 如果没有安装zend_cache扩展,则抛出异常
+	 * 
+	 * @throws WindCacheException 当没有安装zend_cache扩展的时候抛出异常
+	 */
+	public function __construct() {
+		if (!function_exists('zend_shm_cache_fetch')) {
+			throw new WindCacheException('The zend cache extension must be loaded !');
+		}
+	}
+
 	/* (non-PHPdoc)
 	 * @see AbstractWindCache::setValue()
 	 */
diff --git a/wind/collections/WindList.php b/wind/collections/WindList.php
new file mode 100644
index 00000000..6018914c
--- /dev/null
+++ b/wind/collections/WindList.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * @author Qiong Wu <papa0924@gmail.com> 2011-10-8
+ * @copyright ©2003-2103 phpwind.com
+ * @license http://www.windframework.com
+ * @version $Id$
+ * @package collections
+ */
+class WindList implements IteratorAggregate, ArrayAccess, Countable {
+	
+	/**
+	 * @var array 集合列表
+	 */
+	private $list = array();
+	/**
+	 * @var string 列表总数指示器
+	 */
+	private $count = 0;
+	/**
+	 * @var boolean 列表是否只读
+	 */
+	private $isReadOnly = false;
+	
+	/**
+	 * @var boolean 是否固定大小
+	 */
+	private $isFixedSize = false;
+
+	/**
+	 * WindList 实现有三种类别：只读、固定大小、可变大小。 
+	 * 无法修改只读 WindList。
+	 * 固定大小的 WindList 不允许添加或移除元素，但允许修改现有元素。
+	 * 可变大小的 WindList 允许添加、移除和修改元素。
+	 * @param boolean $readOnly 是否只读
+	 * @param array|WindList $data 固定长度，如果指定了$data,那么这个WindList集合的长度是固定的，只许修改
+	 */
+	public function __construct($data = array(),$readOnly = false) {
+		$this->isReadOnly = $readOnly;
+		if(false === empty($data)){
+			if(is_array($data)){
+				$this->list = $data;
+			}elseif($data instanceof WindList){
+				$this->list = $data->getList();
+			}else{
+				throw new WindException("Parameter type is incorrect");
+			}
+			$this->isFixedSize = true;
+			$this->count = count($this->list);
+		}
+		
+	}
+	/**
+	 * 向 WindList 中添加项。
+	 * @param mixed $value
+	 * @return boolean
+	 */
+	public function add($value) {
+		return $this->insertAt($this->count, $value);
+	}
+	/**
+	 * 在 WindList 中的指定索引处插入项。
+	 * @param int $index
+	 * @param mixed $value
+	 * @return boolean
+	 */
+	public function insertAt($index, $value) {
+		if($this->isFixedSize && $this->count === $index){
+			throw new WindException("The list size is fixed");
+		}
+		if (false === $this->isReadOnly) {
+			if ($this->count === $index) {
+				$this->list[$this->count++] = $value;
+			} elseif (0 <= $index && $this->count > $index) {
+				array_splice($this->list, $index, 0, array($value));
+				$this->count++;
+			} elseif ($this->count < $index || 0 > $index) {
+				throw new WindException('Index out of range, is indeed the range should be between 0 to '.$this->count);
+			}
+		} else {
+			throw new WindException('The list of read-only');
+		}
+		return true;
+	}
+	/**
+	 * 取得指定索引的项
+	 * @param int $index 指定索引
+	 * @return mixed
+	 */
+	public function itemAt($index) {
+		if (false === isset($this->list[$index])) {
+			throw new WindException('Index out of range, is indeed the range should be between 0 to '.$this->count);
+		}
+		return $this->list[$index];
+	}
+	/**
+	 * 返回指定项的索引,返回-1表向没有指定项
+	 * @param mixed $value 指定项
+	 * @return int
+	 */
+	public function indexOf($value) {
+		return false !== ($index = array_search($value, $this->list, true)) ? $index : -1;
+	}
+	/**
+	 * 判断WindList中是否包含指定项
+	 * @param mixed $value 指定项
+	 * @return boolean
+	 */
+	public function contain($value) {
+		return 0 <= $this->indexOf($value);
+	}
+	/**
+	 * 判断WindList中是否包含指定的索引
+	 * @param int $index 指定索引
+	 * @return boolean
+	 */
+	public function containAt($index) {
+		return 0 <= $index && $this->count > $index;
+	}
+	/**
+	 * 修改WindList中指定索引的项
+	 * @param int $index 指定索引
+	 * @param mixed $value 要修改的项
+	 * @return boolean
+	 */
+	public function modify($index,$value){
+		$this->removeAt($index,true);
+		$this->count++;
+		$this->insertAt($index, $value);
+		$this->count--;
+		return true;
+	}
+	/**
+	 * 从WindList中移除指定索引的项
+	 * @param int $index 指定索引
+	 * @return mixed
+	 */
+	public function removeAt($index,$force = false) {
+		if ($this->isReadOnly) {
+			throw new WindException('The list of read-only');
+		}
+		if($this->isFixedSize && false === $force){
+			throw new WindException("The list size is fixed");
+		}
+		if ($index > $this->count || $index < 0) {
+			throw new WindException('Index out of range, is indeed the range should be between 0 to '.$this->count);
+		}
+		$this->count--;
+		if (0 === $index) {
+			return array_shift($this->list);
+		}
+		if ($this->count  === $index) {
+			return array_pop($this->list);
+		}
+		$item = $this->list[$index];
+		array_splice($this->list, $index, 1);
+		return $item;
+	}
+	/**
+	 * 从WindList中移除指定的项
+	 * @param mixed $value 指定的项
+	 * @return boolean
+	 */
+	public function remove($value) {
+		return $this->removeAt($this->indexOf($value));
+	}
+	/**
+	 * 清空WindList
+	 * @return boolean
+	 */
+	public function clear() {
+		if ($this->isReadOnly) {
+			throw new WindException('The list of read-only');
+		}
+		if($this->isFixedSize){
+			throw new WindException("The list size is fixed");
+		}
+		$this->count = 0;
+		$this->list = array();
+		return true;
+	}
+	/**
+	 * 将数组中的值合并到WindList
+	 * @param array $array 要合并的数组
+	 * @return boolean
+	 */
+	public function mergeFromArray(array $array) {
+		foreach ($array as $value) {
+			$this->add($value);
+		}
+		return true;
+	}
+	/**
+	 * 将WindList集合合并到WindList
+	 * @param WindList $list 要合并的WindList集合
+	 * @return boolean
+	 */
+	public function mergeFromList(WindList $list) {
+		foreach ($list as $value) {
+			$this->add($value);
+		}
+		return true;
+	}
+	/**
+	 * @return array
+	 */
+	public function getList() {
+		return $this->list;
+	}
+	/**
+	 * 取得集合的总数
+	 * @return string
+	 */
+	public function getCount() {
+		return $this->count;
+	}
+	/**
+	 * 取得集合是否只读
+	 * @return boolean
+	 */
+	public function getIsReadOnly() {
+		return $this->isReadOnly;
+	}
+	/**
+	 * 取得集合是否是固定大小
+	 * @return boolean
+	 */
+	public function getIsFixedSize(){
+		return $this->isFixedSize;
+	}
+	/* 
+	 * 计算集合的总个数
+	 * @see Countable#count()
+	 */
+	public function count() {
+		return $this->getCount();
+	}
+	/**
+	 * @param int $offset
+	 */
+	public function offsetExists($offset) {
+		return $this->containAt($offset);
+	}
+	/**
+	 * @param int $offset
+	 */
+	public function offsetGet($offset) {
+		return $this->itemAt($offset);
+	}
+	/**
+	 * @param int $offset
+	 * @param mixed $value
+	 */
+	public function offsetSet($offset, $value) {
+		if (null === $offset || $this->count === $offset) {
+			return $this->add($value);
+		}
+		return $this->modify($offset, $value);
+	}
+	/**
+	 * @param int $offset
+	 */
+	public function offsetUnset($offset) {
+		return $this->removeAt($offset);
+	}
+	/**
+	 * 取得集合的迭代器
+	 */
+	public function getIterator() {
+		return new ArrayIterator($this->list);
+	}
+
+}
\ No newline at end of file
diff --git a/wind/collections/WindQueue.php b/wind/collections/WindQueue.php
new file mode 100644
index 00000000..983e73d2
--- /dev/null
+++ b/wind/collections/WindQueue.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * 队列操作，先进先出
+ * 
+ * @author Qiong Wu <papa0924@gmail.com> 2011-10-8
+ * @copyright ©2003-2103 phpwind.com
+ * @license http://www.windframework.com
+ * @version $Id$
+ * @package collections
+ */
+class WindQueue implements IteratorAggregate,Countable{
+	/**
+	 * @var array 队列列表
+	 */
+	private $list = array();
+	/**
+	 * @var string 列表总数指示器
+	 */
+	private $count = 0;
+	
+	/**
+	 * 移除并返回位于 Queue顶部的元素。
+	 * @return mixed
+	 */
+	public function dequeue(){
+		if(!$this->count){
+			throw new WindException("The queue is empty");
+		}
+		--$this->count;
+		return array_shift($this->list);
+	}
+	
+	/**
+	 * 返回位于 Queue顶部的对象但不将其移除。
+	 * @return mixed
+	 */
+	public function peek(){
+		if(!$this->count){
+			throw new WindException("The queue is empty");
+		}
+		return $this->list[0];
+	}
+	
+	/**
+	 * 将元素添加到 Queue的底部。
+	 * @param mixed $value
+	 * @return number
+	 */
+	public function enqueue($value){
+		++$this->count;
+		return array_push($this->list,$value);
+	}
+	
+	/**
+	 * 确定某元素是否在 Queue中。
+	 * @param mixed $value
+	 * @return boolean
+	 */
+	public function contain($value){
+		return false !==array_search($value, $this->list, true);
+	}
+	
+	/**
+	 * 将数组中的值合并到当前WindQueue队列
+	 * @param array $array 要合并的数组
+	 * @return boolean
+	 */
+	public function mergeFromArray(array $array) {
+		foreach ($array as $value) {
+			$this->enqueue($value);
+		}
+		return true;
+	}
+	/**
+	 * 将WindQueue队列集合合并到当前WindQueue队列
+	 * @param WindQueue $list 要合并的WindQueue集合
+	 * @return boolean
+	 */
+	public function mergeFromQueue(WindQueue $queue) {
+		foreach ($queue as $value) {
+			$this->enqueue($value);
+		}
+		return true;
+	}
+	
+	/**
+	 *清空队列 
+	 */
+	public function clear(){
+		$this->list = array();
+		$this->count = 0;
+		return true;
+	}
+	
+	/**
+	 * 创建 Queue的浅表副本。
+	 * @return WindQueue
+	 */
+	public function __clone(){
+		return new self();
+	}
+	
+	/**
+	 * 取得队列个数
+	 * @return int
+	 */
+	public function getCount(){
+		return $this->count;
+	}
+	
+	
+	/* 
+	 * 计算队列个数
+	 * @see Countable#count()
+	 */
+	public function count() {
+		return $this->getCount();
+	}
+
+	/**
+	 * 取得队列的迭代器
+	 */
+	public function getIterator() {
+		return new ArrayIterator($this->list);
+	}
+
+	
+}
\ No newline at end of file
diff --git a/wind/collections/WindSortedList.php b/wind/collections/WindSortedList.php
new file mode 100644
index 00000000..e04e338b
--- /dev/null
+++ b/wind/collections/WindSortedList.php
@@ -0,0 +1,326 @@
+<?php
+/**
+ * 表示键/值对的集合，这些键值对按键排序并可按照键和索引访问。
+ * @author Qiong Wu <papa0924@gmail.com> 2011-10-8
+ * @copyright ©2003-2103 phpwind.com
+ * @license http://www.windframework.com
+ * @version $Id$
+ * @package collections
+ */
+class WindSortedList implements IteratorAggregate, ArrayAccess, Countable {
+	/**
+	 * @var array 集合列表
+	 */
+	private $list = array();
+	/**
+	 * @var int 列表总数指示器
+	 */
+	private $count = 0;
+	/**
+	 * @var boolean 列表是否只读
+	 */
+	private $isReadOnly = false;
+	
+	/**
+	 * @var boolean 是否固定大小
+	 */
+	private $isFixedSize = false;
+	
+	/**
+	 * WindList 实现有三种类别：只读、固定大小、可变大小。 
+	 * 无法修改只读 WindList。
+	 * 固定大小的 WindList 不允许添加或移除元素，但允许修改现有元素。
+	 * 可变大小的 WindList 允许添加、移除和修改元素。
+	 * @param boolean $readOnly 是否只读
+	 * @param array|WindList $data 固定长度，如果指定了$data,那么这个WindList集合的长度是固定的，只许修改
+	 */
+	public function __construct($data = array(), $readOnly = false) {
+		$this->isReadOnly = $readOnly;
+		if (false === empty($data)) {
+			if (is_array($data)) {
+				$this->list = $data;
+			} elseif ($data instanceof WindList) {
+				$this->list = $data->getList();
+			} else {
+				throw new WindException("Parameter type is incorrect");
+			}
+			$this->isFixedSize = true;
+			$this->count = count($this->list);
+		}
+	
+	}
+	
+	/**
+	 * 将带有指定键和值的元素添加到 WindSortedList 对象。
+	 * @param mixed $key
+	 * @param mixed $value
+	 */
+	public function add($key, $value) {
+		$this->checkPermissions();
+		if (isset($this->list[$key])) {
+			throw new WindException($key . ' key already exists in the collection');
+		}
+		$this->list[$key] = $value;
+		++$this->count;
+		return true;
+	}
+	/**
+	 * 确定 WindSortedList对象是否包含特定的键。
+	 * @param mixed $key
+	 * @return boolean
+	 */
+	public function contains($key) {
+		return $this->containsKey($key);
+	}
+	
+	/**
+	 * 根据指定的索引确定 WindSortedList对象是否包含特定的键。
+	 * @param mixed $key
+	 * @return boolean
+	 */
+	public function containsIndex($index) {
+		return $this->containsKey($this->getKey($index));
+	}
+	
+	/**
+	 * 确定 WindSortedList对象是否包含特定的键。
+	 * @param mixed $key
+	 * @return boolean
+	 */
+	public function containsKey($key) {
+		return 0 <= $this->indexOfKey($key);
+	}
+	
+	/**
+	 * 确定 WindSortedList对象是否包含特定值。
+	 * @param mixed $value
+	 * @return boolean
+	 */
+	public function containsValue($value) {
+		return 0 <= $this->indexOfValue($value);
+	}
+	
+	/**
+	 * 获取 WindSortedList 对象的指定索引处的键。
+	 * @param int $index 指定的索引
+	 * @return mixed
+	 */
+	public function getKey($index) {
+		$keys = $this->getKeyList();
+		if (false === isset($keys[$index])) {
+			throw new WindException('Index out of range, is indeed the range should be between 0 to ' . $this->count);
+		}
+		return $keys[$index];
+	}
+	
+	/**
+	 * 获取WindSortedList 对象中的键。
+	 * @return mixed
+	 */
+	public function getKeyList() {
+		return array_keys($this->list);
+	}
+	
+	/**
+	 * 获取WindSortedList 对象中的值。
+	 * @return mixed
+	 */
+	public function getValueList() {
+		return array_values($this->list);
+	}
+	
+	/**
+	 * 返回WindSortedList 对象中指定键的从零开始的索引。 
+	 * @param mixed $key
+	 * @return mixed
+	 */
+	public function indexOfKey($key) {
+		return false !== ($index = array_search($key, $this->getKeyList(), true)) ? $index : -1;
+	}
+	
+	/**
+	 * 返回指定的值在 SortedList 对象中第一个匹配项的从零开始的索引。
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	public function indexOfValue($value) {
+		return false !== ($index = array_search($value, $this->getValueList(), true)) ? $index : -1;
+	}
+	
+	/**
+	 * 从WindSortedList中返回指定键的的值
+	 * @param int $key
+	 * @return mixed
+	 */
+	public function item($key) {
+		if (false === isset($this->list[$key])) {
+			throw new WindException($key . ' is not exists in the collection');
+		}
+		return $this->list[$key];
+	}
+	/**
+	 * 从WindSortedList中返回指定索引的的值
+	 * @param int $index
+	 * @return mixed
+	 */
+	public function itemAt($index) {
+		$key = $this->getKey($index);
+		return $this->list[$key];
+	}
+	/**
+	 * 从 SortedList 对象中移除带有指定键的元素。
+	 * @param mixed $key
+	 * @return mixed
+	 */
+	public function remove($key) {
+		$this->checkPermissions();
+		if (false === isset($this->list[$key])) {
+			throw new WindException($key . ' is not exists in the collection');
+		}
+		$item = $this->list[$key];
+		unset($this->list[$key]);
+		--$this->count;
+		return $item;
+	}
+	/**
+	 * 移除 WindSortedList对象的指定索引处的元素。
+	 * @param int $index
+	 * @return mixed
+	 */
+	public function removeAt($index) {
+		$this->checkPermissions();
+		$key = $this->getKey($index);
+		$item = $this->list[$key];
+		unset($this->list[$key]);
+		--$this->count;
+		return $item;
+	}
+	/**
+	 * 替换WindSortedList对象中指定索引处的值。
+	 * @param int $index
+	 * @param mixed $value
+	 * @return boolean
+	 */
+	public function setByIndex($index, $value) {
+		$this->checkPermissions(false);
+		$key = $this->getKey($index);
+		$this->list[$key] = $value;
+		return true;
+	}
+	/**
+	 * 替换WindSortedList对象中指定键处的值。
+	 * 如果指定的键存在，那么替换，否则新增
+	 * @param mixed $key
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	public function setByKey($key, $value) {
+		$this->checkPermissions(false);
+		if (isset($this->list[$key])) {
+			$item = $this->list[$key];
+			$this->list[$key] = $value;
+			return $item;
+		}
+		$this->list[$key] = $value;
+		++$this->count;
+		return $value;
+	}
+	
+	/**
+	 * 从 SortedList 对象中移除所有元素。
+	 * @return boolean
+	 */
+	public function clear() {
+		$this->checkPermissions();
+		$this->count = 0;
+		$this->list = array();
+		return true;
+	}
+	/**
+	 * 取得集合是否只读
+	 * @return boolean
+	 */
+	public function getIsReadOnly() {
+		return $this->isReadOnly;
+	}
+	/**
+	 * 取得集合是否是固定大小
+	 * @return boolean
+	 */
+	public function getIsFixedSize(){
+		return $this->isFixedSize;
+	}
+	/**
+	 * 返回集合的总数
+	 * @return number
+	 */
+	public function getCount() {
+		return $this->count;
+	}
+	/* 计算集合总数
+	 * @see Countable#count()
+	 */
+	public function count() {
+		return $this->getCount();
+	}
+	/**
+	 * 取得WindSortedList集合迭代器
+	 * @return ArrayIterator
+	 */
+	public function getIterator() {
+		return new ArrayIterator($this->list);
+	}
+	/* 
+	 * @see ArrayAccess#offsetExists()
+	 */
+	public function offsetExists($offset) {
+		if (is_int($offset)) {
+			return $this->containsIndex($offset);
+		}
+		return $this->containsKey($offset);
+	}
+	/* 
+	 * @see ArrayAccess#offsetGet()
+	 */
+	public function offsetGet($offset) {
+		if (is_int($offset)) {
+			return $this->itemAt($offset);
+		}
+		return $this->item($offset);
+	}
+	/* 
+	 * @see ArrayAccess#offsetSet()
+	 */
+	public function offsetSet($offset, $value) {
+		if (is_int($offset)) {
+			return $this->setByIndex($offset, $value);
+		}
+		return $this->setByKey($offset, $value);
+	}
+	/* 
+	 * @see ArrayAccess#offsetUnset()
+	 */
+	public function offsetUnset($offset) {
+		if (is_int($offset)) {
+			return $this->removeAt($offset);
+		}
+		return $this->remove($offset);
+	}
+	/**
+	 * 创建 WindSortedList对象的浅表副本。
+	 * @return WindSortedList
+	 */
+	public function __clone() {
+		return new self($this->list, $this->isReadOnly);
+	}
+	
+	private function checkPermissions($ifcheckFixedSize = true) {
+		if ($this->isReadOnly) {
+			throw new WindException('The list of read-only');
+		}
+		if ($this->isFixedSize && $ifcheckFixedSize) {
+			throw new WindException("The list size is fixed");
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/wind/collections/WindStack.php b/wind/collections/WindStack.php
new file mode 100644
index 00000000..226c7d98
--- /dev/null
+++ b/wind/collections/WindStack.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * 堆栈操作，先进后出
+ * @author Qiong Wu <papa0924@gmail.com> 2011-10-8
+ * @copyright ©2003-2103 phpwind.com
+ * @license http://www.windframework.com
+ * @version $Id$
+ * @package collections
+ */
+class WindStack implements IteratorAggregate, Countable {
+	
+	/**
+	 * @var array 集合列表
+	 */
+	private $list = array();
+	/**
+	 * @var string 列表总数指示器
+	 */
+	private $count = 0;
+
+	/**
+	 * 移除并返回位于 Stack 底部的对象。
+	 * @return mixed
+	 */
+	public function pop() {
+		if (!$this->count) {
+			throw new WindException("The stack is empty");
+		}
+		--$this->count;
+		return array_pop($this->list);
+	}
+
+	/**
+	 * 返回位于 Stack底部的对象但不将其移除。
+	 * @return mixed
+	 */
+	public function peek() {
+		if (!$this->count) {
+			throw new WindException("The stack is empty");
+		}
+		return $this->list[$this->count - 1];
+	}
+
+	/**
+	 * 确定某元素是否在 Stack中。
+	 * @param mixed $value
+	 * @return boolean
+	 */
+	public function contain($value) {
+		return false !== array_search($value, $this->list, true);
+	}
+
+	/**
+	 * 将元素插入 Stack 的底部。
+	 * @param mixed $value
+	 * @return number
+	 */
+	public function push($value) {
+		++$this->count;
+		return array_push($this->list, $value);
+	}
+
+	/**
+	 * 清空队列
+	 */
+	public function clear() {
+		$this->count = 0;
+		$this->list = array();
+		return true;
+	}
+
+	/**
+	 * 将数组中的值合并到当前tack队列
+	 * @param array $array 要合并的数组
+	 * @return boolean
+	 */
+	public function mergeFromArray($array) {
+		foreach ($array as $value) {
+			$this->push($value);
+		}
+		return true;
+	}
+
+	/**
+	 * 将WindStack堆栈集合合并到当前Stack队列
+	 * @param WindStack $list 要合并的WindStack集合
+	 * @return boolean
+	 */
+	public function mergeFromStack(WindStack $stack) {
+		foreach ($stack as $value) {
+			$this->push($value);
+		}
+		return true;
+	}
+
+	/**
+	 * 取得堆栈个数
+	 * @return string
+	 */
+	public function getCount() {
+		return $this->count;
+	}
+
+	/* 
+	 * 计算堆栈的总个数
+	 * @see Countable#count()
+	 */
+	public function count() {
+		return $this->getCount();
+	}
+
+	/**
+	 * 取得堆栈的迭代器
+	 */
+	public function getIterator() {
+		return new ArrayIterator($this->list);
+	}
+
+	/**
+	 * 创建 stack的浅表副本。
+	 * @return WindStack
+	 */
+	public function __clone() {
+		return new self();
+	}
+}
\ No newline at end of file
diff --git a/wind/command/WindCommandApplication.php b/wind/command/WindCommandApplication.php
deleted file mode 100644
index 52e61c86..00000000
--- a/wind/command/WindCommandApplication.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/**
- * 命令行应用控制器
- *
- * @author Shi Long <long.shi@alibaba-inc.com>
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.windframework.com
- * @version $Id$
- * @package command
- */
-class WindCommandApplication extends WindModule implements IWindApplication {
-	
-	/**
-	 * @var WindCommandView
-	 */
-	protected $windView = null;
-	
-	/**
-	 * @var WindCommandRouter
-	 */
-	protected $handlerAdapter = null;
-	/**
-	 * @var WindCommandRequest
-	 */
-	protected $request;
-	/**
-	 * @var WindCommandResponse
-	 */
-	protected $response;
-	/**
-	 * @var WindFactory
-	 */
-	protected $windFactory = null;
-	protected $defaultModule = array(
-		'controller-path' => 'controller', 
-		'controller-suffix' => 'Controller', 
-		'error-handler' => 'WIND:command.WindCommandErrorHandler');
-
-	/**
-	 * 应用初始化操作
-	 * 
-	 * @param WindCommandRequest $request
-	 * @param WindCommandResponse $response
-	 * @param WindFactory $factory
-	 */
-	public function __construct($request, $factory) {
-		$this->request = $request;
-		$this->response = $request->getResponse();
-		$this->windFactory = $factory;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindApplication::run()
-	 */
-	public function run() {
-		$module = $this->getModules($this->_getHandlerAdapter()->getModule());
-		$handlerPath = $module['controller-path'] . '.' . ucfirst($this->handlerAdapter->getController()) . $module['controller-suffix'];
-		$className = Wind::import($handlerPath);
-		if ($this->handlerAdapter->isHelp()) {
-			$this->help($className);
-		}
-		if (!class_exists($className)) throw new WindException(
-			"Your requested '$handlerPath' was not found on this server.");
-		
-		try {
-			$handler = new $className();
-			$handler->setDelayAttributes(
-				array('errorMessage' => array('ref' => 'errorMessage'), 'forward' => array('ref' => 'forward')));
-			$handler->doAction($this->handlerAdapter);
-		} catch (WindException $e) {
-			$this->help($className, $e);
-		}
-	}
-
-	/**
-	 * 显示帮助信息
-	 * 
-	 * @param string $className
-	 * @param WindException $e
-	 */
-	protected function help($className, $e = null) {
-		$helps = array();
-		$helps[10] = 'usage: command [options] [args]';
-		$helps[11] = 'Valid options:';
-		$helps[12] = $this->handlerAdapter->getModuleKey() . ' 		routing information,the name of application module';
-		$helps[13] = $this->handlerAdapter->getControllerKey() . ' 	routing information,the name of controller';
-		$helps[14] = $this->handlerAdapter->getActionKey() . ' 		routing information,the name of action';
-		$helps[15] = $this->handlerAdapter->getParamKey() . '		the parameters of the method [action]';
-		if (class_exists($className)) {
-			/*@var $handler WindCommandController */
-			$handler = new $className();
-			$action = $this->handlerAdapter->getAction();
-			if ($action !== 'run') $action = $handler->resolvedActionName($this->handlerAdapter->getAction());
-			if (!method_exists($handler, $action)) return;
-			$method = new ReflectionMethod($handler, $action);
-			$helps[20] = "\r\nlist -p [paraments] of '$className::$action' \r\n";
-			$method = $method->getParameters();
-			$i = 21;
-			foreach ($method as $value) {
-				$helps[$i++] = $value;
-			}
-		}
-		if ($e !== null) $helps[0] = $e->getMessage() . "\r\n";
-		exit(implode("\r\n", $helps));
-	}
-	
-	/* (non-PHPdoc)
-	 * @see WindModule::setConfig()
-	 */
-	public function setConfig($config) {
-		parent::setConfig($config);
-		if ($default = $this->getModules('default')) {
-			$this->defaultModule = WindUtility::mergeArray($this->defaultModule, $default);
-		}
-	}
-
-	/**
-	 * 添加module配置
-	 * <code>
-	 * <controller-path>controller</controller-path>
-	 * <!-- 指定该模块下的controller的后缀格式 -->
-	 * <controller-suffix>Controller</controller-suffix>
-	 * <!-- 配置该模块的error处理的action controller类 -->
-	 * <error-handler>WIND:command.WindCommandErrorHandler</error-handler>
-	 * </code>
-	 * 
-	 * @param string $name module名称
-	 * @param array $config 配置数组
-	 * @param boolean $replace 如果module已经存在是否覆盖他 默认值为false不进行覆盖
-	 * @return array
-	 */
-	public function setModules($name, $config, $replace = false) {
-		if ($replace || !isset($this->_config['modules'][$name])) {
-			$this->_config['modules'][$name] = WindUtility::mergeArray($this->defaultModule, (array) $config);
-		}
-		return $this->_config['modules'][$name];
-	}
-
-	/**
-	 * 获得module配置,$name为空时返回当前module配置
-	 * 
-	 * @param string $name module名称 默认为空
-	 * @return array
-	 * @throws WindActionException
-	 * @throws WindException
-	 */
-	public function getModules($name = '') {
-		if ($name === '') $name = $this->handlerAdapter->getModule();
-		$_module = $this->getConfig('modules', $name, array());
-		if (!isset($_module['_verified'])) {
-			$_module = WindUtility::mergeArray($this->defaultModule, $_module);
-			$_module['_verified'] = true;
-			$this->_config['modules'][$name] = $_module;
-		}
-		return $_module;
-	}
-
-	/**
-	 * 获得组件对象
-	 *
-	 * @param string $componentName 组件名称呢个
-	 * @return object
-	 */
-	public function getComponent($componentName, $args = array()) {
-		return $this->windFactory->getInstance($componentName, $args);
-	}
-
-	/**
-	 * 处理错误请求
-	 * 
-	 * 根据错误请求的相关信息,将程序转向到错误处理句柄进行错误处理
-	 * @param WindActionException actionException
-	 * @return void
-	 * @throws WindFinalException
-	 */
-	protected function sendErrorMessage($exception) {
-		$moduleName = $this->handlerAdapter->getModule();
-		if ($moduleName === 'error') throw new WindFinalException($exception->getMessage());
-		$errorMessage = null;
-		if ($exception instanceof WindActionException) $errorMessage = $exception->getError();
-		if (!$errorMessage) {
-			$errorMessage = $this->getComponent('errorMessage');
-			$errorMessage->addError($exception->getMessage());
-		}
-		if (!$_errorAction = $errorMessage->getErrorAction()) {
-			$module = $this->getModules($moduleName);
-			if (empty($module)) $module = $this->getModules('default');
-			preg_match("/([a-zA-Z]*)$/", @$module['error-handler'], $matchs);
-			$_errorHandler = trim(substr(@$module['error-handler'], 0, -(strlen(@$matchs[0]) + 1)));
-			$_errorAction = 'error/' . @$matchs[0] . '/run/';
-			$this->setModules('error', 
-				array('controller-path' => $_errorHandler, 'controller-suffix' => '', 'error-handler' => ''));
-		}
-		$this->handlerAdapter->setModule('error');
-		$this->handlerAdapter->setController($matchs[0]);
-		Wind::getApp()->getRequest()->setAttribute(array($errorMessage->getError(), $exception->getCode()), 'argv');
-		Wind::getApp()->run();
-	}
-
-	/**
-	 * @return WindFactory
-	 */
-	public function getWindFactory() {
-		return $this->windFactory;
-	}
-
-	/**
-	 * 返回WindCommandRequest
-	 * 
-	 * @return WindCommandRequest $request
-	 */
-	public function getRequest() {
-		return $this->request;
-	}
-
-	/**
-	 * 返回WindCommandResponse
-	 * 
-	 * @return WindCommandResponse $response
-	 */
-	public function getResponse() {
-		return $this->response;
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/wind/command/WindCommandController.php b/wind/command/WindCommandController.php
deleted file mode 100644
index 8afb3199..00000000
--- a/wind/command/WindCommandController.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * 命令行操作控制器
- *
- * @author Shi Long <long.shi@alibaba-inc.com>
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.windframework.com
- * @version $Id$
- * @package command
- */
-abstract class WindCommandController extends WindModule {
-
-	/**
-	 * 默认的操作处理方法
-	 * 
-	 * @return void
-	 */
-	abstract public function run();
-
-	/**
-	 * action操作开始前调用
-	 *
-	 * @param AbstractWindRouter $handlerAdapter
-	 */
-	protected function beforeAction($handlerAdapter) {}
-
-	/**
-	 * action操作结束后调用
-	 *
-	 * @param AbstractWindRouter $handlerAdapter
-	 */
-	protected function afterAction($handlerAdapter) {}
-	
-	/* (non-PHPdoc)
-	 * @see IWindController::doAction()
-	 */
-	public function doAction($handlerAdapter) {
-		$this->beforeAction($handlerAdapter);
-		$action = $handlerAdapter->getAction();
-		if ($action !== 'run') $action = $this->resolvedActionName($action);
-		if (in_array($action, array('doAction', 'beforeAction', 'afterAction', 'resolvedActionName')) || !method_exists(
-			$this, $action)) {
-			throw new WindException('[command.WindCommandController.doAction] ', 
-				WindException::ERROR_CLASS_METHOD_NOT_EXIST);
-		}
-		$method = new ReflectionMethod($this, $action);
-		if ($method->isProtected()) throw new WindException('[command.WindCommandController.doAction] ', 
-			WindException::ERROR_CLASS_METHOD_NOT_EXIST);
-		$args = $this->getRequest()->getRequest('argv');
-		call_user_func_array(array($this, $action), $args);
-		$this->afterAction($handlerAdapter);
-	}
-
-	/**
-	 * 显示错误信息
-	 * 
-	 * @param string $error
-	 */
-	protected function showError($error) {
-		echo "Error: " . $error . "\r\n";
-		echo "Try: command help -m someModule -c someController -a someAction";
-		exit();
-	}
-
-	/**
-	 * 显示信息
-	 * 
-	 * @param string $message 默认为空字符串
-	 * @return void
-	 */
-	protected function showMessage($message) {
-		if (is_array($message)) {
-			foreach ($message as $key => $value)
-				echo "'" . $key . "' => '" . $value . "',\r\n";
-		} else
-			echo $message, "\r\n";
-	}
-
-	/**
-	 * 解析action操作方法名称
-	 * 
-	 * 默认解析规则,在请求的action名称后加'Action'后缀<code>
-	 * 请求的action为 'add',则对应的处理方法名为 'addAction',可以通过覆盖本方法,修改解析规则</code>
-	 * @param string $action
-	 * @return void
-	 */
-	public function resolvedActionName($action) {
-		return $action . 'Action';
-	}
-
-	/**
-	 * 读取输入行
-	 *
-	 * @return string
-	 */
-	protected function getLine($message) {
-		echo $message;
-		return trim(fgets(STDIN));
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/wind/command/WindCommandFrontController.php b/wind/command/WindCommandFrontController.php
deleted file mode 100644
index fc43e576..00000000
--- a/wind/command/WindCommandFrontController.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * 命令行前端控制器
- *
- * @author Shi Long <long.shi@alibaba-inc.com>
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.windframework.com
- * @version $Id$
- * @package command
- */
-class WindCommandFrontController extends AbstractWindFrontController {
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindFrontController::run()
-	 */
-	public function run() {
-		parent::run();
-		exit("Completely Done~\r\n");
-	}
-
-	/**
-	 * @return WindHttpRequest
-	 */
-	public function getRequest() {
-		if ($this->_request === null) {
-			$this->_request = WindFactory::createInstance('WindCommandRequest');
-		}
-		return $this->_request;
-	}
-
-	/**
-	 * 创建并返回应用
-	 *
-	 * @return WindCommandApplication
-	 */
-	protected function _createApplication() {
-		$application = new WindCommandApplication($this->getRequest(), $this->getFactory());
-		$application->setDelayAttributes(
-			array('windView' => array('ref' => 'windView'), 'handlerAdapter' => array('ref' => 'router')));
-		return $application;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindFrontController::showErrorMessage()
-	 */
-	protected function showErrorMessage($message, $file, $line, $trace, $errorcode) {
-		$log = $message . "\r\n" . $file . ":" . $line . "\r\n";
-		list($fileLines, $trace) = WindUtility::crash($file, $line, $trace);
-		foreach ($trace as $key => $value) {
-			$log .= $value . "\r\n";
-		}
-		if (WIND_DEBUG & 2) Wind::getApp()->getComponent('windLogger')->error($log, 'error', true);
-		exit($log);
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindFrontController::_components()
-	 */
-	protected function _components() {
-		return array(
-			'router' => array('path' => 'WIND:command.WindCommandRouter', 'scope' => 'application'), 
-			'windView' => array('path' => 'WIND:command.WindCommandView', 'scope' => 'prototype'), 
-			'db' => array('path' => 'WIND:db.WindConnection', 'scope' => 'singleton'), 
-			'configParser' => array('path' => 'WIND:parser.WindConfigParser', 'scope' => 'singleton'), 
-			'errorMessage' => array('path' => 'WIND:base.WindErrorMessage', 'scope' => 'prototype'), 
-			'windLogger' => array(
-				'path' => 'WIND:log.WindLogger', 
-				'scope' => 'singleton', 
-				'destroy' => 'flush', 
-				'constructor-args' => array('0' => array('value' => 'DATA:log'), '1' => array('value' => '2'))), 
-			'i18n' => array(
-				'path' => 'WIND:i18n.WindLangResource', 
-				'scope' => 'singleton', 
-				'config' => array('path' => 'i18n')));
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindFrontController::_loadBaseLib()
-	*/
-	protected function _loadBaseLib() {
-		Wind::$_imports += array(
-			'WIND:i18n.WindLangResource' => 'WindLangResource', 
-			'WIND:log.WindLogger' => 'WindLogger', 
-			'WIND:base.WindErrorMessage' => 'WindErrorMessage', 
-			'WIND:parser.WindConfigParser' => 'WindConfigParser', 
-			'WIND:db.WindConnection' => 'WindConnection', 
-			'WIND:command.WindCommandView' => 'WindCommandView', 
-			'WIND:command.WindCommandRouter' => 'WindCommandRouter', 
-			'WIND:command.WindCommandErrorHandler' => 'WindCommandErrorHandler', 
-			'WIND:command.WindCmmandRequest' => 'WindCommandRequest', 
-			'WIND:command.WindCommandResponse' => 'WindCommandResponse', 
-			'WIND:command.WindCommandController' => 'WindCommandController', 
-			'WIND:command.WindCommandApplication' => 'WindCommandApplication');
-		
-		Wind::$_classes += array(
-			'WindLangResource' => 'i18n/WindLangResource', 
-			'WindLogger' => 'log/WindLogger', 
-			'WindErrorMessage' => 'base/WindErrorMessage', 
-			'WindConfigParser' => 'parser/WindConfigParser', 
-			'WindConnection' => 'db/WindConnection', 
-			'WindCommandView' => 'command/WindCommandView', 
-			'WindCommandRouter' => 'command/WindCommandRouter', 
-			'WindCommandApplication' => 'command/WindCommandApplication', 
-			'WindCommandController' => 'command/WindCommandController', 
-			'WindCommandErrorHandler' => 'command/WindCommandErrorHandler', 
-			'WindCommandRequest' => 'command/WindCommandRequest', 
-			'WindCommandResponse' => 'command/WindCommandResponse');
-	}
-}
-?>
\ No newline at end of file
diff --git a/wind/command/WindCommandRequest.php b/wind/command/WindCommandRequest.php
deleted file mode 100644
index db90e53b..00000000
--- a/wind/command/WindCommandRequest.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * 命令行request对象
- *
- * @author Shi Long <long.shi@alibaba-inc.com>
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.windframework.com
- * @version $Id$
- * @package command
- */
-class WindCommandRequest implements IWindRequest {
-	/**
-	 * 请求参数信息
-	 * 
-	 * @var array
-	 */
-	private $_attribute = array();
-	
-	/**
-	 * 应答对象
-	 * 
-	 * @var WindCommandResponse
-	 */
-	private $_response = null;
-
-	/**
-	 * 获得用户请求的数据
-	 * 
-	 * @param string $key 获取的参数name,默认为null将获得$_GET和$_POST两个数组的所有值
-	 * @param mixed $defaultValue 当获取值失败的时候返回缺省值,默认值为null
-	 * @return mixed
-	 */
-	public function getRequest($key, $defaultValue = null) {
-		if (isset($_SERVER[$key])) return $_SERVER[$key];
-		if (isset($_ENV[$key])) return $_ENV[$key];
-		return $defaultValue;
-	}
-
-	/**
-	 * 根据名称获得服务器和执行环境信息
-	 * 
-	 * 主要获取的依次顺序为：_attribute、$_SERVER、$_ENV
-	 * 
-	 * @param string $name 获取数据的key值
-	 * @param string $defaultValue 设置缺省值,当获取值失败的时候返回缺省值,默认该值为空字串
-	 * @return string|object|array 返回获得值
-	 */
-	public function getAttribute($key, $defaultValue = '') {
-		if (isset($this->_attribute[$key]))
-			return $this->_attribute[$key];
-		else if (isset($_SERVER[$key]))
-			return $_SERVER[$key];
-		else if (isset($_ENV[$key]))
-			return $_ENV[$key];
-		else
-			return $defaultValue;
-	}
-
-	/**
-	 * 设置属性数据
-	 * 
-	 * @param string|array|object $data 需要设置的数据
-	 * @param string $key 设置的数据保存用的key,默认为空,当数组和object类型的时候将会执行array_merge操作
-	 * @return void
-	 */
-	public function setAttribute($data, $key = '') {
-		if ($key) {
-			$this->_attribute[$key] = $data;
-			return;
-		}
-		if (is_object($data)) $data = get_object_vars($data);
-		if (is_array($data)) $this->_attribute = array_merge($this->_attribute, $data);
-	}
-
-	/**
-	 * 获得请求类型
-	 * 
-	 * @return string  
-	 */
-	public function getRequestType() {
-		return 'command';
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindRequest::getPathInfo()
-	 */
-	public function getPathInfo() {
-		return '';
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindRequest::getHostInfo()
-	 */
-	public function getHostInfo() {
-		return '';
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindRequest::getServerName()
-	 */
-	public function getServerName() {
-		return '';
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindRequest::getServerPort()
-	 */
-	public function getServerPort() {
-		return '';
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindRequest::getResponse()
-	 */
-	public function getResponse() {
-		if ($this->_response === null) {
-			$this->_response = new WindCommandResponse();
-		}
-		return $this->_response;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindRequest::getAcceptLanguage()
-	 */
-	public function getAcceptLanguage() {
-		return '';
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/wind/command/WindCommandResponse.php b/wind/command/WindCommandResponse.php
deleted file mode 100644
index 44612cff..00000000
--- a/wind/command/WindCommandResponse.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * 命令行模式的response
- *
- * @author Shi Long <long.shi@alibaba-inc.com>
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.windframework.com
- * @version $Id$
- * @package command
- */
-class WindCommandResponse implements IWindResponse {
-	private $_output = '';
-	private $charset = 'utf-8';
-
-	/**
-	 * 发送响应信息
-	 * 
-	 * @return void
-	 */
-	public function sendResponse() {
-		echo $this->_output;
-	}
-
-	/**
-	 * 设置输出信息
-	 *
-	 * @param string $output
-	 */
-	public function setOutput($output) {
-		$this->_output = $output;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getHeaders() {
-		return array();
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::getData()
-	 */
-	public function getData() {
-		return array();
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::setData()
-	 */
-	public function setData($data, $key = '') {
-		return false;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::getCharset()
-	 */
-	public function getCharset() {
-		return $this->charset;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::setCharset()
-	 */
-	public function setCharset($_charset) {
-		return $this->charset = $_charset;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::setBody()
-	 */
-	public function setBody($content, $name = 'default') {
-		return false;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::sendError()
-	 */
-	public function sendError($status = self::W_NOT_FOUND, $message = '') {
-		return false;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::sendBody()
-	 */
-	public function sendBody() {
-		return false;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::sendHeaders()
-	 */
-	public function sendHeaders() {
-		return false;
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/wind/command/WindCommandRouter.php b/wind/command/WindCommandRouter.php
deleted file mode 100644
index 1bd6761f..00000000
--- a/wind/command/WindCommandRouter.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-Wind::import('WIND:router.AbstractWindRouter');
-/**
- * 命令行路由，默认路由规则 php index.php [-m default] [-c index] [-a run] [-p id1 id2] [--help]
- *
- * @author Shi Long <long.shi@alibaba-inc.com>
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.windframework.com
- * @version $Id$
- * @package command
- */
-class WindCommandRouter extends AbstractWindRouter {
-	protected $moduleKey = '-m,module,--module';
-	protected $controllerKey = '-c,controller,--controller';
-	protected $actionKey = '-a,action,--action';
-	protected $helpKey = '-h,help,--help';
-	protected $paramKey = '-p,param,--param';
-	protected $help = false;
-	protected $cmd = '';
-	/**
-	 * @var WindCommandRequest
-	 */
-	private $request = null;
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindRouter::route()
-	 */
-	public function route($request) {
-		$this->request = $request;
-		$this->_action = $this->action;
-		$this->_controller = $this->controller;
-		$this->_module = $this->module;
-		if (!empty($this->_config['routes'])) {
-			$params = $this->getHandler()->handle($request);
-			$this->setParams($params, $request);
-		} else {
-			$args = $request->getRequest('argv', array());
-			$this->cmd = $args[0];
-			$_count = count($args);
-			for ($i = 1; $i < $_count; $i++) {
-				if (in_array($args[$i], explode(',', $this->helpKey))) {
-					$this->help = true;
-				} elseif (in_array($args[$i], explode(',', $this->moduleKey))) {
-					$this->module = $args[++$i];
-				} elseif (in_array($args[$i], explode(',', $this->controllerKey))) {
-					$this->controller = $args[++$i];
-				} elseif (in_array($args[$i], explode(',', $this->actionKey))) {
-					$this->action = $args[++$i];
-				} elseif (in_array($args[$i], explode(',', $this->paramKey))) {
-					$_SERVER['argv'] = array_slice($args, $i + 1);
-					break;
-				}
-			}
-		}
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindRouter::assemble()
-	 */
-	public function assemble($action, $args = array(), $route = '') {
-		return '';
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindRouter::setParams()
-	 */
-	protected function setParams($params, $request) {
-		/* @var $request WindCommandRequest */
-		$_SERVER['argv'] = isset($params[$this->paramKey]) ? $params[$this->paramKey] : array();
-		isset($params[$this->moduleKey]) && $this->setModule($params[$this->moduleKey]);
-		isset($params[$this->controllerKey]) && $this->setController($params[$this->controllerKey]);
-		isset($params[$this->actionKey]) && $this->setAction($params[$this->actionKey]);
-	}
-
-	/**
-	 * 是否是请求帮助
-	 *
-	 * @return boolean
-	 */
-	public function isHelp() {
-		return $this->help;
-	}
-
-	/**
-	 * 返回当前命令
-	 *
-	 * @return string
-	 */
-	public function getCmd() {
-		return $this->cmd;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getParamKey() {
-		return $this->paramKey;
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/wind/components_config.php b/wind/components_config.php
new file mode 100644
index 00000000..18697b90
--- /dev/null
+++ b/wind/components_config.php
@@ -0,0 +1,134 @@
+<?php return array(
+	'windApplication' => array(
+		'path' => 'WIND:web.WindWebApplication',
+		'scope' => 'singleton',
+		'properties' => array(
+			'dispatcher' => array(
+				'ref' => 'dispatcher',
+			),
+			'handlerAdapter' => array(
+				'ref' => 'router',
+			),
+		),
+	),
+	'windToken' => array(
+		'path' => 'WIND:token.WindSecurityToken',
+		'scope' => 'singleton',
+		'properties' => array(
+			'tokenContainer' => array(
+				'ref' => 'windCookie',
+			),
+		),
+	),
+	'windLogger' => array(
+		'path' => 'WIND:log.WindLogger',
+		'scope' => 'singleton',
+		'destroy' => 'flush',
+		'constructor-args' => array(
+			'0' => array(
+				'value' => 'DATA:log',
+			),
+			'1' => array(
+				'value' => '2',
+			),
+		),
+	),
+	'dispatcher' => array(
+		'path' => 'WIND:web.WindDispatcher',
+		'scope' => 'application',
+	),
+	'forward' => array(
+		'path' => 'WIND:web.WindForward',
+		'scope' => 'prototype',
+		'properties' => array(
+			'windView' => array(
+				'ref' => 'windView',
+			),
+		),
+	),
+	'router' => array(
+		'path' => 'WIND:router.WindRouter',
+		'scope' => 'application',
+	),
+	'urlHelper' => array(
+		'path' => 'WIND:web.WindUrlHelper',
+		'scope' => 'application',
+	),
+	'windView' => array(
+		'path' => 'WIND:viewer.WindView',
+		'scope' => 'prototype',
+		'config' => array(
+			'template-dir' => 'template',
+			'template-ext' => 'htm',
+			'is-compile' => '1',
+			'compile-dir' => 'compile.template',
+			'compile-ext' => 'tpl',
+			'layout' => '',
+			'theme' => '',
+			'htmlspecialchars' => true,
+		),
+		'properties' => array(
+			'viewResolver' => array(
+				'ref' => 'viewResolver',
+			),
+			'windLayout' => array(
+				'ref' => 'layout',
+			),
+		),
+	),
+	'viewResolver' => array(
+		'path' => 'WIND:viewer.resolver.WindViewerResolver',
+		'scope' => 'prototype',
+	),
+	'layout' => array(
+		'path' => 'WIND:viewer.WindLayout',
+		'scope' => 'prototype',
+	),
+	'template' => array(
+		'path' => 'WIND:viewer.compiler.WindViewTemplate',
+		'scope' => 'prototype',
+	),
+	'db' => array(
+		'path' => 'WIND:db.WindConnection',
+		'scope' => 'singleton',
+		'config' => array(
+			'resource' => 'db_config.xml',
+		),
+	),
+	'errorMessage' => array(
+		'path' => 'WIND:core.web.WindErrorMessage',
+		'scope' => 'prototype',
+	),
+	'configParser' => array(
+		'path' => 'WIND:parser.WindConfigParser',
+		'scope' => 'singleton',
+	),
+	'windCache' => array(
+		'path' => 'WIND:cache.strategy.WindFileCache',
+		'scope' => 'singleton',
+		'config' => array(
+			'dir' => 'DATA:caches',
+			'suffix' => 'php',
+			'expires' => '0',
+		),
+	),
+	'windSession' => array(
+		'path' => 'WIND:http.session.WindSession',
+		'scope' => 'singleton',
+		'destroy' => 'commit',
+	),
+	'i18n' => array(
+		'path' => 'WIND:i18n.WindLangResource',
+		'scope' => 'singleton',
+		'config' => array(
+			'path' => 'i18n',
+		),
+	),
+	'windCookie' => array(
+		'path' => 'WIND:http.cookie.WindNormalCookie',
+		'scope' => 'singleton',
+		'config' => array(
+			'expires' => '86400',
+		),
+	),
+);
\ No newline at end of file
diff --git a/wind/db/WindConnectionManager.php b/wind/db/WindConnectionManager.php
index 46344d2d..2e438fca 100644
--- a/wind/db/WindConnectionManager.php
+++ b/wind/db/WindConnectionManager.php
@@ -2,14 +2,13 @@
 Wind::import("WIND:db.WindConnection");
 /**
  * 数据库链接管理
- *
+ * 
  * 配置说明：<code>
  * 1. 当没有任何策略部署时 ，默认返回当前配置中的第一个链接句柄
  * 2. 当没有任何策略部署时，如果在sql语句中有链接句柄指定时则返回指定的链接句柄
  * 例如：'{db1:tableName}'返回db1指定的链接句柄
  * 3. 如果当前有策略部署时，则按照策略部署规则返回
- * 4. createStatement($sql = null, $forceMaster = false)
- * 当$forceMaster为true时则强制主链接
+ * 4. createStatement($sql = null, $forceMaster = false) 当$forceMaster为true时则强制主链接
  * 配置格式如下：
  * <connections except='*:db1;user*,tablename2:db1|db2;'>
  * <connection name='db1'>
@@ -37,60 +36,60 @@
 class WindConnectionManager extends WindConnection {
 	/**
 	 * 通配符设置
-	 *
+	 * 
 	 * @var string
 	 */
 	private $wildcard = '*';
 	/**
 	 * 数据链接池,临时保存当前所有数据库连接句柄
-	 *
+	 * 
 	 * @var array
 	 */
 	private $pool = array();
 	/**
 	 * 当前数据表名称
-	 *
+	 * 
 	 * @var string
 	 */
 	private $tableName;
 	/**
 	 * 当前的sql语句查询类型
-	 *
+	 * 
 	 * @var string
 	 */
 	private $sqlType;
 	/**
 	 * 数据库连接池策略部署配置信息
-	 *
+	 * 
 	 * @var array
 	 */
 	private $except = array('_current' => '', '_default' => array(), '_except' => array(), '_db' => array());
 	
 	/**
 	 * 是否强制主链接,默认为false
-	 *
+	 * 
 	 * @var boolean
 	 */
 	private $forceMaster = false;
-	
-	/*
-	 * (non-PHPdoc) @see WindConnection::createStatement()
+
+	/* (non-PHPdoc)
+	 * @see WindConnection::createStatement()
 	 */
 	public function createStatement($sql = null, $forceMaster = false) {
 		$this->forceMaster = $forceMaster;
 		return parent::createStatement($sql);
 	}
-	
-	/*
-	 * (non-PHPdoc) @see WindConnection::getDbHandle()
+
+	/* (non-PHPdoc)
+	 * @see WindConnection::getDbHandle()
 	 */
 	public function getDbHandle() {
 		$this->init();
 		return $this->_dbHandle;
 	}
-	
-	/*
-	 * (non-PHPdoc) @see WindConnection::init()
+
+	/* (non-PHPdoc)
+	 * @see WindConnection::init()
 	 */
 	public function init() {
 		try {
@@ -106,16 +105,15 @@ public function init() {
 			}
 			$this->_dbHandle = $this->pool[$this->except['_current']];
 			if (WIND_DEBUG & 2) Wind::getApp()->getComponent('windLogger')->info(
-				"db.WindConnectionManager.init() Initialize db connection successful. use '" . $this->except['_current'] . "'", 
-				'db');
+				"db.WindConnection.init() Initialize db connection success.", 'db');
 		} catch (PDOException $e) {
 			$this->close();
 			throw new WindDbException($e->getMessage());
 		}
 	}
-	
-	/*
-	 * (non-PHPdoc) @see WindConnection::parseQueryString()
+
+	/* (non-PHPdoc)
+	 * @see WindConnection::parseQueryString()
 	 */
 	protected function parseQueryString($sql) {
 		$sql = preg_replace_callback(
@@ -147,8 +145,8 @@ protected function parseQueryString($sql) {
 
 	/**
 	 * 根据当前sql语句类型,从一条数据连接配置中解析出主从信息,并设置当前db链接名
-	 *
-	 * @param array $_c        	
+	 * 
+	 * @param array $_c
 	 * @return void
 	 */
 	private function _resolveCurrentDb($_c) {
@@ -172,7 +170,7 @@ private function _resolveCurrentDb($_c) {
 
 	/**
 	 * 解析sql语句
-	 *
+	 * 
 	 * 解析sql语句,在sql语句中提取数据库连接信息,返回解析后的sql语句<code>
 	 * Array(
 	 * [0] => SELECT * FROM {db1:database.members} WHERE uid<=:uid	| 匹配到的完整str
@@ -182,8 +180,8 @@ private function _resolveCurrentDb($_c) {
 	 * [4] => database.												| 当前database
 	 * [5] => members												| 当前表名
 	 * )</code>
-	 *
-	 * @param array $matchs        	
+	 * 
+	 * @param array $matchs
 	 * @return string
 	 */
 	private function _pregQueryString($matchs) {
@@ -192,13 +190,12 @@ private function _pregQueryString($matchs) {
 			$this->tableName = $matchs[5];
 			$this->except['_current'] = trim($matchs[3], ':');
 			$matchs[0] = str_replace($matchs[3] . $matchs[4], '', $matchs[0]);
-		} else
-			$this->except['_current'] = $this->tableName = '';
+		}
 		return $matchs[0];
 	}
-	
-	/*
-	 * (non-PHPdoc) @see WindConnection::_initConfig()
+
+	/* (non-PHPdoc)
+	 * @see WindConnection::_initConfig()
 	 */
 	protected function _initConfig() {
 		$_except = $this->getConfig('connections', 'except');
@@ -215,8 +212,8 @@ protected function _initConfig() {
 
 	/**
 	 * 重置链接信息
-	 *
-	 * @param string $db        	
+	 * 
+	 * @param string $db
 	 * @return void
 	 */
 	private function _resetConnection($db) {
@@ -228,14 +225,14 @@ private function _resetConnection($db) {
 
 	/**
 	 * 解析链接管理链接策略
-	 *
+	 * 
 	 * db链接管理配置信息如下:<code>except='*:(db1);user*,tablename2:(db1|db2);'</code>
 	 * 一组'*:(db1);'代表一组数据配置,格式如:'tableName1,tableName2,tableName3:(db1|db2,db3,db4)'.
 	 * 数据表名称与策略用':'隔开,':'前面表示一组数据表,可以是多个也可以是一个,多个表名用','隔开.
 	 * ':'后面'()'中表示一组数据策略,例子中策略的意思是'db1'是主链接(master),'db2,db3,db4'为从属链接(slaves).
 	 * 该方法解析这段数据库链接配置,并将解析结果存储到 'except' 属性中.
-	 *
-	 * @param array $matchs        	
+	 * 
+	 * @param array $matchs
 	 * @return void
 	 */
 	private function _pregExcept($matchs) {
diff --git a/wind/db/WindResultSet.php b/wind/db/WindResultSet.php
index c8b9507d..71fe98ae 100644
--- a/wind/db/WindResultSet.php
+++ b/wind/db/WindResultSet.php
@@ -83,7 +83,7 @@ public function columnCount() {
 	 */
 	public function fetch($fetchMode = 0, $fetchType = 0) {
 		if ($fetchMode === 0) $fetchMode = $this->_fetchMode;
-		if ($fetchType === 0) $fetchType = $this->_fetchType;
+		if ($fetchType === 0) $fetchMode = $this->_fetchType;
 		return $this->_fetch($fetchMode, $fetchType);
 	}
 
diff --git a/wind/db/WindSqlStatement.php b/wind/db/WindSqlStatement.php
index da5007f6..5ecdf66c 100644
--- a/wind/db/WindSqlStatement.php
+++ b/wind/db/WindSqlStatement.php
@@ -264,7 +264,7 @@ public function getOne($params = array(), $fetchMode = 0, $fetchType = 0) {
 	 * @see WindConnection::lastInsterId()
 	 */
 	public function lastInsertId($name = '') {
-		return $this->getConnection()->lastInsertId($name);
+		return $this->getConnection($name);
 	}
 
 	/**
@@ -288,7 +288,7 @@ public function execute($params = array(), $rowCount = true) {
 			if (WIND_DEBUG & 2) {
 				Wind::getApp()->getComponent('windLogger')->profileEnd('SQL:execute sql statement.', 'db');
 				Wind::getApp()->getComponent('windLogger')->info(
-					"[component.db.WindSqlStatement.execute] execute sql statement success.\r\n", 'db');
+					"[component.db.WindSqlStatement.execute] execute sql statement success.", 'db');
 			}
 			return $_result;
 		} catch (PDOException $e) {
diff --git a/wind/filter/WindActionFilter.php b/wind/filter/WindActionFilter.php
index 82526ec0..a95f05a1 100644
--- a/wind/filter/WindActionFilter.php
+++ b/wind/filter/WindActionFilter.php
@@ -124,13 +124,13 @@ protected function setGlobal($data, $key = '') {
 	protected function getInput($name, $type = '', $callback = array()) {
 		$value = '';
 		switch (strtolower($type)) {
-			case 'get':
+			case IWindRequest::INPUT_TYPE_GET:
 				$value = $this->getRequest()->getGet($name, null);
 				break;
-			case 'post':
+			case IWindRequest::INPUT_TYPE_POST:
 				$value = $this->getRequest()->getPost($name, null);
 				break;
-			case 'cookie':
+			case IWindRequest::INPUT_TYPE_COOKIE:
 				$value = $this->getRequest()->getCookie($name, null);
 				break;
 			default:
diff --git a/wind/filter/WindHandlerInterceptor.php b/wind/filter/WindHandlerInterceptor.php
index b287b658..eb1b836a 100644
--- a/wind/filter/WindHandlerInterceptor.php
+++ b/wind/filter/WindHandlerInterceptor.php
@@ -10,7 +10,7 @@
  * </ul>
  * 该拦截器需要配合拦截链WindHandlerInterceptorChain实现真正的拦截链.
  *
- * the last known user to change this file in the repository  <$LastChangedBy: yishuo $>
+ * the last known user to change this file in the repository  <$LastChangedBy$>
  * @author Qiong Wu <papa0924@gmail.com>
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
diff --git a/wind/filter/WindHandlerInterceptorChain.php b/wind/filter/WindHandlerInterceptorChain.php
index 71a042c5..7f46ff9b 100644
--- a/wind/filter/WindHandlerInterceptorChain.php
+++ b/wind/filter/WindHandlerInterceptorChain.php
@@ -5,7 +5,7 @@
  * 该类是拦截链核心实现,在创建拦截链的时候往拦截链中添加拦截器实现拦截链的相关操作.
  * 
  *
- * the last known user to change this file in the repository  <$LastChangedBy: yishuo $>
+ * the last known user to change this file in the repository  <$LastChangedBy$>
  * @author Qiong Wu <papa0924@gmail.com>
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
diff --git a/wind/ftp/AbstractWindFtp.php b/wind/ftp/AbstractWindFtp.php
index 5565a14d..bb151112 100644
--- a/wind/ftp/AbstractWindFtp.php
+++ b/wind/ftp/AbstractWindFtp.php
@@ -7,7 +7,7 @@
  * @author xiaoxia.xu <xiaoxia.xuxx@aliyun-inc.com>
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
- * @version $Id$
+ * @version $Id: AbstractWindFtp.php 1532 2011-9-20下午02:16:54 xiaoxiao $
  * @package ftp
  */
 abstract class AbstractWindFtp {
diff --git a/wind/ftp/WindFtp.php b/wind/ftp/WindFtp.php
index afc4379b..4a3202b3 100644
--- a/wind/ftp/WindFtp.php
+++ b/wind/ftp/WindFtp.php
@@ -13,7 +13,7 @@
  * @author xiaoxia.xu <xiaoxia.xuxx@aliyun-inc.com>
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
- * @version $Id$
+ * @version $Id: WindFtp.php 2973 2011-10-15 19:22:48Z yishuo $
  * @package ftp
  */
 class WindFtp extends AbstractWindFtp {
diff --git a/wind/ftp/WindSocketFtp.php b/wind/ftp/WindSocketFtp.php
index e2d1f640..956176e8 100644
--- a/wind/ftp/WindSocketFtp.php
+++ b/wind/ftp/WindSocketFtp.php
@@ -14,7 +14,7 @@
  * @author xiaoxia.xu <xiaoxia.xuxx@aliyun-inc.com>
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
- * @version $Id$
+ * @version $Id: WindSocketFtp.php 2973 2011-10-15 19:22:48Z yishuo $
  * @package ftp
  */
 class WindSocketFtp extends AbstractWindFtp {
diff --git a/wind/http/cookie/WindNormalCookie.php b/wind/http/cookie/WindNormalCookie.php
index f92910bf..cfe4a8bf 100644
--- a/wind/http/cookie/WindNormalCookie.php
+++ b/wind/http/cookie/WindNormalCookie.php
@@ -1,6 +1,6 @@
-<?php
-Wind::import('WIND:http.IWindHttpContainer');
-Wind::import('WIND:utility.WindCookie');
+<?php
+Wind::import('WIND:http.IWindHttpContainer');
+Wind::import('WIND:utility.WindCookie');
 /**
  * 将cookie作为对象操作
  *
@@ -10,20 +10,22 @@
  * @version $Id$
  * @package http
  * @subpackage cookie
- */
-class WindNormalCookie extends WindModule implements IWindHttpContainer {
-	protected $prefix = null;
-	protected $encode = false;
-	protected $path = null;
-	protected $domain = null;
-	protected $secure = false;
-	protected $httponly = false;
-
+ */
+class WindNormalCookie extends WindModule implements IWindHttpContainer {
+	protected $prefix = null;
+	protected $encode = false;
+	protected $expires = null;
+	protected $path = null;
+	protected $domain = null;
+	protected $secure = false;
+	protected $httponly = false;
+
 	/**
 	 * 构造函数
 	 * 
 	 * 根据传入的cookie数据初始化cookie数据
 	 * 
+	 * @param string|int $expires 过期时间,默认为null即会话cookie,随着会话结束将会销毁
 	 * @param boolean $encode 是否使用 MIME base64 对数据进行编码,默认是false即不进行编码
 	 * @param string $prefix cookie前缀,默认为null即没有前缀
 	 * @param string $path cookie保存的路径,默认为null即采用默认
@@ -31,112 +33,122 @@ class WindNormalCookie extends WindModule implements IWindHttpContainer {
 	 * @param boolean $secure 是否安全连接,默认为false即不采用安全链接
 	 * @param boolean $httponly 是否可通过客户端脚本访问,默认为false即客户端脚本可以访问cookie
 	 * @return void
-	 */
-	public function __construct($prefix = null, $encode = false, $path = null, $domain = null, $secure = false, $httponly = false) {
-		$this->prefix = $prefix;
-		$this->encode = $encode;
-		$this->domain = $domain;
-		$this->path = $path;
-		$this->secure = $secure;
-		$this->httponly = $httponly;
-	}
-
+	 */
+	public function __construct($prefix = null, $encode = false, $expires = null, $path = null, $domain = null, $secure = false, $httponly = false) {
+		$this->prefix = $prefix;
+		$this->encode = $encode;
+		$this->expires = $expires;
+		$this->domain = $domain;
+		$this->path = $path;
+		$this->secure = $secure;
+		$this->httponly = $httponly;
+	}
+
 	/**
 	 * 配置设置
 	 *
 	 * @param array|string $config
 	 * @see WindModule::setConfig()
 	 * @return void
-	 */
-	public function setConfig($config) {
-		parent::setConfig($config);
-		$this->prefix = $this->getConfig('prefix');
-		$this->encode = $this->getConfig('encode');
-		$this->domain = $this->getConfig('domain');
-		$this->path = $this->getConfig('path');
-		$this->secure = $this->getConfig('secure');
-		$this->httponly = $this->getConfig('httponly');
-	}
-
+	 */
+	public function setConfig($config) {
+		parent::setConfig($config);
+		$this->prefix = $this->getConfig('prefix');
+		$this->encode = $this->getConfig('encode');
+		$this->expires = $this->getConfig('expires');
+		$this->domain = $this->getConfig('domain');
+		$this->path = $this->getConfig('path');
+		$this->secure = $this->getConfig('secure');
+		$this->httponly = $this->getConfig('httponly');
+	}
+
 	/**
 	 * 设置cookie
 	 * 
 	 * @param string $name
-	 * @param mixed $value
-	 * @param int|null $expires 过期时间
+	 * @param mixed $value
 	 * @return boolean
-	 */
-	public function set($name, $value, $expires = null) {
-		$this->prefix && $name = $this->prefix . $name;
-		return WindCookie::set($name, $value, $this->encode, $expires, $this->path, $this->domain, 
-			$this->secure, $this->httponly);
-	}
-
+	 */
+	public function set($name, $value) {
+		$this->prefix && $name = $this->prefix . $name;
+		return WindCookie::set($name, $value, $this->encode, $this->expires, $this->path, $this->domain, $this->secure, 
+			$this->httponly);
+	}
+
 	/**
 	 * 获取cookie值
 	 *
 	 * @param string $name
 	 * @return void
-	 */
-	public function get($name) {
-		$this->prefix && $name = $this->prefix . $name;
-		return WindCookie::get($name, $this->encode);
-	}
-
+	 */
+	public function get($name) {
+		$this->prefix && $name = $this->prefix . $name;
+		return WindCookie::get($name, $this->encode);
+	}
+
 	/**
 	 * 移除cookie值
 	 * 
 	 * @param string $name
 	 * @return boolean
 	 * @see IWindHttpContainer::delete()
-	 */
-	public function delete($name) {
-		$this->prefix && $name = $this->prefix . $name;
-		return WindCookie::delete($name);
-	}
-	
+	 */
+	public function delete($name) {
+		$this->prefix && $name = $this->prefix . $name;
+		return WindCookie::delete($name);
+	}
+
 	/* (non-PHPdoc)
 	 * @see IWindHttpContainer::isRegistered()
-	 */
-	public function isRegistered($name) {
-		$this->prefix && $name = $this->prefix . $name;
-		return WindCookie::exist($name);
-	}
-
+	 */
+	public function isRegistered($name) {
+		$this->prefix && $name = $this->prefix . $name;
+		return WindCookie::exist($name);
+	}
+
 	/**
 	 * 移除全部cookie值
 	 * 
 	 * @return boolean
-	 */
-	public function deleteAll() {
-		return WindCookie::deleteAll();
-	}
-
+	 */
+	public function deleteAll() {
+		return WindCookie::deleteAll();
+	}
+
 	/**
 	 * 判断cookie值是否存在
 	 *
 	 * @param string $name
-	 */
-	public function exist($name) {
-		$this->prefix && $name = $this->prefix . $name;
-		return WindCookie::exist($name);
-	}
-
+	 */
+	public function exist($name) {
+		$this->prefix && $name = $this->prefix . $name;
+		return WindCookie::exist($name);
+	}
+
 	/**
 	 * 获取cookie的域
 	 * 
 	 * @return string 获得cookie域
-	 */
-	public function getDomain() {
-		return $this->domain;
-	}
-
+	 */
+	public function getDomain() {
+		return $this->domain;
+	}
+
 	/**
 	 * 获取cookie的路径
 	 * 
 	 * @return string 获得cookie保存路径
-	 */
-	public function getPath() {
-		return $this->path;
-	}
+	 */
+	public function getPath() {
+		return $this->path;
+	}
+
+	/**
+	 * 获取cookie的过期时间
+	 * 
+	 * @return mixed 获得cookie的过期时间
+	 */
+	public function getExpirs() {
+		return $this->expires;
+	}
 }
\ No newline at end of file
diff --git a/wind/http/request/IWindRequest.php b/wind/http/request/IWindRequest.php
new file mode 100644
index 00000000..eacd60e0
--- /dev/null
+++ b/wind/http/request/IWindRequest.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * request接口定义
+ *
+ * @author Qiong Wu <papa0924@gmail.com>
+ * @copyright ©2003-2103 phpwind.com
+ * @license http://www.windframework.com
+ * @version $Id$
+ * @package http
+ * @subpackage request
+ */
+interface IWindRequest {
+	/**
+	 * 常量定义GET的别名
+	 *
+	 * @var string
+	 */
+	const INPUT_TYPE_GET = 'get';
+	/**
+	 * 常量定义POST的别名
+	 *
+	 * @var string
+	 */
+	const INPUT_TYPE_POST = 'post';
+	/**
+	 * 常量定义COOKIE的别名
+	 *
+	 * @var string
+	 */
+	const INPUT_TYPE_COOKIE = 'cookie';
+}
+
+
+
+
diff --git a/wind/web/WindHttpRequest.php b/wind/http/request/WindHttpRequest.php
similarity index 88%
rename from wind/web/WindHttpRequest.php
rename to wind/http/request/WindHttpRequest.php
index 22c991eb..3b115711 100644
--- a/wind/web/WindHttpRequest.php
+++ b/wind/http/request/WindHttpRequest.php
@@ -1,4 +1,5 @@
 <?php
+Wind::import('WIND:http.request.IWindRequest');
 /**
  * Request对象
  *
@@ -10,45 +11,35 @@
  * @subpackage request
  */
 class WindHttpRequest implements IWindRequest {
-	/**
+	
+	/**
 	 * 访问的端口号
-	 *
-	 * @var int
-	 */
-	protected $_port = null;
-	/**
-	 * 请求路径信息
-	 *
-	 * @var string
+	 * 
+	 * @var int
 	 */
-	protected $_hostInfo = null;
-	/**
+	private $_port = null;
+	
+	/**
 	 * 客户端IP
-	 *
-	 * @var string
+	 * 
+	 * @var string
 	 */
-	protected $_clientIp = null;
+	private $_clientIp = null;
 	
-	/**
+	/**
 	 * 语言
-	 *
-	 * @var string
+	 * 
+	 * @var string
 	 */
-	protected $_language = null;
+	private $_language = null;
 	
-	/**
+	/**
 	 * 路径信息
-	 *
-	 * @var string
+	 * 
+	 * @var string
 	 */
-	protected $_pathInfo = null;
+	private $_pathInfo = null;
 	
-	/**
-	 * 请求参数信息
-	 *
-	 * @var array
-	 */
-	protected $_attribute = array();
 	/**
 	 * 请求脚本url
 	 * 
@@ -69,7 +60,28 @@ class WindHttpRequest implements IWindRequest {
 	 * @var string
 	 */
 	private $_baseUrl = null;
-
+	
+	/**
+	 * 请求路径信息
+	 *
+	 * @var string
+	 */
+	private $_hostInfo = null;
+	
+	/**
+	 * 请求参数信息
+	 * 
+	 * @var array
+	 */
+	private $_attribute = array();
+	
+	/**
+	 * 应答对象
+	 * 
+	 * @var WindHttpResponse
+	 */
+	private $_response = null;
+	
 	/**
 	 * 初始化Request对象
 	 *
@@ -85,15 +97,29 @@ public function __construct() {
 	 */
 	protected function normalizeRequest() {
 		if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
-			if (isset($_GET)) $_GET = $this->_stripSlashes($_GET);
-			if (isset($_POST)) $_POST = $this->_stripSlashes($_POST);
-			if (isset($_REQUEST)) $_REQUEST = $this->_stripSlashes($_REQUEST);
-			if (isset($_COOKIE)) $_COOKIE = $this->_stripSlashes($_COOKIE);
+			if (isset($_GET)) $_GET = $this->stripSlashes($_GET);
+			if (isset($_POST)) $_POST = $this->stripSlashes($_POST);
+			if (isset($_REQUEST)) $_REQUEST = $this->stripSlashes($_REQUEST);
+			if (isset($_COOKIE)) $_COOKIE = $this->stripSlashes($_COOKIE);
 		}
 	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindRequest::setAttribute()
+
+	/**
+	 * 采用stripslashes反转义特殊字符
+	 *
+	 * @param array|string $data 待反转义的数据
+	 * @return array|string 反转义之后的数据
+	 */
+	private function stripSlashes(&$data) {
+		return is_array($data) ? array_map(array($this, 'stripSlashes'), $data) : stripslashes($data);
+	}
+
+	/**
+	 * 设置属性数据
+	 * 
+	 * @param string|array|object $data 需要设置的数据
+	 * @param string $key 设置的数据保存用的key,默认为空,当数组和object类型的时候将会执行array_merge操作
+	 * @return void
 	 */
 	public function setAttribute($data, $key = '') {
 		if ($key) {
@@ -103,9 +129,15 @@ public function setAttribute($data, $key = '') {
 		if (is_object($data)) $data = get_object_vars($data);
 		if (is_array($data)) $this->_attribute = array_merge($this->_attribute, $data);
 	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindRequest::getAttribute()
+
+	/**
+	 * 根据名称获得服务器和执行环境信息
+	 * 
+	 * 主要获取的依次顺序为：_attribute、$_GET、$_POST、$_COOKIE、$_REQUEST、$_ENV、$_SERVER
+	 * 
+	 * @param string $name 获取数据的key值
+	 * @param string $defaultValue 设置缺省值,当获取值失败的时候返回缺省值,默认该值为空字串
+	 * @return string|object|array 返回获得值
 	 */
 	public function getAttribute($key, $defaultValue = '') {
 		if (isset($this->_attribute[$key]))
@@ -130,6 +162,7 @@ public function getAttribute($key, $defaultValue = '') {
 	 * 获得用户请求的数据
 	 * 
 	 * 返回$_GET,$_POST的值,未设置则返回$defaultValue
+	 * 
 	 * @param string $key 获取的参数name,默认为null将获得$_GET和$_POST两个数组的所有值
 	 * @param mixed $defaultValue 当获取值失败的时候返回缺省值,默认值为null
 	 * @return mixed
@@ -141,10 +174,24 @@ public function getRequest($key = null, $defaultValue = null) {
 		return $defaultValue;
 	}
 
+	/**
+	 * 获取请求数据
+	 * 
+	 * 将从$_GET中获取数据
+	 * 
+	 * @param string $name 待获取的变量名,默认为null
+	 * @param string $default 如果获取变量失败则返回该值,默认为null
+	 * @return mixed
+	 */
+	public function getQuery($name = null, $defaultValue = null) {
+		return $this->getGet($name, $defaultValue);
+	}
+
 	/**
 	 * 获取请求的表单数据
 	 * 
 	 * 从$_POST获得值
+	 * 
 	 * @param string $name 获取的变量名,默认为null,当为null的时候返回$_POST数组
 	 * @param string $defaultValue 当获取变量失败的时候返回该值,默认为null
 	 * @return mixed
@@ -170,6 +217,7 @@ public function getGet($name = '', $defaultValue = null) {
 	 * 返回cookie的值
 	 * 
 	 * 如果$name=null则返回所有Cookie值
+	 * 
 	 * @param string $name 获取的变量名,如果该值为null则返回$_COOKIE数组,默认为null
 	 * @param string $defaultValue 当获取变量失败的时候返回该值,默认该值为null
 	 * @return mixed
@@ -183,6 +231,7 @@ public function getCookie($name = null, $defaultValue = null) {
 	 * 返回session的值
 	 * 
 	 * 如果$name=null则返回所有SESSION值
+	 * 
 	 * @param string $name 获取的变量名,如果该值为null则返回$_SESSION数组,默认为null
 	 * @param string $defaultValue 当获取变量失败的时候返回该值,默认该值为null
 	 * @return mixed
@@ -196,6 +245,7 @@ public function getSession($name = null, $defaultValue = null) {
 	 * 返回Server的值
 	 * 
 	 * 如果$name为空则返回所有Server的值
+	 * 
 	 * @param string $name 获取的变量名,如果该值为null则返回$_SERVER数组,默认为null
 	 * @param string $defaultValue 当获取变量失败的时候返回该值,默认该值为null
 	 * @return mixed
@@ -209,6 +259,7 @@ public function getServer($name = null, $defaultValue = null) {
 	 * 返回ENV的值
 	 * 
 	 * 如果$name为null则返回所有$_ENV的值
+	 * 
 	 * @param string $name 获取的变量名,如果该值为null则返回$_ENV数组,默认为null
 	 * @param string $defaultValue 当获取变量失败的时候返回该值,默认该值为null
 	 * @return mixed
@@ -222,6 +273,7 @@ public function getEnv($name = null, $defaultValue = null) {
 	 * 获取请求链接协议
 	 * 
 	 * 如果是安全链接请求则返回https否则返回http
+	 * 
 	 * @return string 
 	 */
 	public function getScheme() {
@@ -230,6 +282,7 @@ public function getScheme() {
 
 	/**
 	 * 返回请求页面时通信协议的名称和版本
+	 * 
 	 * @return string
 	 */
 	public function getProtocol() {
@@ -240,6 +293,7 @@ public function getProtocol() {
 	 * 返回访问IP
 	 * 
 	 * 如果获取请求IP失败,则返回0.0.0.0
+	 * 
 	 * @return string 
 	 */
 	public function getClientIp() {
@@ -251,6 +305,7 @@ public function getClientIp() {
 	 * 获得请求的方法
 	 * 
 	 * 将返回POST\GET\DELETE等HTTP请求方式
+	 * 
 	 * @return string 
 	 */
 	public function getRequestMethod() {
@@ -261,6 +316,7 @@ public function getRequestMethod() {
 	 * 获得请求类型
 	 * 
 	 * 如果是web请求将返回web
+	 * 
 	 * @return string  
 	 */
 	public function getRequestType() {
@@ -271,6 +327,7 @@ public function getRequestType() {
 	 * 返回该请求是否为ajax请求
 	 * 
 	 * 如果是ajax请求将返回true,否则返回false
+	 * 
 	 * @return boolean 
 	 */
 	public function getIsAjaxRequest() {
@@ -281,6 +338,7 @@ public function getIsAjaxRequest() {
 	 * 请求是否使用的是HTTPS安全链接
 	 * 
 	 * 如果是安全请求则返回true否则返回false
+	 * 
 	 * @return boolean
 	 */
 	public function isSecure() {
@@ -291,6 +349,7 @@ public function isSecure() {
 	 * 返回请求是否为GET请求类型
 	 * 
 	 * 如果请求是GET方式请求则返回true，否则返回false
+	 * 
 	 * @return boolean 
 	 */
 	public function isGet() {
@@ -405,7 +464,6 @@ public function getHeader($header, $default = null) {
 	 * 返回: a=test
 	 * </pre>
 	 * 
-	 * @see IWindRequest::getPathInfo()
 	 * @return string
 	 * @throws WindException
 	 */
@@ -426,6 +484,7 @@ public function getPathInfo() {
 	 * 2]如果: $absolute = true:
 	 * 返回： http://www.phpwind.net/example
 	 * </pre>
+	 * 
 	 * @param boolean $absolute 是否返回主机信息
 	 * @return string
 	 * @throws WindException 当返回信息失败的时候抛出异常
@@ -442,7 +501,7 @@ public function getBaseUrl($absolute = false) {
 	 * 请求: http://www.phpwind.net/example/index.php?a=test
 	 * 返回： http://www.phpwind.net/
 	 * </pre>
-	 * @see IWindRequest::getHostInfo()
+	 * 
 	 * @return string
 	 * @throws WindException 获取主机信息失败的时候抛出异常
 	 */
@@ -456,14 +515,20 @@ public function getHostInfo() {
 	 * 
 	 * 如果脚本运行于虚拟主机中
 	 * 该名称是由那个虚拟主机所设置的值决定
+	 * 
 	 * @return string
 	 */
 	public function getServerName() {
 		return $this->getServer('SERVER_NAME', '');
 	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindRequest::getServerPort()
+
+	/**
+	 * 返回服务端口号
+	 * 
+	 * https链接的默认端口号为443
+	 * http链接的默认端口号为80
+	 * 
+	 * @return int
 	 */
 	public function getServerPort() {
 		if (!$this->_port) {
@@ -478,6 +543,7 @@ public function getServerPort() {
 	 * 
 	 * https链接的默认端口号为443
 	 * http链接的默认端口号为80
+	 * 
 	 * @param int $port 设置的端口号
 	 */
 	public function setServerPort($port) {
@@ -542,14 +608,19 @@ public function getAcceptTypes() {
 	 * 返回客户端程序可以能够进行解码的数据编码方式
 	 * 
 	 * 这里的编码方式通常指某种压缩方式
+	 * 
 	 * @return string|''
 	 */
 	public function getAcceptCharset() {
 		return $this->getServer('HTTP_ACCEPT_ENCODING', '');
 	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindRequest::getAcceptLanguage()
+
+	/**
+	 * 返回客户端程序期望服务器返回哪个国家的语言文档 
+	 * 
+	 * Accept-Language: en-us,zh-cn
+	 * 
+	 * @return string
 	 */
 	public function getAcceptLanguage() {
 		if (!$this->_language) {
@@ -559,22 +630,13 @@ public function getAcceptLanguage() {
 		return $this->_language;
 	}
 
-	/**
-	 * @see IWindRequest::getResponse()
-	 * @return WindHttpResponse
-	 */
-	public function getResponse() {
-		$response = new WindHttpResponse();
-		$response->setHeader('Content-type', 'text/html;charset=utf8');
-		return $response;
-	}
-
 	/**
 	 * 返回访问的IP地址
 	 * 
 	 * <pre>Example:
 	 * 返回：127.0.0.1
 	 * </pre>
+	 * 
 	 * @return string 
 	 */
 	private function _getClientIp() {
@@ -606,6 +668,7 @@ private function _getClientIp() {
 	 * 请求： http://www.phpwind.net/example/index.php?a=test
 	 * 则返回: /example/index.php?a=test
 	 * </pre>
+	 * 
 	 * @throws WindException 处理错误抛出异常
 	 */
 	private function _initRequestUri() {
@@ -629,6 +692,7 @@ private function _initRequestUri() {
 	 * 请求: http://www.phpwind.net/example/index.php?a=test
 	 * 返回: /example/index.php
 	 * </pre>
+	 * 
 	 * @throws WindException 当获取失败的时候抛出异常
 	 */
 	private function _initScriptUrl() {
@@ -658,6 +722,7 @@ private function _initScriptUrl() {
 	 * 请求: http://www.phpwind.net/example/index.php?a=test
 	 * 返回： http://www.phpwind.net/
 	 * </pre>
+	 * 
 	 * @throws WindException 获取主机信息失败的时候抛出异常
 	 */
 	private function _initHostInfo() {
@@ -678,10 +743,11 @@ private function _initHostInfo() {
 	 * 请求: http://www.phpwind.net/example/index.php?a=test
 	 * 返回: a=test
 	 * </pre>
+	 * 
 	 * @throws WindException
 	 */
 	private function _initPathInfo() {
-		$requestUri = $this->getRequestUri();
+		$requestUri = urldecode($this->getRequestUri());
 		$scriptUrl = $this->getScriptUrl();
 		$baseUrl = $this->getBaseUrl();
 		if (strpos($requestUri, $scriptUrl) === 0)
@@ -696,13 +762,4 @@ private function _initPathInfo() {
 		$this->_pathInfo = trim($pathInfo, '/');
 	}
 
-	/**
-	 * 采用stripslashes反转义特殊字符
-	 *
-	 * @param array|string $data 待反转义的数据
-	 * @return array|string 反转义之后的数据
-	 */
-	private function _stripSlashes(&$data) {
-		return is_array($data) ? array_map(array($this, '_stripSlashes'), $data) : stripslashes($data);
-	}
 }
\ No newline at end of file
diff --git a/wind/http/response/IWindResponse.php b/wind/http/response/IWindResponse.php
new file mode 100644
index 00000000..755dbe87
--- /dev/null
+++ b/wind/http/response/IWindResponse.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * response的接口定义
+ *
+ * @author Qiong Wu <papa0924@gmail.com> 2010-11-7
+ * @copyright ©2003-2103 phpwind.com
+ * @license http://www.windframework.com
+ * @version $Id$
+ * @package http
+ * @subpackage response
+ */
+interface IWindResponse {
+
+}
\ No newline at end of file
diff --git a/wind/web/WindHttpResponse.php b/wind/http/response/WindHttpResponse.php
similarity index 83%
rename from wind/web/WindHttpResponse.php
rename to wind/http/response/WindHttpResponse.php
index ac345658..ea8d1988 100644
--- a/wind/web/WindHttpResponse.php
+++ b/wind/http/response/WindHttpResponse.php
@@ -1,4 +1,5 @@
 <?php
+Wind::import('WIND:http.response.IWindResponse');
 /**
  * response实现类
  * 
@@ -17,489 +18,543 @@
  * @subpackage response
  */
 class WindHttpResponse implements IWindResponse {
+	
 	/**
-	 * Status code (100)
+	 * 用以保存响应内容
 	 *
-	 * Server status codes; see RFC 2068.
-	 * Status code (100) indicating the client can continue.
+	 * @var array
+	 */
+	private $_body = array();
+	
+	/**
+	 * 保存模板名字的顺序索引
 	 *
-	 * @var int
+	 * @var array
 	 */
-	const W_CONTINUE = 100;
+	private $_bodyIndex = array();
 	
 	/**
-	 * Status code (101) indicating the server is switching protocols
-	 * according to Upgrade header.
+	 * 输出的编码
+	 *
+	 * @var string
 	 */
-	const W_SWITCHING_PROTOCOLS = 101;
+	private $_charset = 'utf-8';
 	
 	/**
-	 * Status code (200)
+	 * 设置输出的头部信息
 	 *
-	 * Status code (200) indicating the request succeeded normally.
+	 * @var array
+	 */
+	private $_headers = array();
+	
+	/**
+	 * 是否直接跳转
 	 *
-	 * @var int
+	 * @var boolean
 	 */
-	const W_OK = 200;
+	private $_isRedirect = false;
 	
 	/**
-	 * Status code (201)
+	 * 设置相应状态码
 	 *
-	 * Status code (201) indicating the request succeeded and created
-	 * a new resource on the server.
+	 * @var string
+	 */
+	private $_status = '';
+	
+	/**
+	 * 输出数据的保存
 	 *
-	 * @var int
+	 * @var array
 	 */
-	const W_CREATED = 201;
+	private $_data = array();
 	
 	/**
-	 * Status code (202)
+	 * 返回类型
 	 *
-	 * Status code (202) indicating that a request was accepted for
+	 * @var string
+	 */
+	private $_type = '';
+	
+	/**
+	 * Status code (100)
+	 * 
+	 * Server status codes; see RFC 2068.
+	 * Status code (100) indicating the client can continue.
+	 * 
+	 * @var int
+	 */
+	const W_CONTINUE = 100;
+	
+	/**
+	 * Status code (101) indicating the server is switching protocols
+	 * according to Upgrade header.
+	 */
+	const W_SWITCHING_PROTOCOLS = 101;
+	
+	/**
+	 * Status code (200) 
+	 * 
+	 * Status code (200) indicating the request succeeded normally.
+	 * 
+	 * @var int
+	 */
+	const W_OK = 200;
+	
+	/**
+	 * Status code (201) 
+	 * 
+	 * Status code (201) indicating the request succeeded and created
+	 * a new resource on the server.
+	 * 
+	 * @var int
+	 */
+	const W_CREATED = 201;
+	
+	/**
+	 * Status code (202) 
+	 * 
+	 * Status code (202) indicating that a request was accepted for
 	 * processing, but was not completed.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_ACCEPTED = 202;
 	
-	/**
-	 * Status code (203)
-	 *
-	 * Status code (203) indicating that the meta information presented
+	/**
+	 * Status code (203) 
+	 * 
+	 * Status code (203) indicating that the meta information presented
 	 * by the client did not originate from the server.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_NON_AUTHORITATIVE_INFORMATION = 203;
 	
-	/**
-	 * Status code (204)
-	 *
-	 * Status code (204) indicating that the request succeeded but that
+	/**
+	 * Status code (204) 
+	 * 
+	 * Status code (204) indicating that the request succeeded but that
 	 * there was no new information to return.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_NO_CONTENT = 204;
 	
-	/**
+	/**
 	 * Status code (205)
-	 *
-	 * Status code (205) indicating that the agent <em>SHOULD</em> reset
+	 * 
+	 * Status code (205) indicating that the agent <em>SHOULD</em> reset
 	 * the document view which caused the request to be sent.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_RESET_CONTENT = 205;
 	
 	/**
 	 * Status code (206)
-	 *
-	 * Status code (206) indicating that the server has fulfilled
+	 * 
+	 * Status code (206) indicating that the server has fulfilled
 	 * the partial GET request for the resource.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_PARTIAL_CONTENT = 206;
 	
 	/**
-	 * Status code (300)
-	 *
-	 * Status code (300) indicating that the requested resource
-	 * corresponds to any one of a set of representations, each with
+	 * Status code (300) 
+	 * 
+	 * Status code (300) indicating that the requested resource
+	 * corresponds to any one of a set of representations, each with
 	 * its own specific location.
-	 *
-	 * @var int
+	 * 
+	 * @var int 
 	 */
 	const W_MULTIPLE_CHOICES = 300;
 	
-	/**
-	 * Status code (301)
-	 *
-	 * Status code (301) indicating that the resource has permanently
-	 * moved to a new location, and that future references should use a
+	/**
+	 * Status code (301) 
+	 * 
+	 * Status code (301) indicating that the resource has permanently
+	 * moved to a new location, and that future references should use a
 	 * new URI with their requests.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_MOVED_PERMANENTLY = 301;
 	
-	/**
-	 * Status code (302)
-	 *
-	 * Status code (302) indicating that the resource has temporarily
-	 * moved to another location, but that future references should
-	 * still use the original URI to access the resource.
-	 *
-	 * This definition is being retained for backwards compatibility.
+	/**
+	 * Status code (302) 
+	 * 
+	 * Status code (302) indicating that the resource has temporarily
+	 * moved to another location, but that future references should
+	 * still use the original URI to access the resource.
+	 *
+	 * This definition is being retained for backwards compatibility.
 	 * W_FOUND is now the preferred definition.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_MOVED_TEMPORARILY = 302;
 	
-	/**
-	 * Status code (302)
-	 *
-	 * Status code (302) indicating that the resource reside
-	 * temporarily under a different URI. Since the redirection might
-	 * be altered on occasion, the client should continue to use the
-	 * Request-URI for future requests.(HTTP/1.1) To represent the
+	/**
+	 * Status code (302) 
+	 * 
+	 * Status code (302) indicating that the resource reside
+	 * temporarily under a different URI. Since the redirection might
+	 * be altered on occasion, the client should continue to use the
+	 * Request-URI for future requests.(HTTP/1.1) To represent the
 	 * status code (302), it is recommended to use this variable.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_FOUND = 302;
 	
-	/**
-	 * Status code (303)
-	 *
-	 * Status code (303) indicating that the response to the request
+	/**
+	 * Status code (303) 
+	 * 
+	 * Status code (303) indicating that the response to the request
 	 * can be found under a different URI.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_SEE_OTHER = 303;
 	
-	/**
-	 * Status code (304)
-	 *
-	 * Status code (304) indicating that a conditional GET operation
+	/**
+	 * Status code (304) 
+	 * 
+	 * Status code (304) indicating that a conditional GET operation
 	 * found that the resource was available and not modified.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_NOT_MODIFIED = 304;
 	
-	/**
-	 * Status code (305)
-	 *
-	 * Status code (305) indicating that the requested resource
-	 * <em>MUST</em> be accessed through the proxy given by the
+	/**
+	 * Status code (305) 
+	 * 
+	 * Status code (305) indicating that the requested resource
+	 * <em>MUST</em> be accessed through the proxy given by the
 	 * <code><em>Location</em></code> field.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_USE_PROXY = 305;
 	
-	/**
-	 * Status code (307)
-	 *
-	 * Status code (307) indicating that the requested resource
-	 * resides temporarily under a different URI. The temporary URI
-	 * <em>SHOULD</em> be given by the <code><em>Location</em></code>
+	/**
+	 * Status code (307) 
+	 * 
+	 * Status code (307) indicating that the requested resource 
+	 * resides temporarily under a different URI. The temporary URI
+	 * <em>SHOULD</em> be given by the <code><em>Location</em></code> 
 	 * field in the response.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_TEMPORARY_REDIRECT = 307;
 	
-	/**
-	 * Status code (400)
-	 *
-	 * Status code (400) indicating the request sent by the client was
+	/**
+	 * Status code (400) 
+	 * 
+	 * Status code (400) indicating the request sent by the client was
 	 * syntactically incorrect.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_BAD_REQUEST = 400;
 	
-	/**
-	 * Status code (401)
-	 *
-	 * Status code (401) indicating that the request requires HTTP
+	/**
+	 * Status code (401) 
+	 * 
+	 * Status code (401) indicating that the request requires HTTP
 	 * authentication.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_UNAUTHORIZED = 401;
 	
 	/**
 	 * Status code (402)
-	 *
+	 * 
 	 * Status code (402) reserved for future use.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_PAYMENT_REQUIRED = 402;
 	
-	/**
-	 * Status code (403)
-	 *
-	 * Status code (403) indicating the server understood the request
+	/**
+	 * Status code (403) 
+	 * 
+	 * Status code (403) indicating the server understood the request
 	 * but refused to fulfill it.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_FORBIDDEN = 403;
 	
-	/**
-	 * Status code (404)
-	 *
-	 * Status code (404) indicating that the requested resource is not
+	/**
+	 * Status code (404) 
+	 * 
+	 * Status code (404) indicating that the requested resource is not
 	 * available.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_NOT_FOUND = 404;
 	
-	/**
-	 * Status code (405)
-	 *
-	 * Status code (405) indicating that the method specified in the
-	 * <code><em>Request-Line</em></code> is not allowed for the resource
+	/**
+	 * Status code (405) 
+	 * 
+	 * Status code (405) indicating that the method specified in the
+	 * <code><em>Request-Line</em></code> is not allowed for the resource
 	 * identified by the <code><em>Request-URI</em></code>.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_METHOD_NOT_ALLOWED = 405;
 	
-	/**
-	 * Status code (406)
-	 *
-	 * Status code (406) indicating that the resource identified by the
-	 * request is only capable of generating response entities which have
-	 * content characteristics not acceptable according to the accept
+	/**
+	 * Status code (406) 
+	 * 
+	 * Status code (406) indicating that the resource identified by the
+	 * request is only capable of generating response entities which have
+	 * content characteristics not acceptable according to the accept
 	 * headers sent in the request.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_NOT_ACCEPTABLE = 406;
 	
-	/**
-	 * Status code (407)
-	 *
-	 * Status code (407) indicating that the client <em>MUST</em> first
+	/**
+	 * Status code (407) 
+	 * 
+	 * Status code (407) indicating that the client <em>MUST</em> first
 	 * authenticate itself with the proxy.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_PROXY_AUTHENTICATION_REQUIRED = 407;
 	
-	/**
-	 * Status code (408)
-	 *
-	 * Status code (408) indicating that the client did not produce a
+	/**
+	 * Status code (408) 
+	 * 
+	 * Status code (408) indicating that the client did not produce a
 	 * request within the time that the server was prepared to wait.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_REQUEST_TIMEOUT = 408;
 	
-	/**
-	 * Status code (409)
-	 *
-	 * Status code (409) indicating that the request could not be
-	 * completed due to a conflict with the current state of the
+	/**
+	 * Status code (409) 
+	 * 
+	 * Status code (409) indicating that the request could not be
+	 * completed due to a conflict with the current state of the
 	 * resource.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_CONFLICT = 409;
 	
-	/**
-	 * Status code (410)
-	 *
-	 * Status code (410) indicating that the resource is no longer
-	 * available at the server and no forwarding address is known.
+	/**
+	 * Status code (410) 
+	 * 
+	 * Status code (410) indicating that the resource is no longer
+	 * available at the server and no forwarding address is known.
 	 * This condition <em>SHOULD</em> be considered permanent.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_GONE = 410;
 	
-	/**
-	 * Status code (411)
-	 *
-	 * Status code (411) indicating that the request cannot be handled
+	/**
+	 * Status code (411) 
+	 * 
+	 * Status code (411) indicating that the request cannot be handled
 	 * without a defined <code><em>Content-Length</em></code>.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_LENGTH_REQUIRED = 411;
 	
-	/**
-	 * Status code (412)
-	 *
-	 * Status code (412) indicating that the precondition given in one
-	 * or more of the request-header fields evaluated to false when it
+	/**
+	 * Status code (412) 
+	 * 
+	 * Status code (412) indicating that the precondition given in one
+	 * or more of the request-header fields evaluated to false when it
 	 * was tested on the server.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_PRECONDITION_FAILED = 412;
 	
-	/**
-	 * Status code (413)
-	 *
-	 * Status code (413) indicating that the server is refusing to process
-	 * the request because the request entity is larger than the server is
+	/**
+	 * Status code (413) 
+	 * 
+	 * Status code (413) indicating that the server is refusing to process
+	 * the request because the request entity is larger than the server is
 	 * willing or able to process.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_REQUEST_ENTITY_TOO_LARGE = 413;
 	
-	/**
-	 * Status code (414)
-	 *
-	 * Status code (414) indicating that the server is refusing to service
-	 * the request because the <code><em>Request-URI</em></code> is longer
+	/**
+	 * Status code (414) 
+	 * 
+	 * Status code (414) indicating that the server is refusing to service
+	 * the request because the <code><em>Request-URI</em></code> is longer
 	 * than the server is willing to interpret.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_REQUEST_URI_TOO_LONG = 414;
 	
-	/**
-	 * Status code (415)
-	 *
-	 * Status code (415) indicating that the server is refusing to service
-	 * the request because the entity of the request is in a format not
+	/**
+	 * Status code (415) 
+	 * 
+	 * Status code (415) indicating that the server is refusing to service
+	 * the request because the entity of the request is in a format not
 	 * supported by the requested resource for the requested method.
-	 *
-	 * @var int
+	 * 
+	 * @var int
 	 */
 	const W_UNSUPPORTED_MEDIA_TYPE = 415;
 	
-	/**
-	 * Status code (416)
-	 *
-	 * Status code (416) indicating that the server cannot serve the
+	/**
+	 * Status code (416) 
+	 * 
+	 * Status code (416) indicating that the server cannot serve the
 	 * requested byte range.
-	 *
-	 * @var int
-	 */
-	const W_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
-	
-	/**
-	 * Status code (417)
-	 *
-	 * Status code (417) indicating that the server could not meet the
-	 * expectation given in the Expect request header.
-	 *
-	 * @var int
-	 */
-	const W_EXPECTATION_FAILED = 417;
-	
-	/**
-	 * Status code (500)
-	 *
-	 * Status code (500) indicating an error inside the HTTP server
-	 * which prevented it from fulfilling the request.
-	 *
-	 * @var int
-	 */
-	const W_INTERNAL_SERVER_ERROR = 500;
-	
-	/**
-	 * Status code (501)
-	 *
-	 * Status code (501) indicating the HTTP server does not support
-	 * the functionality needed to fulfill the request.
-	 *
-	 * @var int
-	 */
-	const W_NOT_IMPLEMENTED = 501;
-	
-	/**
-	 * Status code (502)
-	 *
-	 * Status code (502) indicating that the HTTP server received an
-	 * invalid response from a server it consulted when acting as a
-	 * proxy or gateway.
-	 *
-	 * @var int
-	 */
-	const W_BAD_GATEWAY = 502;
-	
-	/**
-	 * Status code (503)
-	 *
-	 * Status code (503) indicating that the HTTP server is
-	 * temporarily overloaded, and unable to handle the request.
-	 *
-	 * @var int
-	 */
-	const W_SERVICE_UNAVAILABLE = 503;
-	
-	/**
-	 * Status code (504)
-	 *
-	 * Status code (504) indicating that the server did not receive
-	 * a timely response from the upstream server while acting as
-	 * a gateway or proxy.
-	 *
-	 * @var int
-	 */
-	const W_GATEWAY_TIMEOUT = 504;
-	
-	/**
-	 * Status code (505)
-	 *
-	 * Status code (505) indicating that the server does not support
-	 * or refuses to support the HTTP protocol version that was used
-	 * in the request message.
-	 *
-	 * @var int
-	 */
-	const W_HTTP_VERSION_NOT_SUPPORTED = 505;
-	
-	/**
-	 * 保存模板名字的顺序索引
-	 *
-	 * @var array
+	 * 
+	 * @var int
 	 */
-	protected $_bodyIndex = array();
+	const W_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
 	
-	/**
-	 * 设置输出的头部信息
-	 *
-	 * @var array
+	/**
+	 * Status code (417) 
+	 * 
+	 * Status code (417) indicating that the server could not meet the
+	 * expectation given in the Expect request header.
+	 * 
+	 * @var int
 	 */
-	private $_headers = array();
+	const W_EXPECTATION_FAILED = 417;
 	
-	/**
-	 * 是否直接跳转
-	 *
-	 * @var boolean
+	/**
+	 * Status code (500) 
+	 * 
+	 * Status code (500) indicating an error inside the HTTP server
+	 * which prevented it from fulfilling the request.
+	 * 
+	 * @var int
 	 */
-	private $_isRedirect = false;
+	const W_INTERNAL_SERVER_ERROR = 500;
 	
-	/**
-	 * 设置相应状态码
-	 *
-	 * @var string
+	/**
+	 * Status code (501) 
+	 * 
+	 * Status code (501) indicating the HTTP server does not support
+	 * the functionality needed to fulfill the request.
+	 * 
+	 * @var int
 	 */
-	private $_status = '';
+	const W_NOT_IMPLEMENTED = 501;
 	
-	/**
-	 * 返回类型
-	 *
-	 * @var string
+	/**
+	 * Status code (502) 
+	 * 
+	 * Status code (502) indicating that the HTTP server received an
+	 * invalid response from a server it consulted when acting as a
+	 * proxy or gateway.
+	 * 
+	 * @var int
 	 */
-	private $_type = '';
+	const W_BAD_GATEWAY = 502;
 	
-	/**
-	 * 用以保存响应内容
-	 *
-	 * @var array
+	/**
+	 * Status code (503) 
+	 * 
+	 * Status code (503) indicating that the HTTP server is
+	 * temporarily overloaded, and unable to handle the request.
+	 * 
+	 * @var int
 	 */
-	protected $_body = array();
+	const W_SERVICE_UNAVAILABLE = 503;
 	
-	/**
-	 * 输出的编码
-	 *
-	 * @var string
+	/**
+	 * Status code (504) 
+	 * 
+	 * Status code (504) indicating that the server did not receive
+	 * a timely response from the upstream server while acting as
+	 * a gateway or proxy.
+	 * 
+	 * @var int
 	 */
-	protected $_charset = 'utf-8';
+	const W_GATEWAY_TIMEOUT = 504;
 	
+	/**
+	 * Status code (505) 
+	 * 
+	 * Status code (505) indicating that the server does not support
+	 * or refuses to support the HTTP protocol version that was used
+	 * in the request message.
+	 * 
+	 * @var int
+	 */
+	const W_HTTP_VERSION_NOT_SUPPORTED = 505;
+
 	/**
-	 * 输出数据的保存
+	 * 状态码映射
 	 *
-	 * @var array
+	 * @param int $code 状态码
+	 * @return string 
 	 */
-	protected $_data = array();
+	public function codeMap($code) {
+		$map = array(
+			505 => 'http version not supported', 
+			504 => 'gateway timeout', 
+			503 => 'service unavailable', 
+			503 => 'bad gateway', 
+			502 => 'bad gateway', 
+			501 => 'not implemented', 
+			500 => 'internal server error', 
+			417 => 'expectation failed', 
+			416 => 'requested range not satisfiable', 
+			415 => 'unsupported media type', 
+			414 => 'request uri too long', 
+			413 => 'request entity too large', 
+			412 => 'precondition failed', 
+			411 => 'length required', 
+			410 => 'gone', 
+			409 => 'conflict', 
+			408 => 'request timeout', 
+			407 => 'proxy authentication required', 
+			406 => 'not acceptable', 
+			405 => 'method not allowed', 
+			404 => 'not found', 
+			403 => 'forbidden', 
+			402 => 'payment required', 
+			401 => 'unauthorized', 
+			400 => 'bad request', 
+			300 => 'multiple choices', 
+			301 => 'moved permanently', 
+			302 => 'moved temporarily', 
+			302 => 'found', 
+			303 => 'see other', 
+			304 => 'not modified', 
+			305 => 'use proxy', 
+			307 => 'temporary redirect', 
+			100 => 'continue', 
+			101 => 'witching protocols', 
+			200 => 'ok', 
+			201 => 'created', 
+			202 => 'accepted', 
+			203 => 'non authoritative information', 
+			204 => 'no content', 
+			205 => 'reset content', 
+			206 => 'partial content');
+		return isset($map[$code]) ? $map[$code] : '';
+	}
 
 	/**
 	 * @return string 返回当前请求的返回类型
@@ -553,6 +608,25 @@ public function addHeader($name, $value, $replace = false) {
 		$this->_headers[] = array('name' => $name, 'value' => $value, 'replace' => $replace);
 	}
 
+	/**
+	 * 获得输出的编码方式
+	 * 
+	 * @return string
+	 */
+	public function getCharset() {
+		return $this->_charset;
+	}
+
+	/**
+	 * 设置输出的编码方式
+	 * 
+	 * @param string $_charset 编码方式
+	 * @return void
+	 */
+	public function setCharset($_charset) {
+		$this->_charset = $_charset;
+	}
+
 	/**
 	 * 设置响应头状态码
 	 * 
@@ -565,16 +639,45 @@ public function setStatus($status, $message = '') {
 		if ($status < 100 || $status > 505) return;
 		$this->_status = (int) $status;
 	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::setBody()
+
+	/**
+	 * 设置响应内容
+	 * 
+	 * @param string $content 响应内容信息
+	 * @param string $name 相应内容片段名字,默认为null
+	 * @return void
 	 */
-	public function setBody($content, $name = 'default') {
-		if (!$content || !$name) return;
+	public function setBody($content, $name = null) {
+		if (!$content) return;
+		!$name && $name = 'default';
 		array_push($this->_bodyIndex, $name);
 		$this->_body[$name] = $content;
 	}
 
+	/**
+	 * 添加cookie信息
+	 * 
+	 * @param Cookie $cookie 添加cookie信息
+	 * @return void
+	 */
+	public function addCookie(Cookie $cookie) {
+		//TODO 待完善
+	}
+
+	/**
+	 * 发送一个错误的响应信息
+	 * 
+	 * @param int $status 错误码,默认为404
+	 * @param string $message 错误信息,默认为空
+	 * @return void
+	 */
+	public function sendError($status = self::W_NOT_FOUND, $message = '') {
+		if (!is_int($status) || $status < 400 || $status > 505) return;
+		$this->setBody($message, 'error');
+		$this->setStatus($status);
+		$this->sendResponse();
+	}
+
 	/**
 	 * 重定向一个响应信息
 	 * 
@@ -591,27 +694,23 @@ public function sendRedirect($location, $status = 302) {
 		$this->sendHeaders();
 		exit();
 	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::sendError()
-	*/
-	public function sendError($status = self::W_NOT_FOUND, $message = '') {
-		if (!is_int($status) || $status < 400 || $status > 505) return;
-		$this->setBody($message, 'error');
-		$this->setStatus($status);
-		$this->sendResponse();
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::sendResponse()
+
+	/**
+	 * 发送响应信息
+	 * 
+	 * 依次发送响应头和响应内容
+	 * 
+	 * @return void
 	 */
 	public function sendResponse() {
 		$this->sendHeaders();
 		$this->sendBody();
 	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::sendHeaders()
+
+	/**
+	 * 发送响应头部信息
+	 * 
+	 * @return void
 	 */
 	public function sendHeaders() {
 		if ($this->isSendedHeader()) return;
@@ -623,13 +722,17 @@ public function sendHeaders() {
 			header('Status: ' . $this->_status . ' ' . ucwords($this->codeMap($this->_status)));
 		}
 	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::sendBody()
+
+	/**
+	 * 发送响应内容
+	 * 
+	 * @return void
 	 */
 	public function sendBody() {
+		/*if ($this->_isAjax) echo "<?xml version=\"1.0\" encoding=\"utf-8\"?><ajax><![CDATA[";*/
 		foreach ($this->_bodyIndex as $key)
 			echo $this->_body[$key];
+		/*if ($this->_isAjax) echo "]]></ajax>";*/
 	}
 
 	/**
@@ -670,6 +773,7 @@ public function isSendedHeader($throw = false) {
 		$sended = headers_sent($file, $line);
 		if ($throw && $sended) throw new WindException(
 			__CLASS__ . ' the headers are sent in file ' . $file . ' on line ' . $line);
+		
 		return $sended;
 	}
 
@@ -699,23 +803,25 @@ public function clearBody() {
 	public function clearHeaders() {
 		$this->_headers = array();
 	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::getCharset()
-	*/
-	public function getCharset() {
-		return $this->_charset;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::setCharset()
-	*/
-	public function setCharset($_charset) {
-		$this->_charset = $_charset;
+
+	/**
+	 * 格式化响应头信息
+	 * 
+	 * @param string $name 响应头部名字
+	 * @return string
+	 */
+	private function _normalizeHeader($name) {
+		$filtered = str_replace(array('-', '_'), ' ', (string) $name);
+		$filtered = ucwords(strtolower($filtered));
+		$filtered = str_replace(' ', '-', $filtered);
+		return $filtered;
 	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::getData()
+
+	/**
+	 * 获得保存输出数据
+	 * 
+	 * @param string $var=.. 
+	 * @return mixed
 	 */
 	public function getData() {
 		$_tmp = $this->_data;
@@ -727,9 +833,12 @@ public function getData() {
 		}
 		return $_tmp;
 	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::setData()
+
+	/**
+	 * 设置保存输出数据
+	 * 
+	 * @param mixed $data 待保存的输出数据
+	 * @param string $key 输出数据的key名称,默认为空
 	 */
 	public function setData($data, $key = '', $merge = false) {
 		if ($key) {
@@ -742,68 +851,5 @@ public function setData($data, $key = '', $merge = false) {
 			if (is_array($data)) $this->_data = array_merge($this->_data, $data);
 		}
 	}
-	
-	/* (non-PHPdoc)
-	 * @see IWindResponse::codeMap()
-	 */
-	public function codeMap($code) {
-		$maps = array(
-			505 => 'http version not supported', 
-			504 => 'gateway timeout', 
-			503 => 'service unavailable', 
-			503 => 'bad gateway', 
-			502 => 'bad gateway', 
-			501 => 'not implemented', 
-			500 => 'internal server error', 
-			417 => 'expectation failed', 
-			416 => 'requested range not satisfiable', 
-			415 => 'unsupported media type', 
-			414 => 'request uri too long', 
-			413 => 'request entity too large', 
-			412 => 'precondition failed', 
-			411 => 'length required', 
-			410 => 'gone', 
-			409 => 'conflict', 
-			408 => 'request timeout', 
-			407 => 'proxy authentication required', 
-			406 => 'not acceptable', 
-			405 => 'method not allowed', 
-			404 => 'not found', 
-			403 => 'forbidden', 
-			402 => 'payment required', 
-			401 => 'unauthorized', 
-			400 => 'bad request', 
-			300 => 'multiple choices', 
-			301 => 'moved permanently', 
-			302 => 'moved temporarily', 
-			302 => 'found', 
-			303 => 'see other', 
-			304 => 'not modified', 
-			305 => 'use proxy', 
-			307 => 'temporary redirect', 
-			100 => 'continue', 
-			101 => 'witching protocols', 
-			200 => 'ok', 
-			201 => 'created', 
-			202 => 'accepted', 
-			203 => 'non authoritative information', 
-			204 => 'no content', 
-			205 => 'reset content', 
-			206 => 'partial content');
-		return isset($maps[$code]) ? $maps[$code] : '';
-	}
-
-	/**
-	 * 格式化响应头信息
-	 *
-	 * @param string $name 响应头部名字
-	 * @return string
-	 */
-	private function _normalizeHeader($name) {
-		$filtered = str_replace(array('-', '_'), ' ', (string) $name);
-		$filtered = ucwords(strtolower($filtered));
-		$filtered = str_replace(' ', '-', $filtered);
-		return $filtered;
-	}
 
 }
\ No newline at end of file
diff --git a/wind/http/transfer/AbstractWindHttp.php b/wind/http/transfer/AbstractWindHttp.php
index 67e49df5..cfee5260 100644
--- a/wind/http/transfer/AbstractWindHttp.php
+++ b/wind/http/transfer/AbstractWindHttp.php
@@ -1,205 +1,277 @@
-<?php
+<?php
 /**
+ *
  * @author Qian Su <aoxue.1988.su.qian@163.com>
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
  * @version $Id$
  * @package http
  * @subpackage transfer
- */
-abstract class AbstractWindHttp {
-	/**  
-	 * 发送的cookie
-	 * 
-	 * @var string   
-	 */
-	protected $cookie = array();
-	/**  
-	 * 发送的http头 
-	 * 
-	 * @var array   
-	 */
-	protected $header = array();
-	/**  
-	 * 发送的数据  
-	 * 
-	 * @var array
-	 */
-	protected $data = array();
-	/**
-	 * 错误信息
-	 * 
-	 * @var string
-	 */
-	protected $err = '';
-	/**
-	 * 错误编码
-	 * 
-	 * @var string
-	 */
-	protected $eno = 0;
-	
-	/**
-	 * 超时时间
-	 * 
-	 * @var string
-	 */
-	protected $timeout = 0;
-	/**  
-	 * 访问的URL地址 
-	 * 
-	 * @var array
-	 */
-	protected $url = '';
-	
-	/**
-	 * http连接句柄
-	 */
-	protected $httpHandler = null;
-
-	/**
-	 * 声明受保护的构造函数,避免在类的外界实例化
-	 * 
-	 * @param string $url
-	 * @param int $timeout
-	 */
-	public function __construct($url = '', $timeout = 30) {
-		$this->url = $url;
-		$this->timeout = $timeout;
-		$this->httpHandler = $this->createHttpHandler();
-	}
-
-	/**
-	 * 发送请求底层操作
-	 * 
-	 * @param string $method 请求方式
-	 * @param array $options 额外的主求参数
-	 * @return string 返回页根据请求的响应页面
-	 */
-	abstract public function send($method = self::GET, $options = array());
-
-	/**
-	 * 发送post请求
-	 * 
+ */
+abstract class AbstractWindHttp {
+	
+	/**  
+	 * @var WindHttp 单例 对象
+	 */
+	protected static $instance = null;
+	
+	/**
+	 * @var resource http连接句柄
+	 */
+	protected $httpResource = null;
+	
+	/**  
+	 * @var string 发送的cookie  
+	 */
+	protected $cookie = array();
+	/**  
+	 * @var array  发送的http头  
+	 */
+	protected $header = array();
+	/**  
+	 * @var array 访问的URL地址  
+	 */
+	protected $url = '';
+	/**  
+	 * @var array  发送的数据  
+	 */
+	protected $data = array();
+	
+	/**
+	 * @var string 错误信息
+	 */
+	protected $err = '';
+	/**
+	 * @var string 错误编码
+	 */
+	protected $eno = 0;
+	
+	/**
+	 * @var string 超时时间
+	 */
+	protected $timeout = 0;
+	
+	/**
+	 * @var strint 指向$cookie属性
+	 */
+	const _COOKIE = 'cookie';
+	/**
+	 * @var string 指向$header属性
+	 */
+	const _HEADER = 'header';
+	/**
+	 * @var string 指定$data属性
+	 */
+	const _DATA = 'data';
+	
+	const GET = 'GET';
+	const POST = 'POST';
+	/**
+	 * 声明受保护的构造函数,避免在类的外界实例化
+	 * @param string $url
+	 */
+	protected function __construct($url = '', $timeout = 5) {
+		$this->url = $url;
+		$this->timeout = $timeout;
+	}
+	
+	/**
+	 * 发送post请求
+	 * @param string $url 请求的url
 	 * @param array $data 请求的数据
 	 * @param array $header 发送请求的头
 	 * @param array $cookie  发送的cookie
 	 * @param array $options 额外的请求头
 	 * @return string 返回页根据请求的响应页面
-	 */
-	public function post($data = array(), $header = array(), $cookie = array(), $options = array()) {
-		$this->setHeader($header);
-		$this->setCookie($cookie);
-		$this->setData($data);
-		return $this->send('POST', $options);
-	}
-
-	/**
-	 * get方式传值
-	 * 
+	 */
+	public abstract function post($url = '', $data = array(), $header = array(), $cookie = array(), $options = array());
+	/**
+	 * get方式传值
+	 * @param string $url 请求的url
 	 * @param array $data 请求的数据
 	 * @param array $header 发送请求的头
 	 * @param array $cookie  发送的cookie
 	 * @param array $options 额外的请求头
 	 * @return string 返回页根据请求的响应页面
-	 */
-	public function get($data = array(), $header = array(), $cookie = array(), $options = array()) {
-		$this->setHeader($header);
-		$this->setCookie($cookie);
-		$this->setData($data);
-		return $this->send('GET', $options);
-	}
-
-	/**
-	 * 发送请求
-	 * 
+	 */
+	public abstract function get($url = '', $data = array(), $header = array(), $cookie = array(), $options = array());
+	/**
+	 * 发送请求底层操作
+	 * @param string $method 请求方式
+	 * @param array $options 额外的主求参数
+	 * @return string 返回页根据请求的响应页面
+	 */
+	public abstract function send($method = self::GET, $options = array());
+	
+	/**
+	 * 打开一个http请求
+	 * @return httpResource http请求指针
+	 */
+	public abstract function open();
+	/**
+	 * 发送请求
 	 * @param string $key  请求的名称
 	 * @param string $value 请求的值
 	 * @return boolean
-	 */
-	abstract public function request($key, $value = null);
-
+	 */
+	public abstract function request($key, $value = null);
 	/**
-	 * 响应用户的请求
-	 * 
+	 * 以数组格式请求
+	 * @param array $request
+	 * @return boolean
+	 */
+	public abstract function requestByArray($request = array());
+	/**
+	 * 响应用户的请求
 	 * @return string 返回响应
-	 */
-	abstract public function response();
-
-	/**
-	 * 创建http链接句柄并返回
-	 * 
-	 * @return handler 返回链接句柄
-	 */
-	abstract protected function createHttpHandler();
-
+	 */
+	public abstract function response();
+	/**
+	 *响应用户请求，只返回一行数据
+	 *@return string 
+	 */
+	public abstract function resonseLine();
 	/**
-	 * 取得http通信中的错误
-	 */
-	abstract public function getError();
-
-	/**
-	 * 关闭请求
-	 * 
-	 * @return boolean
-	 */
-	abstract public function close();
-
-	/**
-	 * 打开一个http请求,返回 http请求句柄
-	 * 
-	 * @return httpResource
-	 */
-	protected function getHttpHandler() {
-		return $this->httpHandler;
-	}
-
-	/**
-	 * 清理链接
-	 */
-	public function __destruct() {
-		$this->close();
-	}
-
-	/**
-	 * 设置http头,支持单个值设置和批量设置
-	 * 
-	 * @param string|array $key
-	 * @param string $value
-	 * @return void
-	 */
-	public function setHeader($value, $key = null) {
-		if (is_array($value)) return $this->header = array_merge($this->header, $value);
-		
-		if ($key === null) $key = count($this->header);
-		if (!isset($this->header[$key])) $this->header[$key] = $value;
-	}
-
-	/**
-	 * 设置cookie,支持单个值设置和批量设置
 	 * 
-	 * @param string|array $key
+	 * 关闭请求
+	 */
+	public abstract function close();
+	/**
+	 * 取得http通信中的错误
+	 */
+	public abstract function getError();
+	
+	/**
+	 * 获取http单例对象,对象唯一访问入口
+	 * @param string $url 请求的url
+	 * @return WindHttp
+	 */
+	public static abstract function getInstance($url = '');
+	
+	/**
+	 * 防止克隆
+	 */
+	protected function __clone() {}
+	
+	/**
+	 * 设置url
+	 * @param string|array $url
+	 */
+	public function setUrl($url) {
+		$url && $this->url = $url;
+	}
+	/**
+	 * 设置http头
+	 * @param string $key
 	 * @param string $value
-	 */
-	public function setCookie($key, $value = null) {
-		if (!$key) return;
-		if (is_array($key))
-			$this->cookie = array_merge($this->cookie, $key);
-		else
-			$this->cookie[$key] = $value;
-	}
-
-	/**
-	 * 设置data,支持单个值设置和批量设置
-	 * 
-	 * @param string|array $key
+	 */
+	public function setHeader($key, $value) {
+		$this->header[$key] = $value;
+	}
+	/**
+	 * 批量设置http头
+	 * @param array $datas 实际的http头，数组的值基于key/value形式
+	 * @return boolean
+	 */
+	public function setHeaders($headers = array()) {
+		return $this->setPropertityValue(self::_HEADER, $headers);
+	}
+	/**
+	 * 设置cookie
+	 * @param string $key
+	 * @param string $value
+	 */
+	public function setCookie($key, $value) {
+		$this->cookie[$key] = $value;
+	}
+	/**
+	 * 批量设置要传送的cookie
+	 * @param array $cookies 要传送的cookie，数组的值基于key/value形式
+	 * @return boolean
+	 */
+	public function setCookies($cookies = array()) {
+		return $this->setPropertityValue(self::_COOKIE, $cookies);
+	}
+	/**
+	 * 设置data
+	 * @param string $key
 	 * @param string $value
-	 */
-	public function setData($key, $value = null) {
-		if (!$key) return;
-		if (is_array($key))
-			$this->data = array_merge($this->data, $key);
-		else
-			$this->data[$key] = $value;
-	}
+	 */
+	public function setData($key, $value) {
+		$this->data[$key] = $value;
+	}
+	/**
+	 * 批量设置要传送的数据
+	 * @param array $datas 要传送的数据，数组的值基于key/value形式
+	 * @return boolean
+	 */
+	public function setDatas($datas = array()) {
+		return $this->setPropertityValue(self::_DATA, $datas);
+	}
+	/**
+	 *请空数据，重新发送请求 
+	 */
+	public function clear() {
+		$this->url = array();
+		$this->header = array();
+		$this->cookie = array();
+		$this->data = array();
+	}
+	
+	/**
+	 * 构请查询字符串
+	 * @param array $query  查询的关联数组
+	 * @param string $sep 分隔符
+	 * @return string
+	 */
+	public static function buildQuery($query, $sep = '&') {
+		if (!is_array($query)) {
+			return '';
+		}
+		$_query = '';
+		foreach ($query as $key => $value) {
+			$tmp = rawurlencode($key) . '=' . rawurlencode($value);
+			$_query .= $_query ? $sep . $tmp : $tmp;
+		}
+		return $_query;
+	}
+	/**
+	 * 以指定分隔符的形式来将数组转化成字符串
+	 * @param array $array 关联数组
+	 * @param strin $sep 分隔符
+	 * @return string
+	 */
+	public static function buildArray($array, $sep = ':') {
+		if (!is_array($array)) {
+			return array();
+		}
+		$_array = array();
+		foreach ($array as $key => $value) {
+			$_array[] = $key . $sep . $value;
+		}
+		return $_array;
+	}
+	
+	/**
+	 * 增量式设置对象的属性的值
+	 * @param string $propertity 要设置的对象的属性
+	 * @param array $value 要设置属性的值
+	 * @return boolean
+	 */
+	private function setPropertityValue($propertity, $value = array()) {
+		if (!in_array($propertity, array(self::_COOKIE, self::_DATA, self::_HEADER))) {
+			return false;
+		}
+		if (!is_array($value)) {
+			return false;
+		}
+		if (empty($this->$propertity)) {
+			$this->$propertity = $value;
+		} else {
+			foreach ($value as $key => $_value) {
+				$this->$propertity[$key] = $_value;
+			}
+		}
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/wind/http/transfer/WindHttpCurl.php b/wind/http/transfer/WindHttpCurl.php
index 6b7c2ec7..d3737f0d 100644
--- a/wind/http/transfer/WindHttpCurl.php
+++ b/wind/http/transfer/WindHttpCurl.php
@@ -1,96 +1,145 @@
-<?php
-Wind::import('WIND:http.transfer.AbstractWindHttp');
+<?php
+Wind::import('WIND:http.transfer.AbstractWindHttp');
 /**
+ * Enter description here ...
+ *
  * @author Qian Su <aoxue.1988.su.qian@163.com>
  * @copyright ©2003-2103 phpwind.com
- * @license http://www.phpwind.com/license.php
+ * @license http://www.windframework.com
  * @version $Id$
  * @package http
  * @subpackage transfer
- */
-final class WindHttpCurl extends AbstractWindHttp {
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::createHttpHandler()
-	 */
-	protected function createHttpHandler() {
-		return curl_init();
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::request()
-	 */
-	public function request($name, $value = null) {
-		return curl_setopt($this->getHttpHandler(), $name, $value);
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::response()
-	 */
-	public function response() {
-		return curl_exec($this->getHttpHandler());
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::close()
-	 */
-	public function close() {
-		if (null === $this->httpHandler) return;
-		curl_close($this->httpHandler);
-		$this->httpHandler = null;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::getError()
-	 */
-	public function getError() {
-		$this->err = curl_error($this->getHttpHandler());
-		$this->eno = curl_errno($this->getHttpHandler());
-		return $this->err ? $this->eno . ':' . $this->err : '';
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::send()
-	 */
-	public function send($method = 'GET', $options = array()) {
-		if ($this->data) {
-			switch (strtoupper($method)) {
-				case 'GET':
-					$_url = WindUrlHelper::argsToUrl($this->data);
-					$url = parse_url($this->url);
-					$this->url .= (isset($url['query']) ? '&' : '?') . $_url;
-					break;
-				case 'POST':
-					$this->request(CURLOPT_POST, 1);
-					$_url = WindUrlHelper::argsToUrl($this->data, false);
-					$this->request(CURLOPT_POSTFIELDS, $_url);
-					break;
-				default:
-					break;
-			}
-		}
-		
-		$this->request(CURLOPT_HEADER, 0);
-		$this->request(CURLOPT_FOLLOWLOCATION, 1);
-		$this->request(CURLOPT_RETURNTRANSFER, 1);
-		$this->request(CURLOPT_TIMEOUT, $this->timeout);
-		if ($options && is_array($options)) {
-			curl_setopt_array($this->getHttpHandler(), $options);
-		}
-		$_cookie = '';
-		foreach ($this->cookie as $key => $value) {
-			$_cookie .= ($_cookie !== '' ? "" : "; ") . $key . "=" . $value;
-		}
-		$this->request(CURLOPT_COOKIE, $_cookie);
-		
-		$this->setHeader('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1)', 'User-Agent');
-		$_header = array();
-		foreach ($this->header as $key => $value) {
-			$_header[] = $key . ": " . $value;
-		}
-		$_header && $this->request(CURLOPT_HTTPHEADER, $_header);
-		$this->request(CURLOPT_URL, $this->url);
-		return $this->response();
-	}
+ */
+final class WindHttpCurl extends AbstractWindHttp {
+	
+	protected function __construct($url = '', $timeout = 5) {
+		parent::__construct($url, $timeout);
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#open()
+	 */
+	public function open() {
+		if (null === $this->httpResource) {
+			$this->httpResource = curl_init();
+		}
+		return $this->httpResource;
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#request()
+	 */
+	public function request($name, $value = null) {
+		return curl_setopt($this->httpResource, $name, $value);
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#requestByArray()
+	 */
+	public function requestByArray($opt = array()) {
+		return curl_setopt_array($this->httpResource, $opt);
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#response()
+	 */
+	public function response() {
+		return curl_exec($this->httpResource);
+	}
+	
+	/**
+	 * @see wind/component/http/base/WindHttp#resonseLine()
+	 */
+	public function resonseLine(){
+		return '';
+	}
+	
+	/**
+	 * 释放资源
+	 */
+	public function close() {
+		if ($this->httpResource) {
+			curl_close($this->httpResource);
+			$this->httpResource = null;
+		}
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#getError()
+	 */
+	public function getError() {
+		$this->err = curl_error($this->httpResource);
+		$this->eno = curl_errno($this->httpResource);
+		return $this->err ? $this->eno . ':' . $this->err : '';
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#post()
+	 */
+	public function post($url = '', $data = array(), $header = array(), $cookie = array(), $option = array()) {
+		$url && $this->setUrl($url);
+		$header && is_array($header) && $this->setHeaders($header);
+		$cookie && is_array($cookie) && $this->setCookies($cookie);
+		$data && is_array($data) && $this->setDatas($data);
+		return $this->send(self::POST, $option);
+	}
+	/* 
+	 * @see wind/component/http/base/WindHttp#get()
+	 */
+	public function get($url = '', $data = array(), $header = array(), $cookie = array(), $option = array()) {
+		$url && $this->setUrl($url);
+		$header && is_array($header) && $this->setHeaders($header);
+		$cookie && is_array($cookie) && $this->setCookies($cookie);
+		$data && is_array($data) && $this->setDatas($data);
+		return $this->send(self::GET, $option);
+	}
+	/* 
+	 * @see wind/component/http/base/WindHttp#send()
+	 */
+	public function send($method = self::GET, $options = array()) {
+		if (null === $this->httpResource) {
+			$this->open();
+		}
+		$this->request(CURLOPT_HEADER, 0);
+		$this->request(CURLOPT_FOLLOWLOCATION, 1);
+		$this->request(CURLOPT_RETURNTRANSFER, 1);
+		$this->request(CURLOPT_TIMEOUT, $this->timeout);
+		if ($options && is_array($options)) {
+			$this->requestByArray($options);
+		}
+		if (self::GET === $method && $this->data) {
+			$get = self::buildQuery($this->data, '&');
+			$url = parse_url($this->url);
+			$sep = isset($url['query']) ? '&' : '?';
+			$this->url .= $sep . $get;
+		}
+		if (self::POST === $method && $this->data) {
+			$this->request(CURLOPT_POST, 1);
+			$this->request(CURLOPT_POSTFIELDS, self::buildQuery($this->data, '&'));
+		}
+		if ($this->cookie && $this->cookie) {
+			$this->request(CURLOPT_COOKIE, self::buildQuery($this->cookie, ';'));
+		}
+		if (empty($this->header)) {
+			$this->setHeader('User-Agent', 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1');
+		}
+		$this->request(CURLOPT_HTTPHEADER, self::buildArray($this->header, ':'));
+		$this->request(CURLOPT_URL, $this->url);
+		return $this->response();
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#requestByArray()
+	 */
+	public static function getInstance($url = '') {
+		if (null === self::$instance || false === (self::$instance instanceof self)) {
+			self::$instance = new self($url);
+		}
+		return self::$instance;
+	}
+	
+	public function __destruct() {
+		$this->close();
+	}
 }
 
diff --git a/wind/http/transfer/WindHttpSocket.php b/wind/http/transfer/WindHttpSocket.php
index 54254f3b..5c4c2329 100644
--- a/wind/http/transfer/WindHttpSocket.php
+++ b/wind/http/transfer/WindHttpSocket.php
@@ -1,5 +1,5 @@
-<?php
-Wind::import('WIND:http.transfer.AbstractWindHttp');
+<?php
+Wind::import('WIND:http.transfer.AbstractWindHttp');
 /**
  * socket操作
  *
@@ -9,105 +9,155 @@
  * @version $Id$
  * @package http
  * @subpackage transfer
- */
-final class WindHttpSocket extends AbstractWindHttp {
-	private $host = '';
-	private $port = 80;
-	private $path = '';
-	private $query = '';
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::createHttpHandler()
-	 */
-	protected function createHttpHandler() {
-		$url = parse_url($this->url);
-		
-		$this->host = isset($url['host']) ? $url['host'] : '';
-		$this->port = isset($url['port']) ? $url['port'] : 80;
-		$this->path = isset($url['path']) ? $url['path'] : '/';
-		$this->query = isset($url['query']) ? '?' . $url['query'] : '';
-		$this->path .= $this->query;
-		return fsockopen($this->host, $this->port, $this->eno, $this->err, $this->timeout);
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::request()
-	 */
-	public function request($name, $value = null) {
-		return fputs($this->getHttpHandler(), ($value ? $name . ': ' . $value : $name));
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::response()
-	 */
-	public function response() {
-		$response = '';
-		while (!feof($this->getHttpHandler())) {
-			$response .= fgets($this->getHttpHandler());
-		}
-		return $response;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::close()
-	 */
-	public function close() {
-		if ($this->httpHandler === null) return;
-		fclose($this->httpHandler);
-		$this->httpHandler = null;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::getError()
-	 */
-	public function getError() {
-		return $this->err ? $this->eno . ':' . $this->err : '';
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::send()
-	 */
-	public function send($method = 'GET', $options = array()) {
-		$method = strtoupper($method);
-		if ($this->data) {
-			switch ($method) {
-				case 'GET':
-					$_url = WindUrlHelper::argsToUrl($this->data);
-					$getData = ($this->query ? $this->query . '&' : '?') . $_url;
-					$this->path .= $getData;
-					break;
-				case 'POST':
-					$postData = WindUrlHelper::argsToUrl($this->data, false);
-					$this->setHeader('application/x-www-form-urlencoded', 'Content-Type');
-					$this->setHeader(strlen($postData) . "\r\n\r\n" . $postData, 'Content-Length');
-					break;
-				default:
-					break;
-			}
-		}
-		
-		$this->setHeader($method . " " . $this->path . " HTTP/1.1");
-		$this->setHeader($this->host, "Host");
-		$this->setHeader('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1)', 'User-Agent');
-		$this->setHeader('Close', 'Connection');
-		if ($this->cookie) {
-			$_cookit = WindUrlHelper::argsToUrl($this->cookie, false, ';=');
-			$this->setHeader($_cookit, "Cookie");
-		}
-		$options && $this->setHeader($options);
-		if (!empty($data)) $this->setHeader($data);
-		
-		$_request = '';
-		foreach ($this->header as $key => $value) {
-			if (is_string($key)) {
-				$_request .= $key . ': ' . $value;
-			} elseif (is_int($key)) {
-				$_request .= $value;
-			}
-			$_request .= "\r\n";
-		}
-		
-		$_request && $this->request($_request . "\r\n");
-		return $this->response();
-	}
+ */
+final class WindHttpSocket extends AbstractWindHttp {
+	
+	private $host = '';
+	private $port = 0;
+	private $path = '';
+	private $query = '';
+	
+	protected function __construct($url = '', $timeout = 5) {
+		parent::__construct($url, $timeout);
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#open()
+	 */
+	public function open() {
+		if (null === $this->httpResource) {
+			$url = parse_url($this->url);
+			$this->host = $url['host'];
+			$this->port = isset($url['port']) && $url['port'] ? $url['port'] : 80;
+			$this->path = isset($url['path']) && $url['path'] ? $url['path'] : '/';
+			$this->path .= $url['query'] ? '?' . $url['query'] : '';
+			$this->query = $url['query'];
+			$this->httpResource = fsockopen($this->host, $this->port, $this->eno, $this->err, $this->timeout);
+		}
+		return $this->httpResource;
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#request()
+	 */
+	public function request($name, $value = null) {
+		return fputs($this->httpResource, ($value ? $name . ': ' . $value : $name) . "\n");
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#requestByArray()
+	 */
+	public function requestByArray($request = array()) {
+		$_request = '';
+		foreach ($request as $key => $value) {
+			if (is_string($key)) {
+				$_request .= $key . ': ' . $value;
+			}
+			if (is_int($key)) {
+				$_request .= $value;
+			}
+			$_request .= "\n";
+		}
+		fputs($this->httpResource, $_request);
+	}
+	/* 
+	 * @see wind/component/http/base/WindHttp#resonseLine()
+	 */
+	public function response() {
+		$response = '';
+		while (!feof($this->httpResource)) {
+			$response .= fgets($this->httpResource);
+		}
+		return $response;
+	}
+	
+	/**
+	 *  @see wind/component/http/base/WindHttp#response()
+	 */
+	public function resonseLine(){
+		return feof($this->httpResource) ? '' : fgets($this->httpResource);
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#close()
+	 */
+	public function close() {
+		if ($this->httpResource) {
+			fclose($this->httpResource);
+			$this->httpResource = null;
+		}
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#getError()
+	 */
+	public function getError() {
+		return $this->err ? $this->eno . ':' . $this->err : '';
+	}
+	/* 
+	 * @see wind/component/http/base/WindHttp#post()
+	 */
+	public function post($url = '', $data = array(), $header = array(), $cookie = array(), $option = array()) {
+		$url && $this->setUrl($url);
+		$header && is_array($header) && $this->setHeaders($header);
+		$cookie && is_array($cookie) && $this->setCookies($cookie);
+		$data && is_array($data) && $this->setDatas($data);
+		return $this->send(self::POST, $option);
+	}
+	/* 
+	 * @see wind/component/http/base/WindHttp#get()
+	 */
+	public function get($url = '', $data = array(), $header = array(), $cookie = array(), $option = array()) {
+		$url && $this->setUrl($url);
+		$header && is_array($header) && $this->setHeaders($header);
+		$cookie && is_array($cookie) && $this->setCookies($cookie);
+		$data && is_array($data) && $this->setDatas($data);
+		return $this->send(self::GET, $option);
+	}
+	/* 
+	 * @see wind/component/http/base/WindHttp#send()
+	 */
+	public function send($method = self::GET, $options = array()) {
+		if (self::GET === $method && $this->data) {
+			$url = parse_url($this->url);
+			$get = self::buildQuery($this->data, '&');
+			$this->url .= ($url['query'] ? '&' : '?') . $get;
+		}
+		$this->open();
+		$this->setHeader("Host", $this->host);
+		$this->setHeader('User-Agent', 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1)');
+		if ($this->cookie && $this->cookie) {
+			$this->setHeader("Cookie", self::buildQuery($this->cookie, ';'));
+		}
+		if (self::POST === $method && $this->data) {
+			$data = self::buildQuery($this->data, '&');
+			$this->setHeader('Content-Type', 'application/x-www-form-urlencoded');
+			$this->setHeader('Content-Length', strlen($data));
+		}
+		if ($options) {
+			$this->setHeaders($options);
+		}
+		$this->setHeader('Connection', 'Close');
+		$this->request($method . " " . $this->path . " HTTP/1.1");
+		$this->requestByArray($this->header);
+		if ($data) {
+			$this->request("\n" . $data);
+		}
+		$this->request("\n");
+		return $this->response();
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#getInstance()
+	 */
+	public static function getInstance($url = '') {
+		if (null === self::$instance || false === (self::$instance instanceof self)) {
+			self::$instance = new self($url);
+		}
+		return self::$instance;
+	}
+	
+	public function __destruct() {
+		$this->close();
+	}
 }
\ No newline at end of file
diff --git a/wind/http/transfer/WindHttpStream.php b/wind/http/transfer/WindHttpStream.php
index 6eef1b90..ade1fb1f 100644
--- a/wind/http/transfer/WindHttpStream.php
+++ b/wind/http/transfer/WindHttpStream.php
@@ -1,5 +1,5 @@
-<?php
-Wind::import('WIND:http.transfer.AbstractWindHttp');
+<?php
+Wind::import('WIND:http.transfer.AbstractWindHttp');
 /**
  * Enter description here ...
  *
@@ -9,115 +9,168 @@
  * @version $Id$
  * @package http
  * @subpackage transfer
- */
-final class WindHttpStream extends AbstractWindHttp {
+ */
+final class WindHttpStream extends AbstractWindHttp {
+	const HTTP = 'http';
+	const HTTPS = 'https';
+	const FTP = 'ftp';
+	const FTPS = 'ftp';
+	const SOCKET = 'socket';
+	
 	/**
 	 * @var string 字节流对象
-	 */
-	private $context = null;
+	 */
+	private $context = null;
 	/**
 	 * @var string 通信协议
-	 */
-	private $wrapper = 'http';
-	private $host = '';
-	private $port = 80;
-	private $path = '';
-	private $query = '';
-
+	 */
+	private $wrapper = self::HTTP;
+	protected function __construct($url = '', $timeout = 5) {
+		parent::__construct($url, $timeout);
+		$this->context = stream_context_create();
+	}
+	
 	/**
 	 * 设置通信协议
 	 * @param string $wrapper
-	 */
-	public function setWrapper($wrapper = 'http') {
-		$this->wrapper = $wrapper;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::createHttpHandler()
-	 */
-	protected function createHttpHandler() {
-		$url = parse_url($this->url);
-		isset($url['scheme']) && $this->wrapper = $url['scheme'];
-		isset($url['host']) && $this->host = $url['host'];
-		isset($url['path']) && $this->path = $url['path'];
-		isset($url['query']) && $this->query = $url['query'];
-		$this->context = stream_context_create();
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::request()
-	 */
-	public function request($name, $value = null) {
-		return stream_context_set_option($this->context, $this->wrapper, $name, $value);
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::response()
-	 */
-	public function response() {
-		$response = '';
-		while (!feof($this->getHttpHandler())) {
-			$response .= fgets($this->getHttpHandler());
-		}
-		return $response;
-	}
-
+	 */
+	public function setWrapper($wrapper = self::HTTP) {
+		$this->wrapper = $wrapper;
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#open()
+	 */
+	public function open() {
+		if (null === $this->httpResource) {
+			$this->httpResource = fopen($this->url, 'r', false, $this->context);
+		}
+		return $this->httpResource;
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#request()
+	 */
+	public function request($name, $value = null) {
+		return stream_context_set_option($this->context, $this->wrapper, $name, $value);
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#requestByArray()
+	 */
+	public function requestByArray($opt = array()) {
+		foreach ($opt as $key => $value) {
+			if (false === $this->request($key, $value)) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#response()
+	 */
+	public function response() {
+		$response = '';
+		while (!feof($this->httpResource)) {
+			$response .= fgets($this->httpResource);
+		}
+		return $response;
+	}
+	
+	/**
+	 *  @see wind/component/http/base/WindHttp#resonseLine()
+	 */
+	public function resonseLine(){
+		return feof($this->httpResource) ? '' : fgets($this->httpResource);
+	}
+	
 	/**
 	 * 释放资源
-	 */
-	public function close() {
-		if ($this->httpHandler) {
-			fclose($this->httpHandler);
-			$this->httpHandler = null;
-			$this->context = null;
-		}
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::getError()
-	 */
-	public function getError() {
-		return $this->err ? $this->eno . ':' . $this->err : '';
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindHttp::send()
-	 */
-	public function send($method = 'GET', $options = array()) {
-		$method = strtoupper($method);
-		if ($this->data) {
-			switch ($method) {
-				case 'GET':
-					$_url = WindUrlHelper::argsToUrl($this->data);
-					$this->url .= ($this->query ? '&' : '?') . $_url;
-					break;
-				case 'POST':
-					$data = WindUrlHelper::argsToUrl($this->data, false);
-					$this->setHeader('application/x-www-form-urlencoded', 'Content-Type');
-					$this->setHeader(strlen($data), 'Content-Length');
-					$this->request('content', $data);
-					break;
-				default:
-					break;
-			}
-		}
-		$this->httpHandler = fopen($this->url, 'r', false, $this->context);
-		
-		$this->setHeader($this->host, "Host");
-		$this->setHeader('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1)', 'User-Agent');
-		$this->setHeader('Close', 'Connection');
-		if ($options) $this->setHeader($options);
-		if ($this->cookie) {
-			$_cookie = WindUrlHelper::argsToUrl($this->cookie, false, ';=');
-			$this->setHeader($_cookie, "Cookie");
-		}
-		$_header = '';
-		foreach ($this->header as $key => $value) {
-			$_header .= $key . ': ' . $value . "\r\n";
-		}
-		$_header && $this->request('header', $_header);
-		$this->request('method', $method);
-		$this->request('timeout', $this->timeout);
-		return $this->response();
-	}
+	 */
+	public function close() {
+		if ($this->httpResource) {
+			fclose($this->httpResource);
+			$this->httpResource = null;
+			$this->context = null;
+		}
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#getError()
+	 */
+	public function getError() {
+		return $this->err ? $this->eno . ':' . $this->err : '';
+	}
+	
+	/* 
+	 * @see wind/component/http/base/WindHttp#post()
+	 */
+	public function post($url = '', $data = array(), $header = array(), $cookie = array(), $option = array()) {
+		$url && $this->setUrl($url);
+		$header && is_array($header) && $this->setHeaders($header);
+		$cookie && is_array($cookie) && $this->setCookies($cookie);
+		$data && is_array($data) && $this->setDatas($data);
+		return $this->send(self::POST, $option);
+	}
+	/* 
+	 * @see wind/component/http/base/WindHttp#get()
+	 */
+	public function get($url = '', $data = array(), $header = array(), $cookie = array(), $option = array()) {
+		$url && $this->setUrl($url);
+		$header && is_array($header) && $this->setHeaders($header);
+		$cookie && is_array($cookie) && $this->setCookies($cookie);
+		$data && is_array($data) && $this->setDatas($data);
+		return $this->send(self::GET, $option);
+	}
+	/* 
+	 * @see wind/component/http/base/WindHttp#send()
+	 */
+	public function send($method = self::GET, $options = array()) {
+		$url = parse_url($this->url);
+		if (self::GET === $method && $this->data) {
+			$get = self::buildQuery($this->data, '&');
+			$this->url .= ($url['query'] ? '&' : '?') . $get;
+		}
+		if (self::POST === $method && $this->data) {
+			$data = self::buildQuery($this->data, '&');
+			$this->setHeader('Content-Type', 'application/x-www-form-urlencoded');
+			$this->setHeader('Content-Length', strlen($data));
+		}
+		$this->setHeader("Host", $url['host']);
+		$this->setHeader('User-Agent', 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1)');
+		if ($this->cookie) {
+			$this->setHeader("Cookie", self::buildQuery($this->cookie, ';'));
+		}
+		$this->setHeader('Connection', 'Close');
+		$this->request('method', $method);
+		$this->request('timeout', $this->timeout);
+		
+		if ($this->header) {
+			$header = '';
+			foreach ($this->header as $key => $value) {
+				$header .= $key . ': ' . $value . "\n";
+			}
+			$this->request('header', $header);
+		}
+		$data && $this->request('content', $data);
+		$options && is_array($options) && $this->requestByArray($options);
+		$this->open();
+		return $this->response();
+	}
+	
+	/**
+	 * @see wind/component/http/base/WindHttp#getInstance()
+	 *
+	 */
+	public static function getInstance($url = '') {
+		if (null === self::$instance || false === (self::$instance instanceof self)) {
+			self::$instance = new self($url);
+		}
+		return self::$instance;
+	}
+	
+	public function __destruct() {
+		$this->close();
+	}
 }
\ No newline at end of file
diff --git a/wind/http/transfer/WindHttpTransferException.php b/wind/http/transfer/WindHttpTransferException.php
deleted file mode 100644
index 37e7fe2f..00000000
--- a/wind/http/transfer/WindHttpTransferException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * @author Qiong Wu <papa0924@gmail.com> 2012-4-5
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.phpwind.com/license.php
- * @version $Id$
- * @package http
- * @subpackage transfer
- */
-class WindHttpTransferException extends WindException {
-
-}
-
-?>
\ No newline at end of file
diff --git a/wind/i18n/WindLangResource.php b/wind/i18n/WindLangResource.php
index be7162a7..fa4dbf5a 100644
--- a/wind/i18n/WindLangResource.php
+++ b/wind/i18n/WindLangResource.php
@@ -75,15 +75,14 @@ public function getMessage($message, $params = array()) {
 	 */
 	protected function translate($message) {
 		$package = $file = '';
-		$_message = $message;
-		if (strpos($_message, ':') != false) list($package, $_message) = explode(':', $_message, 2);
-		if (strpos($_message, '.') != false) list($file, $key) = explode('.', $_message, 2);
+		if (strpos($message, ':') != false) list($package, $message) = explode(':', $message, 2);
+		if (strpos($message, '.') != false) list($file, $key) = explode('.', $message, 2);
 		$path = $this->resolvedPath($package);
 		if (is_file($path . '/' . $file . $this->suffix)) {
 			$path = $path . '/' . $file . $this->suffix;
 		} elseif (is_file($path . '/' . $this->default . $this->suffix)) {
 			$path = $path . '/' . $this->default . $this->suffix;
-			$key = $_message;
+			$key = $message;
 			$file = $this->default;
 		} else
 			return $message;
@@ -100,7 +99,7 @@ protected function translate($message) {
 			}
 			$this->_messages[$path] = $messages;
 		}
-		return isset($this->_messages[$path][$key]) ? $this->_messages[$path][$key] : $message;
+		return isset($this->_messages[$path][$key]) ? $this->_messages[$path][$key] : $key;
 	}
 
 	/**
diff --git a/wind/license b/wind/license
deleted file mode 100644
index 1c1a2a93..00000000
--- a/wind/license
+++ /dev/null
@@ -1,31 +0,0 @@
-License of WindFramework
-
-The WindFramework is free software. It is released under the terms of the following BSD License.
-
-Copyright (c) 2003-2012, phpwind.com
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of phpwind.com nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/wind/mail/WindMail.php b/wind/mail/WindMail.php
index 64fed51b..a0fc5df5 100644
--- a/wind/mail/WindMail.php
+++ b/wind/mail/WindMail.php
@@ -83,7 +83,7 @@ class WindMail {
 	//邮件编码
 	const ENCODE_7BIT = '7bit';
 	const ENCODE_8BIT = '8bit';
-	const ENCODE_QP = 'qp';
+	const ENCODE_QP = 'quoted-printable';
 	const ENCODE_BASE64 = 'base64';
 	const ENCODE_BINARY = 'binary';
 	
@@ -464,8 +464,6 @@ private function _boundary($i = 0) {
 	 */
 	private function _encode($message, $encode = '') {
 		$encode || $encode = $this->encode;
-		if (in_array($encode, array(self::ENCODE_7BIT, self::ENCODE_8BIT)))
-			$encode = self::ENCODE_BINARY;
 		$mailEncoder = Wind::import("WIND:mail.encode.WindMail" . ucfirst($encode));
 		if (!class_exists($mailEncoder)) throw new WindMailException(
 			'[mail.WindMail._encode] encod class for ' . $encode . ' is not exist.');
@@ -483,8 +481,6 @@ private function _encode($message, $encode = '') {
 	 */
 	private function _encodeHeader($message, $encode = '') {
 		$encode || $encode = $this->encode;
-		if (in_array($encode, array(self::ENCODE_7BIT, self::ENCODE_8BIT)))
-			$encode = self::ENCODE_BINARY;
 		$mailEncoder = Wind::import("WIND:mail.encode.WindMail" . ucfirst($encode));
 		if (!class_exists($mailEncoder)) throw new WindMailException(
 			'[mail.WindMail._encode] encod class for ' . $encode . ' is not exist.');
diff --git a/wind/mail/encode/WindMailBinary.php b/wind/mail/encode/WindMailBinary.php
deleted file mode 100644
index 50281361..00000000
--- a/wind/mail/encode/WindMailBinary.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-Wind::import("WIND:mail.IWindMailEncoder");
-/**
- * 二进制编码，消息体内容是没有经过编码的原始数据
- *
- * @author Shi Long <long.shi@alibaba-inc.com>
- * @copyright ©2003-2103 phpwind.com
- * @license http://www.windframework.com
- * @version $id$
- * @package mail
- * @subpackage encode
- */
-class WindMailBinary implements IWindMailEncoder {
-	/* (non-PHPdoc)
-	 * @see IWindMailEncoder::encode()
-	 */
-	public function encode($string, $length, $linebreak) {
-		// TODO Auto-generated method stub
-		return $string;
-	}
-
-	/* (non-PHPdoc)
-	 * @see IWindMailEncoder::decode()
-	 */
-	public function decode($string, $length, $linebreak) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	/* (non-PHPdoc)
-	 * @see IWindMailEncoder::encodeHeader()
-	 */
-	public function encodeHeader($string, $charset, $length, $linebread) {
-		// TODO Auto-generated method stub
-		return $string;
-	}
-
-	/* (non-PHPdoc)
-	 * @see IWindMailEncoder::decodeHeader()
-	 */
-	public function decodeHeader($string, $charset, $length, $linebread) {
-		// TODO Auto-generated method stub
-		
-	}
-
-
-}
-
-?>
\ No newline at end of file
diff --git a/wind/mail/sender/WindPhpMail.php b/wind/mail/sender/WindPhpMail.php
index cc6801b7..18960d09 100644
--- a/wind/mail/sender/WindPhpMail.php
+++ b/wind/mail/sender/WindPhpMail.php
@@ -15,7 +15,7 @@ class WindPhpMail implements IWindSendMail {
 	/* (non-PHPdoc)
 	 * @see IWindSendMail::send()
 	 */
-	public function send($mail, $config = array()) {
+	public function send(WindMail $mail, $config = array()) {
 		$to = '';
 		foreach ($mail->getRecipients() as $key => $value)
 			$to .= $to ? ', ' . $value : $value;
diff --git a/wind/mq/IWindMq.php b/wind/mq/IWindMq.php
new file mode 100644
index 00000000..f6dec68e
--- /dev/null
+++ b/wind/mq/IWindMq.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * 消息队列接口定义
+ * 
+ * 定义了基础的消息队列接口。<code>
+ * push  插入一条消息
+ * pop   弹出一条消息，被弹出的值同时会在队列中删除
+ * delete 删除一个队列
+ * length 队列长度
+ * range  取消息列表，offset默认为1，offset为0时取出全部消息
+ * </code>
+ * 消息队列中数据的存取形式是先进先出的，即先插入的输入先弹出。
+ * @author Qiong Wu <papa0924@gmail.com>
+ * @copyright ©2003-2103 phpwind.com
+ * @license http://www.windframework.com
+ * @version $Id$
+ * @package mq
+ */
+interface IWindMq {
+
+	/**
+	 * 返回mq的对象
+	 * 
+	 * @return object
+	 */
+	public function getMq();
+
+	/**
+	 * 向消息队列中插入一条数据
+	 *
+	 * 向消息队列中插入一条数据,消息会被插入到队尾。
+	 * 当插入失败时抛出异常
+	 * @param string $key
+	 * @param string $value 
+	 * @throws WindMqException 
+	 */
+	public function push($key, $value);
+
+	/**
+	 * 从消息队列中弹出一条数据
+	 * 
+	 * 消息队列总是遵循先进先出的数据存取原则。
+	 * 该接口将队列首部的数据弹出，并返回。
+	 * @param string $key
+	 * @return string
+	 */
+	public function pop($key);
+
+	/**
+	 * 返回名称为key的list中start开始，offset个元素（offset为 0 ，返回所有）
+	 * 当$start为负数时，从对尾开始
+	 * @param string $key
+	 * @param int $start
+	 * @param int $offset 
+	 * @return array
+	 */
+	public function range($key, $start = 0, $offset = 1);
+
+	/**
+	 * 返回队列长度
+	 *
+	 * @param string $key
+	 * @return int
+	 */
+	public function length($key);
+
+	/**
+	 * 删除队列key
+	 *
+	 * @param string $key
+	 * @return boolean
+	 */
+	public function delete($key);
+
+}
+
+?>
\ No newline at end of file
diff --git a/wind/mq/WindMqCluster.php b/wind/mq/WindMqCluster.php
new file mode 100644
index 00000000..b2349c5a
--- /dev/null
+++ b/wind/mq/WindMqCluster.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Enter description here ...
+ *
+ * @author Qiong Wu <papa0924@gmail.com>
+ * @copyright ©2003-2103 phpwind.com
+ * @version $Id$
+ * @package 
+ */
+class WindMqCluster {
+	//TODO - Insert your code here
+
+
+}
+
+?>
\ No newline at end of file
diff --git a/wind/mq/exception/WindMqClusterException.php b/wind/mq/exception/WindMqClusterException.php
new file mode 100644
index 00000000..49d6090e
--- /dev/null
+++ b/wind/mq/exception/WindMqClusterException.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * wind分布式部署管理
+ *
+ * @author Qiong Wu <papa0924@gmail.com>
+ * @copyright ©2003-2103 phpwind.com
+ * @version $Id$
+ * @package 
+ */
+class WindMqClusterException extends WindException {
+	//TODO - Insert your code here
+
+
+}
+
+?>
\ No newline at end of file
diff --git a/wind/mq/exception/WindMqException.php b/wind/mq/exception/WindMqException.php
new file mode 100644
index 00000000..4da823ad
--- /dev/null
+++ b/wind/mq/exception/WindMqException.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * 队列异常类型
+ *
+ * @author Qiong Wu <papa0924@gmail.com>
+ * @copyright ©2003-2103 phpwind.com
+ * @version $Id$
+ * @package mq
+ * @subpackage exception
+ */
+class WindMqException extends WindException {
+	//TODO - Insert your code here
+
+
+}
+
+?>
\ No newline at end of file
diff --git a/wind/mq/implements/WindMqBeanstalk.php b/wind/mq/implements/WindMqBeanstalk.php
new file mode 100644
index 00000000..7d72f333
--- /dev/null
+++ b/wind/mq/implements/WindMqBeanstalk.php
@@ -0,0 +1,72 @@
+<?php
+Wind::import('WIND:mq.exception.WindMqException');
+Wind::import('WIND:mq.IWindMq');
+/**
+ * 基于beanstalk的消息队列实现
+ * 
+ * @author Qiong Wu <papa0924@gmail.com>
+ * @copyright ©2003-2103 phpwind.com
+ * @version $Id$
+ * @package mq
+ * @subpackage implements
+ */
+class WindMqBeanstalk implements IWindMq {
+	
+	
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::getMq()
+	 */
+	public function getMq() {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::push()
+	 */
+	public function push($key, $value) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::pop()
+	 */
+	public function pop($key) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::range()
+	 */
+	public function range($key, $start = 0, $offset = 1) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::length()
+	 */
+	public function length($key) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::delete()
+	 */
+	public function delete($key) {
+		// TODO Auto-generated method stub
+	
+
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/wind/mq/implements/WindMqMemcacheq.php b/wind/mq/implements/WindMqMemcacheq.php
new file mode 100644
index 00000000..45a35157
--- /dev/null
+++ b/wind/mq/implements/WindMqMemcacheq.php
@@ -0,0 +1,103 @@
+<?php
+Wind::import('WIND:mq.exception.WindMqException');
+Wind::import('WIND:mq.IWindMq');
+/**
+ * 基于memcacheq的队列实现
+ * 
+ * memcacheq只支持<code>
+ * push
+ * pop
+ * delete</code>
+ * @author Qiong Wu <papa0924@gmail.com>
+ * @copyright ©2003-2103 phpwind.com
+ * @version $Id$
+ * @package mq
+ * @subpackage implements
+ */
+class WindMqMemcacheq extends WindModule implements IWindMq {
+	
+	/**
+	 * @var Memcahce
+	 */
+	protected $mq = null;
+	
+	private $host = '127.0.0.1';
+	private $port = '21201';
+
+	/**
+	 * @param string $connectStr 链接字符串
+	 */
+	public function __construct($host = '127.0.0.1', $port = '21201') {
+		$this->host = $host;
+		$this->port = $port;
+	}
+
+	/* (non-PHPdoc)
+	 * @see WindModule::setConfig()
+	 */
+	public function setConfig($config) {
+		parent::setConfig($config);
+		if ($_host = $this->getConfig('host')) $this->host = $_host;
+		if ($_port = $this->getConfig('port')) $this->port = $_port;
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::getMq()
+	 */
+	public function getMq() {
+		if ($this->mq === null && !($this->mq = $this->_getMq())) {
+			if (!class_exists('memcache')) throw new WindMqException(
+				"[mq.implements.WindMqRedis.getMq] Class 'redis' not found");
+			$this->mq = new Memcache();
+			if (!$this->mq->connect($this->host, $this->port)) throw new WindMqException(
+				"[mq.implements.WindMqMemcacheq.getMq] Can't connect to " . $this->host . ":" . $this->port . ". name or service not known");
+		}
+		return $this->mq;
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::push()
+	 */
+	public function push($key, $value) {
+		return $this->getMq()->set($key, $value);
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::pop()
+	 */
+	public function pop($key) {
+		return $this->getMq()->get($key);
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::range()
+	 */
+	public function range($key, $start = 0, $offset = 1) {
+		throw new WindMqException("[mq.WindMqMemcacheq.range] unimplemented method 'range'");
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::length()
+	 */
+	public function length($key) {
+		throw new WindMqException("[mq.WindMqMemcacheq.range] unimplemented method 'range'");
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::delete()
+	 */
+	public function delete($key) {
+		foreach (func_get_args() as $_key) {
+			if ($this->getMq()->delete($_key)) continue;
+			return false;
+		}
+		return true;
+	}
+
+	public function __destruct() {
+		$this->getMq()->close();
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/wind/mq/implements/WindMqRabbit.php b/wind/mq/implements/WindMqRabbit.php
new file mode 100644
index 00000000..722c7ee7
--- /dev/null
+++ b/wind/mq/implements/WindMqRabbit.php
@@ -0,0 +1,115 @@
+<?php
+Wind::import('WIND:mq.exception.WindMqException');
+Wind::import('WIND:mq.IWindMq');
+/**
+ * Enter description here ...
+ *
+ * @author Qiong Wu <papa0924@gmail.com>
+ * @copyright ©2003-2103 phpwind.com
+ * @version $Id$
+ * @package 
+ */
+class WindMqRabbit implements IWindMq {
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::push()
+	 */
+	public function push($key, $value) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::pop()
+	 */
+	public function pop($key) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::pushR()
+	 */
+	public function pushR($key, $value) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::PopL()
+	 */
+	public function PopL($key) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::set()
+	 */
+	public function set($key, $index, $value) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::get()
+	 */
+	public function get($key, $index) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::batchPush()
+	 */
+	public function batchPush($keys, $values) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::range()
+	 */
+	public function range($key, $start = 0, $offset = 1) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::increment()
+	 */
+	public function increment($key, $by = null) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::decrement()
+	 */
+	public function decrement($key, $by = null) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::clear()
+	 */
+	public function clear($key) {
+		// TODO Auto-generated method stub
+	
+
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/wind/mq/implements/WindMqRedis.php b/wind/mq/implements/WindMqRedis.php
new file mode 100644
index 00000000..ef3b1169
--- /dev/null
+++ b/wind/mq/implements/WindMqRedis.php
@@ -0,0 +1,137 @@
+<?php
+Wind::import('WIND:mq.exception.WindMqException');
+Wind::import('WIND:mq.IWindMq');
+/**
+ * 基于redis list 消息队列实现,依赖与phpredis扩展
+ * 
+ * redis消息队列，支持<code>
+ * push  支持优先级
+ * pop
+ * delete 支持批量删除($key1,$key2,$key3,$key4)
+ * length
+ * range
+ * </code>
+ * @author Qiong Wu <papa0924@gmail.com>
+ * @copyright ©2003-2103 phpwind.com
+ * @version $Id$
+ * @package mq
+ * @subpackage implements
+ */
+class WindMqRedis extends WindModule implements IWindMq {
+	
+	/**
+	 * @var Redis
+	 */
+	protected $mq = null;
+	
+	private $zCache = '_zList'; //队列优先级实现
+	private $host = '127.0.0.1';
+	private $port = '6379';
+	private $auth;
+
+	/**
+	 * @param string $connectStr 链接字符串
+	 */
+	public function __construct($host = '127.0.0.1', $port = '6379', $auth = '') {
+		$this->host = $host;
+		$this->port = $port;
+		$this->auth = $auth;
+	}
+
+	/* (non-PHPdoc)
+	 * @see WindModule::setConfig()
+	 */
+	public function setConfig($config) {
+		parent::setConfig($config);
+		if ($_host = $this->getConfig('host')) $this->host = $_host;
+		if ($_port = $this->getConfig('port')) $this->port = $_port;
+		if ($_auth = $this->getConfig('auth')) $this->auth = $_auth;
+	}
+
+	/**
+	 * @see IWindMq::getMq()
+	 * @return Redis
+	 */
+	public function getMq() {
+		if ($this->mq === null && !($this->mq = $this->_getMq())) {
+			if (!class_exists('redis')) throw new WindMqException(
+				"[mq.implements.WindMqRedis.getMq] Class 'redis' not found");
+			
+			$this->mq = new Redis();
+			if (!$this->mq->connect($this->host, $this->port)) throw new WindMqException(
+				"[mq.implements.WindMqRedis.getMq] Can't connect to " . $this->host . ":" . $this->port . ". name or service not known");
+			if ($this->auth) {
+				if (!$this->mq->auth($this->auth)) throw new WindMqException(
+					'[mq.implements.WindMqRedis.getMq] Permission denied ');
+			}
+		}
+		return $this->mq;
+	}
+
+	/**
+	 * 向消息队列中插入一条数据
+	 * 
+	 * 增加优先级支持，优先级队列为一个唯一(值不可重复)队列
+	 * @see IWindMq::push()
+	 * @param string $key
+	 * @param string $value
+	 * @param int $priority 优先级，默认为null(无优先级)
+	 * @return boolean
+	 */
+	public function push($key, $value, $priority = null) {
+		$_result = false;
+		if ($priority !== null) {
+			$priority = intval($priority);
+			$_result = $this->getMq()->zAdd($key, $priority, $value);
+			$_result && $this->getMq()->sAdd($this->zCache, $key);
+		} else
+			$_result = $this->getMq()->rPush($key, $value);
+		return $_result;
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::pop()
+	 */
+	public function pop($key) {
+		$_result = '';
+		if ($this->getMq()->sIsMember($this->zCache, $key)) {
+			$_result = $this->getMq()->zRange($key, 0, 1);
+			if (empty($_result)) return '';
+			$this->getMq()->zDelete($key, $_result[0]);
+			$_result = $_result[0];
+		}
+		$_result = $this->getMq()->lPop($key);
+		return $_result;
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::range()
+	 */
+	public function range($key, $start = 0, $offset = 1) {
+		$start = intval($start);
+		$offset = intval($offset);
+		$_r = $this->getMq()->sIsMember($this->zCache, $key);
+		return call_user_func_array(array($this->getMq(), ($_r ? 'zRange' : 'lRange')), 
+			array($key, $start, $start + ($offset - 1)));
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::length()
+	 */
+	public function length($key) {
+		$_r = $this->getMq()->sIsMember($this->zCache, $key);
+		return $key ? call_user_func_array(array($this->getMq(), ($_r ? 'zSize' : 'lSize')), 
+			array($key)) : 0;
+	}
+
+	/* (non-PHPdoc)
+	 * @see IWindMq::clear()
+	 */
+	public function delete($key) {
+		$this->getMq()->sRem($this->zCache, $key);
+		return call_user_func_array(array($this->getMq(), 'delete'), func_get_args());
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/wind/parser/WindConfigParser.php b/wind/parser/WindConfigParser.php
index 607f411b..de910bd6 100644
--- a/wind/parser/WindConfigParser.php
+++ b/wind/parser/WindConfigParser.php
@@ -14,12 +14,15 @@
  * @package parser
  */
 class WindConfigParser implements IWindConfigParser {
+	
 	const CONFIG_XML = '.XML';
+	
 	const CONFIG_PHP = '.PHP';
+	
 	const CONFIG_INI = '.INI';
-	const CONFIG_PROPERTIES = '.PROPERTIES';
-	private $configs = array();
 	
+	const CONFIG_PROPERTIES = '.PROPERTIES';
+
 	/* (non-PHPdoc)
      * @see IWindConfigParser::parse()
      */
@@ -51,8 +54,9 @@ public function parse($configPath, $alias = '', $append = '', AbstractWindCache
 	 */
 	private function setCache($alias, $append, $cache, $data) {
 		if ($append) {
-			$this->configs[$alias] = $data;
-			$cache->set($append, $this->configs);
+			$_config = (array) $cache->get($append);
+			$_config[$alias] = $data;
+			$cache->set($append, $_config);
 		} else {
 			$cache->set($alias, $data);
 		}
@@ -68,9 +72,9 @@ private function setCache($alias, $append, $cache, $data) {
 	 */
 	private function getCache($alias, $append, $cache) {
 		if (!$append) return $cache->get($alias);
-		if (isset($this->configs[$alias])) return $this->configs[$alias];
-		$this->configs = $cache->get($append);
-		return isset($this->configs[$alias]) ? $this->configs[$alias] : array();
+		
+		$config = $cache->get($append);
+		return isset($config[$alias]) ? $config[$alias] : array();
 	}
 
 	/**
diff --git a/wind/parser/WindIniParser.php b/wind/parser/WindIniParser.php
index 90dee4a5..31243172 100644
--- a/wind/parser/WindIniParser.php
+++ b/wind/parser/WindIniParser.php
@@ -160,6 +160,7 @@ private function merge($key, $value, &$data = array()) {
 		if (is_array($value[$c_key])) {
 			$this->merge($c_key, $value[$c_key], $data[$key]);
 		} else {
+			if (!is_array($data[$key])) $data[$key] = array($data[$key]);
 			$data[$key][$c_key] = $value[$c_key];
 		}
 		return $data;
diff --git a/wind/readme b/wind/readme
index f03e8bed..0a5b5962 100644
--- a/wind/readme
+++ b/wind/readme
@@ -1,16 +1,4 @@
-windframework是一个轻量级的php开源框架。它以组件工厂为核心，提供了像MVC，数据持久化，视图模板引擎等应用技术。 
-此外windframework采取了一种组件化的开发模式。虽然目前的组件库还不算丰富健壮，但是基于这种开发模式，
-使组件的扩展变得非常的容易。 windframework拥有一个强健的内核，它实现了基于配置的Ioc控制反转技术。
-开发者只需要简单的配置，就可以实现类的依赖注入，完全实现了类与类的松耦合
-
-https://github.com/phpwind/windframework
-http://phpwind.github.com/windframework/
-
-环境要求：
-php5.1.2及以上版本。
-可发布的web环境，apache或nginx
-
-当前版本说明：
+当前 版本说明：
 wind_0.8.0
 release date: 2011.09.29
 description:
diff --git a/wind/router/AbstractWindRouter.php b/wind/router/AbstractWindRouter.php
index 3eae5f1b..7895384d 100644
--- a/wind/router/AbstractWindRouter.php
+++ b/wind/router/AbstractWindRouter.php
@@ -16,7 +16,9 @@ abstract class AbstractWindRouter extends WindHandlerInterceptorChain {
 	protected $module = 'default';
 	protected $controller = 'index';
 	protected $action = 'run';
+	
 	protected $defaultRoute = '';
+	
 	protected $_action;
 	protected $_controller;
 	protected $_module;
@@ -38,7 +40,7 @@ abstract public function route($request);
 	 * @return string
 	 */
 	abstract public function assemble($action, $args = array(), $route = '');
-	
+
 	/* (non-PHPdoc)
 	 * @see WindModule::setConfig()
 	 */
@@ -68,16 +70,14 @@ public function setConfig($config) {
 	 * @return void
 	 */
 	protected function setParams($params, $request) {
-		foreach ($params as $key => $value) {
-			if ($key === $this->actionKey) {
-				$this->setAction($value);
-			} elseif ($key === $this->controllerKey) {
-				$this->setController($value);
-			} elseif ($key === $this->moduleKey) {
-				$this->setModule($value);
-			}
-			$_GET[$key] = $value;
-		}
+		$_GET = array_merge($_GET, $params);
+		$action = isset($params[$this->actionKey]) ? $params[$this->actionKey] : $request->getRequest($this->actionKey);
+		$controller = isset($params[$this->controllerKey]) ? $params[$this->controllerKey] : $request->getRequest(
+			$this->controllerKey);
+		$module = isset($params[$this->moduleKey]) ? $params[$this->moduleKey] : $request->getRequest($this->moduleKey);
+		$action && $this->setAction($action);
+		$controller && $this->setController($controller);
+		$module && $this->setModule($module);
 	}
 
 	/**
@@ -197,7 +197,7 @@ public function setControllerKey($controllerKey) {
 	public function setActionKey($actionKey) {
 		$this->actionKey = $actionKey;
 	}
-
+	
 	/**
 	 * 返回默认的module值
 	 * 
@@ -206,7 +206,7 @@ public function setActionKey($actionKey) {
 	public function getDefaultModule() {
 		return $this->_module;
 	}
-
+	
 	/**
 	 * 返回默认的controller值
 	 * 
@@ -215,7 +215,7 @@ public function getDefaultModule() {
 	public function getDefaultController() {
 		return $this->_controller;
 	}
-
+	
 	/**
 	 * 返回默认的action值
 	 * 
diff --git a/wind/router/WindMutilAppRouter.php b/wind/router/WindMutilAppRouter.php
index 5b598655..81ddbcc9 100644
--- a/wind/router/WindMutilAppRouter.php
+++ b/wind/router/WindMutilAppRouter.php
@@ -1,5 +1,4 @@
 <?php
-Wind::import('WIND:router.WindRouter');
 /**
  * 多应用支持路由协议解析器
  *
diff --git a/wind/router/WindRouter.php b/wind/router/WindRouter.php
index 4bda7704..640c236d 100644
--- a/wind/router/WindRouter.php
+++ b/wind/router/WindRouter.php
@@ -39,7 +39,7 @@ class WindRouter extends AbstractWindRouter {
 	 * @var WindHttpRequest
 	 */
 	private $request = null;
-	
+
 	/* (non-PHPdoc)
 	 * @see IWindRouter::route()
 	 */
@@ -48,16 +48,11 @@ public function route($request) {
 		$this->_controller = $this->controller;
 		$this->_module = $this->module;
 		$this->request = $request;
-		if (!empty($this->_config['routes'])) {
-			$params = $this->getHandler()->handle($request);
-			$params && $this->setParams($params, $request);
-		} else {
-			$this->action = $request->getRequest($this->actionKey, $this->_action);
-			$this->controller = $request->getRequest($this->controllerKey, $this->_controller);
-			$this->module = $request->getRequest($this->moduleKey, $this->_module);
-		}
+		$this->setCallBack(array($this, 'defaultRoute'));
+		$params = $this->getHandler()->handle($request);
+		$params && $this->setParams($params, $request);
 	}
-	
+
 	/* (non-PHPdoc)
 	 * @see AbstractWindRouter::assemble()
 	 */
@@ -74,5 +69,17 @@ public function assemble($action, $args = array(), $route = null) {
 		}
 		return $_url;
 	}
+
+	/**
+	 * 默认路由规则
+	 * 
+	 * 默认情况下仅仅解析路由相关参数值
+	 * @param WindHttpRequest $request
+	 * @return array
+	 */
+	public function defaultRoute($request) {
+		$pathinfo = $request->getPathInfo();
+		return $pathinfo ? WindUrlHelper::urlToArgs($pathinfo) : array();
+	}
 }
 ?>
\ No newline at end of file
diff --git a/wind/token/WindSecurityToken.php b/wind/token/WindSecurityToken.php
index 5d289fb1..58521254 100644
--- a/wind/token/WindSecurityToken.php
+++ b/wind/token/WindSecurityToken.php
@@ -3,19 +3,6 @@
 /**
  * token令牌安全类
  * 
- * 我们在使用wind框架中的'token'功能时依赖该类，需要用以组件的形式配置进系统中，默认系统并未配置该组件。
- * 组件配置方式如下,需要配置外部依赖<i>tokenContainer</i>可以是WindCookie或者WindSeesion类型：<pre>
- * 'windToken' => array(
- * 'path' => 'WIND:token.WindSecurityToken',
- * 'scope' => 'singleton',
- * 'properties' => array(
- * 'tokenContainer' => array('ref' => 'windCookie'))),
- * 
- * 'windCookie' => array(
- * 'path' => 'WIND:http.cookie.WindNormalCookie',
- * 'scope' => 'singleton',
- * 'config' => array('expires' => '86400')),
- * <pre>
  * @author Qiong Wu <papa0924@gmail.com> 2011-10-19
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
diff --git a/wind/upload/AbstractWindUpload.php b/wind/upload/AbstractWindUpload.php
index a8a80097..32ecdc46 100644
--- a/wind/upload/AbstractWindUpload.php
+++ b/wind/upload/AbstractWindUpload.php
@@ -7,7 +7,7 @@
  * @author xiaoxia.xu <xiaoxia.xuxx@aliyun-inc.com>
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
- * @version $Id$
+ * @version $Id: AbstractWindUpload.php 1532 2011-9-22下午02:56:35 xiaoxiao $
  * @package upload
  */
 abstract class AbstractWindUpload {
diff --git a/wind/upload/WindFormUpload.php b/wind/upload/WindFormUpload.php
index 37159193..07e91789 100644
--- a/wind/upload/WindFormUpload.php
+++ b/wind/upload/WindFormUpload.php
@@ -6,7 +6,7 @@
  * @author xiaoxia.xu <xiaoxia.xuxx@aliyun-inc.com>
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
- * @version $Id$
+ * @version $Id: WindFormUpload.php 1532 2011-9-22下午03:13:32 xiaoxiao $
  * @package upload
  */
 class WindFormUpload extends AbstractWindUpload {
diff --git a/wind/upload/WindFtpUpload.php b/wind/upload/WindFtpUpload.php
index f5e0f17b..ad95f5ef 100644
--- a/wind/upload/WindFtpUpload.php
+++ b/wind/upload/WindFtpUpload.php
@@ -6,7 +6,7 @@
  * @author xiaoxia.xu <xiaoxia.xuxx@aliyun-inc.com>
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
- * @version $Id$
+ * @version $Id: WindFtpUpload.php 1532 2011-9-22下午03:14:09 xiaoxiao $
  * @package upload
  */
 class WindFtpUpload extends AbstractWindUpload {
diff --git a/wind/utility/WindCookie.php b/wind/utility/WindCookie.php
index 33e3194c..d7701c66 100644
--- a/wind/utility/WindCookie.php
+++ b/wind/utility/WindCookie.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * cookie操作类
  * 
@@ -14,9 +14,9 @@
  * @version $Id$
  * @package http
  * @subpackage cookie
- */
-class WindCookie {
-
+ */
+class WindCookie {
+
 	/**
 	 * 设置cookie
 	 * 
@@ -29,62 +29,63 @@ class WindCookie {
 	 * @param boolean $secure 是否安全连接,默认为false即不采用安全链接
 	 * @param boolean $httponly 是否可通过客户端脚本访问,默认为false即客户端脚本可以访问cookie
 	 * @return boolean 设置成功返回true,失败返回false
-	 */
-	public static function set($name, $value = null, $encode = false, $expires = null, $path = null, $domain = null, $secure = false, $httponly = false) {
-		if (empty($name)) return false;
-		$encode && $value && $value = base64_encode(serialize($value));
-		$path = $path ? $path : '/';
-		setcookie($name, $value, $expires, $path, $domain, $secure, $httponly);
-		return true;
-	}
-
+	 */
+	public static function set($name, $value = null, $encode = false, $expires = null, $path = null, $domain = null, $secure = false, $httponly = false) {
+		if (empty($name)) return false;
+		$value && $value = serialize($value);
+		$encode && $value = base64_encode($value);
+		$path = $path ? $path : '/';
+		setcookie($name, $value, $expires, $path, $domain, $secure, $httponly);
+		return true;
+	}
+
 	/**
 	 * 根据cookie的名字删除cookie
 	 * 
 	 * @param string $name cookie名称
 	 * @return boolean 删除成功返回true
-	 */
-	public static function delete($name) {
-		if (self::exist($name)) {
-			self::set($name, '');
-			unset($_COOKIE[$name]);
-		}
-		return true;
-	}
-
+	 */
+	public static function delete($name) {
+		if (self::exist($name)) {
+			self::set($name, '');
+			unset($_COOKIE[$name]);
+		}
+		return true;
+	}
+
 	/**
 	 * 取得指定名称的cookie值
 	 * 
 	 * @param string $name cookie名称
 	 * @param boolean $dencode 是否对cookie值进行过解码,默认为false即不用解码
 	 * @return mixed 获取成功将返回保存的cookie值,获取失败将返回false
-	 */
-	public static function get($name, $dencode = false) {
-		if (self::exist($name)) {
-			$value = $_COOKIE[$name];
-			$value && $dencode && $value = unserialize(base64_decode($value));
-			return $value ? $value : $value;
-		}
-		return false;
-	}
-
+	 */
+	public static function get($name, $dencode = false) {
+		if (self::exist($name)) {
+			$value = $_COOKIE[$name];
+			$value && $dencode && $value = base64_decode($value);
+			return $value ? unserialize($value) : $value;
+		}
+		return false;
+	}
+
 	/**
 	 * 移除全部cookie
 	 * 
 	 * @return boolean 移除成功将返回true
-	 */
-	public static function deleteAll() {
-		$_COOKIE = array();
-		return true;
-	}
-
+	 */
+	public static function deleteAll() {
+		$_COOKIE = array();
+		return true;
+	}
+
 	/**
 	 * 判断cookie是否存在
 	 * 
 	 * @param string $name cookie名称
 	 * @return boolean 如果不存在则返回false,否则返回true
-	 */
-	public static function exist($name) {
-		return isset($_COOKIE[$name]);
-	}
+	 */
+	public static function exist($name) {
+		return isset($_COOKIE[$name]);
+	}
 }
\ No newline at end of file
diff --git a/wind/utility/WindFolder.php b/wind/utility/WindFolder.php
index 9e6d6113..fc4db23a 100644
--- a/wind/utility/WindFolder.php
+++ b/wind/utility/WindFolder.php
@@ -1,5 +1,5 @@
 <?php
-Wind::import('WIND:utility.WindFile');
+Wind::import('WIND:utlity.WindFile');
 /**
  * 文件夹工具类
  *
diff --git a/wind/utility/WindImage.php b/wind/utility/WindImage.php
index 696545b9..0bfd9abd 100644
--- a/wind/utility/WindImage.php
+++ b/wind/utility/WindImage.php
@@ -7,7 +7,7 @@
  * @author xiaoxia.xu <xiaoxia.xuxx@aliyun-inc.com>
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
- * @version $Id$
+ * @version $Id: WindImage.php 1532 2011-9-22下午03:48:03 xiaoxiao $
  * @package utility
  */
 class WindImage {
diff --git a/wind/utility/WindPack.php b/wind/utility/WindPack.php
index 7b6f1517..2a92621b 100644
--- a/wind/utility/WindPack.php
+++ b/wind/utility/WindPack.php
@@ -10,31 +10,65 @@
  * @package utility
  */
 class WindPack {
-	
+
 	/**
 	 * 使用正则打包
 	 * 
 	 * @var string 
 	 */
 	const STRIP_SELF = 'stripWhiteSpaceBySelf';
-	
+
 	/**
 	 * 利用php自身的函数打包
 	 * 
 	 * @var string 
 	 */
 	const STRIP_PHP = 'stripWhiteSpaceByPhp';
-	
+
 	/**
 	 * 通过token方式打包
 	 * 
 	 * @var string 
 	 */
 	const STRIP_TOKEN = 'stripWhiteSpaceByToken';
+
 	private $packList = array();
+
 	private $contentInjectionPosition;
+
 	private $contentInjectionCallBack = '';
 
+	/**
+	 * 将指定文件类型且指定文件夹下的所指定文件打包成一个易阅读的文件,
+	 * 
+	 * @param mixed $dir 要打包的目录
+	 * @param string $dst 文件名
+	 * @param string $packMethod 打包方式,默认为stripWhiteSpaceByPhp
+	 * @param boolean $compress 是否压缩，默认为true
+	 * @param string $absolutePath 文件路径,默认为空
+	 * @param array $ndir 不须要打包的目录，默认包括'.', '..', '.svn'三个
+	 * @param array $suffix 不允许打包的文件类型，默认为空数组
+	 * @param array $nfile 不允许打包的文件，默认为空数组
+	 * @return boolean
+	 */
+	public function packFromDir($dir, $dst, $packMethod = WindPack::STRIP_PHP, $compress = true, $absolutePath = '', $ndir = array('.','..','.svn'), $suffix = array(), $nfile = array()) {
+		if (empty($dst) || empty($dir)) return false;
+		$suffix = is_array($suffix) ? $suffix : array($suffix);
+		if (!($content = $this->readContentFromDir($packMethod, $dir, $absolutePath, $ndir, $suffix, $nfile))) {
+			return false;
+		}
+		$fileSuffix = WindFile::getFileSuffix($dst);
+		$replace = $compress ? ' ' : "\n";
+		$content = implode($replace, $content);
+		$content = $this->callBack($content, $replace);
+		$content = $this->stripNR($content, $replace);
+		$content = $this->stripPhpIdentify($content, '');
+		$content = $this->stripImport($content, '');
+		$content = $this->getContentBySuffix($content, $fileSuffix, $replace);
+		WindFile::write($dst, $content);
+		return true;
+	}
+
 	/**
 	 * 将给出的文件列表进行打包
 	 * 
@@ -42,18 +76,23 @@ class WindPack {
 	 * @param string $dst  打包文件的存放位置
 	 * @param method $packMethod 打包的方式，默认为stripWhiteSpaceByPhp
 	 * @param boolean $compress 打包是否采用压缩的方式，默认为true
+	 * @param string $absolutePath 文件路径,默认为空
 	 * @return boolean
 	 */
-	public function packFromFileList($fileList, $dst, $packMethod = WindPack::STRIP_PHP, $compress = true) {
+	public function packFromFileList($fileList, $dst, $packMethod = WindPack::STRIP_PHP, $compress = true, $absolutePath = '') {
 		if (empty($dst) || empty($fileList)) return false;
 		$content = array();
-		$this->readContentFromFileList($fileList, $packMethod, $content);
+		$this->readContentFromFileList($fileList, $packMethod, $absolutePath, $content);
+		$fileSuffix = WindFile::getSuffix($dst);
 		$replace = $compress ? ' ' : "\n";
 		$content = implode($replace, $content);
 		$content = $this->callBack($content, $replace);
 		$content = $this->stripNR($content, $replace);
 		$content = $this->stripPhpIdentify($content, '');
-		return WindFile::write($dst, '<?php' . $replace . $content . '?>');
+		//$content = $this->stripImport($content, '');
+		$content = $this->getContentBySuffix($content, $fileSuffix, $replace);
+		WindFile::write($dst, $content);
+		return true;
 	}
 
 	/**
@@ -103,28 +142,71 @@ public function stripWhiteSpaceByToken($filename) {
 		return $compressContent;
 	}
 
+	/**
+	 * 从各个目录中取得对应的每个文件的内容 
+	 * 
+	 * @param string $packMethod 打包方式，默认为stripWhiteSpaceByPhp
+	 * @param mixed $dir 目录名，默认为空数组
+	 * @param string $absolutePath 绝对路径名，默认为空
+	 * @param array $ndir 不须要打包的目录，默认包括'.', '..', '.svn'三个
+	 * @param array $suffix 不允许打包的文件类型，默认为空数组
+	 * @param array $nfile 不允许打包的文件，默认为空数组
+	 * @return array
+	 */
+	public function readContentFromDir($packMethod = WindPack::STRIP_PHP, $dir = array(), $absolutePath = '', $ndir = array('.','..','.svn'), $suffix = array(), $nfile = array()) {
+		static $content = array();
+		if (empty($dir) || false === $this->isValidatePackMethod($packMethod)) {
+			return false;
+		}
+		$dir = is_array($dir) ? $dir : array($dir);
+		foreach ($dir as $_dir) {
+			$_dir = is_dir($absolutePath) ? WindFile::appendSlashesToDir($absolutePath) . $_dir : $_dir;
+			if (is_dir($_dir)) {
+				$handle = dir($_dir);
+				while (false != ($tmp = $handle->read())) {
+					$name = WindFile::appendSlashesToDir($_dir) . $tmp;
+					if (is_dir($name) && !in_array($tmp, $ndir)) {
+						$this->readContentFromDir($packMethod, $name, $absolutePath, $ndir, $suffix, $nfile);
+					}
+					if (is_file($name) && !in_array(WindFile::getFileSuffix($name), $suffix) && !in_array($file = basename($name), $nfile)) {
+						$content[] = $this->$packMethod($name);
+						$this->setPackList($file, $name);
+					}
+				}
+				$handle->close();
+			}
+		}
+		return $content;
+	}
+
 	/**
 	 * 从文件列表中取得对应的每个文件的内容 
 	 * 
 	 * @param mixed $fileList 文件列表
 	 * @param method $packMethod  打包方式，默认为stripWhiteSpaceByPhp
+	 * @param string $absolutePath  绝对路径名，默认为空
 	 * @param array $content 保存文件内容，默认为空数组
 	 * @return array:
 	 */
-	public function readContentFromFileList(array $fileList, $packMethod = WindPack::STRIP_PHP, &$content = array()) {
-		if (empty($fileList) || false === $this->isValidatePackMethod($packMethod)) return array();
-		
+	public function readContentFromFileList($fileList, $packMethod = WindPack::STRIP_PHP, $absolutePath = '', &$content = array()) {
+		if (empty($fileList) || false === $this->isValidatePackMethod($packMethod)) {
+			return array();
+		}
+		$fileList = is_array($fileList) ? $fileList : array($fileList);
 		foreach ($fileList as $key => $value) {
-			$parents = class_parents($key);
-			$_fileList = $this->buildFileList($parents, $fileList);
-			$this->readContentFromFileList($_fileList, $packMethod, $content);
-			$implements = class_implements($key);
-			$_fileList = $this->buildFileList($implements, $fileList);
-			$this->readContentFromFileList($_fileList, $packMethod, $content);
-			if (in_array($key, $this->packList)) continue;
-			if (is_file($value)) {
-				$content[] = $this->$packMethod($value);
-				$this->packList[] = $key;
+			if (is_array($value) && isset($value[1])) {
+				$parents = class_parents($value[1]);
+				$_fileList = $this->buildFileList($parents, $fileList);
+				$this->readContentFromFileList($_fileList, $packMethod, $absolutePath, $content);
+				$implements = class_implements($value[1]);
+				$_fileList = $this->buildFileList($implements, $fileList);
+				$this->readContentFromFileList($_fileList, $packMethod, $absolutePath, $content);
+				if (key_exists($key, $this->getPackList())) continue;
+				$file = is_dir($absolutePath) ? WindFile::appendSlashesToDir($absolutePath) . $key : $key;
+				if (is_file($file)) {
+					$content[] = $this->$packMethod($file);
+					$this->setPackList($key, $value);
+				}
 			}
 		}
 	}
@@ -193,8 +275,7 @@ public function stripStrByRule($content, $rule, $replace = '') {
 	 * @return string
 	 */
 	public function stripImport($content, $replace = '') {
-		$str = preg_match_all('/L[\t ]*::[\t ]*import[\t ]*\([\t ]*[\'\"]([^$][\w\.:]+)[\"\'][\t ]*\)[\t ]*/', $content, 
-			$matchs);
+		$str = preg_match_all('/L[\t ]*::[\t ]*import[\t ]*\([\t ]*[\'\"]([^$][\w\.:]+)[\"\'][\t ]*\)[\t ]*/', $content, $matchs);
 		if ($matchs[1]) {
 			foreach ($matchs[1] as $key => $value) {
 				$name = substr($value, strrpos($value, '.') + 1);
@@ -207,6 +288,15 @@ public function stripImport($content, $replace = '') {
 		return $content;
 	}
 
+	/**
+	 * 取得被打包的文件列表
+	 * 
+	 * @return array
+	 */
+	public function getPackList() {
+		return $this->packList;
+	}
+
 	/**
 	 * 从文件读取内容
 	 *
@@ -228,6 +318,26 @@ public function getContentFromFile($filename) {
 		return false;
 	}
 
+	/**
+	 * 根据文件后缀得取对应的mime内容
+	 * 
+	 * @param string $content 要打包的内容内容
+	 * @param string $suffix 文件后缀类型
+	 * @param string $replace 替换的字串，默认为空
+	 * @return string
+	 */
+	public function getContentBySuffix($content, $suffix, $replace = ' ') {
+		switch ($suffix) {
+			case 'php':
+				$content = '<?php' . $replace . $content . '?>';
+				break;
+			default:
+				$content = '<?php' . $replace . $content . '?>';
+				break;
+		}
+		return $content;
+	}
+
 	/**
 	 * 构造文件列表
 	 *
@@ -235,11 +345,11 @@ public function getContentFromFile($filename) {
 	 * @param array $fileList 文件列表
 	 * @return array 保存$list中存在于$fileList中的文件列表
 	 */
-	private function buildFileList(array $list, $fileList) {
+	private function buildFileList($list, $fileList) {
 		$_temp = array();
 		foreach ($list as $fileName) {
 			foreach ($fileList as $key => $value) {
-				if ($key == $fileName) {
+				if ($value[1] == $fileName) {
 					$_temp[$key] = $value;
 					break;
 				}
@@ -271,7 +381,7 @@ public function setContentInjectionCallBack($contentInjectionCallBack, $position
 	 */
 	public function callBack($content, $replace = '') {
 		if ($this->contentInjectionCallBack !== '') {
-			$_content = call_user_func_array($this->contentInjectionCallBack, array($this->packList));
+			$_content = call_user_func_array($this->contentInjectionCallBack, array($this->getPackList()));
 			if ($this->contentInjectionPosition == 'before') {
 				$content = $replace . $_content . $content;
 			} elseif ($this->contentInjectionPosition == 'after') {
@@ -288,7 +398,27 @@ public function callBack($content, $replace = '') {
 	 * @return boolean
 	 */
 	private function isValidatePackMethod($packMethod) {
-		return method_exists($this, $packMethod) && in_array($packMethod, 
-			array(WindPack::STRIP_PHP, WindPack::STRIP_SELF, WindPack::STRIP_TOKEN));
+		return method_exists($this, $packMethod) && in_array($packMethod, array(WindPack::STRIP_PHP, 
+			WindPack::STRIP_SELF, WindPack::STRIP_TOKEN));
+	}
+
+	/**
+	 * 添加被打包的文件到列表
+	 * 
+	 * @param  string $key   保存的key值
+	 * @param  string $value 需要被保存的值
+	 * @return void
+	 */
+	private function setPackList($key, $value) {
+		if (isset($this->packList[$key])) {
+			if (is_array($this->packList[$key])) {
+				array_push($this->packList[$key], $value);
+			} else {
+				$tmp_name = $this->packList[$key];
+				$this->packList[$key] = array($tmp_name, $value);
+			}
+		} else {
+			$this->packList[$key] = $value;
+		}
 	}
 }
\ No newline at end of file
diff --git a/wind/utility/WindSecurity.php b/wind/utility/WindSecurity.php
index 0cfde2e4..efb448eb 100644
--- a/wind/utility/WindSecurity.php
+++ b/wind/utility/WindSecurity.php
@@ -68,7 +68,7 @@ public static function encrypt($str, $key, $iv = '') {
 	public static function decrypt($str, $key, $iv = '') {
 		if (!$str || !is_string($str)) throw new WindException(
 			'[utility.WindSecurity.dncrypt] security string is required.', WindException::ERROR_PARAMETER_TYPE_ERROR);
-		if (!$key || !is_string($key)) throw new WindException('[utility.WindSecurity.decrypt] security key is required.', 
+		if (!$key || !is_string($key)) throw new WindException('[utlity.WindSecurity.decrypt] security key is required.', 
 			WindException::ERROR_PARAMETER_TYPE_ERROR);
 		
 		$size = mcrypt_get_block_size(MCRYPT_DES, MCRYPT_MODE_CBC);
diff --git a/wind/utility/WindString.php b/wind/utility/WindString.php
index dfebef0d..54563a0b 100644
--- a/wind/utility/WindString.php
+++ b/wind/utility/WindString.php
@@ -10,7 +10,7 @@
  */
 class WindString {
 	
-	const UTF8 = 'utf-8';
+	const UTF8 = 'utf8';
 	
 	const GBK = 'gbk';
 
@@ -46,13 +46,12 @@ public static function substr($string, $start, $length, $charset = self::UTF8, $
 	public static function strlen($string, $charset = self::UTF8) {
 		$len = strlen($string);
 		$i = $count = 0;
-		$charset = strtolower(substr($charset, 0, 3));
 		while ($i < $len) {
 			if (ord($string[$i]) <= 129)
 				$i++;
 			else
-				switch ($charset) {
-					case 'utf':
+				switch (strtolower($charset)) {
+					case self::UTF8:
 						$i += 3;
 						break;
 					default:
diff --git a/wind/utility/WindUtility.php b/wind/utility/WindUtility.php
index 54f311ef..d03ce769 100644
--- a/wind/utility/WindUtility.php
+++ b/wind/utility/WindUtility.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * 通用工具库
  *
@@ -7,9 +7,9 @@
  * @license http://www.windframework.com
  * @version $Id$
  * @package utility
- */
-class WindUtility {
-
+ */
+class WindUtility {
+
 	/**
 	 * 解析表达式
 	 * 
@@ -24,18 +24,18 @@ class WindUtility {
 	 * <li>第三个元素: 表达式的操作符</li>
 	 * <li>第四个元素： 表达式的右边操作数</li>
 	 * </ul>
-	 */
-	public static function resolveExpression($expression) {
-		$operators = array('==', '!=', '<', '>', '<=', '>=');
-		$operatorsReplace = array('#==#', '#!=#', '#<#', '#>#', '#<=#', '#>=#');
-		list($p, $o, $v2) = explode('#', str_replace($operators, $operatorsReplace, $expression));
-		if (strpos($p, ":") !== false)
-			list($_namespace, $p) = explode(':', trim($p, ':'));
-		else
-			$_namespace = '';
-		return array($_namespace, $p, $o, $v2);
-	}
-
+	 */
+	public static function resolveExpression($expression) {
+		$operators = array('==', '!=', '<', '>', '<=', '>=');
+		$operatorsReplace = array('#==#', '#!=#', '#<#', '#>#', '#<=#', '#>=#');
+		list($p, $o, $v2) = explode('#', str_replace($operators, $operatorsReplace, $expression));
+		if (strpos($p, ":") !== false)
+			list($_namespace, $p) = explode(':', trim($p, ':'));
+		else
+			$_namespace = '';
+		return array($_namespace, $p, $o, $v2);
+	}
+
 	/**
 	 * 执行简单的条件表达式
 	 * 
@@ -45,82 +45,84 @@ public static function resolveExpression($expression) {
 	 * @param string $v2 右边的操作数
 	 * @param string $operator 操作符号
 	 * @return boolean 
-	 */
-	public static function evalExpression($v1, $v2, $operator) {
-		switch ($operator) {
-			case '==':
-				return $v1 == $v2;
-			case '!=':
-				return $v1 != $v2;
-			case '<':
-				return $v1 < $v2;
-			case '>':
-				return $v1 > $v2;
-			case '<=':
-				return $v1 <= $v2;
-			case '>=':
-				return $v1 >= $v2;
-			default:
-				return false;
-		}
-		return false;
-	}
-
+	 */
+	public static function evalExpression($v1, $v2, $operator) {
+		switch ($operator) {
+			case '==':
+				return $v1 == $v2;
+			case '!=':
+				return $v1 != $v2;
+			case '<':
+				return $v1 < $v2;
+			case '>':
+				return $v1 > $v2;
+			case '<=':
+				return $v1 <= $v2;
+			case '>=':
+				return $v1 >= $v2;
+			default:
+				return false;
+		}
+		return false;
+	}
+
 	/**
 	 * 递归合并两个数组
 	 * 
 	 * @param array $array1 数组1
 	 * @param array $array2  数组2
 	 * @return array 合并后的数组
-	 */
-	public static function mergeArray($array1, $array2) {
-		foreach ($array2 as $key => $value) {
-			if (empty($value)) {
-				$array1[$key] = $value;
-			} else if (!isset($array1[$key])) {
-				$array1[$key] = $value;
-			} elseif (is_array($array1[$key]) && is_array($value)) {
-				$array1[$key] = self::mergeArray($array1[$key], $array2[$key]);
-			} elseif (is_numeric($key) && $array1[$key] !== $array2[$key]) {
-				$array1[] = $value;
-			} else
-				$array1[$key] = $value;
-		}
-		return $array1;
-	}
-
+	 */
+	public static function mergeArray($array1, $array2) {
+		foreach ($array2 as $key => $value) {
+			if (empty($value)) {
+				$array1[$key] = $value;
+			} else if (!isset($array1[$key])) {
+				$array1[$key] = $value;
+			} elseif (is_array($array1[$key]) && is_array($value)) {
+				$array1[$key] = self::mergeArray($array1[$key], $array2[$key]);
+			} elseif (is_numeric($key) && $array1[$key] !== $array2[$key]) {
+				$array1[] = $value;
+			} else
+				$array1[$key] = $value;
+		}
+		return $array1;
+	}
+
 	/**
 	 * 将字符串首字母小写
 	 * 
 	 * @param string $str 待处理的字符串 
 	 * @return string 返回处理后的字符串
-	 */
-	public static function lcfirst($str) {
-		$str[0] = strtolower($str[0]);
-		return $str;
-	}
-
+	 */
+	public static function lcfirst($str) {
+		if (function_exists('lcfirst')) return lcfirst($str);
+		
+		$str[0] = strtolower($str[0]);
+		return $str;
+	}
+
 	/**
 	 * 获得随机数字符串
 	 * 
 	 * @param int $length 随机数的长度
 	 * @return string 随机获得的字串
-	 */
-	public static function generateRandStr($length) {
-		$randstr = "";
-		for ($i = 0; $i < (int) $length; $i++) {
-			$randnum = mt_rand(0, 61);
-			if ($randnum < 10) {
-				$randstr .= chr($randnum + 48);
-			} else if ($randnum < 36) {
-				$randstr .= chr($randnum + 55);
-			} else {
-				$randstr .= chr($randnum + 61);
-			}
-		}
-		return $randstr;
-	}
-
+	 */
+	public static function generateRandStr($length) {
+		$randstr = "";
+		for ($i = 0; $i < (int) $length; $i++) {
+			$randnum = mt_rand(0, 61);
+			if ($randnum < 10) {
+				$randstr .= chr($randnum + 48);
+			} else if ($randnum < 36) {
+				$randstr .= chr($randnum + 55);
+			} else {
+				$randstr .= chr($randnum + 61);
+			}
+		}
+		return $randstr;
+	}
+
 	/**
 	 * 通用组装测试验证规则
 	 * 
@@ -137,16 +139,16 @@ public static function generateRandStr($length) {
 	 * <li>default: 验证失败是设置的默认值,缺省为null</li>
 	 * <li>message: 验证失败是返回的错误信息,默认为'提示：XX验证失败'</li>
 	 * </ul>
-	 */
-	public static function buildValidateRule($field, $validator, $args = array(), $default = null, $message = '') {
-		return array(
-			'field' => $field, 
-			'validator' => $validator, 
-			'args' => (array) $args, 
-			'default' => $default, 
-			'message' => ($message ? $message : '提示：\'' . $field . '\'验证失败'));
-	}
-
+	 */
+	public static function buildValidateRule($field, $validator, $args = array(), $default = null, $message = '') {
+		return array(
+			'field' => $field, 
+			'validator' => $validator, 
+			'args' => (array) $args, 
+			'default' => $default, 
+			'message' => ($message ? $message : '提示：\'' . $field . '\'验证失败'));
+	}
+
 	/**
 	 * 对字符串中的参数进行替换
 	 * 
@@ -162,84 +164,15 @@ public static function buildValidateRule($field, $validator, $args = array(), $d
 	 * @param string $from
 	 * @param string $to 可选参数,默认值为''
 	 * @return string
-	 */
-	public static function strtr($str, $from, $to = '') {
-		if (is_string($from)) return strtr($str, $from, $to);
-		if (isset($from[0])) {
-			foreach ($from as $key => $value) {
-				$from['#' . $key] = $value;
-				unset($from[$key]);
-			}
-		}
-		return !empty($from) ? strtr($str, $from) : $str;
-	}
-
-	/**
-	 * 错误信息处理方法
-	 *
-	 * @param string $file
-	 * @param string $line
-	 * @param array $trace
-	 */
-	public static function crash($file, $line, $trace) {
-		$msg = '';
-		$count = count($trace);
-		$padLen = strlen($count);
-		foreach ($trace as $key => $call) {
-			if (!isset($call['file']) || $call['file'] == '') {
-				$call['file'] = '~Internal Location~';
-				$call['line'] = 'N/A';
-			}
-			$traceLine = '#' . str_pad(($count - $key), $padLen, "0", STR_PAD_LEFT) . '  ' . self::getCallLine(
-				$call);
-			$trace[$key] = $traceLine;
-		}
-		$fileLines = array();
-		if (is_file($file)) {
-			$currentLine = $line - 1;
-			$fileLines = explode("\n", file_get_contents($file, null, null, 0, 10000000));
-			$topLine = $currentLine - 5;
-			$fileLines = array_slice($fileLines, $topLine > 0 ? $topLine : 0, 10, true);
-			if (($count = count($fileLines)) > 0) {
-				$padLen = strlen($count);
-				foreach ($fileLines as $line => &$fileLine)
-					$fileLine = " " . htmlspecialchars(
-						str_pad($line + 1, $padLen, "0", STR_PAD_LEFT) . ": " . str_replace("\t", 
-							"    ", rtrim($fileLine)), null, "UTF-8");
-			}
-		}
-		return array($fileLines, $trace);
-	}
-
-	/**
-	 * @param array $call
-	 * @return string
-	 */
-	private static function getCallLine($call) {
-		$call_signature = "";
-		if (isset($call['file'])) $call_signature .= $call['file'] . " ";
-		if (isset($call['line'])) $call_signature .= "(" . $call['line'] . ") ";
-		if (isset($call['function'])) {
-			$call_signature .= $call['function'] . "(";
-			if (isset($call['args'])) {
-				foreach ($call['args'] as $arg) {
-					if (is_string($arg))
-						$arg = '"' . (strlen($arg) <= 64 ? $arg : substr($arg, 0, 64) . "…") . '"';
-					else if (is_object($arg))
-						$arg = "[Instance of '" . get_class($arg) . "']";
-					else if ($arg === true)
-						$arg = "true";
-					else if ($arg === false)
-						$arg = "false";
-					else if ($arg === null)
-						$arg = "null";
-					else
-						$arg = strval($arg);
-					$call_signature .= $arg . ',';
-				}
-			}
-			$call_signature = trim($call_signature, ',') . ")";
-		}
-		return $call_signature;
-	}
+	 */
+	public static function strtr($str, $from, $to = '') {
+		if (is_string($from)) return strtr($str, $from, $to);
+		if (isset($from[0])) {
+			foreach ($from as $key => $value) {
+				$from['#' . $key] = $value;
+				unset($from[$key]);
+			}
+		}
+		return !empty($from) ? strtr($str, $from) : $str;
+	}
 }
\ No newline at end of file
diff --git a/wind/viewer/AbstractWindTemplateCompiler.php b/wind/viewer/AbstractWindTemplateCompiler.php
index b2c32970..5ceed1bd 100644
--- a/wind/viewer/AbstractWindTemplateCompiler.php
+++ b/wind/viewer/AbstractWindTemplateCompiler.php
@@ -14,7 +14,7 @@ abstract class AbstractWindTemplateCompiler extends WindHandlerInterceptor {
 	/**
 	 * @var array
 	 */
-	protected $tags= array();
+	protected $tags = array();
 	/**
 	 * @var WindViewTemplate
 	 */
@@ -31,10 +31,6 @@ abstract class AbstractWindTemplateCompiler extends WindHandlerInterceptor {
 	 * @var WindHttpResponse
 	 */
 	protected $response = null;
-	/**
-	 * @var array
-	 */
-	protected $_propertiesCache = array();
 
 	/**
 	 * 初始化标签解析器
diff --git a/wind/viewer/WindLayout.php b/wind/viewer/WindLayout.php
index 11a79fa4..498ee8b4 100644
--- a/wind/viewer/WindLayout.php
+++ b/wind/viewer/WindLayout.php
@@ -49,16 +49,16 @@ class WindLayout extends WindModule {
 	 * @param WindViewerResolver $viewer
 	 * @return void
 	 */
-	public function parser($layout, $__viewer) {
-		$this->viewer = $__viewer;
+	public function parser($layout, $viewer) {
+		$this->viewer = $viewer;
 		if (method_exists($this->viewer, 'compile')) {
-			list($__tpl) = $this->viewer->compile($layout);
+			list($tpl) = $this->viewer->compile($layout);
 		} else
-			$__tpl = $this->viewer->getWindView()->getViewTemplate($layout);
+			$tpl = $this->viewer->getWindView()->getViewTemplate($layout);
 		
 		ob_start();
-		if (!@include ($__tpl)) {
-			throw new WindViewException('[component.viewer.WindLayout.parser] layout file ' . $__tpl, 
+		if (!@include ($tpl)) {
+			throw new WindViewException('[component.viewer.WindLayout.parser] layout file ' . $tpl, 
 				WindViewException::VIEW_NOT_EXIST);
 		}
 		return ob_get_clean();
diff --git a/wind/viewer/WindView.php b/wind/viewer/WindView.php
index d6859390..dfe27ccb 100644
--- a/wind/viewer/WindView.php
+++ b/wind/viewer/WindView.php
@@ -1,5 +1,4 @@
 <?php
-Wind::import('WIND:utility.WindFolder');
 Wind::import('WIND:viewer.IWindView');
 /**
  * 视图处理器
@@ -136,7 +135,7 @@ public function render($display = false) {
 				$content = $layout->parser($this->layout, $viewResolver);
 			} else
 				$content = $viewResolver->windFetch();
-			Wind::getApp()->getResponse()->setBody($content, $this->templateName);
+			$this->getResponse()->setBody($content, $this->templateName);
 		} else {
 			echo $viewResolver->windFetch();
 		}
@@ -154,8 +153,7 @@ public function setConfig($config) {
 			$this->compileExt = $this->getConfig('compile-ext', '', $this->compileExt);
 			$this->isCompile = $this->getConfig('is-compile', '', $this->isCompile);
 			$this->layout = $this->getConfig('layout', '', $this->layout);
-			$this->htmlspecialchars = $this->getConfig('htmlspecialchars', '', 
-				$this->htmlspecialchars);
+			$this->htmlspecialchars = $this->getConfig('htmlspecialchars', '', $this->htmlspecialchars);
 			$this->setThemePackage($this->getConfig('theme-package'));
 		}
 	}
diff --git a/wind/viewer/compiler/WindTemplateCompilerEcho.php b/wind/viewer/compiler/WindTemplateCompilerEcho.php
index dc3a05d2..e211fda8 100644
--- a/wind/viewer/compiler/WindTemplateCompilerEcho.php
+++ b/wind/viewer/compiler/WindTemplateCompilerEcho.php
@@ -1,7 +1,6 @@
 <?php
 Wind::import('WIND:viewer.AbstractWindTemplateCompiler');
 Wind::import('WIND:utility.WindSecurity');
-Wind::import('WIND:utility.WindJson');
 /**
  * 变量输出编译类
  * 
@@ -18,7 +17,7 @@
  * @subpackage compiler
  */
 class WindTemplateCompilerEcho extends AbstractWindTemplateCompiler {
-	
+
 	/* (non-PHPdoc)
 	 * @see AbstractWindTemplateCompiler::compile()
 	 */
@@ -49,7 +48,7 @@ public function compile($key, $content) {
 				$content = '<?php strip_tags(' . $_output . ');?>';
 				break;
 			default:
-				$content = '<?php echo htmlspecialchars(' . $_output . ', ENT_QUOTES);?>';
+				$content = '<?php echo WindSecurity::escapeHTML(' . $_output . ');?>';
 		}
 		return $content;
 	}
diff --git a/wind/viewer/compiler/WindTemplateCompilerPage.php b/wind/viewer/compiler/WindTemplateCompilerPage.php
new file mode 100644
index 00000000..0079a487
--- /dev/null
+++ b/wind/viewer/compiler/WindTemplateCompilerPage.php
@@ -0,0 +1,113 @@
+<?php
+Wind::import('WIND:viewer.AbstractWindTemplateCompiler');
+/**
+ * page标签解析
+ * 
+ * 职责：编译模板page标签
+ * 支持参数类型：<code>
+ * 模板名称,当前页,总条数,每页显示多少条,url
+ * <page tpl='' current='' count='' per='' url='read.php?tid=$tid&page=' args='' />
+ * </code>
+ * @author Qiong Wu <papa0924@gmail.com>
+ * @copyright ©2003-2103 phpwind.com
+ * @license http://www.windframework.com
+ * @version $Id$
+ * @package viewer
+ * @subpackage compiler
+ */
+class WindTemplateCompilerPage extends AbstractWindTemplateCompiler {
+	/**
+	 * 分页模板
+	 *
+	 * @var string
+	 */
+	protected $tpl = '';
+	/**
+	 * 分页跳转url
+	 *
+	 * @var string
+	 */
+	protected $url = '';
+	/**
+	 * 字符型数字,总共有多少页
+	 *
+	 * @var string
+	 */
+	protected $total = '0';
+	/**
+	 * 字符型数字,当前page
+	 *
+	 * @var string
+	 */
+	protected $page = '1';
+	/**
+	 * 字符型数字,总条数
+	 *
+	 * @var string
+	 */
+	protected $count = '0';
+	/**
+	 * 字符型数字,每页显示的条数
+	 *
+	 * @var string
+	 */
+	protected $per = '0';
+	/**
+	 * 数组类型，createUrl中接收的传递参数
+	 *
+	 * @var array
+	 */
+	protected $args = array();
+
+	/* (non-PHPdoc)
+	 * @see AbstractWindTemplateCompiler::compile()
+	 */
+	public function compile($key, $content) {
+		empty($this->total) && $this->total = '0';
+		empty($this->page) && $this->page = '1';
+		empty($this->count) && $this->count = '0';
+		empty($this->per) && $this->per = '0';
+		empty($this->url) && $this->url = '';
+		empty($this->args) && $this->args = 'array()';
+		$_return = array();
+		$_return[] = '<?php $__tplPageCount=(int)' . $this->count . ';';
+		$_return[] = '$__tplPagePer=(int)' . $this->per . ';';
+		$_return[] = '$__tplPageTotal=(int)' . $this->total . ';';
+		$_return[] = '$__tplPageCurrent=(int)' . $this->page . ';'; 
+		$_return[] = '$__tplPageUrl="' . $this->url . '";'; 
+		$_return[] = '$__tplPageArgs=' . $this->args . ';'; 
+		$_return[] = 'if($__tplPageCount > 0 && $__tplPagePer > 0){';
+		$_return[] = '$__tplPageTotal = ceil($__tplPageCount / $__tplPagePer);}';
+		$_return[] = '$__tplPageCurrent > $__tplPageTotal && $__tplPageCurrent = $__tplPageTotal;';
+		$_return[] = 'if ($__tplPageTotal > 1) {?>';
+		$_return[] = $this->getTplContent();
+		$_return[] = '<?php } ?>';
+		return implode("\r\n", $_return);
+	}
+
+	/**
+	 * 获得page页模板内容
+	 *
+	 * @return string|mixed
+	 */
+	private function getTplContent() {
+		if (!$this->tpl) return '';
+		list(, $content) = $this->windViewerResolver->compile($this->tpl, '', true);
+		$arrPageTags = array('$total', '$page', '$url', '$count', '$args');
+		$arrPageVars = array(
+			'$__tplPageTotal',
+			'$__tplPageCurrent',
+			'$__tplPageUrl',
+			'$__tplPageCount',
+			'$__tplPageArgs');
+		return str_ireplace($arrPageTags, $arrPageVars, $content);
+	}
+
+	/* (non-PHPdoc)
+	 * @see AbstractWindTemplateCompiler::getProperties()
+	 */
+	public function getProperties() {
+		return array('tpl', 'total', 'page', 'per', 'count', 'url', 'args');
+	}
+}
+?>
\ No newline at end of file
diff --git a/wind/viewer/compiler/WindTemplateCompilerToken.php b/wind/viewer/compiler/WindTemplateCompilerToken.php
index 2ab26d29..65983f18 100644
--- a/wind/viewer/compiler/WindTemplateCompilerToken.php
+++ b/wind/viewer/compiler/WindTemplateCompilerToken.php
@@ -18,6 +18,10 @@ class WindTemplateCompilerToken extends AbstractWindTemplateCompiler {
 	 * @see AbstractWindTemplateCompiler::compile()
 	 */
 	public function compile($key, $content) {
+		/* @var $token WindSecurityToken */
+		$token = Wind::getApp()->getComponent('windToken');
+		$this->name || $this->name = 'token';
+		$value = $token->saveToken($this->name);
 		$_content = '<?php $__tpl_token = Wind::getApp()->getComponent(\'windToken\');';
 		$_content .= '$__tpl_token_value = $__tpl_token->saveToken(\'' . $this->name . '\'); ?>';
 		$_content .= '<input type=\'hidden\' name=\'' . $this->name . '\'  value=\'<?php echo $__tpl_token_value ?>\'/>';
diff --git a/wind/viewer/compiler/WindViewTemplate.php b/wind/viewer/compiler/WindViewTemplate.php
index e097f659..5218eef9 100644
--- a/wind/viewer/compiler/WindViewTemplate.php
+++ b/wind/viewer/compiler/WindViewTemplate.php
@@ -1,6 +1,6 @@
 <?php
 Wind::import('WIND:viewer.AbstractWindViewTemplate');
-Wind::import('WIND:utility.WindFile');
+Wind::import('WIND:utility.WindUtility');
 /**
  * 模板编译类
  * 
@@ -61,8 +61,7 @@ protected function doCompile($content, $windViewerResolver = null) {
 			$content = preg_replace('/\?>(\s|\n)*?<\?php/i', "\r\n", $content);
 			return $content;
 		} catch (Exception $e) {
-			throw new WindViewException(
-				'[component.viewer.WindViewTemplate.doCompile] compile fail.' . $e->getMessage(), 
+			throw new WindViewException('[component.viewer.WindViewTemplate.doCompile] compile fail.' . $e->getMessage(), 
 				WindViewException::ERROR_SYSTEM_ERROR);
 		}
 	}
@@ -103,8 +102,8 @@ private function creatTagCompiler($content, $compiler, $regex, $windViewerResolv
 		}
 		$_compilerClass = Wind::import($compiler);
 		$this->windHandlerInterceptorChain->addInterceptors(
-			new $_compilerClass($this->_compilerCache, $this, $windViewerResolver, 
-				$this->getRequest(), $this->getResponse()));
+			new $_compilerClass($this->_compilerCache, $this, $windViewerResolver, $this->getRequest(), 
+				$this->getResponse()));
 		$this->_compilerCache = array();
 		return $content;
 	}
@@ -116,21 +115,18 @@ private function creatTagCompiler($content, $compiler, $regex, $windViewerResolv
 	 */
 	protected function getTags() {
 		$_tags['internal'] = $this->createTag('internal', 'WIND:viewer.compiler.WindTemplateCompilerInternal', 
-			'/<\?php.*?\?>/is');
+			'/<\?php(.|\n)*?\?>/i');
 		/*标签体增加在该位置*/
-		$_tags['template'] = $this->createTag('template', 
-			'WIND:viewer.compiler.WindTemplateCompilerTemplate');
-		//$_tags['page'] = $this->createTag('page', 'WIND:viewer.compiler.WindTemplateCompilerPage');
-		$_tags['action'] = $this->createTag('action', 
-			'WIND:viewer.compiler.WindTemplateCompilerAction');
+		$_tags['template'] = $this->createTag('template', 'WIND:viewer.compiler.WindTemplateCompilerTemplate');
+		$_tags['page'] = $this->createTag('page', 'WIND:viewer.compiler.WindTemplateCompilerPage');
+		$_tags['action'] = $this->createTag('action', 'WIND:viewer.compiler.WindTemplateCompilerAction');
 		//$_tags['component'] = $this->createTag('component', 'WIND:viewer.compiler.WindTemplateCompilerComponent');
-		$_tags['token'] = $this->createTag('token', 
-			'WIND:viewer.compiler.WindTemplateCompilerToken');
+		$_tags['token'] = $this->createTag('token', 'WIND:viewer.compiler.WindTemplateCompilerToken');
 		$_tags['lang'] = $this->createTag('lang', 'WIND:viewer.compiler.WindTemplateCompilerLang');
 		$_tags = array_merge($_tags, $this->getConfig('support-tags', '', array()));
 		/*标签解析结束*/
-		$_tags['expression'] = $this->createTag('expression', 
-			'WIND:viewer.compiler.WindTemplateCompilerEcho', '/({@|{\$[\w$]{1})[^}{@\n]*}/i');
+		$_tags['expression'] = $this->createTag('expression', 'WIND:viewer.compiler.WindTemplateCompilerEcho', 
+			'/({@|{\$[\w$]{1})[^}{@\n]*}/i');
 		//$_tags['echo'] = $this->createTag('echo', 'WIND:viewer.compiler.WindTemplateCompilerEcho', '/\$[\w_]+/i');
 		/* 块编译标签，嵌套变量处理 */
 		//$_tags['script1'] = $this->createTag('script1', 'WIND:viewer.compiler.WindTemplateCompilerScript', '/<!--\[[\w\s]*\]>(.|\n)*<!\[[\w\s]*\]-->/Ui');
diff --git a/wind/viewer/resolver/WindViewerResolver.php b/wind/viewer/resolver/WindViewerResolver.php
index 0dbce082..23d98a61 100644
--- a/wind/viewer/resolver/WindViewerResolver.php
+++ b/wind/viewer/resolver/WindViewerResolver.php
@@ -1,6 +1,6 @@
-<?php
-Wind::import('WIND:viewer.resolver.WindNormalViewerResolver');
-Wind::import('WIND:viewer.exception.WindViewException');
+<?php
+Wind::import('WIND:viewer.resolver.WindNormalViewerResolver');
+Wind::import('WIND:viewer.exception.WindViewException');
 /**
  * 视图渲染器引擎
  * 
@@ -25,20 +25,21 @@
  * @license http://www.windframework.com
  * @version $Id$
  * @package viewer
- */
-class WindViewerResolver extends WindNormalViewerResolver implements IWindViewerResolver {
+ */
+class WindViewerResolver extends WindNormalViewerResolver implements IWindViewerResolver {
+
 	/* (non-PHPdoc)
 	 * @see IWindViewerResolver::windFetch()
-	 */
-	public function windFetch($template = '') {
-		$template || $template = $this->windView->templateName;
-		if (!$template) return '';
-		ob_start();
-		list($compileFilePath) = $this->compile($template);
-		WindRender::render($compileFilePath, $this->vars, $this);
-		return ob_get_clean();
-	}
-
+	 */
+	public function windFetch($template = '') {
+		$template || $template = $this->windView->templateName;
+		if (!$template) return '';
+		ob_start();
+		list($compileFilePath) = $this->compile($template);
+		WindRender::render($compileFilePath, $this->vars, $this);
+		return ob_get_clean();
+	}
+
 	/**
 	 * 编译模板并返回编译后模板地址及内容
 	 * 
@@ -55,25 +56,24 @@ public function windFetch($template = '') {
 	 * <i>compileFile</i>模板编译文件绝对地址,
 	 * <i>content</i>编译后模板输出内容,当<i>$output</i>
 	 * 为false时将content写入compileFile</pre>
-	 */
-	public function compile($template, $suffix = '', $readOnly = false, $forceOutput = false) {
-		$templateFile = $this->windView->getViewTemplate($template, $suffix);
-		if (!is_file($templateFile)) {
-			throw new WindViewException(
-				'[component.viewer.WindViewerResolver.compile] ' . $templateFile, 
-				WindViewException::VIEW_NOT_EXIST);
-		}
-		$compileFile = $this->windView->getCompileFile($template);
-		if (!$this->checkReCompile($templateFile, $compileFile)) {
-			return array($compileFile, ($forceOutput ? WindFile::read($compileFile) : ''));
-		}
-		/* @var $_windTemplate WindViewTemplate */
-		$_windTemplate = Wind::getApp()->getComponent('template');
-		$_output = $_windTemplate->compile($templateFile, $this);
-		$readOnly === false && WindFile::write($compileFile, $_output);
-		return array($compileFile, $_output);
-	}
-
+	 */
+	public function compile($template, $suffix = '', $readOnly = false, $forceOutput = false) {
+		$templateFile = $this->windView->getViewTemplate($template, $suffix);
+		if (!is_file($templateFile)) {
+			throw new WindViewException('[component.viewer.WindViewerResolver.compile] ' . $templateFile, 
+				WindViewException::VIEW_NOT_EXIST);
+		}
+		$compileFile = $this->windView->getCompileFile($template);
+		if (!$this->checkReCompile($templateFile, $compileFile)) {
+			return array($compileFile, ($forceOutput ? WindFile::read($compileFile) : ''));
+		}
+		/* @var $_windTemplate WindViewTemplate */
+		$_windTemplate = Wind::getApp()->getWindFactory()->getInstance('template');
+		$_output = $_windTemplate->compile($templateFile, $this);
+		$readOnly === false && WindFile::write($compileFile, $_output);
+		return array($compileFile, $_output);
+	}
+
 	/**
 	 * 检查是否需要重新编译,需要编译返回false，不需要编译返回true
 	 * 
@@ -83,14 +83,13 @@ public function compile($template, $suffix = '', $readOnly = false, $forceOutput
 	 * @param string $templateFilePath 模板路径
 	 * @param string $compileFilePath 编译路径
 	 * @return boolean
-	 */
-	private function checkReCompile($templateFilePath, $compileFilePath) {
-		if (WIND_DEBUG) return true;
-		if ($this->getWindView()->isCompile) {
-			if (!is_file($compileFilePath)) return true;
-			$_c_m_t = filemtime($compileFilePath);
-			if ((int) $_c_m_t <= (int) filemtime($templateFilePath)) return true;
-		}
-		return false;
-	}
+	 */
+	private function checkReCompile($templateFilePath, $compileFilePath) {
+		if (WIND_DEBUG) return true;
+		if ($this->getWindView()->isCompile) {
+			$_c_m_t = @filemtime($compileFilePath);
+			if ((int) $_c_m_t <= (int) @filemtime($templateFilePath)) return true;
+		}
+		return false;
+	}
 }
diff --git a/wind/web/WindController.php b/wind/web/WindController.php
index a9b471d0..7888b8db 100644
--- a/wind/web/WindController.php
+++ b/wind/web/WindController.php
@@ -11,26 +11,23 @@
  * @package web
  */
 abstract class WindController extends WindSimpleController {
-	
+
 	/* (non-PHPdoc)
 	 * @see WindSimpleController::run()
 	 */
 	public function run() {}
-	
+
 	/* (non-PHPdoc)
 	 * @see WindAction::resolvedActionMethod()
 	 */
 	protected function resolvedActionMethod($handlerAdapter) {
 		$action = $handlerAdapter->getAction();
 		if ($action !== 'run') $action = $this->resolvedActionName($action);
-		if (in_array($action, array('doAction', 'beforeAction', 'afterAction', 'forwardAction')) || !method_exists(
-			$this, $action)) {
-			throw new WindException('[web.WindController.resolvedActionMethod] ', 
-				WindException::ERROR_CLASS_METHOD_NOT_EXIST);
-		}
+		if (in_array($action, array('doAction', 'beforeAction', 'afterAction', 'forwardAction'))) throw new WindException(
+			'[web.WindController.resolvedActionMethod]', WindException::ERROR_CLASS_METHOD_NOT_EXIST);
 		$method = new ReflectionMethod($this, $action);
-		if ($method->isProtected()) throw new WindException('[web.WindController.resolvedActionMethod]', 
-			WindException::ERROR_CLASS_METHOD_NOT_EXIST);
+		if ($method->isAbstract() || !$method->isPublic()) throw new WindException(
+			'[web.WindController.resolvedActionMethod]', WindException::ERROR_CLASS_METHOD_NOT_EXIST);
 		return $action;
 	}
 
diff --git a/wind/web/WindDispatcher.php b/wind/web/WindDispatcher.php
index 89762353..4237d5db 100644
--- a/wind/web/WindDispatcher.php
+++ b/wind/web/WindDispatcher.php
@@ -39,7 +39,7 @@ public function dispatch($forward, $router, $display) {
 		} else {
 			$view = $forward->getWindView();
 			if ($view->templateName) {
-				$this->getResponse()->setData($forward->getVars(), $view->templateName);
+				Wind::getApp()->getResponse()->setData($forward->getVars(), $view->templateName);
 				$view->render($this->display || $display);
 			}
 			$this->display = false;
diff --git a/wind/web/WindErrorHandler.php b/wind/web/WindErrorHandler.php
index 0985e3d3..afe12de4 100644
--- a/wind/web/WindErrorHandler.php
+++ b/wind/web/WindErrorHandler.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * 系统默认的错误处理类
  * 
@@ -14,31 +14,29 @@
  * @license http://www.windframework.com
  * @version $Id$
  * @package web
- */
-class WindErrorHandler extends WindController {
-	protected $error = array();
-	protected $errorCode = 0;
-	protected $errorDir = 'WIND:web.view';
-	
+ */
+class WindErrorHandler extends WindController {
+	protected $error = array();
+	protected $errorCode = 0;
+	protected $errorDir = 'WIND:web.view';
+
 	/* (non-PHPdoc)
 	 * @see WindAction::beforeAction()
-	 */
-	public function beforeAction($handlerAdapter) {
-		$error = $this->getForward()->getVars('__error');
-		$this->error = $error['message'];
-		$this->errorCode = $error['code'];
-		$this->getForward()->setVars(array(), '__error');
-	}
-	
+	 */
+	public function beforeAction($handlerAdapter) {
+		$this->error = $this->getForward()->getVars('error');
+		$this->errorCode = (int) $this->getForward()->getVars('errorCode');
+	}
+
 	/* (non-PHPdoc)
 	 * @see WindAction::run()
-	 */
-	public function run() {
-		$this->setOutput("Error message", "errorHeader");
-		$this->setOutput($this->error, "errors");
-		$errDir = Wind::getApp()->getConfig('errorpage');
-		!$errDir && $errDir = $this->errorDir;
-		$this->setTemplatePath($errDir);
-		$this->setTemplate('erroraction');
-	}
+	 */
+	public function run() {
+		$this->setOutput("Error message", "errorHeader");
+		$this->setOutput($this->error, "errors");
+		$errDir = Wind::getApp()->getConfig('errorpage');
+		!$errDir && $errDir = $this->errorDir;
+		$this->setTemplatePath($errDir);
+		$this->setTemplate('erroraction');
+	}
 }
\ No newline at end of file
diff --git a/wind/web/WindForward.php b/wind/web/WindForward.php
index ed57bab1..037ae8a4 100644
--- a/wind/web/WindForward.php
+++ b/wind/web/WindForward.php
@@ -17,10 +17,6 @@ class WindForward extends WindModule {
 	 * @var WindView
 	 */
 	protected $windView = null;
-	/**
-	 * @see WindModule::_delayAttributes
-	 */
-	protected $_delayAttributes = array('windView' => array('ref' => 'windView'));
 	/**
 	 * 存储变量
 	 * 
@@ -123,15 +119,9 @@ public function getWindView() {
 		if ($this->windView === null) {
 			$this->_getWindView();
 			$module = Wind::getApp()->getModules();
-			if (isset($module['template-path'])) {
-				$this->windView->templateDir = $module['template-path'];
-			}
-			if (isset($module['compile-path'])) {
-				$this->windView->compileDir = $module['compile-path'];
-			}
-			if (isset($module['theme-path'])) {
-				$this->windView->setThemePackage($module['theme-path']);
-			}
+			if (isset($module['template-dir'])) $this->windView->templateDir = $module['template-dir'];
+			if (isset($module['compile-dir'])) $this->windView->compileDir = $module['compile-dir'];
+			if (isset($module['theme-package'])) $this->windView->setThemePackage($module['theme-package']);
 		}
 		return $this->windView;
 	}
diff --git a/wind/web/WindSimpleController.php b/wind/web/WindSimpleController.php
index ff792600..5a12185c 100644
--- a/wind/web/WindSimpleController.php
+++ b/wind/web/WindSimpleController.php
@@ -18,14 +18,6 @@ abstract class WindSimpleController extends WindModule implements IWindControlle
 	 * @var WindErrorMessage
 	 */
 	protected $errorMessage = null;
-	/**
-	 * @var WindHttpRequest
-	 */
-	protected $request = null;
-	/**
-	 * @var WindHttpResponse
-	 */
-	protected $response = null;
 
 	/**
 	 * 默认的操作处理方法
@@ -33,7 +25,7 @@ abstract class WindSimpleController extends WindModule implements IWindControlle
 	 * @return void
 	 */
 	abstract public function run();
-	
+
 	/* (non-PHPdoc)
 	 * @see IWindController::doAction()
 	 */
@@ -132,7 +124,7 @@ protected function forwardAction($action, $args = array(), $isRedirect = false,
 	protected function forwardRedirect($url) {
 		$this->getForward()->forwardRedirect($url);
 	}
-	
+
 	/* 数据处理 */
 	/**
 	 * 设置模板数据
@@ -175,13 +167,13 @@ protected function getInput($name, $type = '', $callback = null) {
 		} else {
 			$value = '';
 			switch (strtolower($type)) {
-				case 'get':
+				case IWindRequest::INPUT_TYPE_GET:
 					$value = $this->getRequest()->getGet($name);
 					break;
-				case 'post':
+				case IWindRequest::INPUT_TYPE_POST:
 					$value = $this->getRequest()->getPost($name);
 					break;
-				case 'cookie':
+				case IWindRequest::INPUT_TYPE_COOKIE:
 					$value = $this->getRequest()->getCookie($name);
 					break;
 				default:
@@ -190,7 +182,7 @@ protected function getInput($name, $type = '', $callback = null) {
 			return $callback ? array($value, call_user_func_array($callback, array($value))) : $value;
 		}
 	}
-	
+
 	/* 模板处理 */
 	/**
 	 * 设置页面模板
@@ -251,7 +243,7 @@ protected function setThemePackage($package) {
 	protected function setLayout($layout) {
 		$this->getForward()->getWindView()->layout = $layout;
 	}
-	
+
 	/* 错误处理 */
 	/**
 	 * 添加错误信息
@@ -324,6 +316,7 @@ public function setForward($forward) {
 	public function setErrorMessage($errorMessage) {
 		$this->errorMessage = $errorMessage;
 	}
+
 }
 
 /**
@@ -342,10 +335,9 @@ interface IWindController {
 	 * 处理请求并返回Forward对象
 	 * 
 	 * @param WindRouter $handlerAdapter
-	 * @param WindHttpRequest $request
-	 * @param WindHttpResponse $response
 	 * @return WindForward|null
 	 */
 	public function doAction($handlerAdapter);
+
 }
 ?>
\ No newline at end of file
diff --git a/wind/web/WindUrlHelper.php b/wind/web/WindUrlHelper.php
index 411dba2a..def79dba 100644
--- a/wind/web/WindUrlHelper.php
+++ b/wind/web/WindUrlHelper.php
@@ -39,30 +39,25 @@ public static function checkUrl($url, $absolute = true) {
 	 * @return array
 	 */
 	public static function urlToArgs($url, $decode = true, $separator = '&=') {
-		if (strlen($separator) !== 2) return array();
-		if (false !== $pos = strpos($url, '?')) $url = substr($url, $pos + 1);
-		$url = explode($separator[0], trim($url, $separator[0]));
+		!$separator && $separator = '&=';
+		false !== ($pos = strpos($url, '?')) && $url = substr($url, $pos + 1);
+		$_sep1 = substr($separator, 0, 1);
+		if ($_sep2 = substr($separator, 1, 1)) {
+			$__sep1 = preg_quote($_sep1, '/');
+			$url = preg_replace('/' . $__sep1 . '[\w+]' . $__sep1 . '/i', $_sep1, $url);
+			$url = str_replace($_sep2, $_sep1, $url);
+		}
+		$url = explode($_sep1, trim($url, $_sep1) . $_sep1);
 		$args = array();
-		if ($separator[0] === $separator[1]) {
-			$_count = count($url);
-			for ($i = 0; $i < $_count; $i += 2) {
-				if (!isset($url[$i + 1])) {
-					$args[] = $decode ? rawurldecode($url[$i]) : $url[$i];
-					continue;
-				}
-				$_k = $decode ? rawurldecode($url[$i]) : $url[$i];
-				$_v = $decode ? rawurldecode($url[$i + 1]) : $url[$i + 1];
-				$args[$_k] = $_v;
-			}
-		} else {
-			foreach ($url as $value) {
-				if (strpos($value, $separator[1]) === false) {
-					$args[] = $decode ? rawurldecode($value) : $value;
-					continue;
-				}
-				list($__k, $__v) = explode($separator[1], $value);
-				$args[$__k] = $decode && $__v ? rawurldecode($__v) : $__v;
+		for ($i = 0; $i < count($url); $i = $i + 2) {
+			if (!isset($url[$i]) || !isset($url[$i + 1])) continue;
+			$_v = $decode ? urldecode($url[$i + 1]) : $url[$i + 1];
+			$_k = $url[$i];
+			if (strpos($_k, self::$_sep) === 0) {
+				$_k = substr($_k, strlen(self::$_sep));
+				$_v = unserialize($_v);
 			}
+			$args[$_k] = $_v;
 		}
 		return $args;
 	}
@@ -80,18 +75,19 @@ public static function urlToArgs($url, $decode = true, $separator = '&=') {
 	 * @return string
 	 */
 	public static function argsToUrl($args, $encode = true, $separator = '&=') {
-		if (strlen($separator) !== 2) return;
+		!$separator && $separator = '&=';
+		$_sep1 = substr($separator, 0, 1);
+		$_sep2 = substr($separator, 1, 1);
+		!$_sep2 && $_sep2 = $_sep1;
 		$_tmp = '';
 		foreach ((array) $args as $key => $value) {
-			$value = $encode ? rawurlencode($value) : $value;
-			if (is_int($key)) {
-				$value && $_tmp .= $value . $separator[0];
-				continue;
-			}
-			$key = ($encode ? rawurlencode($key) : $key);
-			$_tmp .= $key . $separator[1] . $value . $separator[0];
+			if (is_array($value) || is_object($value))
+				$_tmp .= self::$_sep . "$key" . $_sep2 . urlencode(serialize($value));
+			else
+				$_tmp .= "$key" . $_sep2 . urlencode($value);
+			$_tmp .= $_sep1;
 		}
-		return trim($_tmp, $separator[0]);
+		return trim($_tmp, $_sep1 . $_sep2);
 	}
 
 	/**
@@ -125,6 +121,14 @@ public static function resolveAction($action, $args = array()) {
 	public static function createUrl($action, $args = array(), $anchor = '', $route = null, $absolute = true) {
 		/* @var $router AbstractWindRouter */
 		$router = Wind::getApp()->getComponent('router');
+		if ($_token = Wind::getApp()->getConfig('url-token')) {
+			/* @var $token WindSecurityToken */
+			$token = Wind::getApp()->getComponent('windToken');
+			$args[$_token] = $token->saveToken($_token);
+		}
+		if ($urlArgs = Wind::getApp()->getUrlArgs()) {
+			$args = array_merge($args, $urlArgs);
+		}
 		$url = $router->assemble($action, $args, $route);
 		$url .= $anchor ? '#' . $anchor : '';
 		return self::checkUrl($url, $absolute);
diff --git a/wind/web/WindWebApplication.php b/wind/web/WindWebApplication.php
index c5340b46..804a02e8 100644
--- a/wind/web/WindWebApplication.php
+++ b/wind/web/WindWebApplication.php
@@ -1,4 +1,6 @@
 <?php
+Wind::import('WIND:http.request.WindHttpRequest');
+Wind::import('WIND:http.response.WindHttpResponse');
 /**
  * 应用控制器,协调处理用户请求,处理,跳转分发等工作
  *
@@ -25,6 +27,7 @@ class WindWebApplication extends WindModule implements IWindApplication {
 	 * @var WindDispatcher
 	 */
 	protected $dispatcher = null;
+	protected $token = '';
 	/**
 	 * @var WindRouter
 	 */
@@ -36,60 +39,81 @@ class WindWebApplication extends WindModule implements IWindApplication {
 
 	/**
 	 * 应用初始化操作
-	 *
-	 * @param WindHttpRequest $request        	
-	 * @param WindHttpResponse $response        	
-	 * @param WindFactory $factory        	
+	 * 
+	 * @param WindHttpRequest $request
+	 * @param WindHttpResponse $response
+	 * @param WindFactory $factory
 	 */
-	public function __construct($request, $factory) {
-		$this->response = $request->getResponse();
+	public function __construct($request, $response, $factory) {
 		$this->request = $request;
+		$this->response = $response;
 		$this->windFactory = $factory;
 	}
 
-	/**
-	 * 请求处理完毕后，进一步分发
-	 *
-	 * @param WindForward $forward
-	 * @param boolean $display
+	/* (non-PHPdoc)
+	 * @see IWindApplication::doDispatch()
 	 */
 	public function doDispatch($forward, $display = false) {
 		if ($forward === null) return;
 		$this->_getDispatcher()->dispatch($forward, $this->handlerAdapter, $display);
 	}
-	
+
 	/* (non-PHPdoc)
 	 * @see IWindApplication::run()
 	 */
-	public function run($filters = false) {
-		$module = $this->getModules($this->_getHandlerAdapter()->getModule());
-		$handlerPath = $module['controller-path'] . '.' . ucfirst($this->handlerAdapter->getController()) . $module['controller-suffix'];
-		$className = Wind::import($handlerPath);
-		if (!class_exists($className)) throw new WindException(
-			'Your requested \'' . $handlerPath . '\' was not found on this server.', 404);
-		$handler = new $className();
-		$handler->setDelayAttributes(
-			array('errorMessage' => array('ref' => 'errorMessage'), 'forward' => array('ref' => 'forward')));
-		$filters && $this->resolveActionFilters($handler);
-		
+	public function run() {
 		try {
-			$forward = $handler->doAction($this->handlerAdapter);
+			$this->checkProcess();
+			$module = $this->getModules();
+			$module = $this->setModules($this->handlerAdapter->getModule(), $module, true);
+			if (!$module) {
+				throw new WindActionException(
+					'[web.WindWebApplication.run] Your requested \'' . $this->handlerAdapter->getModule() . '\' was not found on this server.', 
+					404);
+			}
+			
+			$handlerPath = $module['controller-path'] . '.' . ucfirst($this->handlerAdapter->getController()) . $module['controller-suffix'];
+			if (WIND_DEBUG & 2) {
+				Wind::getApp()->getComponent('windLogger')->info(
+					'[web.WindWebApplication.run] \r\n\taction handl:' . $handlerPath, 'wind.core');
+			}
+			$this->windFactory->addClassDefinitions($handlerPath, 
+				array(
+					'path' => $handlerPath, 
+					'scope' => 'prototype', 
+					'config' => $this->getConfig('actionmap'), 
+					'properties' => array(
+						'errorMessage' => array('ref' => 'errorMessage'), 
+						'forward' => array('ref' => 'forward'), 
+						'urlHelper' => array('ref' => 'urlHelper'))));
+			$handler = $this->windFactory->getInstance($handlerPath);
+			if (!$handler) {
+				throw new WindActionException(
+					'[web.WindWebApplication.run] Your requested \'' . $handlerPath . '\' was not found on this server.', 
+					404);
+			}
+			if ($filters = $this->getConfig('filters')) {
+				unset($this->_config['filters']);
+				$this->resolveActionMapping($filters, $handler);
+				$forward = $this->_proxy->runProcess($handler);
+			} else
+				$forward = $this->runProcess($handler);
 			$this->doDispatch($forward);
 		} catch (WindForwardException $e) {
 			$this->doDispatch($e->getForward());
 		} catch (WindActionException $e) {
-			$this->sendErrorMessage(($e->getError() ? $e->getError() : $e->getMessage()), $e->getCode());
+			$this->sendErrorMessage($e);
 		} catch (WindException $e) {
-			$this->sendErrorMessage($e->getMessage(), $e->getCode());
+			$this->sendErrorMessage($e);
 		}
 	}
-	
+
 	/* (non-PHPdoc)
 	 * @see WindModule::setConfig()
 	 */
 	public function setConfig($config) {
 		parent::setConfig($config);
-		if ($default = $this->getConfig('modules', 'default', array())) {
+		if ($default = $this->getModules('default')) {
 			$this->defaultModule = WindUtility::mergeArray($this->defaultModule, $default);
 		}
 		$charset = $this->getConfig('charset', '', 'utf-8');
@@ -97,11 +121,23 @@ public function setConfig($config) {
 		$this->getResponse()->setCharset($charset);
 	}
 
+	/**
+	 * 执行请求的进程
+	 * 
+	 * @param IWindController $handler
+	 * @return void
+	 * @throws WindFinalException
+	 */
+	public function runProcess($handler) {
+		if (!$handler instanceof IWindController) throw new WindFinalException();
+		return $handler->doAction($this->handlerAdapter);
+	}
+
 	/**
 	 * 设置全局变量
-	 *
-	 * @param array|object|string $data        	
-	 * @param string $key        	
+	 * 
+	 * @param array|object|string $data
+	 * @param string $key
 	 * @return void
 	 */
 	public function setGlobal($data, $key = '') {
@@ -116,7 +152,7 @@ public function setGlobal($data, $key = '') {
 
 	/**
 	 * 获取全局变量
-	 *
+	 * 
 	 * @return mixed
 	 */
 	public function getGlobal() {
@@ -125,6 +161,26 @@ public function getGlobal() {
 		return call_user_func_array(array($this->response, 'getData'), $_args);
 	}
 
+	/**
+	 * 获取urlArg值
+	 * 
+	 * @return array
+	 */
+	public function getUrlArgs() {
+		return $this->getGlobal('__url__');
+	}
+
+	/**
+	 * 设置urlargs值
+	 *
+	 * @param string $data
+	 * @param string $key
+	 */
+	public function setUrlArgs($data, $key) {
+		if (!$key || !$data) return;
+		$this->setGlobal(array($key => $data), '__url__');
+	}
+
 	/**
 	 * 添加module配置
 	 * <code>
@@ -139,7 +195,7 @@ public function getGlobal() {
 	 * <template-dir>template</template-dir>
 	 * <!-- 指定模板后缀 -->
 	 * <template-ext>htm</template-ext></code>
-	 *
+	 * 
 	 * @param string $name module名称
 	 * @param array $config 配置数组
 	 * @param boolean $replace 如果module已经存在是否覆盖他 默认值为false不进行覆盖
@@ -147,82 +203,59 @@ public function getGlobal() {
 	 */
 	public function setModules($name, $config, $replace = false) {
 		if ($replace || !isset($this->_config['modules'][$name])) {
-			$this->_config['modules'][$name] = (array) $config;
+			$this->_config['modules'][$name] = WindUtility::mergeArray($this->defaultModule, (array) $config);
 		}
 		return $this->_config['modules'][$name];
 	}
 
 	/**
 	 * 获得module配置,$name为空时返回当前module配置
-	 *
+	 * 
 	 * @param string $name module名称 默认为空
-	 * @param boolean $merge 合并默认值
 	 * @return array
 	 * @throws WindActionException
 	 * @throws WindException
 	 */
 	public function getModules($name = '') {
-		if ($name === '') $name = $this->handlerAdapter->getModule();
-		$_module = $this->getConfig('modules', $name, array());
-		if (!isset($_module['_verified']) || $_module['_verified'] !== true) {
-			if (empty($_module)) {
-				$_module = $this->getConfig('modules', 'pattern', array());
-				$_pattern = !empty($_module);
-			}
-			$_module = WindUtility::mergeArray($this->defaultModule, $_module);
-			if (isset($_pattern) && $_pattern) {
-				$_keys = array_keys($_module);
-				$_replace = array(
-					'{' . $this->handlerAdapter->getModuleKey() . '}' => $this->handlerAdapter->getModule(), 
-					'{' . $this->handlerAdapter->getControllerKey() . '}' => $this->handlerAdapter->getController(), 
-					'{' . $this->handlerAdapter->getActionKey() . '}' => $this->handlerAdapter->getAction());
-				foreach ($_keys as $_key) {
-					if (strrchr($_key, '-') !== '-path') continue;
-					$_module[$_key] = strtr($_module[$_key], $_replace);
-				}
-			}
-			$_module['_verified'] = true;
-			$this->_config['modules'][$name] = $_module;
-		}
-		return $_module;
+		if ($name === '') return $this->getConfig('modules', $this->handlerAdapter->getModule());
+		return $this->getConfig('modules', $name, array());
 	}
 
 	/**
 	 * 获得组件对象
-	 *
+	 * 
 	 * @param string $componentName 组件名称呢个
 	 * @return object
 	 */
-	public function getComponent($componentName, $args = array()) {
-		return $this->windFactory->getInstance($componentName, $args);
-	}
-
-	/**
-	 * 手动注册actionFilter
-	 *
-	 * 参数为数组格式：
-	 * @param array $filters
-	 */
-	public function registeActionFilter($filters) {
-		if (!$filters) return;
-		if (empty($this->_config['filters']))
-			$this->_config['filters'] = $filters;
-		else
-			$this->_config['filters'] += $filters;
+	public function getComponent($componentName) {
+		$component = null;
+		switch ($componentName) {
+			case 'windCache':
+				if ($this->getConfig('iscache', '', false)) {
+					$component = $this->windFactory->getInstance($componentName);
+				}
+				break;
+			default:
+				$component = $this->windFactory->getInstance($componentName);
+				break;
+		}
+		return $component;
 	}
 
 	/**
 	 * 解析action过滤链的配置信息
-	 *
-	 * @param WindSimpleController $handler        	
+	 * 
+	 * @param array $filters
+	 * @param WindSimpleController $handler
 	 * @return void
 	 */
-	protected function resolveActionFilters(&$handler) {
-		if (!$filters = $this->getConfig('filters')) return;
+	protected function resolveActionMapping($filters, $handler) {
+		$this->_proxy || $this->_proxy = new WindClassProxy($this);
 		/* @var $cache AbstractWindCache */
 		$_filters = array();
 		if ($cache = $this->getComponent('windCache')) {
-			$_filters = $cache->get('filters');
+			$key = md5(serialize($filters));
+			$_filters = $cache->get($key);
 		}
 		$_token = $this->handlerAdapter->getModule() . '/' . $this->handlerAdapter->getController() . '/' . $this->handlerAdapter->getAction();
 		if (!isset($_filters[$_token])) {
@@ -241,54 +274,65 @@ protected function resolveActionFilters(&$handler) {
 				}
 				$_filters[$_token][] = $_filter;
 			}
-			$cache && $cache->set('filters', $_filters);
+			$cache && $cache->set($key, $_filters);
 		}
 		if (empty($_filters[$_token])) return;
-		/* @var $proxy WindClassProxy */
-		$proxy = WindFactory::createInstance(Wind::import('WIND:factory.WindClassProxy'));
-		$proxy->registerTargetObject($handler);
+		$args = array($handler->getForward(), $handler->getErrorMessage());
 		foreach ($_filters[$_token] as $value) {
-			$proxy->registerEventListener('doAction', 
+			$this->_proxy->registerEventListener('runProcess', 
 				$this->windFactory->createInstance(Wind::import($value['class']), 
-					array($handler->getForward(), $handler->getErrorMessage(), $this->handlerAdapter, $value)));
+					array($args[0], $args[1], $this->handlerAdapter, $value)));
 		}
-		$handler = $proxy;
 	}
 
 	/**
 	 * 处理错误请求
-	 *
+	 * 
 	 * 根据错误请求的相关信息,将程序转向到错误处理句柄进行错误处理
-	 * @param WindErrorMessage $errorMessage
-	 * @param int $errorcode
+	 * @param WindActionException actionException
 	 * @return void
+	 * @throws WindFinalException
 	 */
-	protected function sendErrorMessage($errorMessage, $errorcode) {
-		if (is_string($errorMessage)) {
-			$_tmp = $errorMessage;
-			/* @var $errorMessage WindErrorMessage */
-			$errorMessage = $this->getComponent('errorMessage');
-			$errorMessage->addError($_tmp);
-		}
-		/* @var $router WindRouter */
+	protected function sendErrorMessage($exception) {
 		$moduleName = $this->handlerAdapter->getModule();
-		if ($moduleName === 'error') throw new WindFinalException($errorMessage->getError(0));
-		
+		if ($moduleName === 'error') throw new WindFinalException($exception->getMessage());
+		$errorMessage = null;
+		if ($exception instanceof WindActionException) $errorMessage = $exception->getError();
+		if (!$errorMessage) {
+			$errorMessage = $this->windFactory->getInstance('errorMessage');
+			$errorMessage->addError($exception->getMessage());
+		}
 		if (!$_errorAction = $errorMessage->getErrorAction()) {
 			$module = $this->getModules($moduleName);
-			$_errorClass = Wind::import(@$module['error-handler']);
-			$_errorAction = 'error/' . $_errorClass . '/run/';
+			if (empty($module)) $module = $this->getModules('default');
+			preg_match("/([a-zA-Z]*)$/", @$module['error-handler'], $matchs);
+			$_errorHandler = trim(substr(@$module['error-handler'], 0, -(strlen(@$matchs[0]) + 1)));
+			$_errorAction = 'error/' . @$matchs[0] . '/run/';
 			$this->setModules('error', 
-				array(
-					'controller-path' => array_search($_errorClass, Wind::$_imports), 
-					'controller-suffix' => '', 
-					'error-handler' => ''));
+				array('controller-path' => $_errorHandler, 'controller-suffix' => '', 'error-handler' => ''));
 		}
 		/* @var $forward WindForward */
-		$forward = $this->getComponent('forward');
-		$error = array('message' => $errorMessage->getError(), 'code' => $errorcode);
-		$forward->forwardAction($_errorAction, array('__error' => $error), false, false);
-		$this->doDispatch($forward);
+		$forward = $this->getSystemFactory()->getInstance('forward');
+		$forward->forwardAction($_errorAction, array(), false, false);
+		$forward->setVars($errorMessage->getError(), 'error');
+		$forward->setVars($exception->getCode(), 'errorCode');
+		$this->_getDispatcher()->dispatch($forward, $this->handlerAdapter, false);
+	}
+
+	/**
+	 * 检查请求的合法性
+	 * 
+	 * 检查请求的合法性,当判断请求不合法时,抛出一个终止异常并终止当前进程
+	 * @return void
+	 * @throws WindFinalException
+	 */
+	protected function checkProcess() {
+		$token = $this->_getHandlerAdapter()->getModule() . '/' . $this->handlerAdapter->getController() . '/' . $this->handlerAdapter->getAction();
+		if (strcasecmp($token, $this->token) === 0) {
+			throw new WindFinalException('[WindWebApplication.checkProcess] dulplicat request \'' . $token . '\'', 
+				WindException::ERROR_SYSTEM_ERROR);
+		}
+		$this->token = $token;
 	}
 
 	/**
diff --git a/wind/web/WindWebFrontController.php b/wind/web/WindWebFrontController.php
index 2f303629..51d6171f 100644
--- a/wind/web/WindWebFrontController.php
+++ b/wind/web/WindWebFrontController.php
@@ -1,149 +1,69 @@
 <?php
 /**
  * 应用前端控制器
- *
+ * 
  * 应用前端控制器，负责根据应用配置启动应用，多应用管理，多应用的配置管理等.
- *
  * @author Qiong Wu <papa0924@gmail.com> 2011-10-12
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
  * @version $Id: WindFrontController.php 2966 2011-10-14 06:41:59Z yishuo $
  * @package wind
  */
-class WindWebFrontController extends AbstractWindFrontController {
+class WindWebFrontController extends WindFrontController {
+	private $_configStateQueue = array();
 
-	/**
+	/** 
 	 * 创建并执行当前应用
-	 *
-	 * @deprecated
-	 * @param string $appName        	
-	 * @param string|array $config        	
+	 * 
+	 * @param string $appName
+	 * @param string|array $config
 	 * @return void
 	 */
 	public function multiRun() {
-		$this->initConfig();
+		$this->request || $this->request = new WindHttpRequest();
 		
 		/* @var $router WindRouter */
-		$router = $this->getFactory()->getInstance('router');
-		$this->_appName && $router->setApp($this->_appName);
-		$router->route($this->getRequest());
+		$router = $this->factory->getInstance('router');
+		if ($this->_appName) {
+			$router->setApp($this->_appName);
+		} elseif (!$this->getApp()) {
+			$this->_appName = 'default';
+			$router->setApp('default');
+		}
+		$router->route($this->request);
 		$this->_appName = $router->getApp();
-		$this->_run();
-	}
-	
-	/*
-	 * (non-PHPdoc) @see AbstractWindFrontController::createApplication()
-	 */
-	protected function _createApplication() {
-		$application = new WindWebApplication($this->getRequest(), $this->getFactory());
-		$application->setDelayAttributes(
-			array('dispatcher' => array('ref' => 'dispatcher'), 'handlerAdapter' => array('ref' => 'router')));
-		return $application;
+		if (!in_array($this->_appName, $this->_configStateQueue) && $this->_appName !== 'default' && isset(
+			$this->_config['default']) && isset($this->_config[$this->_appName])) {
+			$this->_config[$this->_appName] = WindUtility::mergeArray($this->_config['default'], 
+				$this->_config[$this->_appName]);
+			$this->_configStateQueue[] = $this->_appName;
+		}
+		$this->_run($this->createApplication());
 	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindFrontController::showErrorMessage()
-	*/
-	protected function showErrorMessage($message, $file, $line, $trace, $errorcode) {
-		parent::showErrorMessage($message, $file, $line, $trace, $errorcode);
-		if (!empty($this->_config[$this->_appName]['errorDir'])) {
-			$errDir = $this->_config[$this->_appName]['errorDir'];
-		} else
-			$errDir = 'WIND:web.view';
-		$errDir = Wind::getRealPath($errDir, false);
-		if (is_file($errDir . '/' . $errorcode . '.htm')) $this->_errPage = $errorcode;
-		ob_start();
-		require $errDir . '/' . $this->_errPage . '.htm';
-		exit(ob_get_clean());
-	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindFrontController::_components()
+
+	/**
+	 * 返回对应app的配置信息
+	 * 
+	 * @param string $appName
+	 * @return array
 	 */
-	protected function _components() {
-		return array(
-			'router' => array('path' => 'WIND:router.WindRouter', 'scope' => 'application'), 
-			'windView' => array(
-				'path' => 'WIND:viewer.WindView', 
-				'scope' => 'application', 
-				'config' => array(
-					'template-dir' => 'template', 
-					'template-ext' => 'htm', 
-					'is-compile' => '1', 
-					'compile-dir' => 'compile.template', 
-					'compile-ext' => 'tpl', 
-					'layout' => '', 
-					'theme' => '', 
-					'htmlspecialchars' => true), 
-				'properties' => array(
-					'viewResolver' => array('path' => 'WIND:viewer.resolver.WindViewerResolver'), 
-					'windLayout' => array('path' => 'WIND:viewer.WindLayout'))), 
-			'template' => array('path' => 'WIND:viewer.compiler.WindViewTemplate', 'scope' => 'prototype'), 
-			'db' => array('path' => 'WIND:db.WindConnection', 'scope' => 'application'), 
-			'configParser' => array('path' => 'WIND:parser.WindConfigParser', 'scope' => 'singleton'), 
-			'dispatcher' => array('path' => 'WIND:web.WindDispatcher', 'scope' => 'application'), 
-			'forward' => array(
-				'path' => 'WIND:web.WindForward', 
-				'scope' => 'prototype', 
-				'properties' => array('windView' => array('ref' => 'windView'))), 
-			'errorMessage' => array('path' => 'WIND:base.WindErrorMessage', 'scope' => 'prototype'), 
-			'windLogger' => array(
-				'path' => 'WIND:log.WindLogger', 
-				'scope' => 'singleton', 
-				'destroy' => 'flush', 
-				'constructor-args' => array('0' => array('value' => 'DATA:log'), '1' => array('value' => '2'))), 
-			'i18n' => array(
-				'path' => 'WIND:i18n.WindLangResource', 
-				'scope' => 'singleton', 
-				'config' => array('path' => 'i18n')));
+	public function getConfig($appName) {
+		return isset($this->_config[$appName]) ? $this->_config[$appName] : array();
 	}
-	
-	/* (non-PHPdoc)
-	 * @see AbstractWindFrontController::_loadBaseLib()
+
+	/**
+	 * 设置app配置
+	 * 
+	 * 设置app配置到当前应用,适用于动态挂载一个app
+	 * @param string $appName
+	 * @param array $config
 	 */
-	protected function _loadBaseLib() {
-		Wind::$_imports += array(
-			'WIND:i18n.WindLangResource' => 'WindLangResource', 
-			'WIND:log.WindLogger' => 'WindLogger', 
-			'WIND:core.web.WindErrorMessage' => 'WindErrorMessage', 
-			'WIND:web.WindForward' => 'WindForward', 
-			'WIND:web.WindDispatcher' => 'WindDispatcher', 
-			'WIND:parser.WindConfigParser' => 'WindConfigParser', 
-			'WIND:db.WindConnection' => 'WindConnection', 
-			'WIND:viewer.compiler.WindViewTemplate' => 'WindViewTemplate', 
-			'WIND:viewer.WindView' => 'WindView', 
-			'WIND:router.WindRouter' => 'WindRouter', 
-			'WIND:web.WindController' => 'WindController', 
-			'WIND:web.WindDispatcher' => 'WindDispatcher', 
-			'WIND:web.WindErrorHandler' => 'WindErrorHandler', 
-			'WIND:web.WindForward' => 'WindForward', 
-			'WIND:web.WindHttpRequest' => 'WindHttpRequest', 
-			'WIND:web.WindHttpResponse' => 'WindHttpResponse', 
-			'WIND:web.WindSimpleController' => 'WindSimpleController', 
-			'WIND:web.WindUrlHelper' => 'WindUrlHelper', 
-			'WIND:web.WindWebApplication' => 'WindWebApplication');
-		
-		Wind::$_classes += array(
-			'WindLangResource' => 'i18n/WindLangResource', 
-			'WindLogger' => 'log/WindLogger', 
-			'WindErrorMessage' => 'core/web/WindErrorMessage', 
-			'WindForward' => 'web/WindForward', 
-			'WindDispatcher' => 'web/WindDispatcher', 
-			'WindConfigParser' => 'parser/WindConfigParser', 
-			'WindConnection' => 'db/WindConnection', 
-			'WindViewTemplate' => 'viewer/compiler/WindViewTemplate', 
-			'WindView' => 'viewer/WindView', 
-			'WindRouter' => 'router/WindRouter', 
-			'WindController' => 'web/WindController', 
-			'WindDispatcher' => 'web/WindDispatcher', 
-			'WindErrorHandler' => 'web/WindErrorHandler', 
-			'WindForward' => 'web/WindForward', 
-			'WindHttpRequest' => 'web/WindHttpRequest', 
-			'WindHttpResponse' => 'web/WindHttpResponse', 
-			'WindSimpleController' => 'web/WindSimpleController', 
-			'WindUrlHelper' => 'web/WindUrlHelper', 
-			'WindWebApplication' => 'web/WindWebApplication');
+	public function setConfig($appName, $config) {
+		if (isset($this->_config[$appName])) return;
+		if (!$config || !is_array($config)) return;
+		$this->_config[$appName] = $config;
 	}
+
 }
 
 ?>
\ No newline at end of file
diff --git a/wind/web/filter/WindFormFilter.php b/wind/web/filter/WindFormFilter.php
index 8fcfc379..0d72708f 100644
--- a/wind/web/filter/WindFormFilter.php
+++ b/wind/web/filter/WindFormFilter.php
@@ -33,7 +33,7 @@
  * @author xiaoxia.xu <xiaoxia.xuxx@aliyun-inc.com>
  * @copyright ©2003-2103 phpwind.com
  * @license http://www.windframework.com
- * @version $Id$
+ * @version $Id: WindFormFilter.php 1532 2011-9-21下午12:53:17 xiaoxiao $
  * @package web
  * @subpackage filter
  */
@@ -52,7 +52,7 @@ class WindFormFilter extends WindActionFilter {
 	public function preHandle() {
 		if (!$this->form) return null;
 		$className = Wind::import($this->form);
-		$form = WindFactory::createInstance($className);
+		$form = $this->getSystemFactory()->createInstance($className);
 		$methods = get_class_methods($form);
 		foreach ($methods as $method) {
 			if ((0 !== strpos($method, 'set')) || ('' == ($_tmp = substr($method, 3)))) continue;
diff --git a/wind/web/view/close.htm b/wind/web/view/404.htm
similarity index 64%
rename from wind/web/view/close.htm
rename to wind/web/view/404.htm
index 1e799194..dae4b5e3 100644
--- a/wind/web/view/close.htm
+++ b/wind/web/view/404.htm
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
 <head>
-<title><?php echo $message; ?></title>
+<title>404 Not Found</title>
 <style>
 body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,form,p,blockquote,th,td {
 	margin: 0;
@@ -57,7 +57,7 @@
 }
 
 .wrap {
-	width: 70%;
+	width: 80%;
 	margin: 50px auto;
 	border: 1px solid #ccc;
 	background: #fff;
@@ -70,15 +70,12 @@
 	padding: 0 20px;
 	margin: 0;
 	font-size: 16px;
-	background:#f9f9f9;
-	background-repeat: no-repeat;
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#f4f4f4));
-	background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #f4f4f4);
-	background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #f4f4f4);
-	background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #f4f4f4);
-	background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #f4f4f4);
-	background-image: linear-gradient(#ffffff, #ffffff 25%, #f4f4f4);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f4f4f4', GradientType=0);
+	background: #f7f7f7;
+	background: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f3f3f3) );
+	background: -moz-linear-gradient(top, #ffffff, #f3f3f3);
+	filter: progid :     DXImageTransform.Microsoft.gradient (     startColorstr =     '#ffffff',
+		endColorstr =  
+		  '#f3f3f3' );
 }
 
 h1 span {
@@ -133,7 +130,12 @@
 <body>
 <div class="wrap">
 <div class="main">
-<?php echo $message;?>
+<h2>404 Not Found</h2>
+<div><?php echo $errmessage; ?></div>
+<div class="tips"><?php echo "The server encountered an internal error and failed to process your request. 
+Please try again later. If this error is temporary, reloading the page might resolve the problem.
+\nIf you are able to contact the administrator report this error message.
+(" . Wind::getApp()->getConfig('siteInfo', '', "http://www.windframework.com/") . ")" ; ?></div>
 </div>
 </div>
 </body>
diff --git a/wind/web/view/error.htm b/wind/web/view/error.htm
index 4f5b895b..5e95c0be 100644
--- a/wind/web/view/error.htm
+++ b/wind/web/view/error.htm
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
 <head>
-<title><?php echo $message; ?></title>
+<title><?php echo $topic; ?></title>
 <style>
 body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,form,p,blockquote,th,td {
 	margin: 0;
@@ -57,7 +57,7 @@
 }
 
 .wrap {
-	width: 70%;
+	width: 80%;
 	margin: 50px auto;
 	border: 1px solid #ccc;
 	background: #fff;
@@ -70,15 +70,12 @@
 	padding: 0 20px;
 	margin: 0;
 	font-size: 16px;
-	background:#f9f9f9;
-	background-repeat: no-repeat;
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#f4f4f4));
-	background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #f4f4f4);
-	background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #f4f4f4);
-	background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #f4f4f4);
-	background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #f4f4f4);
-	background-image: linear-gradient(#ffffff, #ffffff 25%, #f4f4f4);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f4f4f4', GradientType=0);
+	background: #f7f7f7;
+	background: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f3f3f3) );
+	background: -moz-linear-gradient(top, #ffffff, #f3f3f3);
+	filter: progid :         DXImageTransform.Microsoft.gradient (         startColorstr =        
+		'#ffffff', endColorstr =    
+		    '#f3f3f3' );
 }
 
 h1 span {
@@ -132,16 +129,13 @@
 </head>
 <body>
 <div class="wrap">
+<h1><?php echo $topic; ?></h1>
 <div class="main">
-<h2><?php echo "Uncaught error with message '$message'"?></h2>
-<?php if(WIND_DEBUG) {?>
-<h3><?php echo $file,':',$line; ?></h3>
-<?php
-	list($fileLines, $trace) = WindUtility::crash($file, $line, $trace);
-?>
+<h2><?php echo $errmessage; ?></h2>
+<h3><?php echo $file; ?></h3>
 <ul>
 	<?php foreach($fileLines as $key => $value):
-		if($key == ($line-1)):?>
+		if($key == $currentLine):?>
 	<li class="err"><?php echo $value; ?></li>
 	<?php else: ?>
 	<li><?php echo $value; ?></li>
@@ -154,7 +148,6 @@ <h3>__Stack:</h3>
 	<li><?php echo $value; ?></li>
 	<?php endforeach; ?>
 </ul>
-<?php } ?>
 <div class="tips"><?php echo "The server encountered an internal error and failed to process your request. 
 Please try again later. If this error is temporary, reloading the page might resolve the problem.
 \nIf you are able to contact the administrator report this error message.
diff --git a/wind/web/view/erroraction.htm b/wind/web/view/erroraction.htm
index 355ba142..407a9040 100644
--- a/wind/web/view/erroraction.htm
+++ b/wind/web/view/erroraction.htm
@@ -2,138 +2,12 @@
 <html>
 <head>
 <title>{@G:title}</title>
-<style>
-body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,form,p,blockquote,th,td {
-	margin: 0;
-	padding: 0;
-}
-
-ul,li {
-	list-style: none;
-}
-
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-
-th {
-	text-align: left;
-}
-
-td,th,div {
-	word-break: break-all;
-	word-wrap: break-word;
-}
-
-form {
-	display: inline;
-}
-
-* {
-	outline: none
-}
-
-img {
-	border: 0;
-}
-
-em,cite {
-	font-style: normal;
-}
-
-blockquote {
-	quotes: none;
-}
-
-html {
-	font-size: 12px;
-}
-
-body {
-	font: 12px/1.5 Verdana;
-	color: #333;
-	background: #f3f3f3;
-}
-
-.wrap {
-	width: 80%;
-	margin: 50px auto;
-	border: 1px solid #ccc;
-	background: #fff;
-}
-
-h1 {
-	border-bottom: 1px solid #ccc;
-	line-height: 40px;
-	height: 40px;
-	padding: 0 20px;
-	margin: 0;
-	font-size: 16px;
-	background:#f9f9f9;
-	background-repeat: no-repeat;
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#f4f4f4));
-	background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #f4f4f4);
-	background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #f4f4f4);
-	background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #f4f4f4);
-	background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #f4f4f4);
-	background-image: linear-gradient(#ffffff, #ffffff 25%, #f4f4f4);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f4f4f4', GradientType=0);
-}
-
-h1 span {
-	color: #dd5925;
-}
-
-.main {
-	padding: 20px;
-	line-height: 1.8;
-}
-
-h2 {
-	color: #dd5925;
-	font-size: 14px;
-	background: #f9eeea;
-	margin-bottom: 10px;
-	line-height: 25px;
-	padding: 0 10px;
-}
-
-h3 {
-	padding-left: 24px;
-	background: #f7f7f7;
-	font-weight: 100;
-	font-size: 12px;
-	margin-bottom: 10px;
-}
-
-ul {
-	padding-left: 48px;
-	margin-bottom: 10px;
-}
-
-ul li:hover {
-	background: #f3f3f3;
-}
-
-.err {
-	color: #ff0000;
-	background: #faf6f4;
-}
-
-.tips {
-	padding: 5px 10px;
-	background: #ffffe3;
-	border: 1px solid #cccccc;
-	line-height: 20px;
-	color: #333;
-}
-</style>
+<template resource='style' />
 </head>
 <body>
 <div class="wrap">
+<h1>{$errorHeader}:</h1>
 <div class="main">
-<h2 class="f14 b">{$errorHeader}:</h2>
 <ul>
 	<!--#foreach ($errors as $key => $error):
 		$key = $key + 1;
@@ -142,10 +16,11 @@ <h2 class="f14 b">{$errorHeader}:</h2>
 	<li>{$key}. {$error}</li>
 	<!--#endforeach;#-->
 </ul>
-<div class="tips"><?php echo "The server encountered an internal error and failed to process your request. 
+<h2 class="f14 b">You Can Get Help In:</h2>
+<p><?php echo "The server encountered an internal error and failed to process your request. 
 Please try again later. If this error is temporary, reloading the page might resolve the problem.
 \nIf you are able to contact the administrator report this error message.
-(" . Wind::getApp()->getConfig('siteInfo', '', "http://www.windframework.com/") . ")" ; ?></div>
+(" . Wind::getApp()->getConfig('siteInfo', '', "http://www.windframework.com/") . ")" ; ?></p>
 </div>
 </div>
 </body>
diff --git a/wind/web/view/style.htm b/wind/web/view/style.htm
new file mode 100644
index 00000000..15914bb9
--- /dev/null
+++ b/wind/web/view/style.htm
@@ -0,0 +1,124 @@
+<style>
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,form,p,blockquote,th,td {
+	margin: 0;
+	padding: 0;
+}
+
+ul,li {
+	list-style: none;
+}
+
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+
+th {
+	text-align: left;
+}
+
+td,th,div {
+	word-break: break-all;
+	word-wrap: break-word;
+}
+
+form {
+	display: inline;
+}
+
+* {
+	outline: none
+}
+
+img {
+	border: 0;
+}
+
+em,cite {
+	font-style: normal;
+}
+
+blockquote {
+	quotes: none;
+}
+
+html {
+	font-size: 12px;
+}
+
+body {
+	font: 12px/1.5 Verdana;
+	color: #333;
+	background: #f3f3f3;
+}
+
+.wrap {
+	width: 80%;
+	margin: 50px auto;
+	border: 1px solid #ccc;
+	background: #fff;
+}
+
+h1 {
+	border-bottom: 1px solid #ccc;
+	line-height: 40px;
+	height: 40px;
+	padding: 0 20px;
+	margin: 0;
+	font-size: 16px;
+	background: #f7f7f7;
+	background: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f3f3f3) );
+	background: -moz-linear-gradient(top, #ffffff, #f3f3f3);
+	filter: progid :     DXImageTransform.Microsoft.gradient (     startColorstr =     '#ffffff',
+		endColorstr =  
+		  '#f3f3f3' );
+}
+
+h1 span {
+	color: #dd5925;
+}
+
+.main {
+	padding: 20px;
+	line-height: 1.8;
+}
+
+h2 {
+	color: #dd5925;
+	font-size: 14px;
+	background: #f9eeea;
+	margin-bottom: 10px;
+	line-height: 25px;
+	padding: 0 10px;
+}
+
+h3 {
+	padding-left: 24px;
+	background: #f7f7f7;
+	font-weight: 100;
+	font-size: 12px;
+	margin-bottom: 10px;
+}
+
+ul {
+	padding-left: 48px;
+	margin-bottom: 10px;
+}
+
+ul li:hover {
+	background: #f3f3f3;
+}
+
+.err {
+	color: #ff0000;
+	background: #faf6f4;
+}
+
+.tips {
+	padding: 5px 10px;
+	background: #ffffe3;
+	border: 1px solid #cccccc;
+	line-height: 20px;
+	color: #333;
+}
+</style>