tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r1237740 [2/3] - in /tuscany/sca-cpp/trunk: ./ components/constdb/ components/http/ components/sqldb/ hosting/ hosting/server/ hosting/server/data/ hosting/server/data/accounts/ hosting/server/data/accounts/jane@localhost/ hosting/server/da...
Date Mon, 30 Jan 2012 15:56:19 GMT
Copied: tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets/htdocs/app.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets/htdocs/app.html?p2=tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/app.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/app.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/app.composite&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/app.stats (from r1237738, tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.stats)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/app.stats?p2=tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/app.stats&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.stats&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/htdocs/app.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/htdocs/app.html?p2=tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/app.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/app.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/app.composite&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/app.stats (from r1237738, tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.stats)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/app.stats?p2=tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/app.stats&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.stats&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/htdocs/app.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets3/htdocs/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/htdocs/app.html?p2=tuscany/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets3/htdocs/app.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/apps/twsms/app.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/apps/twsms/app.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/apps/twsms/app.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/apps/twsms/app.composite&p1=tuscany/sca-cpp/trunk/modules/edit/apps/twsms/app.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/apps/twsms/app.stats (from r1237738, tuscany/sca-cpp/trunk/modules/edit/apps/twsms/app.stats)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/apps/twsms/app.stats?p2=tuscany/sca-cpp/trunk/hosting/server/data/apps/twsms/app.stats&p1=tuscany/sca-cpp/trunk/modules/edit/apps/twsms/app.stats&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/apps/twsms/htdocs/app.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/apps/twsms/htdocs/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/apps/twsms/htdocs/app.html?p2=tuscany/sca-cpp/trunk/hosting/server/data/apps/twsms/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/twsms/htdocs/app.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/dashboards/jane@localhost/user.apps (from r1237738, tuscany/sca-cpp/trunk/modules/edit/dashboards/jane@localhost/user.apps)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/dashboards/jane%40localhost/user.apps?p2=tuscany/sca-cpp/trunk/hosting/server/data/dashboards/jane%40localhost/user.apps&p1=tuscany/sca-cpp/trunk/modules/edit/dashboards/jane%40localhost/user.apps&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/dashboards/jane@sca-store.com/user.apps (from r1237738, tuscany/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com/user.apps)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/dashboards/jane%40sca-store.com/user.apps?p2=tuscany/sca-cpp/trunk/hosting/server/data/dashboards/jane%40sca-store.com/user.apps&p1=tuscany/sca-cpp/trunk/modules/edit/dashboards/jane%40sca-store.com/user.apps&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/dashboards/john@localhost/user.apps (from r1237738, tuscany/sca-cpp/trunk/modules/edit/dashboards/john@localhost/user.apps)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/dashboards/john%40localhost/user.apps?p2=tuscany/sca-cpp/trunk/hosting/server/data/dashboards/john%40localhost/user.apps&p1=tuscany/sca-cpp/trunk/modules/edit/dashboards/john%40localhost/user.apps&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/dashboards/john@sca-store.com/user.apps (from r1237738, tuscany/sca-cpp/trunk/modules/edit/dashboards/john@sca-store.com/user.apps)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/dashboards/john%40sca-store.com/user.apps?p2=tuscany/sca-cpp/trunk/hosting/server/data/dashboards/john%40sca-store.com/user.apps&p1=tuscany/sca-cpp/trunk/modules/edit/dashboards/john%40sca-store.com/user.apps&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/palettes/animation/palette.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/palettes/animation/palette.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/palettes/animation/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/palettes/control/palette.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes/control/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/palettes/control/palette.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/palettes/control/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/control/palette.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/palettes/database/palette.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes/database/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/palettes/database/palette.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/palettes/database/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/database/palette.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/database/palette.composite (original)
+++ tuscany/sca-cpp/trunk/hosting/server/data/palettes/database/palette.composite Mon Jan 30 15:56:11 2012
@@ -34,7 +34,7 @@
  <component x="80" y="10" name="filedb" title="file" color="pink1">
   <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <reference name="db" target="Cache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
  <component x="80" y="60" name="get" title="get" color="pink1">
@@ -46,7 +46,7 @@
  <component x="140" y="10" name="nosqldb" title="index **" color="pink1">
   <implementation.python script="nuvem/nosqldb.py"/>
   <service name="nosqldb"/>
-  <reference name="db" target="AppDataNoSQLCache" visible="false"/>
+  <reference name="db" target="Cache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
  <component x="200" y="60" name="post" title="post" color="pink1">
@@ -66,7 +66,7 @@
  <component x="210" y="10" name="sqldb" title="sql **" color="pink1">
   <implementation.python script="nuvem/sqldb.py"/>
   <service name="sqldb"/>
-  <reference name="db" target="AppDataSQLCache" visible="false"/>
+  <reference name="db" target="Cache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/hosting/server/data/palettes/http/palette.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes/http/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/palettes/http/palette.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/palettes/http/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/http/palette.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/http/palette.composite (original)
+++ tuscany/sca-cpp/trunk/hosting/server/data/palettes/http/palette.composite Mon Jan 30 15:56:11 2012
@@ -18,6 +18,7 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="app" promote="app"/>
  <service name="delete" promote="delete"/>
  <service name="email" promote="email"/>
  <service name="get" promote="get"/>
@@ -31,73 +32,78 @@
  <service name="put" promote="put"/>
  <service name="url" promote="url"/>
  <service name="user" promote="user"/>
- <component x="80" y="170" name="delete" title="delete" color="green1">
+ <component x="80" y="10" name="app" title="app" color="green1">
+  <implementation.python script="nuvem/app.py"/>
+  <service name="app"/>
+  <property name="app" visible="false"/>
+ </component>
+ <component x="80" y="220" name="delete" title="delete" color="green1">
   <implementation.cpp path="lib/http" library="libhttpdelete"/>
   <service name="delete"/>
   <reference name="url"/>
  </component>
