Add namespaces: Exceptions, I18N, Security

59 files changed, 226 insertions, 117 deletions

diff --git a/framework/Exceptions/TApplicationException.php b/framework/Exceptions/TApplicationException.php
index 9de434e0..ccb97d46 100644
--- a/framework/Exceptions/TApplicationException.php
+++ b/framework/Exceptions/TApplicationException.php
@@ -6,16 +6,18 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright © 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
+
 /**
  * TApplicationException class
  *
  * TApplicationException is the base class for all user application-level exceptions.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.0
  */
 class TApplicationException extends TException
diff --git a/framework/Exceptions/TConfigurationException.php b/framework/Exceptions/TConfigurationException.php
index e2506472..8de0c1ae 100644
--- a/framework/Exceptions/TConfigurationException.php
+++ b/framework/Exceptions/TConfigurationException.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
+
 /**
  * TConfigurationException class
  *
@@ -16,7 +18,7 @@
  * such as error in an application configuration file or control template file.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.0
  */
 class TConfigurationException extends TSystemException
diff --git a/framework/Exceptions/TDbConnectionException.php b/framework/Exceptions/TDbConnectionException.php
index c39c6d8a..e303af44 100644
--- a/framework/Exceptions/TDbConnectionException.php
+++ b/framework/Exceptions/TDbConnectionException.php
@@ -6,16 +6,18 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
+
 /**
  * TDbConnectionException class
  *
  * TDbConnectionException represents an exception caused by DB connection failure.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.0
  */
 class TDbConnectionException extends TDbException
diff --git a/framework/Exceptions/TDbException.php b/framework/Exceptions/TDbException.php
index fe1d24f4..7f466204 100644
--- a/framework/Exceptions/TDbException.php
+++ b/framework/Exceptions/TDbException.php
@@ -6,16 +6,18 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
+
 /**
  * TDbException class
  *
  * TDbException represents an exception related with DB operations.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.0
  */
 class TDbException extends TSystemException
diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php
index 8337f3be..13d1203f 100644
--- a/framework/Exceptions/TErrorHandler.php
+++ b/framework/Exceptions/TErrorHandler.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
+
 /**
  * TErrorHandler class
  *
@@ -44,7 +46,7 @@
  * <module id="error" class="TErrorHandler" ErrorTemplatePath="System.Exceptions" />
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.0
  */
 class TErrorHandler extends TModule
diff --git a/framework/Exceptions/TException.php b/framework/Exceptions/TException.php
index 80dd01f1..fb1db200 100644
--- a/framework/Exceptions/TException.php
+++ b/framework/Exceptions/TException.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
+
 /**
  * TException class
  *
@@ -27,7 +29,7 @@
  * "message.txt" will be used instead.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.0
  */
 class TException extends Exception
diff --git a/framework/Exceptions/THttpException.php b/framework/Exceptions/THttpException.php
index f151138b..883c2b63 100644
--- a/framework/Exceptions/THttpException.php
+++ b/framework/Exceptions/THttpException.php
@@ -6,9 +6,10 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
 
 /**
  * THttpException class
@@ -18,7 +19,7 @@
  * It is used by {@link TErrorHandler} to provide different error output to users.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.0
  */
 class THttpException extends TSystemException
diff --git a/framework/Exceptions/TIOException.php b/framework/Exceptions/TIOException.php
index 42231284..9b3f18bb 100644
--- a/framework/Exceptions/TIOException.php
+++ b/framework/Exceptions/TIOException.php
@@ -6,16 +6,18 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
+
 /**
  * TIOException class
  *
  * TIOException represents an exception related with improper IO operations.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.0
  */
 class TIOException extends TSystemException
diff --git a/framework/Exceptions/TInvalidDataTypeException.php b/framework/Exceptions/TInvalidDataTypeException.php
index 03f94985..71670d7d 100644
--- a/framework/Exceptions/TInvalidDataTypeException.php
+++ b/framework/Exceptions/TInvalidDataTypeException.php
@@ -6,16 +6,18 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
+
 /**
  * TInvalidDataTypeException class
  *
  * TInvalidDataTypeException represents an exception caused by invalid data type.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.0
  */
 class TInvalidDataTypeException extends TSystemException
diff --git a/framework/Exceptions/TInvalidDataValueException.php b/framework/Exceptions/TInvalidDataValueException.php
index 075bb871..17ab3ccd 100644
--- a/framework/Exceptions/TInvalidDataValueException.php
+++ b/framework/Exceptions/TInvalidDataValueException.php
@@ -6,16 +6,18 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
+
 /**
  * TInvalidDataValueException class
  *
  * TInvalidDataValueException represents an exception caused by invalid data value.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.0
  */
 class TInvalidDataValueException extends TSystemException
