Refactor server hosting module, rename it and move it under a hosting dir, and refactor its datastore components into a single component.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1237740 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 27 insertions, 24 deletions

diff --git a/sca-cpp/trunk/modules/edit/start b/sca-cpp/trunk/hosting/server/start
index a6c417bbb1..da0dcecf40 100755
--- a/sca-cpp/trunk/modules/edit/start
+++ b/sca-cpp/trunk/hosting/server/start
@@ -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/scribe-cat server" sslcombined
 
 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/home.b64
 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