svn commit: r988830 [1/3] - in /shindig/trunk/php: ./ config/ external/resources/ external/resources/com/ external/resources/com/google/ external/resources/com/google/caja/ external/resources/com/google/caja/plugin/ src/gadgets/ src/gadgets/servlet/ te...

[bh...@apache.org]

Author: bhofmann
Date: Wed Aug 25 07:12:05 2010
New Revision: 988830

URL: http://svn.apache.org/viewvc?rev=988830&view=rev
Log:
Fix for:  PHP gadgets.util.sanitizeHtml does not work anymore 

* added needed caja resources to php/external/resources
* changed featureRegistry to load these files instead of trying to lod them from the caja svn

see http://codereview.appspot.com/2011047/


Added:
    shindig/trunk/php/external/resources/
    shindig/trunk/php/external/resources/com/
    shindig/trunk/php/external/resources/com/google/
    shindig/trunk/php/external/resources/com/google/caja/
    shindig/trunk/php/external/resources/com/google/caja/plugin/
    shindig/trunk/php/external/resources/com/google/caja/plugin/domita-minified.js
    shindig/trunk/php/external/resources/com/google/caja/plugin/html-sanitizer-minified.js
    shindig/trunk/php/external/resources/com/google/caja/plugin/valija.out.js
    shindig/trunk/php/src/gadgets/servlet/ContentFilesServlet.php
    shindig/trunk/php/src/gadgets/servlet/ResourcesFilesServlet.php
    shindig/trunk/php/test/gadgets/FilesServletTest.php
Modified:
    shindig/trunk/php/NOTICE
    shindig/trunk/php/config/container.php
    shindig/trunk/php/src/gadgets/GadgetFeatureRegistry.php
    shindig/trunk/php/src/gadgets/servlet/FilesServlet.php
    shindig/trunk/php/test/ShindigAllTests.php

Modified: shindig/trunk/php/NOTICE
URL: http://svn.apache.org/viewvc/shindig/trunk/php/NOTICE?rev=988830&r1=988829&r2=988830&view=diff
==============================================================================
--- shindig/trunk/php/NOTICE (original)
+++ shindig/trunk/php/NOTICE Wed Aug 25 07:12:05 2010
@@ -26,3 +26,6 @@ Douglas Crockford  (http://www.crockford
 
 This product includes software (OAuth.php) developed by 
 Andy Smith (http://oauth.googlecode.com/svn/code/php/LICENSE.txt)
+
+This product includes software (Caja) developed by
+Google Inc. (http://code.google.com/p/google-caja/).
\ No newline at end of file

Modified: shindig/trunk/php/config/container.php
URL: http://svn.apache.org/viewvc/shindig/trunk/php/config/container.php?rev=988830&r1=988829&r2=988830&view=diff
==============================================================================
--- shindig/trunk/php/config/container.php (original)
+++ shindig/trunk/php/config/container.php Wed Aug 25 07:12:05 2010
@@ -78,8 +78,9 @@ $shindigConfig = array(
   'default_iframe_prefix' => '/gadgets/ifr?',
 
  'servlet_map' => array( 
-   '/container' => 'FilesServlet', 
-   '/samplecontainer' => 'FilesServlet', 
+   '/container' => 'ContentFilesServlet',
+   '/samplecontainer' => 'ContentFilesServlet',
+   '/gadgets/resources' => 'ResourcesFilesServlet',
    '/gadgets/js' => 'JsServlet', 
    '/gadgets/proxy' => 'ProxyServlet', 
    '/gadgets/makeRequest' => 'MakeRequestServlet', 
@@ -120,6 +121,7 @@ $shindigConfig = array(
   ),
   'container_path' => realpath(dirname(__FILE__) . '/../../config') . '/',
   'javascript_path' => realpath(dirname(__FILE__) . '/../../content') . '/',
+  'resources_path' => realpath(dirname(__FILE__) . '/../external/resources') . '/',
 
   // The OAuth SSL certificates to use, and the pass phrase for the private key
   'private_key_file' => realpath(dirname(__FILE__) . '/../certs') . '/private.key',