- <component x="130" y="60" name="email" title="email" color="green1">
+ <component x="140" y="110" name="email" title="email" color="green1">
   <implementation.python script="nuvem/email.py"/>
   <service name="email"/>
   <property name="email" visible="false"/>
  </component>
- <component x="80" y="120" name="get" title="get" color="green1">
+ <component x="80" y="170" name="get" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference name="url"/>
  </component>
- <component x="80" y="10" name="host" title="host" color="green1">
+ <component x="130" y="10" name="host" title="host" color="green1">
   <implementation.python script="nuvem/host.py"/>
   <service name="host"/>
   <property name="host" visible="false"/>
  </component>
- <component x="190" y="60" name="keychain" title="keychain" color="green1">
+ <component x="210" y="110" name="keychain" title="keychain" color="green1">
   <implementation.python script="nuvem/keychain.py"/>
   <service name="keychain"/>
   <reference name="name"/>
   <reference name="account" target="Accounts" visible="false"/>
  </component>
- <component x="250" y="10" name="param" title="?param" color="green1">
+ <component x="150" y="60" name="param" title="?param" color="green1">
   <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>x</property>
   <property name="query" visible="false"/>
  </component>
- <component x="180" y="10" name="params" title="?params" color="green1">
+ <component x="80" y="60" name="params" title="?params" color="green1">
   <implementation.python script="nuvem/params.py"/>
   <service name="params"/>
   <property name="query" visible="false"/>
  </component>
- <component x="260" y="120" name="patch" title="patch" color="green1">
+ <component x="260" y="170" name="patch" title="patch" color="green1">
   <implementation.cpp path="lib/http" library="libhttppatch"/>
   <service name="patch"/>
   <reference name="url"/>
   <reference name="content"/>
  </component>
- <component x="130" y="10" name="path" title="path" color="green1">
+ <component x="190" y="10" name="path" title="path" color="green1">
   <implementation.python script="nuvem/path.py"/>
   <service name="path"/>
   <property name="path" visible="false"/>
  </component>
- <component x="200" y="120" name="post" title="post" color="green1">
+ <component x="200" y="170" name="post" title="post" color="green1">
   <implementation.cpp path="lib/http" library="libhttppost"/>
   <service name="post"/>
   <reference name="url"/>
   <reference name="content"/>
  </component>
- <component x="140" y="120" name="put" title="put" color="green1">
+ <component x="140" y="170" name="put" title="put" color="green1">
   <implementation.cpp path="lib/http" library="libhttpput"/>
   <service name="put"/>
   <reference name="url"/>
   <reference name="content"/>
  </component>
- <component x="270" y="60" name="url" title="url" color="green1">
+ <component x="250" y="10" name="url" title="url" color="green1">
   <implementation.python script="nuvem/url.py"/>
   <service name="url"/>
   <reference name="address"/>
   <reference name="args"/>
  </component>
- <component x="80" y="60" name="user" title="user" color="green1">
+ <component x="80" y="110" name="user" title="user" color="green1">
   <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
   <property name="user" visible="false"/>

