You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/05/17 08:32:17 UTC

svn commit: r944983 - in /shindig/trunk/php: config/container.php docs/README.svn.txt

Author: lindner
Date: Mon May 17 06:32:16 2010
New Revision: 944983

URL: http://svn.apache.org/viewvc?rev=944983&view=rev
Log:
path adjustment for javascript->content move

Modified:
    shindig/trunk/php/config/container.php
    shindig/trunk/php/docs/README.svn.txt

Modified: shindig/trunk/php/config/container.php
URL: http://svn.apache.org/viewvc/shindig/trunk/php/config/container.php?rev=944983&r1=944982&r2=944983&view=diff
==============================================================================
--- shindig/trunk/php/config/container.php (original)
+++ shindig/trunk/php/config/container.php Mon May 17 06:32:16 2010
@@ -99,7 +99,7 @@ $shindigConfig = array(
   'base_path' => realpath(dirname(__FILE__) . '/..') . '/',
   'features_path' => realpath(dirname(__FILE__) . '/../../features/src/main/javascript/features') . '/',
   'container_path' => realpath(dirname(__FILE__) . '/../../config') . '/',
-  'javascript_path' => realpath(dirname(__FILE__) . '/../../javascript') . '/',
+  'javascript_path' => realpath(dirname(__FILE__) . '/../../content') . '/',
 
   // The OAuth SSL certificates to use, and the pass phrase for the private key
   'private_key_file' => realpath(dirname(__FILE__) . '/../certs') . '/private.key',
@@ -107,7 +107,7 @@ $shindigConfig = array(
   'private_key_phrase' => 'partuza',
 
   // the path to the json db file, used only if your using the JsonDbOpensocialService example/demo service
-  'jsondb_path' => realpath(dirname(__FILE__) . '/../../javascript/sampledata') . '/canonicaldb.json',
+  'jsondb_path' => realpath(dirname(__FILE__) . '/../../content/sampledata') . '/canonicaldb.json',
 
   // Force these libraries to be external (included through <script src="..."> tags), this way they could be cached by the browser
   'forcedJsLibs' => '',

Modified: shindig/trunk/php/docs/README.svn.txt
URL: http://svn.apache.org/viewvc/shindig/trunk/php/docs/README.svn.txt?rev=944983&r1=944982&r2=944983&view=diff
==============================================================================
--- shindig/trunk/php/docs/README.svn.txt (original)
+++ shindig/trunk/php/docs/README.svn.txt Mon May 17 06:32:16 2010
@@ -10,27 +10,27 @@
   -----------
   
   Shindig's svn repository contains both the Java and PHP versions of shindig, and the shared
-  javascript and features code.
+  content and features code.
    
   To make PHP Shindig work from svn, its default file path configurations in 
       <shindig>/php/config/container.php
-  are all configured for a file path layout where the features and javascript code is contained
-  in a directory level above the php folder (ie <shindig>/php/../{features, javascript}), resulting in a 
+  are all configured for a file path layout where the features and content code is contained
+  in a directory level above the php folder (ie <shindig>/php/../{features, content}), resulting in a 
   folder layout like:
   
   shindig/             (contains the shared README, NOTICE, LICENSE, etc files)
-  shindig/javascript   (contains shared javascript code)
+  shindig/content      (contains shared javascript code)
   shindig/features     (contains shared features code)
   shindig/config       (contains the shared configuration)
   shindig/java         (contains the java-shindig implementation)
   shindig/php          (contains the php-shindig implementation)
   
   The release script moves these folders to the top level php folder and makes the php folder the top
-  level folder when building it's archives, so in other words the javascript and features code will be
-  located in <shindig>/{features, javascript}, resulting in the folowing layout:
+  level folder when building it's archives, so in other words the content and features code will be
+  located in <shindig>/{features, content}, resulting in the folowing layout:
 
   shindig/             (contains the php implementation(!) & the php specific README, NOTICE, LICENSE, etc files)
-  shindig/javascript   (contains shared javascript code)
+  shindig/content      (contains shared javascript code)
   shindig/features     (contains shared features code)
   shindig/config       (contains both the shared as wel as php specific configuration)
   .. etc ..
@@ -70,28 +70,28 @@
    2) PHP Shindig's configuration
    
    The file paths of all the shared resources are different between the released and svn versions in the config/container.php config file
-   (notice the extra ../ for the javascript, features and jsondb path's with the SVN version)
+   (notice the extra ../ for the content, features and jsondb path's with the SVN version)
    
    RELEASE
    
   'base_path' => realpath(dirname(__FILE__) . '/..') . '/',
   'features_path' => realpath(dirname(__FILE__) . '/../features/src/main/javascript/features') . '/',
   'container_path' => realpath(dirname(__FILE__) . '/../config') . '/',
-  'javascript_path' => realpath(dirname(__FILE__) . '/../javascript') . '/',
+  'javascript_path' => realpath(dirname(__FILE__) . '/../content') . '/',
   'private_key_file' => realpath(dirname(__FILE__) . '/../certs') . '/private.key',
   'public_key_file' => realpath(dirname(__FILE__) . '/../certs') . '/public.crt',
   'private_key_phrase' => 'SOMEKEY',
-  'jsondb_path' => realpath(dirname(__FILE__) . '/../javascript/sampledata') . '/canonicaldb.json',
+  'jsondb_path' => realpath(dirname(__FILE__) . '/../content/sampledata') . '/canonicaldb.json',
    
    SVN
    
   'base_path' => realpath(dirname(__FILE__) . '/..') . '/',
   'features_path' => realpath(dirname(__FILE__) . '/../../features/src/main/javascript/features') . '/',
   'container_path' => realpath(dirname(__FILE__) . '/../../config') . '/',
-  'javascript_path' => realpath(dirname(__FILE__) . '/../../javascript') . '/',
+  'javascript_path' => realpath(dirname(__FILE__) . '/../../content') . '/',
   'private_key_file' => realpath(dirname(__FILE__) . '/../certs') . '/private.key',
   'public_key_file' => realpath(dirname(__FILE__) . '/../certs') . '/public.crt',
   'private_key_phrase' => 'SOMEKEY',
-  'jsondb_path' => realpath(dirname(__FILE__) . '/../../javascript/sampledata') . '/canonicaldb.json',
+  'jsondb_path' => realpath(dirname(__FILE__) . '/../../content/sampledata') . '/canonicaldb.json',