Add namespaces: Caching, Collections, Data

28 files changed, 112 insertions, 49 deletions

diff --git a/framework/Data/ActiveRecord/Exceptions/TActiveRecordConfigurationException.php b/framework/Data/ActiveRecord/Exceptions/TActiveRecordConfigurationException.php
index a1c07b8c..f309c954 100644
--- a/framework/Data/ActiveRecord/Exceptions/TActiveRecordConfigurationException.php
+++ b/framework/Data/ActiveRecord/Exceptions/TActiveRecordConfigurationException.php
@@ -6,14 +6,16 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord\Exceptions
  */
 
+namespace Prado\Data\ActiveRecord\Exceptions;
+
 /**
  * TActiveRecordConfigurationException class.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord\Exceptions
  * @since 3.1
  */
 class TActiveRecordConfigurationException extends TActiveRecordException
diff --git a/framework/Data/ActiveRecord/Exceptions/TActiveRecordException.php b/framework/Data/ActiveRecord/Exceptions/TActiveRecordException.php
index a252631c..063a4cd3 100644
--- a/framework/Data/ActiveRecord/Exceptions/TActiveRecordException.php
+++ b/framework/Data/ActiveRecord/Exceptions/TActiveRecordException.php
@@ -6,14 +6,16 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord\Exceptions
  */
 
+namespace Prado\Data\ActiveRecord\Exceptions;
+
 /**
  * Base exception class for Active Records.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord\Exceptions
  * @since 3.1
  */
 class TActiveRecordException extends TDbException
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php b/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
index 2197b48c..f3687b9b 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
@@ -7,9 +7,11 @@
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
- * @package System.Data.ActiveRecord.Relations
+ * @package Prado\Data\ActiveRecord\Relations
  */
 
+namespace Prado\Data\ActiveRecord\Relations;
+
 /**
  * Loads base active record relationship class.
  */
@@ -65,7 +67,7 @@ Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
  * @version $Id$
- * @package System.Data.ActiveRecord.Relations
+ * @package Prado\Data\ActiveRecord\Relations
  * @since 3.1
  */
 class TActiveRecordBelongsTo extends TActiveRecordRelation
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php b/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php
index 92fe495a..330d7c39 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php
@@ -7,9 +7,11 @@
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
- * @package System.Data.ActiveRecord.Relations
+ * @package Prado\Data\ActiveRecord\Relations
  */
 
+namespace Prado\Data\ActiveRecord\Relations;
+
 /**
  * Loads base active record relations class.
  */
@@ -63,7 +65,7 @@ Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
  * @version $Id$
- * @package System.Data.ActiveRecord.Relations
+ * @package Prado\Data\ActiveRecord\Relations
  * @since 3.1
  */
 class TActiveRecordHasMany extends TActiveRecordRelation
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php b/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
index 1b58f112..449739e3 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
@@ -7,9 +7,11 @@
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
- * @package System.Data.ActiveRecord.Relations
+ * @package Prado\Data\ActiveRecord\Relations
  */
 
+namespace Prado\Data\ActiveRecord\Relations;
+
 /**
  * Loads base active record relations class.
  */
@@ -79,7 +81,7 @@ Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
  * @version $Id$
- * @package System.Data.ActiveRecord.Relations
+ * @package Prado\Data\ActiveRecord\Relations
  * @since 3.1
  */
 class TActiveRecordHasManyAssociation extends TActiveRecordRelation
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php b/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
index 46c4d9fb..005ad98c 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
@@ -7,9 +7,11 @@
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
- * @package System.Data.ActiveRecord.Relations
+ * @package Prado\Data\ActiveRecord\Relations
  */
 
+namespace Prado\Data\ActiveRecord\Relations;
+
 /**
  * Loads base active record relationship class.
  */
@@ -80,7 +82,7 @@ Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
  * @version $Id$
- * @package System.Data.ActiveRecord.Relations
+ * @package Prado\Data\ActiveRecord\Relations
  * @since 3.1
  */
 class TActiveRecordHasOne extends TActiveRecordRelation
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php b/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
index 7fe2d468..51bcaee2 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
@@ -7,9 +7,11 @@
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
- * @package System.Data.ActiveRecord.Relations
+ * @package Prado\Data\ActiveRecord\Relations
  */
 
+namespace Prado\Data\ActiveRecord\Relations;
+
 /**
  * Load active record relationship context.
  */
@@ -20,7 +22,7 @@ Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelationContext');
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
  * @version $Id$
- * @package System.Data.ActiveRecord.Relations
+ * @package Prado\Data\ActiveRecord\Relations
  * @since 3.1
  */
 abstract class TActiveRecordRelation
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php b/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
index 961dcd91..862d9b4c 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
@@ -7,9 +7,11 @@
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
- * @package System.Data.ActiveRecord.Relations
+ * @package Prado\Data\ActiveRecord\Relations
  */
 
+namespace Prado\Data\ActiveRecord\Relations;
+
 /**
  * TActiveRecordRelationContext holds information regarding record relationships
  * such as record relation property name, query criteria and foreign object record
@@ -20,7 +22,7 @@
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
  * @version $Id$
- * @package System.Data.ActiveRecord.Relations
+ * @package Prado\Data\ActiveRecord\Relations
  * @since 3.1
  */
 class TActiveRecordRelationContext
diff --git a/framework/Data/ActiveRecord/Scaffold/IScaffoldEditRenderer.php b/framework/Data/ActiveRecord/Scaffold/IScaffoldEditRenderer.php
index e7f85065..a82f71d2 100644
--- a/framework/Data/ActiveRecord/Scaffold/IScaffoldEditRenderer.php
+++ b/framework/Data/ActiveRecord/Scaffold/IScaffoldEditRenderer.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord.Scaffold
+  * @package Prado\Data\ActiveRecord\Scaffold
  */
 
+namespace Prado\Data\ActiveRecord\Scaffold;
+
 /**
  * IScaffoldEditRenderer interface.
  *
@@ -18,7 +20,7 @@
  * that is called before the save() method is called on the TActiveRecord.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @package System.Data.ActiveRecord.Scaffold
+  * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.1
  */
 interface IScaffoldEditRenderer extends IDataRenderer
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php
index 0a2c0cd3..8f3d78ff 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php
@@ -6,8 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord.Scaffold.InputBuilder
+  * @package Prado\Data\ActiveRecord\Scaffold\InputBuilder
  */
+
+namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TIbmScaffoldInput extends TScaffoldInputCommon
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php
index 1cb73438..f713383f 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php
@@ -5,8 +5,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord.Scaffold.InputBuilder
+  * @package Prado\Data\ActiveRecord\Scaffold\InputBuilder
  */
+
+namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TMssqlScaffoldInput extends TScaffoldInputCommon
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php
index e2e75318..36585645 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php
@@ -5,8 +5,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord.Scaffold.InputBuilder
+  * @package Prado\Data\ActiveRecord\Scaffold\InputBuilder
  */
+
+namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TMysqlScaffoldInput extends TScaffoldInputCommon
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php
index 6d10874a..83823403 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php
@@ -5,8 +5,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord.Scaffold.InputBuilder
+  * @package Prado\Data\ActiveRecord\Scaffold\InputBuilder
  */
+
+namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TPgsqlScaffoldInput extends TScaffoldInputCommon
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php
index 14244b4c..df0b9fa3 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php
@@ -5,8 +5,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord.Scaffold.InputBuilder
+  * @package Prado\Data\ActiveRecord\Scaffold\InputBuilder
  */
+
+namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
+
 class TScaffoldInputBase
 {
 	const DEFAULT_ID = 'scaffold_input';
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php
index 3394680e..85e6a7c3 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php
@@ -5,8 +5,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord.Scaffold.InputBuilder
+  * @package Prado\Data\ActiveRecord\Scaffold\InputBuilder
  */
+
+namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputBase');
 
 class TScaffoldInputCommon extends TScaffoldInputBase
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php
index 441d2770..2a06548e 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php
@@ -5,8 +5,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord.Scaffold.InputBuilder
+  * @package Prado\Data\ActiveRecord\Scaffold\InputBuilder
  */
+
+namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TSqliteScaffoldInput extends TScaffoldInputCommon
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
index 122dfbd2..209fd5bd 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord.Scaffold
+  * @package Prado\Data\ActiveRecord\Scaffold
  */
 
+namespace Prado\Data\ActiveRecord\Scaffold;
+
 /**
  * Include the base Active Record class.
  */
@@ -25,7 +27,7 @@ Prado::using('System.Data.ActiveRecord.TActiveRecord');
  * file explicitly.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @package System.Data.ActiveRecord.Scaffold
+  * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.1
  */
 abstract class TScaffoldBase extends TTemplateControl
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php
index 592c958a..234a57f9 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord.Scaffold
+  * @package Prado\Data\ActiveRecord\Scaffold
  */
 
+namespace Prado\Data\ActiveRecord\Scaffold;
+
 /**
  * Load scaffold base.
  */
@@ -42,7 +44,7 @@ Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
  * xxx is the property name).
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @package System.Data.ActiveRecord.Scaffold
+  * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.1
  */
 class TScaffoldEditView extends TScaffoldBase
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
index afdb126c..619436c3 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord.Scaffold
+  * @package Prado\Data\ActiveRecord\Scaffold
  */
 
+namespace Prado\Data\ActiveRecord\Scaffold;
+
 /**
  * Load the scaffold base class.
  */
@@ -43,7 +45,7 @@ Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
  * Parameters property of TActiveRecordCriteria.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @package System.Data.ActiveRecord.Scaffold
+  * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.1
  */
 class TScaffoldListView extends TScaffoldBase
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php
index ea2d2c94..92c261fa 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php
@@ -7,9 +7,11 @@
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
- * @package System.Data.ActiveRecord.Scaffold
+  * @package Prado\Data\ActiveRecord\Scaffold
  */
 
+namespace Prado\Data\ActiveRecord\Scaffold;
+
 /**
  * Import the scaffold base.
  */
@@ -30,7 +32,7 @@ Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Id$
- * @package System.Data.ActiveRecord.Scaffold
+  * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.1
  */
 class TScaffoldSearch extends TScaffoldBase
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
index acc78fd2..f5e03f02 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord.Scaffold
+  * @package Prado\Data\ActiveRecord\Scaffold
  */
 
+namespace Prado\Data\ActiveRecord\Scaffold;
+
 /**
  * Import scaffold base, list, edit and search controls.
  */
@@ -34,7 +36,7 @@ Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldSearch');
  * the Active Record class to be displayed/edited/added.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @package System.Data.ActiveRecord.Scaffold
+  * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.0
  */
 class TScaffoldView extends TScaffoldBase
diff --git a/framework/Data/ActiveRecord/TActiveRecord.php b/framework/Data/ActiveRecord/TActiveRecord.php
index 5e4755d6..8b295c2f 100644
--- a/framework/Data/ActiveRecord/TActiveRecord.php
+++ b/framework/Data/ActiveRecord/TActiveRecord.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord
  */
 
+namespace Prado\Data\ActiveRecord;
+
 /**
  * Load record manager, criteria and relations.
  */
@@ -141,7 +143,7 @@ Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelationContext');
  * </code>
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord
  * @since 3.1
  */
 abstract class TActiveRecord extends TComponent
diff --git a/framework/Data/ActiveRecord/TActiveRecordChangeEventParameter.php b/framework/Data/ActiveRecord/TActiveRecordChangeEventParameter.php
index f1307529..95f923df 100644
--- a/framework/Data/ActiveRecord/TActiveRecordChangeEventParameter.php
+++ b/framework/Data/ActiveRecord/TActiveRecordChangeEventParameter.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord
  */
 
+namespace Prado\Data\ActiveRecord;
+
 /**
  * TActiveRecordChangeEventParameter class
  *
@@ -19,7 +21,7 @@
  * be set to false to prevent the requested change event to be performed.
  *
  * @author Wei Zhuo<weizhuo@gmail.com>
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord
  * @since 3.1.2
  */
 class TActiveRecordChangeEventParameter extends TEventParameter
diff --git a/framework/Data/ActiveRecord/TActiveRecordConfig.php b/framework/Data/ActiveRecord/TActiveRecordConfig.php
index 6e726df0..e862b52b 100644
--- a/framework/Data/ActiveRecord/TActiveRecordConfig.php
+++ b/framework/Data/ActiveRecord/TActiveRecordConfig.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord
  */
 
+namespace Prado\Data\ActiveRecord;
+
 Prado::using('System.Data.TDataSourceConfig');
 Prado::using('System.Data.ActiveRecord.TActiveRecordManager');
 
@@ -65,7 +67,7 @@ Prado::using('System.Data.ActiveRecord.TActiveRecordManager');
  * </code>
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord
  * @since 3.1
  */
 class TActiveRecordConfig extends TDataSourceConfig
diff --git a/framework/Data/ActiveRecord/TActiveRecordCriteria.php b/framework/Data/ActiveRecord/TActiveRecordCriteria.php
index aec3ce53..59a80212 100644
--- a/framework/Data/ActiveRecord/TActiveRecordCriteria.php
+++ b/framework/Data/ActiveRecord/TActiveRecordCriteria.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord
  */
 
+namespace Prado\Data\ActiveRecord;
+
 Prado::using('System.Data.DataGateway.TSqlCriteria');
 
 /**
@@ -27,7 +29,7 @@ Prado::using('System.Data.DataGateway.TSqlCriteria');
  * </code>
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord
  * @since 3.1
  */
 class TActiveRecordCriteria extends TSqlCriteria
diff --git a/framework/Data/ActiveRecord/TActiveRecordGateway.php b/framework/Data/ActiveRecord/TActiveRecordGateway.php
index 4d4fdac1..de0be08d 100644
--- a/framework/Data/ActiveRecord/TActiveRecordGateway.php
+++ b/framework/Data/ActiveRecord/TActiveRecordGateway.php
@@ -6,15 +6,17 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord
  */
 
+namespace Prado\Data\ActiveRecord;
+
 /**
  * TActiveRecordGateway excutes the SQL command queries and returns the data
  * record as arrays (for most finder methods).
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord
  * @since 3.1
  */
 class TActiveRecordGateway extends TComponent
diff --git a/framework/Data/ActiveRecord/TActiveRecordInvalidFinderResult.php b/framework/Data/ActiveRecord/TActiveRecordInvalidFinderResult.php
index 1d02f4c8..9e02027c 100644
--- a/framework/Data/ActiveRecord/TActiveRecordInvalidFinderResult.php
+++ b/framework/Data/ActiveRecord/TActiveRecordInvalidFinderResult.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord
  */
 
+namespace Prado\Data\ActiveRecord;
+
 /**
  * TActiveRecordInvalidFinderResult class.
  * TActiveRecordInvalidFinderResult defines the enumerable type for possible results
@@ -19,7 +21,7 @@
  * - Exception: throws a TActiveRecordException
  *
  * @author Yves Berkholz <godzilla80@gmx.net>
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord
  * @see TActiveRecordManager::setInvalidFinderResult
  * @see TActiveRecordConfig::setInvalidFinderResult
  * @see TActiveRecord::setInvalidFinderResult
diff --git a/framework/Data/ActiveRecord/TActiveRecordManager.php b/framework/Data/ActiveRecord/TActiveRecordManager.php
index 4aa2cde9..74a78e0e 100644
--- a/framework/Data/ActiveRecord/TActiveRecordManager.php
+++ b/framework/Data/ActiveRecord/TActiveRecordManager.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord
  */
 
+namespace Prado\Data\ActiveRecord;
+
 Prado::using('System.Data.TDbConnection');
 Prado::using('System.Data.ActiveRecord.TActiveRecord');
 Prado::using('System.Data.ActiveRecord.Exceptions.TActiveRecordException');
@@ -30,7 +32,7 @@ Prado::using('System.Data.ActiveRecord.TActiveRecordGateway');
  * the active record gateway to cache the table meta data information.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @package System.Data.ActiveRecord
+ * @package Prado\Data\ActiveRecord
  * @since 3.1
  */
 class TActiveRecordManager extends TComponent