Copied: tuscany/sca-cpp/trunk/hosting/server/data/palettes/lists/palette.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/palettes/lists/palette.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/palettes/lists/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/palettes/logic/palette.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/palettes/logic/palette.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/palettes/logic/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/palettes/math/palette.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes/math/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/palettes/math/palette.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/palettes/math/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/math/palette.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/palettes/python/palette.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes/python/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/palettes/python/palette.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/palettes/python/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/python/palette.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/palettes/search/palette.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes/search/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/palettes/search/palette.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/palettes/search/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/search/palette.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/palettes/social/palette.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes/social/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/palettes/social/palette.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/palettes/social/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/social/palette.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/palettes/talk/palette.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/palettes/talk/palette.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/palettes/talk/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/palettes/text/palette.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes/text/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/palettes/text/palette.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/palettes/text/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/text/palette.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/palettes/transform/palette.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/palettes/transform/palette.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/palettes/transform/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/palettes/values/palette.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes/values/palette.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/palettes/values/palette.composite?p2=tuscany/sca-cpp/trunk/hosting/server/data/palettes/values/palette.composite&p1=tuscany/sca-cpp/trunk/modules/edit/palettes/values/palette.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/store/all/store.apps (from r1237738, tuscany/sca-cpp/trunk/modules/edit/store/all/store.apps)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/store/all/store.apps?p2=tuscany/sca-cpp/trunk/hosting/server/data/store/all/store.apps&p1=tuscany/sca-cpp/trunk/modules/edit/store/all/store.apps&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/store/featured/store.apps (from r1237738, tuscany/sca-cpp/trunk/modules/edit/store/featured/store.apps)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/store/featured/store.apps?p2=tuscany/sca-cpp/trunk/hosting/server/data/store/featured/store.apps&p1=tuscany/sca-cpp/trunk/modules/edit/store/featured/store.apps&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/store/new/store.apps (from r1237738, tuscany/sca-cpp/trunk/modules/edit/store/new/store.apps)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/store/new/store.apps?p2=tuscany/sca-cpp/trunk/hosting/server/data/store/new/store.apps&p1=tuscany/sca-cpp/trunk/modules/edit/store/new/store.apps&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/data/store/top/store.apps (from r1237738, tuscany/sca-cpp/trunk/modules/edit/store/top/store.apps)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/data/store/top/store.apps?p2=tuscany/sca-cpp/trunk/hosting/server/data/store/top/store.apps&p1=tuscany/sca-cpp/trunk/modules/edit/store/top/store.apps&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/account/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/account/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/account/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/account/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/account/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/app/cache-manifest.cmf (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/app/cache-manifest.cmf?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/app/cache-manifest.cmf&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/app/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/app/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/app/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/app/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/app/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/cache-manifest.cmf (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/cache-manifest.cmf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/cache-manifest.cmf?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/cache-manifest.cmf&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/cache-manifest.cmf&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/clone/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/clone/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/clone/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/clone/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/clone/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/create/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/create/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/create/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/create/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/create/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/favicon.ico (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/favicon.ico)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/favicon.ico?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/favicon.ico&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/favicon.ico&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/graph/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/graph/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/graph/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/graph/index.html Mon Jan 30 15:56:11 2012
@@ -61,7 +61,7 @@
 var appname = ui.fragmentParams(location)['app'];
 var ispalette = false;
 if (isNil(appname)) {
-    appname = ui.fragmentParams()['palette'];
+    appname = ui.fragmentParams(location)['palette'];
 
     // Edit a palette instead of a regular app
     if (!isNil(appname))

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/home/home.b64 (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/home/home.b64)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/home/home.b64?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/home/home.b64&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/home/home.b64&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/home/home.png (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/home/home.png)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/home/home.png?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/home/home.png&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/home/home.png&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/home/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/home/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/home/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/home/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/home/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/login/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/login/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/login/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/login/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/login/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/page/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/page/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/page/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/page/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/page/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/app.b64 (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/app.b64)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/app.b64?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/app.b64&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/app.b64&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/app.png (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/app.png)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/app.png?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/app.png&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/app.png&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/app.xcf (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/app.xcf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/app.xcf?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/app.xcf&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/app.xcf&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/delete.b64 (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/delete.b64)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/delete.b64?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/delete.b64&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/delete.b64&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/delete.png (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/delete.png)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/delete.png?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/delete.png&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/delete.png&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/delete.xcf (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/delete.xcf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/delete.xcf?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/delete.xcf&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/delete.xcf&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/grid72.b64 (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/grid72.b64)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/grid72.b64?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/grid72.b64&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/grid72.b64&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/grid72.png (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/grid72.png)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/grid72.png?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/grid72.png&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/grid72.png&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/iframe.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/iframe.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/iframe.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/iframe.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/iframe.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/img.b64 (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/img.b64)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/img.b64?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/img.b64&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/img.b64&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/img.png (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/img.png)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/img.png?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/img.png&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/img.png&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/img.xcf (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/img.xcf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/img.xcf?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/img.xcf&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/img.xcf&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notauth/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/notauth/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notauth/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notauth/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/notauth/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/htdocs/public/notauth/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notauth/index.html Mon Jan 30 15:56:11 2012
@@ -23,7 +23,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
-<base href="/notauth/"/>
+<base href="/public/notauth/"/>
 <script type="text/javascript">
 
 window.appcache = {};

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notfound/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/notfound/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notfound/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notfound/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/notfound/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/htdocs/public/notfound/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notfound/index.html Mon Jan 30 15:56:11 2012
@@ -23,7 +23,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
-<base href="/notfound/"/>
+<base href="/public/notfound/"/>
 <script type="text/javascript">
 
 window.appcache = {};

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notyet/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/notyet/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notyet/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notyet/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/notyet/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/htdocs/public/notyet/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notyet/index.html Mon Jan 30 15:56:11 2012
@@ -23,7 +23,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
-<base href="/notyet/"/>
+<base href="/public/notyet/"/>
 <script type="text/javascript">
 
 window.appcache = {};

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/oops/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/oops/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/oops/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/oops/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/oops/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/htdocs/public/oops/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/public/oops/index.html Mon Jan 30 15:56:11 2012
@@ -20,10 +20,10 @@
 <html>
 <head>
 <title>Oops</title>
-<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0/> 
+<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
-<base href="/oops/"/>
+<base href="/public/oops/"/>
 <script type="text/javascript">
 
 window.appcache = {};

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/touchicon.b64 (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/touchicon.b64)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/touchicon.b64?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/touchicon.b64&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/touchicon.b64&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/touchicon.png (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/touchicon.png)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/touchicon.png?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/touchicon.png&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/touchicon.png&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/touchicon.xcf (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/touchicon.xcf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/touchicon.xcf?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/touchicon.xcf&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/touchicon.xcf&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/user.b64 (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/user.b64)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/user.b64?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/user.b64&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/user.b64&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/user.png (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/public/user.png)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/user.png?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/public/user.png&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/public/user.png&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/robots.txt (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/robots.txt)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/robots.txt?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/robots.txt&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/robots.txt&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/stats/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/stats/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/stats/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/stats/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/stats/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/htdocs/store/index.html (from r1237738, tuscany/sca-cpp/trunk/modules/edit/htdocs/store/index.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/store/index.html?p2=tuscany/sca-cpp/trunk/hosting/server/htdocs/store/index.html&p1=tuscany/sca-cpp/trunk/modules/edit/htdocs/store/index.html&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/log.py (from r1237738, tuscany/sca-cpp/trunk/modules/edit/log.py)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/log.py?p2=tuscany/sca-cpp/trunk/hosting/server/log.py&p1=tuscany/sca-cpp/trunk/modules/edit/log.py&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/mkapplinks (from r1237738, tuscany/sca-cpp/trunk/modules/edit/mkapplinks)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/mkapplinks?p2=tuscany/sca-cpp/trunk/hosting/server/mkapplinks&p1=tuscany/sca-cpp/trunk/modules/edit/mkapplinks&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/pages.py (from r1237738, tuscany/sca-cpp/trunk/modules/edit/pages.py)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/pages.py?p2=tuscany/sca-cpp/trunk/hosting/server/pages.py&p1=tuscany/sca-cpp/trunk/modules/edit/pages.py&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/pages.py (original)
+++ tuscany/sca-cpp/trunk/hosting/server/pages.py Mon Jan 30 15:56:11 2012
@@ -20,7 +20,7 @@ from util import *
 
 # Convert an id to an app id
 def appid(id):
-    return ("'" + car(id), "'htdocs", "'app.html")
+    return ("'apps", "'" + car(id), "'htdocs", "'app.html")
 
 # Put an app page into the apps db
 def put(id, app, cache):

Copied: tuscany/sca-cpp/trunk/hosting/server/palettes.py (from r1237738, tuscany/sca-cpp/trunk/modules/edit/palettes.py)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/palettes.py?p2=tuscany/sca-cpp/trunk/hosting/server/palettes.py&p1=tuscany/sca-cpp/trunk/modules/edit/palettes.py&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes.py (original)
+++ tuscany/sca-cpp/trunk/hosting/server/palettes.py Mon Jan 30 15:56:11 2012
@@ -20,7 +20,7 @@ from util import *
 
 # Convert an id to a palette id
 def paletteid(id):
-    return ("'" + car(id), "'palette.composite")
+    return ("'palettes", "'" + car(id), "'palette.composite")
 
 # Put a palette into the palettes db
 def put(id, palette, cache):

Copied: tuscany/sca-cpp/trunk/hosting/server/selector.py (from r1237738, tuscany/sca-cpp/trunk/modules/edit/log.py)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/selector.py?p2=tuscany/sca-cpp/trunk/hosting/server/selector.py&p1=tuscany/sca-cpp/trunk/modules/edit/log.py&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/log.py (original)
+++ tuscany/sca-cpp/trunk/hosting/server/selector.py Mon Jan 30 15:56:11 2012
@@ -15,10 +15,14 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# Log service component
-from sys import stderr
+# App composites collection implementation
+from util import *
 
-# Log a message
-def log(msg):
-    print >> stderr, '[rconsole]', msg
+# Get the database to use for a particular key
+def get(id, db1, db2):
+    if isNil(id):
+        return db1
+    if cadr(id)[0:1].lower() < 'm':
+        return db1
+    return db2
 

Copied: tuscany/sca-cpp/trunk/hosting/server/server.composite (from r1237738, tuscany/sca-cpp/trunk/modules/edit/edit.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/server.composite?p2=tuscany/sca-cpp/trunk/hosting/server/server.composite&p1=tuscany/sca-cpp/trunk/modules/edit/edit.composite&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/edit.composite (original)
+++ tuscany/sca-cpp/trunk/hosting/server/server.composite Mon Jan 30 15:56:11 2012
@@ -18,8 +18,8 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  targetNamespace="http://edit"
-  name="edit">
+  targetNamespace="http://server"
+  name="server">
         
     <component name="User">
         <implementation.python script="user.py"/>
@@ -61,7 +61,7 @@
             <binding.http uri="accounts"/>
         </service>
         <reference name="user" target="User"/>
-        <reference name="cache" target="AccountCache"/>
+        <reference name="cache" target="Cache"/>
     </component>
     
     <component name="Dashboards">
@@ -70,7 +70,7 @@
             <binding.http uri="dashboards"/>
         </service>        
         <reference name="user" target="User"/>
-        <reference name="cache" target="DashboardCache"/>
+        <reference name="cache" target="Cache"/>
         <reference name="apps" target="Apps"/>
     </component>
     
@@ -79,7 +79,7 @@
         <service name="AppStore">
             <binding.http uri="appstore"/>
         </service>        
-        <reference name="cache" target="StoreCache"/>
+        <reference name="cache" target="Cache"/>
     </component>
     
     <component name="Apps">
@@ -87,7 +87,7 @@
         <service name="Apps">
             <binding.http uri="apps"/>
         </service>
-        <reference name="cache" target="AppCache"/>
+        <reference name="cache" target="Cache"/>
         <reference name="store" target="AppStore"/>
         <reference name="composites" target="Composites"/>
         <reference name="pages" target="Pages"/>
@@ -98,7 +98,7 @@
         <service name="Composites">
             <binding.http uri="composites"/>
         </service>
-        <reference name="cache" target="AppDocCache"/>
+        <reference name="cache" target="Doccache"/>
     </component>
     
     <component name="Pages">
@@ -106,7 +106,7 @@
         <service name="Pages">
             <binding.http uri="pages"/>
         </service>
-        <reference name="cache" target="AppDocCache"/>
+        <reference name="cache" target="Doccache"/>
     </component>
     
     <component name="Palettes">
@@ -114,157 +114,57 @@
         <service name="Palettes">
             <binding.http uri="palettes"/>
         </service>
-        <reference name="cache" target="PaletteDocCache"/>
+        <reference name="cache" target="Doccache"/>
     </component>
     
-    <component name="AccountCache">
+    <component name="Cache">
         <implementation.cpp path="../../components/cache" library="libdatacache"/>
-        <service name="AccountCache">
-            <binding.http uri="accountcache"/>
+        <service name="Cache">
+            <binding.http uri="cache"/>
         </service>
         <reference name="l1reader" target="Memcache"/>
         <reference name="l1writer" target="Memcache"/>
-        <reference name="l2reader" target="AccountDB"/>
-        <reference name="l2writer" target="AccountDB"/>
+        <reference name="l2reader" target="Database"/>
+        <reference name="l2writer" target="Database"/>
     </component>
 
-    <component name="AccountDB">
-        <implementation.cpp path="../../components/filedb" library="libfiledb"/>
-        <property name="dbname">accounts</property>
-        <property name="format">scheme</property>
-        <service name="AccountDB">
-            <binding.http uri="accountdb"/>
-        </service>
-    </component>
-
-    <component name="DashboardCache">
+    <component name="Doccache">
         <implementation.cpp path="../../components/cache" library="libdatacache"/>
-        <service name="DashboardCache">
-            <binding.http uri="dashboardcache"/>
+        <service name="Doccache">
+            <binding.http uri="doccache"/>
         </service>
         <reference name="l1reader" target="Memcache"/>
         <reference name="l1writer" target="Memcache"/>
-        <reference name="l2reader" target="DashboardDB"/>
-        <reference name="l2writer" target="DashboardDB"/>
+        <reference name="l2reader" target="Documents"/>
+        <reference name="l2writer" target="Documents"/>
     </component>
 
-    <component name="DashboardDB">
-        <implementation.cpp path="../../components/filedb" library="libfiledb"/>
-        <property name="dbname">dashboards</property>
-        <property name="format">scheme</property>
-        <service name="DashboardDB">
-            <binding.http uri="dashboarddb"/>
-        </service>
-    </component>
-
-    <component name="StoreCache">
-        <implementation.cpp path="../../components/cache" library="libdatacache"/>
-        <service name="StoreCache">
-            <binding.http uri="storecache"/>
+    <component name="Memcache">
+        <implementation.cpp path="../../components/cache" library="libmemcache"/>
+        <service name="Memcache">
+            <binding.http uri="memcache"/>
         </service>
-        <reference name="l1reader" target="Memcache"/>
-        <reference name="l1writer" target="Memcache"/>
-        <reference name="l2reader" target="StoreDB"/>
-        <reference name="l2writer" target="StoreDB"/>
+        <property name="servers">localhost:11211</property>
     </component>
 
-    <component name="StoreDB">
+    <component name="Database">
         <implementation.cpp path="../../components/filedb" library="libfiledb"/>
-        <property name="dbname">store</property>
+        <property name="dbname">data</property>
         <property name="format">scheme</property>
-        <service name="StoreDB">
-            <binding.http uri="storedb"/>
-        </service>
-    </component>
-
-    <component name="AppCache">
-        <implementation.cpp path="../../components/cache" library="libdatacache"/>
-        <service name="AppCache">
-            <binding.http uri="appcache"/>
+        <service name="Database">
+            <binding.http uri="database"/>
         </service>
-        <reference name="l1reader" target="Memcache"/>
-        <reference name="l1writer" target="Memcache"/>
-        <reference name="l2reader" target="AppDB"/>
-        <reference name="l2writer" target="AppDB"/>
     </component>
 
-    <component name="AppDB">
+    <component name="Documents">
         <implementation.cpp path="../../components/filedb" library="libfiledb"/>
-        <property name="dbname">apps</property>
-        <property name="format">scheme</property>
-        <service name="AppDB">
-            <binding.http uri="appdb"/>
-        </service>
-    </component>
-
-    <component name="AppDocCache">
-        <implementation.cpp path="../../components/cache" library="libdatacache"/>
-        <service name="AppDocCache">
-            <binding.http uri="appdoccache"/>
-        </service>
-        <reference name="l1reader" target="Memcache"/>
-        <reference name="l1writer" target="Memcache"/>
-        <reference name="l2reader" target="AppDocDB"/>
-        <reference name="l2writer" target="AppDocDB"/>
-    </component>
-
-    <component name="AppDocDB">
-        <implementation.cpp path="../../components/filedb" library="libfiledb"/>
-        <property name="dbname">apps</property>
-        <property name="format">xml</property>
-        <service name="AppDocDB">
-            <binding.http uri="appdocdb"/>
-        </service>
-    </component>
-
-    <component name="PaletteDocCache">
-        <implementation.cpp path="../../components/cache" library="libdatacache"/>
-        <service name="PaletteDocCache">
-            <binding.http uri="palettedoccache"/>
-        </service>
-        <reference name="l1reader" target="Memcache"/>
-        <reference name="l1writer" target="Memcache"/>
-        <reference name="l2reader" target="PaletteDocDB"/>
-        <reference name="l2writer" target="PaletteDocDB"/>
-    </component>
-
-    <component name="PaletteDocDB">
-        <implementation.cpp path="../../components/filedb" library="libfiledb"/>
-        <property name="dbname">palettes</property>
+        <property name="dbname">data</property>
         <property name="format">xml</property>
-        <service name="PaletteDocDB">
-            <binding.http uri="palettedocdb"/>
-        </service>
-    </component>
-
-    <component name="AppDataFileCache">
-        <implementation.cpp path="../../components/cache" library="libdatacache"/>
-        <service name="AppDataFileCache">
-            <binding.http uri="appdatafilecache"/>
-        </service>
-        <reference name="l1reader" target="Memcache"/>
-        <reference name="l1writer" target="Memcache"/>
-        <reference name="l2reader" target="AppDataFileDB"/>
-        <reference name="l2writer" target="AppDataFileDB"/>
-    </component>
-
-    <component name="AppDataFileDB">
-        <implementation.cpp path="../../components/filedb" library="libfiledb"/>
-        <property name="dbname">tmp/appdata/filedb</property>
-        <property name="format">scheme</property>
-        <service name="AppDataFileDB">
-            <binding.http uri="appdatafiledb"/>
+        <service name="Documents">
+            <binding.http uri="documents"/>
         </service>
     </component>
 
-    <component name="Memcache">
-        <implementation.cpp path="../../components/cache" library="libmemcache"/>
-        <service name="Memcache">
-            <binding.http uri="memcache"/>
-        </service>
-        <property name="servers">localhost:11211</property>
-    </component>
-
     <component name="Log">
         <implementation.python script="log.py"/>
         <service name="Log">

Copied: tuscany/sca-cpp/trunk/hosting/server/ssl-start (from r1237738, tuscany/sca-cpp/trunk/modules/edit/ssl-start)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/ssl-start?p2=tuscany/sca-cpp/trunk/hosting/server/ssl-start&p1=tuscany/sca-cpp/trunk/modules/edit/ssl-start&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/ssl-start (original)
+++ tuscany/sca-cpp/trunk/hosting/server/ssl-start Mon Jan 30 15:56:11 2012
@@ -17,15 +17,15 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# For this module to work, add the sca-store.com domain to your /etc/hosts as follows:
-# 127.0.0.1 sca-store.com
+# For this module to work, add the example.com domain to your /etc/hosts as follows:
+# 127.0.0.1 example.com
 
 here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
-jsprefix=`echo "import os; print os.path.realpath('$here/../js')" | python`
+jsprefix=`echo "import os; print os.path.realpath('$here/../../modules/js')" | python`
 
 # Create SSL certificates
-../../modules/http/ssl-ca-conf tmp sca-store.com
-../../modules/http/ssl-cert-conf tmp sca-store.com server
+../../modules/http/ssl-ca-conf tmp example.com
+../../modules/http/ssl-cert-conf tmp example.com server
 
 # Configure and start logging
 if [ -x ../../components/log/scribe-cat ]; then
@@ -40,7 +40,7 @@ fi
 ../../components/cache/memcached-start tmp 11212
 
 # Configure server
-../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs
+../../modules/http/httpd-conf tmp example.com 8090 htdocs
 ../../modules/http/httpd-event-conf tmp
 ../../modules/http/httpd-ssl-conf tmp 8453
 
@@ -66,8 +66,8 @@ fi
 #../../modules/http/group-auth-conf tmp jane
 #../../modules/http/group-auth-conf tmp admin
 # Configure the email addresses associated with your OpenID and OAuth ids here
-../../modules/http/group-auth-conf tmp john@sca-store.com
-../../modules/http/group-auth-conf tmp jane@sca-store.com
+../../modules/http/group-auth-conf tmp john@example.com
+../../modules/http/group-auth-conf tmp jane@example.com
 
 # Configure mod-security
 ../../modules/http/mod-security-conf tmp
@@ -80,6 +80,7 @@ fi
 if [ -x ../../components/log/scribe-cat ]; then
     cat >tmp/conf/log.conf <<EOF
 # Generated by: ssl-start $*
+LogLevel notice
 ErrorLog "|$here/../../components/log/scribe-cat server"
 CustomLog "|$here/../../components/log/scribe-cat server" combined
 
@@ -97,6 +98,27 @@ SecAuditLog "|$here/../../components/log
 
 EOF
 
+else
+    cat >tmp/conf/log.conf <<EOF
+# Generated by: ssl=start $*
+LogLevel debug
+ErrorLog $here/tmp/logs/error_log
+CustomLog $here/tmp/logs/access_log combined
+
+EOF
+
+    cat >tmp/conf/log-ssl.conf <<EOF
+# Generated by: ssl-start $*
+CustomLog $here/tmp/logs/ssl_access_log sslcombined
+
+EOF
+
+    cat >tmp/conf/mod-security-log.conf <<EOF
+# Generated by: ssl-start $*
+SecAuditLog $here/tmp/logs/secaudit_log secaudit
+
+EOF
+
 fi
 
 # Configure certificate mime type
@@ -124,11 +146,11 @@ EOF
 cat >>tmp/conf/httpd.conf <<EOF
 # Generated by: ssl-start $*
 # Configure SCA Composite
-SCAContribution `pwd`/
-SCAComposite edit.composite
+SCAContribution $here/
+SCAComposite server.composite
 
 # Configure SCA Composite for mass dynamic virtual Hosting
-SCAVirtualContribution `pwd`/apps/
+SCAVirtualContribution $here/apps/
 SCAVirtualComposite app.composite
 
 EOF
@@ -142,29 +164,16 @@ Alias /home/home.b64 $here/htdocs/home/h
 EOF
 
 # Create app resource links
-./mkapplinks . ../../../.. ../../../../../nuvem
+./mkapplinks data ../../../../.. ../../../../../../nuvem
 
 # Configure app resource aliases
 cat >>tmp/conf/svhost-ssl.conf <<EOF
 # Generated by: ssl-start $*
-<Location /v>
-RewriteEngine on
-
 # Map /v/<app-name>/<path> to htdocs/app/<path>
-RewriteCond %{REQUEST_URI} ^/v/.+/.*$
-RewriteRule /v/(.+)/(.*)$ $here/htdocs/app/\$2 [L]
-
-# Redirect /v/<app-name> to /<app-name>/
-RewriteCond %{REQUEST_URI} ^/v/[^/]+$
-RewriteRule /v/([^/]+)$ /\$1/ [L,R]
-
-</Location>
+AliasMatch /v/([^/]+)(.*)$ $here/htdocs/app\$2
 
 EOF
 
-# Create application database directories
-mkdir -p tmp/appdata/filedb
-
 # Start server
 ../../modules/http/httpd-start tmp
 

Copied: tuscany/sca-cpp/trunk/hosting/server/start (from r1237738, tuscany/sca-cpp/trunk/modules/edit/start)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/start?p2=tuscany/sca-cpp/trunk/hosting/server/start&p1=tuscany/sca-cpp/trunk/modules/edit/start&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/start (original)
+++ tuscany/sca-cpp/trunk/hosting/server/start Mon Jan 30 15:56:11 2012
@@ -17,11 +17,11 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# For this module to work, add the sca-store.com domain to your /etc/hosts as follows:
-# 127.0.0.1 sca-store.com
+# For this module to work, add the example.com domain to your /etc/hosts as follows:
+# 127.0.0.1 example.com
 
 here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
-jsprefix=`echo "import os; print os.path.realpath('$here/../js')" | python`
+jsprefix=`echo "import os; print os.path.realpath('$here/../../modules/js')" | python`
 
 # Configure and start logging
 if [ -x ../../components/log/scribe-cat ]; then
@@ -36,17 +36,18 @@ fi
 ../../components/cache/memcached-start tmp 11212
 
 # Configure server
-../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs
+../../modules/http/httpd-conf tmp example.com 8090 htdocs
 ../../modules/http/httpd-event-conf tmp
 
 # Configure Python component support
-../server/server-conf tmp
-../python/python-conf tmp
+../../modules/server/server-conf tmp
+../../modules/python/python-conf tmp
 
 # Configure server log streaming
 if [ -x ../../components/log/scribe-cat ]; then
     cat >tmp/conf/log.conf <<EOF
 # Generated by: start $*
+LogLevel notice
 ErrorLog "|$here/../../components/log/scribe-cat server"
 CustomLog "|$here/../../components/log/scribe-cat server" combined
 
@@ -58,6 +59,21 @@ CustomLog "|$here/../../components/log/s
 
 EOF
 
+else
+    cat >tmp/conf/log.conf <<EOF
+# Generated by: start $*
+LogLevel debug
+ErrorLog $here/tmp/logs/error_log
+CustomLog $here/tmp/logs/access_log combined
+
+EOF
+
+    cat >tmp/conf/log-ssl.conf <<EOF
+# Generated by: start $*
+CustomLog $here/tmp/logs/ssl_access_log sslcombined
+
+EOF
+
 fi
 
 # Configure error pages
@@ -75,11 +91,11 @@ EOF
 cat >>tmp/conf/httpd.conf <<EOF
 # Generated by: start $*
 # Configure SCA Composite
-SCAContribution `pwd`/
-SCAComposite edit.composite
+SCAContribution $here/
+SCAComposite server.composite
 
 # Configure SCA Composite for mass dynamic virtual Hosting
-SCAVirtualContribution `pwd`/apps/
+SCAVirtualContribution $here/data/apps/
 SCAVirtualComposite app.composite
 
 EOF
@@ -93,29 +109,16 @@ Alias /home/home.b64 $here/htdocs/home/h
 EOF
 
 # Create app resource links
-./mkapplinks . ../../../.. ../../../../../nuvem
+./mkapplinks data ../../../../.. ../../../../../../nuvem
 
 # Configure app resource aliases
 cat >>tmp/conf/svhost.conf <<EOF
 # Generated by: start $*
-<Location /v>
-RewriteEngine on
-
 # Map /v/<app-name>/<path> to htdocs/app/<path>
-RewriteCond %{REQUEST_URI} ^/v/.+/.*$
-RewriteRule /v/(.+)/(.*)$ $here/htdocs/app/\$2 [L]
-
-# Redirect /v/<app-name> to /<app-name>/
-RewriteCond %{REQUEST_URI} ^/v/[^/]+$
-RewriteRule /v/([^/]+)$ /\$1/ [L,R]
-
-</Location>
+AliasMatch /v/([^/]+)(.*)$ $here/htdocs/app\$2
 
 EOF
 
-# Create application database directories
-mkdir -p tmp/appdata/filedb
-
 # Start server
 ../../modules/http/httpd-start tmp
 

Copied: tuscany/sca-cpp/trunk/hosting/server/stop (from r1237738, tuscany/sca-cpp/trunk/modules/edit/stop)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/stop?p2=tuscany/sca-cpp/trunk/hosting/server/stop&p1=tuscany/sca-cpp/trunk/modules/edit/stop&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/store.py (from r1237738, tuscany/sca-cpp/trunk/modules/edit/store.py)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/store.py?p2=tuscany/sca-cpp/trunk/hosting/server/store.py&p1=tuscany/sca-cpp/trunk/modules/edit/store.py&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/store.py (original)
+++ tuscany/sca-cpp/trunk/hosting/server/store.py Mon Jan 30 15:56:11 2012
@@ -20,7 +20,7 @@ from util import *
 
 # Convert a particular store tag to a store id
 def storeid(tag):
-    return ("'" + tag, "'store.apps")
+    return ("'store", "'" + tag, "'store.apps")
 
 # Get a store from the cache
 def getstore(id, cache):

Copied: tuscany/sca-cpp/trunk/hosting/server/user.py (from r1237738, tuscany/sca-cpp/trunk/modules/edit/user.py)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/user.py?p2=tuscany/sca-cpp/trunk/hosting/server/user.py&p1=tuscany/sca-cpp/trunk/modules/edit/user.py&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/util.py (from r1237738, tuscany/sca-cpp/trunk/modules/edit/util.py)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/util.py?p2=tuscany/sca-cpp/trunk/hosting/server/util.py&p1=tuscany/sca-cpp/trunk/modules/edit/util.py&r1=1237738&r2=1237740&rev=1237740&view=diff
==============================================================================
    (empty)

Modified: tuscany/sca-cpp/trunk/modules/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/Makefile.am?rev=1237740&r1=1237739&r2=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/Makefile.am Mon Jan 30 15:56:11 2012
@@ -15,5 +15,5 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-SUBDIRS = scheme atom rss js json scdl http server python opencl java openid oauth wsgi edit
+SUBDIRS = scheme atom rss js json scdl http server python opencl java openid oauth wsgi
 

Modified: tuscany/sca-cpp/trunk/modules/http/http-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/http-test?rev=1237740&r1=1237739&r2=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/http-test (original)
+++ tuscany/sca-cpp/trunk/modules/http/http-test Mon Jan 30 15:56:11 2012
@@ -24,7 +24,7 @@
 sleep 2
 
 # Test
-./curl-test
+./curl-test 2>/dev/null
 rc=$?
 
 # Cleanup

Modified: tuscany/sca-cpp/trunk/modules/http/httpd.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd.hpp?rev=1237740&r1=1237739&r2=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd.hpp Mon Jan 30 15:56:11 2012
@@ -205,7 +205,7 @@ const string serverName(request_rec* r, 
 /**
  * Return true if a request is targeting a virtual host.
  */
-const bool isVirtualHostRequest(const server_rec* s, const string& d, request_rec* r) {
+const bool isVhostRequest(const server_rec* s, const string& d, request_rec* r) {
     const string rh = hostName(r);
     return rh != hostName(s) && http::topDomain(rh) == d;
 }

Modified: tuscany/sca-cpp/trunk/modules/http/proxy-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/proxy-test?rev=1237740&r1=1237739&r2=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/proxy-test (original)
+++ tuscany/sca-cpp/trunk/modules/http/proxy-test Mon Jan 30 15:56:11 2012
@@ -29,7 +29,7 @@
 sleep 2
 
 # Test
-./curl-test
+./curl-test 2>/dev/null
 rc=$?
 
 # Cleanup

Modified: tuscany/sca-cpp/trunk/modules/server/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/Makefile.am?rev=1237740&r1=1237739&r2=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/server/Makefile.am Mon Jan 30 15:56:11 2012
@@ -25,19 +25,14 @@ moddir = $(prefix)/modules/server
 
 EXTRA_DIST = domain-test.composite client-test.scm server-test.scm htdocs/*.html htdocs/test/*.xml htdocs/test/*.txt
 
-mod_LTLIBRARIES = libmod_tuscany_eval.la libmod_tuscany_wiring.la
-noinst_DATA = libmod_tuscany_eval${libsuffix} libmod_tuscany_wiring${libsuffix}
+mod_LTLIBRARIES = libmod_tuscany_eval.la
+noinst_DATA = libmod_tuscany_eval${libsuffix}
 
 libmod_tuscany_eval_la_SOURCES = mod-eval.cpp
 libmod_tuscany_eval_la_LDFLAGS = -lxml2 -lcurl -lmozjs
 libmod_tuscany_eval${libsuffix}:
 	ln -s .libs/libmod_tuscany_eval${libsuffix}
 
-libmod_tuscany_wiring_la_SOURCES = mod-wiring.cpp
-libmod_tuscany_wiring_la_LDFLAGS = -lxml2 -lcurl -lmozjs
-libmod_tuscany_wiring${libsuffix}:
-	ln -s .libs/libmod_tuscany_wiring${libsuffix}
-
 noinst_test_LTLIBRARIES = libimpl-test.la
 noinst_testdir = `pwd`/tmp
 noinst_DATA += libimpl-test${libsuffix}

Modified: tuscany/sca-cpp/trunk/modules/server/client-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/client-test.cpp?rev=1237740&r1=1237739&r2=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/client-test.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/server/client-test.cpp Mon Jan 30 15:56:11 2012
@@ -29,7 +29,7 @@
 
 int main() {
     tuscany::cout << "Testing..." << tuscany::endl;
-    tuscany::server::testURI = "http://localhost:8090/test";
+    tuscany::server::testURI = "http://localhost:8090/scheme";
 
     tuscany::server::testServer();
 

Modified: tuscany/sca-cpp/trunk/modules/server/client-test.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/client-test.hpp?rev=1237740&r1=1237739&r2=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/client-test.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/server/client-test.hpp Mon Jan 30 15:56:11 2012
@@ -36,7 +36,7 @@
 namespace tuscany {
 namespace server {
 
-string testURI = "http://localhost:8090/test";
+string testURI = "http://localhost:8090/scheme";
 bool testBlobs = true;
 
 ostream* curlWriter(const string& s, ostream* os) {

Modified: tuscany/sca-cpp/trunk/modules/server/domain-test.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/domain-test.composite?rev=1237740&r1=1237739&r2=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/domain-test.composite (original)
+++ tuscany/sca-cpp/trunk/modules/server/domain-test.composite Mon Jan 30 15:56:11 2012
@@ -23,8 +23,8 @@
         
     <component name="scheme-test">
         <implementation.scheme script="server-test.scm"/>
-        <service name="test">
-            <binding.http uri="test"/>
+        <service name="scheme">
+            <binding.http uri="scheme"/>
         </service>
     </component>     
 

Modified: tuscany/sca-cpp/trunk/modules/server/httpd-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/httpd-test?rev=1237740&r1=1237739&r2=1237740&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/httpd-test (original)
+++ tuscany/sca-cpp/trunk/modules/server/httpd-test Mon Jan 30 15:56:11 2012
@@ -41,31 +41,31 @@ rc=$?
 
 # Test ATOMPub
 if [ "$rc" = "0" ]; then
-    $curl_prefix/bin/curl http://localhost:8090/test/ >tmp/feed.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/scheme/ >tmp/feed.xml 2>/dev/null
     diff tmp/feed.xml htdocs/test/feed.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    $curl_prefix/bin/curl http://localhost:8090/test/111 >tmp/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/scheme/111 >tmp/entry.xml 2>/dev/null
     diff tmp/entry.xml htdocs/test/entry.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    $curl_prefix/bin/curl http://localhost:8090/test/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/test/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/scheme/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/test/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    $curl_prefix/bin/curl http://localhost:8090/test/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/test/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/scheme/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/test/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    $curl_prefix/bin/curl http://localhost:8090/test/111 -X DELETE 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/scheme/111 -X DELETE 2>/dev/null
     rc=$?
 fi
 
 # Test JSON-RPC
 if [ "$rc" = "0" ]; then
-    $curl_prefix/bin/curl http://localhost:8090/test/ -X POST -H "Content-type: application/json-rpc" --data @htdocs/test/json-request.txt >tmp/json-result.txt 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/scheme/ -X POST -H "Content-type: application/json-rpc" --data @htdocs/test/json-request.txt >tmp/json-result.txt 2>/dev/null
     diff tmp/json-result.txt htdocs/test/json-result.txt
     rc=$?
 fi



Mime
View raw message