diff --git a/framework/Exceptions/TInvalidOperationException.php b/framework/Exceptions/TInvalidOperationException.php
index 4366e5f0..83725658 100644
--- a/framework/Exceptions/TInvalidOperationException.php
+++ b/framework/Exceptions/TInvalidOperationException.php
@@ -6,16 +6,18 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
+
 /**
  * TInvalidOperationException class
  *
  * TInvalidOperationException represents an exception caused by invalid operations.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.0
  */
 class TInvalidOperationException extends TSystemException
diff --git a/framework/Exceptions/TNotSupportedException.php b/framework/Exceptions/TNotSupportedException.php
index b793dbbe..7d0c733b 100644
--- a/framework/Exceptions/TNotSupportedException.php
+++ b/framework/Exceptions/TNotSupportedException.php
@@ -6,16 +6,18 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
+
 /**
  * TNotSupportedException class
  *
  * TNotSupportedException represents an exception caused by using an unsupported PRADO feature.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.0
  */
 class TNotSupportedException extends TSystemException
diff --git a/framework/Exceptions/TPhpErrorException.php b/framework/Exceptions/TPhpErrorException.php
index 75218c44..a65342ae 100644
--- a/framework/Exceptions/TPhpErrorException.php
+++ b/framework/Exceptions/TPhpErrorException.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
+
 /**
  * TPhpErrorException class
  *
@@ -16,7 +18,7 @@
  * This exception is mainly thrown within a PHP error handler.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.0
  */
 class TPhpErrorException extends TSystemException
diff --git a/framework/Exceptions/TSystemException.php b/framework/Exceptions/TSystemException.php
index 5d5c7d8e..6a863907 100644
--- a/framework/Exceptions/TSystemException.php
+++ b/framework/Exceptions/TSystemException.php
@@ -6,16 +6,18 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
+
 /**
  * TSystemException class
  *
  * TSystemException is the base class for all framework-level exceptions.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.0
  */
 class TSystemException extends TException
diff --git a/framework/Exceptions/TTemplateException.php b/framework/Exceptions/TTemplateException.php
index 7deb6ed0..4b58df10 100644
--- a/framework/Exceptions/TTemplateException.php
+++ b/framework/Exceptions/TTemplateException.php
@@ -6,16 +6,18 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Exceptions
+ * @package Prado\Exceptions
  */
 
+namespace Prado\Exceptions;
+
 /**
  * TTemplateException class
  *
  * TTemplateException represents an exception caused by invalid template syntax.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Exceptions
+ * @package Prado\Exceptions
  * @since 3.1
  */
 class TTemplateException extends TConfigurationException
diff --git a/framework/I18N/TChoiceFormat.php b/framework/I18N/TChoiceFormat.php
index 4525aaad..20130e3e 100644
--- a/framework/I18N/TChoiceFormat.php
+++ b/framework/I18N/TChoiceFormat.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.I18N
+ * @package Prado\I18N
  */
 
+namespace Prado\I18N;
+
  /**
  * Get the ChoiceFormat class.
  */
@@ -71,7 +73,7 @@ Prado::using('System.I18N.TTranslate');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Fri Dec 24 21:38:49 EST 2004
- * @package System.I18N
+ * @package Prado\I18N
  */
 class TChoiceFormat extends TTranslate
 {
diff --git a/framework/I18N/TDateFormat.php b/framework/I18N/TDateFormat.php
index e7846be7..f5b2c6ec 100644
--- a/framework/I18N/TDateFormat.php
+++ b/framework/I18N/TDateFormat.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.I18N
+ * @package Prado\I18N
  */
 
+namespace Prado\I18N;
+
 /**
  * Get the DateFormat class.
  */
@@ -56,7 +58,7 @@ Prado::using('System.I18N.TI18NControl');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Sat Dec 11 15:25:11 EST 2004
- * @package System.I18N
+ * @package Prado\I18N
  */
 class TDateFormat extends TI18NControl implements IDataRenderer
 {
diff --git a/framework/I18N/TGlobalization.php b/framework/I18N/TGlobalization.php
index 3fbaa2b4..67c77092 100644
--- a/framework/I18N/TGlobalization.php
+++ b/framework/I18N/TGlobalization.php
@@ -6,9 +6,10 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.I18N
+ * @package Prado\I18N
  */
 
+namespace Prado\I18N;
 
 /**
  * TGlobalization contains settings for Culture, Charset
@@ -20,7 +21,7 @@
  *
  * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.66 $  $Date: ${DATE} ${TIME} $
- * @package System.I18N
+ * @package Prado\I18N
  * @since 3.0
  */
 class TGlobalization extends TModule
diff --git a/framework/I18N/TGlobalizationAutoDetect.php b/framework/I18N/TGlobalizationAutoDetect.php
index a79a128d..e5488e17 100644
--- a/framework/I18N/TGlobalizationAutoDetect.php
+++ b/framework/I18N/TGlobalizationAutoDetect.php
@@ -7,9 +7,11 @@
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Revision: 1.66 $  $Date: ${DATE} ${TIME} $
- * @package System.I18N
+ * @package Prado\I18N
  */
 
+namespace Prado\I18N;
+
 /**
  * Import the HTTPNeogtiator
  */
@@ -21,7 +23,7 @@ Prado::using('System.I18N.core.HTTPNegotiator');
  *
  * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.66 $  $Date: ${DATE} ${TIME} $
- * @package System.I18N
+ * @package Prado\I18N
  */
 class TGlobalizationAutoDetect extends TGlobalization
 {
diff --git a/framework/I18N/TI18NControl.php b/framework/I18N/TI18NControl.php
index 96fc8b62..73f44420 100644
--- a/framework/I18N/TI18NControl.php
+++ b/framework/I18N/TI18NControl.php
@@ -6,9 +6,10 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.I18N
+ * @package Prado\I18N
  */
 
+namespace Prado\I18N;
 
 /**
  * TI18NControl class.
@@ -27,7 +28,7 @@
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Sat Dec 11 15:25:11 EST 2004
- * @package System.I18N
+ * @package Prado\I18N
  */
 class TI18NControl extends TControl
 {
diff --git a/framework/I18N/TNumberFormat.php b/framework/I18N/TNumberFormat.php
index 89eab245..0af6d893 100644
--- a/framework/I18N/TNumberFormat.php
+++ b/framework/I18N/TNumberFormat.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.I18N
+ * @package Prado\I18N
  */
 
+namespace Prado\I18N;
+
 /**
  * Get the NumberFormat class.
  */
@@ -61,7 +63,7 @@ Prado::using('System.I18N.TI18NControl');
   *
   * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
   * @version v1.0, last update on Sat Dec 11 17:49:56 EST 2004
-  * @package System.I18N
+  * @package Prado\I18N
   */
 class TNumberFormat extends TI18NControl implements IDataRenderer
 {
diff --git a/framework/I18N/TTranslate.php b/framework/I18N/TTranslate.php
index 1365b937..516c3416 100644
--- a/framework/I18N/TTranslate.php
+++ b/framework/I18N/TTranslate.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.I18N
+ * @package Prado\I18N
  */
 
+namespace Prado\I18N;
+
 /**
  * Get the parent control class.
  */
@@ -57,7 +59,7 @@ Prado::using('System.I18N.TI18NControl');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Fri Dec 24 21:38:49 EST 2004
- * @package System.I18N
+ * @package Prado\I18N
  */
 class TTranslate extends TI18NControl
 {
diff --git a/framework/I18N/TTranslateParameter.php b/framework/I18N/TTranslateParameter.php
index d5c41230..9a60f772 100644
--- a/framework/I18N/TTranslateParameter.php
+++ b/framework/I18N/TTranslateParameter.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.I18N
+ * @package Prado\I18N
  */
 
+namespace Prado\I18N;
+
 /**
  * TTranslateParameter component should be used inside the TTranslate component to
  * allow parameter substitution.
@@ -36,7 +38,7 @@
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v3.0, last update on Friday, 6 January 2006
- * @package System.I18N
+ * @package Prado\I18N
  */
 class TTranslateParameter extends TControl
 {
diff --git a/framework/I18N/Translation.php b/framework/I18N/Translation.php
index 9592ef53..14e58031 100644
--- a/framework/I18N/Translation.php
+++ b/framework/I18N/Translation.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.I18N
+ * @package Prado\I18N
  */
 
+namespace Prado\I18N;
+
 /**
  * Get the MessageFormat class.
  */
@@ -22,7 +24,7 @@ Prado::using('System.I18N.core.MessageFormat');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Tue Dec 28 11:54:48 EST 2004
- * @package System.I18N
+ * @package Prado\I18N
  */
 class Translation extends TComponent
 {
diff --git a/framework/I18N/core/ChoiceFormat.php b/framework/I18N/core/ChoiceFormat.php
index f5db61db..6b61bb17 100644
--- a/framework/I18N/core/ChoiceFormat.php
+++ b/framework/I18N/core/ChoiceFormat.php
@@ -14,9 +14,10 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.1 $  $Date: 2005/01/11 07:19:39 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
 
 /**
  * ChoiceFormat class.
@@ -74,7 +75,7 @@
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Fri Dec 24 20:46:16 EST 2004
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 class ChoiceFormat
 {
diff --git a/framework/I18N/core/CultureInfo.php b/framework/I18N/core/CultureInfo.php
index fc20b833..7283175a 100644
--- a/framework/I18N/core/CultureInfo.php
+++ b/framework/I18N/core/CultureInfo.php
@@ -13,9 +13,11 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
+
 /**
  * CultureInfo class.
  *
@@ -43,7 +45,7 @@
  * For example, Australian English is "en_AU".
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 class CultureInfo
 {
diff --git a/framework/I18N/core/DateFormat.php b/framework/I18N/core/DateFormat.php
index 6cfe1bfc..50bdf53c 100644
--- a/framework/I18N/core/DateFormat.php
+++ b/framework/I18N/core/DateFormat.php
@@ -13,9 +13,11 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.8 $  $Date: 2005/12/15 07:14:49 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
+
 /**
  * Get the DateTimeFormatInfo class.
  */
@@ -43,7 +45,7 @@ require_once(dirname(__FILE__).'/util.php');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Sat Dec 04 14:10:49 EST 2004
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 class DateFormat
 {
diff --git a/framework/I18N/core/DateTimeFormatInfo.php b/framework/I18N/core/DateTimeFormatInfo.php
index d4deee1f..2f6e894f 100644
--- a/framework/I18N/core/DateTimeFormatInfo.php
+++ b/framework/I18N/core/DateTimeFormatInfo.php
@@ -14,9 +14,11 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.2 $  $Date: 2005/01/05 03:15:14 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
+
 /**
  * Get the CultureInfo class.
  */
@@ -73,7 +75,7 @@ require_once(dirname(__FILE__).'/CultureInfo.php');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Fri Dec 03 22:30:31 EST 2004
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 class DateTimeFormatInfo
 {
diff --git a/framework/I18N/core/Gettext/TGettext.php b/framework/I18N/core/Gettext/TGettext.php
index 2c5f91c7..860a9208 100644
--- a/framework/I18N/core/Gettext/TGettext.php
+++ b/framework/I18N/core/Gettext/TGettext.php
@@ -13,9 +13,11 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.4 $  $Date: 2005/01/09 23:36:23 $
- * @package System.I18N.core
+ * @package Prado\I18N\core\Gettext
  */
 
+namespace Prado\I18N\core\Gettext;
+
 // +----------------------------------------------------------------------+
 // | PEAR :: File :: Gettext                                              |
 // +----------------------------------------------------------------------+
@@ -54,7 +56,7 @@
  * @author      Michael Wallner <mike@php.net>
  * @version     $Revision: 1.4 $
  * @access      public
- * @package System.I18N.core
+ * @package Prado\I18N\core\Gettext
  */
 class TGettext
 {
diff --git a/framework/I18N/core/Gettext/TGettext_MO.php b/framework/I18N/core/Gettext/TGettext_MO.php
index 3e84ef2e..d78b88e4 100644
--- a/framework/I18N/core/Gettext/TGettext_MO.php
+++ b/framework/I18N/core/Gettext/TGettext_MO.php
@@ -13,9 +13,10 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.3 $  $Date: 2005/08/27 03:21:12 $
- * @package System.I18N.core
+ * @package Prado\I18N\core\Gettext
  */
 
+namespace Prado\I18N\core\Gettext;
 
 // +----------------------------------------------------------------------+
 // | PEAR :: File :: Gettext :: MO                                        |
@@ -48,7 +49,7 @@ require_once dirname(__FILE__).'/TGettext.php';
  * @author      Michael Wallner <mike@php.net>
  * @version     $Revision: 1.3 $
  * @access      public
- * @package System.I18N.core
+ * @package Prado\I18N\core\Gettext
  */
 class TGettext_MO extends TGettext
 {
diff --git a/framework/I18N/core/Gettext/TGettext_PO.php b/framework/I18N/core/Gettext/TGettext_PO.php
index 950a5de3..9651da2e 100644
--- a/framework/I18N/core/Gettext/TGettext_PO.php
+++ b/framework/I18N/core/Gettext/TGettext_PO.php
@@ -13,9 +13,11 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.2 $  $Date: 2005/01/05 03:15:14 $
- * @package System.I18N.core
+ * @package Prado\I18N\core\Gettext
  */
 
+namespace Prado\I18N\core\Gettext;
+
 // +----------------------------------------------------------------------+
 // | PEAR :: File :: Gettext :: PO                                        |
 // +----------------------------------------------------------------------+
@@ -47,7 +49,7 @@ require_once dirname(__FILE__).'/TGettext.php';
  * @author      Michael Wallner <mike@php.net>
  * @version     $Revision: 1.2 $
  * @access      public
- * @package System.I18N.core
+ * @package Prado\I18N\core\Gettext
  */
 class TGettext_PO extends TGettext
 {
diff --git a/framework/I18N/core/HTTPNegotiator.php b/framework/I18N/core/HTTPNegotiator.php
index 26b532b8..9c96d568 100644
--- a/framework/I18N/core/HTTPNegotiator.php
+++ b/framework/I18N/core/HTTPNegotiator.php
@@ -14,9 +14,11 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.2 $  $Date: 2005/01/05 03:15:14 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
+
 /**
  * Include the CultureInfo class.
  */
@@ -29,7 +31,7 @@ require_once(dirname(__FILE__).'/CultureInfo.php');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Fri Dec 24 16:01:35 EST 2004
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 class HTTPNegotiator
 {
diff --git a/framework/I18N/core/IMessageSource.php b/framework/I18N/core/IMessageSource.php
index f8263b97..32c56ebf 100644
--- a/framework/I18N/core/IMessageSource.php
+++ b/framework/I18N/core/IMessageSource.php
@@ -14,9 +14,11 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.3 $  $Date: 2005/01/09 22:15:32 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
  
+namespace Prado\I18N\core;
+
 /**
  * IMessageSource interface.
  * 
@@ -27,7 +29,7 @@
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Fri Dec 24 17:40:19 EST 2004
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 interface IMessageSource
 {
diff --git a/framework/I18N/core/MessageCache.php b/framework/I18N/core/MessageCache.php
index ad310258..722f2aac 100644
--- a/framework/I18N/core/MessageCache.php
+++ b/framework/I18N/core/MessageCache.php
@@ -2,9 +2,11 @@
 /**
  * Translation table cache.
  * @author $Author: weizhuo $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
+
 /**
  * Load the cache lite library.
  */
@@ -13,7 +15,7 @@ require_once(dirname(__FILE__).'/TCache_Lite.php');
 /**
  * Cache the translation table into the file system.
  * It can cache each cataloug+variant or just the whole section.
- * @package System.I18N.core
+ * @package Prado\I18N\core
  * @author $Author: weizhuo $
  */
 class MessageCache
diff --git a/framework/I18N/core/MessageFormat.php b/framework/I18N/core/MessageFormat.php
index fd0d445d..64e53454 100644
--- a/framework/I18N/core/MessageFormat.php
+++ b/framework/I18N/core/MessageFormat.php
@@ -14,9 +14,11 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.5 $  $Date: 2005/08/27 03:21:12 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
+
 /**
  * Get the MessageSource classes.
  */
@@ -49,7 +51,7 @@ require_once(dirname(__FILE__).'/util.php');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Fri Dec 24 20:46:16 EST 2004
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 class MessageFormat
 {
diff --git a/framework/I18N/core/MessageSource.php b/framework/I18N/core/MessageSource.php
index 50c13334..db24237a 100644
--- a/framework/I18N/core/MessageSource.php
+++ b/framework/I18N/core/MessageSource.php
@@ -13,9 +13,10 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.4 $  $Date: 2005/12/17 06:11:28 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
 
  /**
   * Get the IMessageSource interface.
@@ -68,7 +69,7 @@ require_once(dirname(__FILE__).'/MessageCache.php');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Fri Dec 24 19:55:49 EST 2004
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 abstract class MessageSource implements IMessageSource
 {	
diff --git a/framework/I18N/core/MessageSource_Database.php b/framework/I18N/core/MessageSource_Database.php
index 142c28db..d887954d 100644
--- a/framework/I18N/core/MessageSource_Database.php
+++ b/framework/I18N/core/MessageSource_Database.php
@@ -11,9 +11,11 @@
  * The latest version of PRADO can be obtained from:
  * {@link http://prado.sourceforge.net/}
  *
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
+
 /**
  * Get the MessageSource class file.
  */
@@ -26,7 +28,7 @@ require_once(dirname(__FILE__).'/MessageSource.php');
  *
  * See the MessageSource::factory() method to instantiate this class.
  *
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 class MessageSource_Database extends MessageSource
 {
diff --git a/framework/I18N/core/MessageSource_MySQL.php b/framework/I18N/core/MessageSource_MySQL.php
index 743694fa..52715ecd 100644
--- a/framework/I18N/core/MessageSource_MySQL.php
+++ b/framework/I18N/core/MessageSource_MySQL.php
@@ -14,9 +14,11 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.4 $  $Date: 2005/02/25 09:59:40 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
+
 /**
  * Get the MessageSource class file.
  */
@@ -36,7 +38,7 @@ require_once(dirname(__FILE__).'/util.php');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Fri Dec 24 16:58:58 EST 2004
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 class MessageSource_MySQL extends MessageSource
 {
diff --git a/framework/I18N/core/MessageSource_SQLite.php b/framework/I18N/core/MessageSource_SQLite.php
index 46b5d865..78e4e78d 100644
--- a/framework/I18N/core/MessageSource_SQLite.php
+++ b/framework/I18N/core/MessageSource_SQLite.php
@@ -14,9 +14,11 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.4 $  $Date: 2005/02/25 09:59:40 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
- 
+
+namespace Prado\I18N\core;
+
 /**
  * Get the MessageSource class file.
  */
@@ -36,7 +38,7 @@ require_once(dirname(__FILE__).'/util.php');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Fri Dec 24 16:58:58 EST 2004
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 class MessageSource_SQLite extends MessageSource
 {
diff --git a/framework/I18N/core/MessageSource_XLIFF.php b/framework/I18N/core/MessageSource_XLIFF.php
index 198a1290..3b3a8813 100644
--- a/framework/I18N/core/MessageSource_XLIFF.php
+++ b/framework/I18N/core/MessageSource_XLIFF.php
@@ -14,9 +14,11 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.8 $  $Date: 2005/12/17 06:11:28 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
+
 /**
  * Get the MessageSource class file.
  */
@@ -35,7 +37,7 @@ require_once(dirname(__FILE__).'/MessageSource.php');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Fri Dec 24 16:18:44 EST 2004
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 class MessageSource_XLIFF extends MessageSource
 {
diff --git a/framework/I18N/core/MessageSource_gettext.php b/framework/I18N/core/MessageSource_gettext.php
index 4419c395..f5af9f0d 100644
--- a/framework/I18N/core/MessageSource_gettext.php
+++ b/framework/I18N/core/MessageSource_gettext.php
@@ -14,9 +14,11 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.7 $  $Date: 2005/12/17 06:11:28 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
+
 /**
  * Get the MessageSource class file.
  */
@@ -37,7 +39,7 @@ require_once(dirname(__FILE__).'/Gettext/TGettext.php');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Fri Dec 24 16:18:44 EST 2004
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 class MessageSource_gettext extends MessageSource
 {
diff --git a/framework/I18N/core/NumberFormat.php b/framework/I18N/core/NumberFormat.php
index ded64782..4bd8c838 100644
--- a/framework/I18N/core/NumberFormat.php
+++ b/framework/I18N/core/NumberFormat.php
@@ -14,9 +14,11 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.6 $  $Date: 2005/12/20 09:32:42 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
+
 /**
  * Get the NumberFormatInfo class file.
  */
@@ -69,7 +71,7 @@ require_once(dirname(__FILE__).'/util.php');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Fri Dec 10 18:10:20 EST 2004
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 class NumberFormat
 {
diff --git a/framework/I18N/core/NumberFormatInfo.php b/framework/I18N/core/NumberFormatInfo.php
index 2a666726..4b37e64d 100644
--- a/framework/I18N/core/NumberFormatInfo.php
+++ b/framework/I18N/core/NumberFormatInfo.php
@@ -14,9 +14,11 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.3 $  $Date: 2005/08/04 05:27:19 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
+
 /**
  * Get the CultureInfo class file.
  */
@@ -43,7 +45,7 @@ require_once(dirname(__FILE__).'/CultureInfo.php');
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Sun Dec 05 14:48:26 EST 2004
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 class NumberFormatInfo
 {
diff --git a/framework/I18N/core/TCache_Lite.php b/framework/I18N/core/TCache_Lite.php
index 69e1c308..fddba41b 100644
--- a/framework/I18N/core/TCache_Lite.php
+++ b/framework/I18N/core/TCache_Lite.php
@@ -14,9 +14,11 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.3 $  $Date: 2005/10/09 10:24:12 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
+
 /**
 * Fast, light and safe Cache Class
 *
diff --git a/framework/I18N/core/TMessageSourceIOException.php b/framework/I18N/core/TMessageSourceIOException.php
index 6eaaf939..dea7031e 100644
--- a/framework/I18N/core/TMessageSourceIOException.php
+++ b/framework/I18N/core/TMessageSourceIOException.php
@@ -13,9 +13,10 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.4 $  $Date: 2005/12/17 06:11:28 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
+namespace Prado\I18N\core;
 
 /**
  * TMessageSourceIOException thrown when unable to modify message source
@@ -23,7 +24,7 @@
  *
  * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.4 $  $Date: 2005/12/17 06:11:28 ${DATE} ${TIME} $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 class TMessageSourceIOException extends TException
 {
diff --git a/framework/I18N/core/util.php b/framework/I18N/core/util.php
index f84c4fb2..c5f15467 100644
--- a/framework/I18N/core/util.php
+++ b/framework/I18N/core/util.php
@@ -14,10 +14,12 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version $Revision: 1.3 $  $Date: 2005/08/27 03:21:12 $
- * @package System.I18N.core
+ * @package Prado\I18N\core
  */
 
 
+namespace Prado\I18N\core;
+
 	/**
 	 * For a given DSN (database connection string), return some information
 	 * about the DSN. This function comes from PEAR's DB package.
diff --git a/framework/IO/TTarFileExtractor.php b/framework/IO/TTarFileExtractor.php
index cb613fff..e8eee004 100644
--- a/framework/IO/TTarFileExtractor.php
+++ b/framework/IO/TTarFileExtractor.php
@@ -4,9 +4,11 @@
  *
  * @author Vincent Blavet <vincent@phpconcept.net>
  * @copyright Copyright &copy; 1997-2003 The PHP Group
- * @package System.IO
+ * @package Prado\IO
  */
 
+namespace Prado\IO;
+
 /* vim: set ts=4 sw=4: */
 // +----------------------------------------------------------------------+
 // | PHP Version 4                                                        |
@@ -30,7 +32,7 @@
  * TTarFileExtractor class
  *
  * @author Vincent Blavet <vincent@phpconcept.net>
- * @package System.IO
+ * @package Prado\IO
  * @since 3.0
  */
 class TTarFileExtractor
diff --git a/framework/IO/TTextWriter.php b/framework/IO/TTextWriter.php
index f888083d..d9033b81 100644
--- a/framework/IO/TTextWriter.php
+++ b/framework/IO/TTextWriter.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.IO
+ * @package Prado\IO
  */
 
+namespace Prado\IO;
+
 /**
  * TTextWriter class.
  *
@@ -17,7 +19,7 @@
  * and can be obtained by calling {@link flush()}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.IO
+ * @package Prado\IO
  * @since 3.0
  */
 class TTextWriter extends TComponent implements ITextWriter
diff --git a/framework/Security/IUserManager.php b/framework/Security/IUserManager.php
index 0ca65929..3e23c2e7 100644
--- a/framework/Security/IUserManager.php
+++ b/framework/Security/IUserManager.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Security
+ * @package Prado\Security
  */
 
+namespace Prado\Security;
+
 /**
  * IUserManager interface
  *
@@ -17,7 +19,7 @@
  * and {@link TUser}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Security
+ * @package Prado\Security
  * @since 3.0
  */
 interface IUserManager
diff --git a/framework/Security/TAuthManager.php b/framework/Security/TAuthManager.php
index 2bf6a5b1..be83b695 100644
--- a/framework/Security/TAuthManager.php
+++ b/framework/Security/TAuthManager.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Security
+ * @package Prado\Security
  */
 
+namespace Prado\Security;
+
 /**
  * Using IUserManager interface
  */
@@ -36,7 +38,7 @@ Prado::using('System.Security.IUserManager');
  * <module id="users" class="System.Security.TUserManager" />
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Security
+ * @package Prado\Security
  * @since 3.0
  */
 class TAuthManager extends TModule
diff --git a/framework/Security/TAuthorizationRule.php b/framework/Security/TAuthorizationRule.php
index 6da784c7..ce0835de 100644
--- a/framework/Security/TAuthorizationRule.php
+++ b/framework/Security/TAuthorizationRule.php
@@ -6,8 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Security
+ * @package Prado\Security
  */
+
+namespace Prado\Security;
+
 /**
  * TAuthorizationRule class
  *
@@ -24,7 +27,7 @@
  * IP rules are separated by comma ',' and can contain wild card in the rules (e.g. '192.132.23.33, 192.122.*.*')
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Security
+ * @package Prado\Security
  * @since 3.0
  */
 class TAuthorizationRule extends TComponent
diff --git a/framework/Security/TAuthorizationRuleCollection.php b/framework/Security/TAuthorizationRuleCollection.php
index d83cb567..a2356a92 100644
--- a/framework/Security/TAuthorizationRuleCollection.php
+++ b/framework/Security/TAuthorizationRuleCollection.php
@@ -6,9 +6,10 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Security
+ * @package Prado\Security
  */
 
+namespace Prado\Security;
 
 /**
  * TAuthorizationRuleCollection class.
@@ -16,7 +17,7 @@
  * To check if a user is allowed, call {@link isUserAllowed}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Security
+ * @package Prado\Security
  * @since 3.0
  */
 class TAuthorizationRuleCollection extends TList
diff --git a/framework/Security/TDbUser.php b/framework/Security/TDbUser.php
index 0939b41c..8b30e0f3 100644
--- a/framework/Security/TDbUser.php
+++ b/framework/Security/TDbUser.php
@@ -6,9 +6,10 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Security
+ * @package Prado\Security
  */
 
+namespace Prado\Security;
 
 /**
  * TDbUser class
@@ -19,7 +20,7 @@
  * - {@link createUser()}: creates a new user instance given the username
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Security
+ * @package Prado\Security
  * @since 3.1.0
  */
 abstract class TDbUser extends TUser
diff --git a/framework/Security/TDbUserManager.php b/framework/Security/TDbUserManager.php
index 88910b9a..4d04ece1 100644
--- a/framework/Security/TDbUserManager.php
+++ b/framework/Security/TDbUserManager.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Security
+ * @package Prado\Security
  */
 
+namespace Prado\Security;
+
 /**
  * Using IUserManager interface
  */
@@ -43,7 +45,7 @@ Prado::using('System.Security.TUser');
  * which specifies how to establish database connection to retrieve user information.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Security
+ * @package Prado\Security
  * @since 3.1.0
  */
 class TDbUserManager extends TModule implements IUserManager
diff --git a/framework/Security/TSecurityManager.php b/framework/Security/TSecurityManager.php
index 2f9ef464..57d2f70a 100644
--- a/framework/Security/TSecurityManager.php
+++ b/framework/Security/TSecurityManager.php
@@ -6,9 +6,10 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Security
+ * @package Prado\Security
  */
 
+namespace Prado\Security;
 
 /**
  * TSecurityManager class
@@ -35,7 +36,7 @@
  * Note, to use encryption, the PHP Mcrypt extension must be loaded.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Security
+ * @package Prado\Security
  * @since 3.0
  */
 class TSecurityManager extends TModule
diff --git a/framework/Security/TSecurityManagerValidationMode.php b/framework/Security/TSecurityManagerValidationMode.php
index fe1086b5..bae56956 100644
--- a/framework/Security/TSecurityManagerValidationMode.php
+++ b/framework/Security/TSecurityManagerValidationMode.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Security
+ * @package Prado\Security
  */
 
+namespace Prado\Security;
+
 /**
  * TSecurityManagerValidationMode class.
  *
@@ -22,7 +24,7 @@
  * - SHA1: an SHA1 hash is generated from the data and used for validation.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Security
+ * @package Prado\Security
  * @since 3.0.4
  */
 class TSecurityManagerValidationMode extends TEnumerable
diff --git a/framework/Security/TUser.php b/framework/Security/TUser.php
index 8a229b1a..cf89e46f 100644
--- a/framework/Security/TUser.php
+++ b/framework/Security/TUser.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Security
+ * @package Prado\Security
  */
 
+namespace Prado\Security;
+
 /**
  * Using IUserManager interface
  */
@@ -26,7 +28,7 @@ Prado::using('System.Security.IUserManager');
  * TUser is meant to be used together with {@link IUserManager}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Security
+ * @package Prado\Security
  * @since 3.0
  */
 class TUser extends TComponent implements IUser
diff --git a/framework/Security/TUserManager.php b/framework/Security/TUserManager.php
index f3cce876..361f0e5b 100644
--- a/framework/Security/TUserManager.php
+++ b/framework/Security/TUserManager.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Security
+ * @package Prado\Security
  */
 
+namespace Prado\Security;
+
 /**
  * Using TUser class
  */
@@ -63,7 +65,7 @@ Prado::using('System.Security.TUser');
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Carl Mathisen <carl@kamikazemedia.no>
- * @package System.Security
+ * @package Prado\Security
  * @since 3.0
  */
 class TUserManager extends TModule implements IUserManager
diff --git a/framework/Security/TUserManagerPasswordMode.php b/framework/Security/TUserManagerPasswordMode.php
index 8737fb53..4a4493a2 100644
--- a/framework/Security/TUserManagerPasswordMode.php
+++ b/framework/Security/TUserManagerPasswordMode.php
@@ -6,9 +6,11 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @package System.Security
+ * @package Prado\Security
  */
 
+namespace Prado\Security;
+
 /**
  * TUserManagerPasswordMode class.
  * TUserManagerPasswordMode defines the enumerable type for the possible modes
@@ -20,7 +22,7 @@
  * - SHA1: the password is recorded as the SHA1 hash value of the original password
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @package System.Security
+ * @package Prado\Security
  * @since 3.0.4
  */
 class TUserManagerPasswordMode extends TEnumerable