prepare for 3.1.4 release.3.1.4

5 files changed, 174 insertions, 174 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index 6c215c09..d69606dd 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,31 +1,31 @@
-The PRADO framework and the included demos are free software.

-They are released under the terms of the following BSD License.

-

-Copyright 2004-2008, The PRADO Group (http://www.pradosoft.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 the PRADO Group 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.

+The PRADO framework and the included demos are free software.
+They are released under the terms of the following BSD License.
+
+Copyright 2004-2009, The PRADO Group (http://www.pradosoft.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 the PRADO Group 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.
diff --git a/HISTORY b/HISTORY
index 9c367538..00e86f9c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,4 +1,4 @@
-Version 3.1.4 To be released
+Version 3.1.4 January 11, 2009
 ==============================
 BUG: Issue#9  - Global page properties are ignored when using external configuration (Christophe)
 BUG: Issue#59 - TPropertyAccess::has() returns false even if the property of an object was found (Carl)
diff --git a/buildscripts/texbuilder/quickstart/quickstart.tex b/buildscripts/texbuilder/quickstart/quickstart.tex
index 5172a718..de3d2a07 100644
--- a/buildscripts/texbuilder/quickstart/quickstart.tex
+++ b/buildscripts/texbuilder/quickstart/quickstart.tex
@@ -1,139 +1,139 @@
-\documentclass{book}

-\usepackage[pdftex]{graphicx}

-\usepackage[pdftex]{hyperref}

-

-\usepackage{fancyhdr}

-

-%---------- fonts Type 1 -----------------

-%\usepackage{times}

-%\usepackage[T1]{fontenc}

-%\usepackage{textcomp}

-

-%------------------------Page set-up-----------------------------------------

-

-\renewcommand{\baselinestretch}{1.25}

-\setlength{\hoffset}{-1in}

-\setlength{\oddsidemargin}{3.5cm}

-\setlength{\evensidemargin}{3.5cm}

-\setlength{\topmargin}{0cm}

-\setlength{\footskip}{2cm}

-\setlength{\headheight}{14pt}

-\setlength{\marginparwidth}{0cm}

-\setlength{\marginparsep}{0cm}

-\setlength{\marginparpush}{0cm}

-\setlength{\textwidth}{15cm}

-\setlength{\parindent}{0cm}

-\setlength{\parskip}{0.75\baselineskip}

-

-%------------------------------------------------------------------------------

-

-

-%---- change link style ----

-\hypersetup{colorlinks, linkcolor=blue, pdfstartview={FitH}}

-

-

-% Pages and Fancyheadings stuff

-%-----------------------------------------------------------------------

-\cfoot{\thepage}

-\fancyhead[LE,RO]{}

-\fancyhead[LO]{\nouppercase{\scshape\rightmark}}

-\fancyhead[RE]{\nouppercase{\scshape\leftmark}}

-%-----------------------------------------------------------------------

-

-% boxes

-

-\newsavebox{\fmboxb}

-\newenvironment{mybox}

-    {\vspace{-2mm}\begin{center}\begin{lrbox}{\fmboxb}\hspace{2mm}

-        \begin{minipage}{0.85\textwidth} \vspace{2mm}\small}

-    {  \vspace{2mm} \end{minipage}

-    \hspace{2mm}\end{lrbox}\fbox{\usebox{\fmboxb}}\end{center}}

-

-

-%----------------- TITLE --------------

-

-\title{\Huge \bfseries PRADO v3.1.3 Quickstart Tutorial

-    \thanks{Copyright 2004-2008. All Rights Reserved.}

-}

-\author{Qiang Xue and Wei Zhuo}

-\date{\today}

-

-

-%-------------- BEGIN DOCUMENT ------------------

-

-

-\begin{document}

-

-\maketitle

-

-\pagestyle{plain}

-\addcontentsline{toc}{chapter}{Contents}

-\pagenumbering{roman}

-\tableofcontents

-

-\chapter*{Preface}

-\addcontentsline{toc}{chapter}{Preface}

-Prado quick start doc

-

-\chapter*{License}

-\addcontentsline{toc}{chapter}{License}

-PRADO is free software released under the terms of the following BSD license.\\

-Copyright 2004-2008, The PRADO Group (http://www.pradosoft.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:

-\begin{enumerate}

-	\item Redistributions of source code must retain the above copyright notice,

-this list of conditions and the following disclaimer.

-

- \item 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.

-

-\item Neither the name of the PRADO Group nor the names of its contributors may

-be used to endorse or promote products derived from this software without

-specific prior written permission.

-\end{enumerate}

-

-\begin{verbatim}

-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.

-\end{verbatim}

-

-

-\newpage

-

-\pagestyle{fancyplain}

-\pagenumbering{arabic}

-

-\include{ch1}

-\include{ch2}

-\include{ch3}

-\include{ch4}

-\include{ch5}

-\include{ch6}

-\include{ch7}

-\include{ch8}

-\include{ch9}

-\include{ch10}

-\include{ch11}

-\include{ch12}

-\include{ch13}

-\include{ch14}

-\include{ch15}

-\include{ch16}

-\include{ch17}

-\include{ch18}

-\include{ch19}

-\include{ch20}

-

-\end{document}

+\documentclass{book}
+\usepackage[pdftex]{graphicx}
+\usepackage[pdftex]{hyperref}
+
+\usepackage{fancyhdr}
+
+%---------- fonts Type 1 -----------------
+%\usepackage{times}
+%\usepackage[T1]{fontenc}
+%\usepackage{textcomp}
+
+%------------------------Page set-up-----------------------------------------
+
+\renewcommand{\baselinestretch}{1.25}
+\setlength{\hoffset}{-1in}
+\setlength{\oddsidemargin}{3.5cm}
+\setlength{\evensidemargin}{3.5cm}
+\setlength{\topmargin}{0cm}
+\setlength{\footskip}{2cm}
+\setlength{\headheight}{14pt}
+\setlength{\marginparwidth}{0cm}
+\setlength{\marginparsep}{0cm}
+\setlength{\marginparpush}{0cm}
+\setlength{\textwidth}{15cm}
+\setlength{\parindent}{0cm}
+\setlength{\parskip}{0.75\baselineskip}
+
+%------------------------------------------------------------------------------
+
+
+%---- change link style ----
+\hypersetup{colorlinks, linkcolor=blue, pdfstartview={FitH}}
+
+
+% Pages and Fancyheadings stuff
+%-----------------------------------------------------------------------
+\cfoot{\thepage}
+\fancyhead[LE,RO]{}
+\fancyhead[LO]{\nouppercase{\scshape\rightmark}}
+\fancyhead[RE]{\nouppercase{\scshape\leftmark}}
+%-----------------------------------------------------------------------
+
+% boxes
+
+\newsavebox{\fmboxb}
+\newenvironment{mybox}
+    {\vspace{-2mm}\begin{center}\begin{lrbox}{\fmboxb}\hspace{2mm}
+        \begin{minipage}{0.85\textwidth} \vspace{2mm}\small}
+    {  \vspace{2mm} \end{minipage}
+    \hspace{2mm}\end{lrbox}\fbox{\usebox{\fmboxb}}\end{center}}
+
+
+%----------------- TITLE --------------
+
+\title{\Huge \bfseries PRADO v3.1.4 Quickstart Tutorial
+    \thanks{Copyright 2004-2009. All Rights Reserved.}
+}
+\author{Qiang Xue and Wei Zhuo}
+\date{\today}
+
+
+%-------------- BEGIN DOCUMENT ------------------
+
+
+\begin{document}
+
+\maketitle
+
+\pagestyle{plain}
+\addcontentsline{toc}{chapter}{Contents}
+\pagenumbering{roman}
+\tableofcontents
+
+\chapter*{Preface}
+\addcontentsline{toc}{chapter}{Preface}
+Prado quick start doc
+
+\chapter*{License}
+\addcontentsline{toc}{chapter}{License}
+PRADO is free software released under the terms of the following BSD license.\\
+Copyright 2004-2009, The PRADO Group (http://www.pradosoft.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:
+\begin{enumerate}
+	\item Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+ \item 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.
+
+\item Neither the name of the PRADO Group nor the names of its contributors may
+be used to endorse or promote products derived from this software without
+specific prior written permission.
+\end{enumerate}
+
+\begin{verbatim}
+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.
+\end{verbatim}
+
+
+\newpage
+
+\pagestyle{fancyplain}
+\pagenumbering{arabic}
+
+\include{ch1}
+\include{ch2}
+\include{ch3}
+\include{ch4}
+\include{ch5}
+\include{ch6}
+\include{ch7}
+\include{ch8}
+\include{ch9}
+\include{ch10}
+\include{ch11}
+\include{ch12}
+\include{ch13}
+\include{ch14}
+\include{ch15}
+\include{ch16}
+\include{ch17}
+\include{ch18}
+\include{ch19}
+\include{ch20}
+
+\end{document}
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index 5256b32e..ea6b9737 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -66,7 +66,7 @@ class PradoBase
 	 */
 	public static function getVersion()
 	{
-		return '3.1.4a';
+		return '3.1.4';
 	}
 
 	/**
diff --git a/index.html b/index.html
index aade2261..d680be3a 100644
--- a/index.html
+++ b/index.html
@@ -8,8 +8,8 @@
 
 <body>
 <h1>PRADO Framework for PHP 5 </h1>
-<p>Version 3.1.4, To be released<br>
-Copyright&copy; 2004-2008 by <a href="http://www.pradosoft.com/">Prado Software</a><br>
+<p>Version 3.1.4, January 11, 2009<br>
+Copyright&copy; 2004-2009 by <a href="http://www.pradosoft.com/">Prado Software</a><br>
 All Rights Reserved.
 </p>