Happy 2014!

(cherry picked from commit 7915cde127eba2a5143fd45c6b32e81ad91bdfae)

Conflicts:
	framework/Data/Common/Mssql/TMssqlMetaData.php
	framework/Data/Common/Mysql/TMysqlMetaData.php
	framework/Data/Common/Oracle/TOracleMetaData.php
	framework/Data/Common/Pgsql/TPgsqlMetaData.php
	framework/Data/Common/Sqlite/TSqliteMetaData.php
	framework/Data/Common/TDbMetaData.php
	framework/Web/UI/ActiveControls/TCallbackClientScript.php
	framework/Web/UI/JuiControls/TJuiAutoComplete.php
	framework/Web/UI/JuiControls/TJuiControlAdapter.php
	framework/Web/UI/JuiControls/TJuiDraggable.php
	framework/Web/UI/JuiControls/TJuiDroppable.php
	framework/Web/UI/JuiControls/TJuiResizable.php
	framework/Web/UI/JuiControls/TJuiSelectable.php
	framework/Web/UI/JuiControls/TJuiSortable.php
	framework/Wsat/TWsatARGenerator.php
	framework/Wsat/TWsatService.php
	framework/Wsat/pages/TWsatGenerateAR.php
	framework/Wsat/pages/TWsatHome.php
	framework/Wsat/pages/TWsatLogin.php
	framework/Wsat/pages/TWsatScaffolding.php

6 files changed, 12 insertions, 12 deletions

diff --git a/framework/Data/SqlMap/DataMapper/TFastSqlMapApplicationCache.php b/framework/Data/SqlMap/DataMapper/TFastSqlMapApplicationCache.php
index ae6aa200..3af45e41 100644
--- a/framework/Data/SqlMap/DataMapper/TFastSqlMapApplicationCache.php
+++ b/framework/Data/SqlMap/DataMapper/TFastSqlMapApplicationCache.php
@@ -4,7 +4,7 @@
  *
  * @author Berczi Gabor <gabor.berczi@devworx.hu>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id: TFastSqlMapApplicationCache.php 2996 2011-06-20 15:24:57Z ctrlaltca@gmail.com $
  * @package System.Data.SqlMap
@@ -12,9 +12,9 @@
 
 /**
  * TFastSqlMapApplicationCache class file
- *  
+ *
  * Fast SqlMap result cache class with minimal-concurrency get/set and atomic flush operations
- *  
+ *
  * @author Berczi Gabor <gabor.berczi@devworx.hu>
  * @version $Id: TFastSqlMapApplicationCache.php 2996 2011-06-20 15:24:57Z ctrlaltca@gmail.com $
  * @package System.Data.SqlMap
@@ -30,12 +30,12 @@ class TFastSqlMapApplicationCache implements ICache
 	{
 		$this->_cacheModel = $cacheModel;
 	}
-	
+
 	protected function getBaseKeyKeyName()
 	{
 		return 'SqlMapCacheBaseKey::'.$this->_cacheModel->getId();
 	}
-	
+
 	protected function getBaseKey()
 	{
 		$cache = $this->getCache();
@@ -48,7 +48,7 @@ class TFastSqlMapApplicationCache implements ICache
 		}
 		return $basekey;
 	}
-	
+
 	protected function getCacheKey($key)
 	{
 		return $this->getBaseKey().'###'.$key;
@@ -63,7 +63,7 @@ class TFastSqlMapApplicationCache implements ICache
 	{
 		$this->getCache()->delete($this->getBaseKeyKeyName());
 	}
-	
+
 	public function get($key)
 	{
 		$result = $this->getCache()->get($this->getCacheKey($key));
diff --git a/framework/Data/SqlMap/DataMapper/TLazyLoadList.php b/framework/Data/SqlMap/DataMapper/TLazyLoadList.php
index c512ef92..38a77d55 100644
--- a/framework/Data/SqlMap/DataMapper/TLazyLoadList.php
+++ b/framework/Data/SqlMap/DataMapper/TLazyLoadList.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id: TLazyLoadList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
diff --git a/framework/Data/SqlMap/DataMapper/TPropertyAccess.php b/framework/Data/SqlMap/DataMapper/TPropertyAccess.php
index 20a853c4..d5b25071 100644
--- a/framework/Data/SqlMap/DataMapper/TPropertyAccess.php
+++ b/framework/Data/SqlMap/DataMapper/TPropertyAccess.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id: TPropertyAccess.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapCache.php b/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
index 15e148fe..acb0b301 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id: TSqlMapCache.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php b/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
index f3d67d47..c6716a85 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id: TSqlMapPagedList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php b/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php
index 9d743b82..c09ec42a 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id: TSqlMapTypeHandlerRegistry.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap