Merge from 3.0 branch till 1004.

1 files changed, 68 insertions, 1 deletions

diff --git a/framework/3rdParty/readme.html b/framework/3rdParty/readme.html
index c81d263e..b48f5b74 100644
--- a/framework/3rdParty/readme.html
+++ b/framework/3rdParty/readme.html
@@ -45,10 +45,77 @@ projects.
 <tr>

   <td>N.A.</td>

   <td>Tar.php</td>

-  <td><a href="http://www.php.net/license/3_0.txt">Version 3.0 of the PHP license</a></td>

+  <td><a href="http://www.php.net/license/3_0.txt">PHP License 3.0</a></td>

   <td>System.IO.TTarFileExtractor</td>

   <td>TTarFileExtractor is based on Tar.php whose author is Vincent Blavet.</td>

 </tr>

+<tr>

+	<td><a href="../I18N/core/data">../I18N/core/data</a></td>

+	<td><a href="http://icu.sourceforge.net/">International Components for Unicode (Locale Data)</a></td>

+	<td><a href="http://dev.icu-project.org/cgi-bin/viewcvs.cgi/*checkout*/icu/license.html">BSD???</a></td>

+	<td>System.I18N.core.*</td>

+	<td>The ICU data http://dev.icu-project.org/cgi-bin/viewcvs.cgi/icu/source/data/locales/ are PHP serialized.</td>

+</tr>

+<tr>

+	<td><a href="../I18N/core/util.php">../I18N/core/util.php</a></td>

+	<td><a href="http://pear.php.net/package/DB">PEAR :: Package :: DB</a></td>

+	<td><a href="http://www.php.net/license/3_0.txt">PHP License 3.0</a></td>

+	<td>N.A.</td>

+	<td>The parseDSN() function from DB.php file.</td>	

+</tr>

+<tr>

+	<td><a href="../I18N/core/TCache_Lite.php">../I18N/core/TCache_Lite.php</a></td>

+	<td><a href="http://pear.php.net/package/Cache_Lite">PEAR :: Package :: Cache_Lite</a></td>

+	<td><a href="http://www.gnu.org/licenses/lgpl.html">LGPL</a></td>

+	<td>N.A.</td>

+	<td>Cache_Lite class was renamed as TCache_Lite for packaging purposes.</td>	

+</tr>

+<tr>

+	<td><a href="../I18N/core/Gettext">../I18N/core/Gettext</a></td>

+	<td><a href="http://pear.php.net/package/File_Gettext">PEAR :: Package :: File_Gettext</a></td>

+	<td><a href="http://www.php.net/license/3_0.txt">PHP License 3.0</a></td>

+	<td>N.A.</td>

+	<td>File_Gettext, File::Gettext::MO, and File::Gettext::PO</td>	

+</tr>

+

+<tr>

+	<td><a href="../Web/Javascripts/TJSON.php">../Web/Javascripts/TJSON.php</a></td>

+	<td><a href="http://pear.php.net/pepr/pepr-proposal-show.php?id=198">Service_JSON proposal</a></td>

+	<td><a href="http://www.opensource.org/licenses/bsd-license.php">BSD</a></td>

+	<td>N.A.</td>

+	<td>JSON encoder/decoder by Michal Migurski, Matt Knapp and Brett Stimmerman</td>	

+</tr>

+

+<tr>

+	<td><a href="../Web/Javascripts/effects/rico.js">../Web/Javascripts/effects/rico.js</a></td>

+	<td><a href="http://openrico.org/">Rico</a></td>

+	<td><a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License v2</a></td>

+	<td>N.A.</td>

+	<td>Rico Javascript Library (not yet utilized in Prado)</td>	

+</tr>

+<tr>

+	<td><a href="../Web/Javascripts/prototype/">../Web/Javascripts/prototype</a></td>

+	<td><a href="http://dev.rubyonrails.org/browser/spinoffs/prototype">Prototype javascript library</a></td>

+	<td><a href="../Web/Javascripts/prototype/LICENSE">The Prototype License (MIT based)</a></td>

+	<td>N.A.</td>

+	<td>Core of Prado javascript library.</td>	

+</tr>

+<tr>

+	<td><a href="../Web/Javascripts/extra/logger.js">../Web/Javascripts/extra/logger.js</a></td>

+	<td><a href="http://gleepglop.com/javascripts/logger/">http://gleepglop.com/javascripts/logger/</a> <a href="http://slayeroffice.com">http://slayeroffice.com</a></td>

+	<td>None</td>

+	<td>TJavascriptLogger</td>

+	<td>Javascript logger by Corey Johnson. Object Tree by S.G. Chipman.</td>	

+</tr>

+

+<tr>

+	<td><a href="../Web/Javascripts/extra/json.js">../Web/Javascripts/extra/json.js</a></td>

+	<td><a href="http://www.JSON.org">http://www.JSON.org</a></td>

+	<td><a href="http://www.json.org/license.html">MIT based</a></td>

+	<td>N.A.</td>

+	<td>Has "The Software shall be used for Good, not Evil." clause.</td>	

+</tr>

+

 </table>

 </p>

 </body>