Minor fixes to get all samples working in a target install dir.

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

12 files changed, 53 insertions, 25 deletions

diff --git a/sca-cpp/trunk/Makefile.am b/sca-cpp/trunk/Makefile.am
index 62cdb9bdc5..d41536ac0b 100644
--- a/sca-cpp/trunk/Makefile.am
+++ b/sca-cpp/trunk/Makefile.am
@@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = etc kernel modules components samples doc ubuntu
 
 datadir=$(prefix)
-dist_data_DATA = AUTHORS README LICENSE COPYING NOTICE
+dist_data_DATA = AUTHORS README LICENSE COPYING NOTICE NEWS
 nobase_dist_data_DATA = xsd/*.xsd xsd/external/*.xsd xsd/external/*.dtd
 EXTRA_DIST = INSTALL bootstrap
 
diff --git a/sca-cpp/trunk/components/sqldb/Makefile.am b/sca-cpp/trunk/components/sqldb/Makefile.am
index 7ed24e712c..336330cdb4 100644
--- a/sca-cpp/trunk/components/sqldb/Makefile.am
+++ b/sca-cpp/trunk/components/sqldb/Makefile.am
@@ -22,7 +22,7 @@ INCLUDES = -I${PGSQL_INCLUDE}
 incl_HEADERS = *.hpp
 incldir = $(prefix)/include/components/sqldb
 
-dist_comp_SCRIPTS = pgsql-conf pgsql-start pgsql-stop pgsql pgsql-standby-conf
+dist_comp_SCRIPTS = pgsql-conf pgsql-start pgsql-stop pgsql pgsql-standby-conf pgsql-backup
 compdir=$(prefix)/components/sqldb
 
 comp_DATA = pgsql.prefix
diff --git a/sca-cpp/trunk/modules/http/Makefile.am b/sca-cpp/trunk/modules/http/Makefile.am
index b17f774da2..209c7358b7 100644
--- a/sca-cpp/trunk/modules/http/Makefile.am
+++ b/sca-cpp/trunk/modules/http/Makefile.am
@@ -20,7 +20,7 @@ INCLUDES = -I${HTTPD_INCLUDE}
 incl_HEADERS = *.hpp
 incldir = $(prefix)/include/modules/http
 
-dist_mod_SCRIPTS = httpd-conf httpd-start httpd-stop httpd-restart ssl-ca-conf ssl-cert-conf ssl-cert-find httpd-ssl-conf httpd-auth-conf proxy-conf proxy-ssl-conf proxy-member-conf proxy-ssl-member-conf vhost-conf vhost-ssl-conf tunnel-ssl-conf
+dist_mod_SCRIPTS = httpd-conf httpd-addr httpd-start httpd-stop httpd-restart ssl-ca-conf ssl-cert-conf ssl-cert-find httpd-ssl-conf httpd-auth-conf proxy-conf proxy-ssl-conf proxy-member-conf proxy-ssl-member-conf vhost-conf vhost-ssl-conf tunnel-ssl-conf
 moddir=$(prefix)/modules/http
 
 curl_test_SOURCES = curl-test.cpp
diff --git a/sca-cpp/trunk/modules/server/mod-eval.hpp b/sca-cpp/trunk/modules/server/mod-eval.hpp
index c01178cab3..2fe4bd76e0 100644
--- a/sca-cpp/trunk/modules/server/mod-eval.hpp
+++ b/sca-cpp/trunk/modules/server/mod-eval.hpp
@@ -576,7 +576,7 @@ const failable<bool> virtualHostConfig(ServerConf& vsc, const ServerConf& sc, re
 
     // Chdir to the virtual host's contribution
     if (chdir(c_str(sc.contributionPath)) != 0)
-        return mkfailure<bool>("Couldn't chdir to the deployed contribution");
+        return mkfailure<bool>(string("Couldn't chdir to the deployed contribution: ") + sc.contributionPath);
 
     // Configure the deployed components
     const failable<bool> cr = confComponents(vsc);
@@ -607,7 +607,7 @@ const failable<bool> virtualHostCleanup(const ServerConf& vsc, const ServerConf&
 
     // Chdir back to the main server's contribution
     if (chdir(c_str(sc.contributionPath)) != 0)
-        return mkfailure<bool>("Couldn't chdir to the deployed contribution");
+        return mkfailure<bool>(string("Couldn't chdir to the deployed contribution: ") + sc.contributionPath);
     return true;
 }
 
@@ -725,7 +725,7 @@ int postConfig(apr_pool_t *p, unused apr_pool_t *plog, unused apr_pool_t *ptemp,
     if (count == 1) {
         // Chdir to the deployed contribution
         if (chdir(c_str(sc.contributionPath)) != 0) {
-            mkfailure<bool>("Couldn't chdir to the deployed contribution");
+            mkfailure<bool>(string("Couldn't chdir to the deployed contribution: ") + sc.contributionPath);
             return -1;
         }
 
diff --git a/sca-cpp/trunk/samples/store-cluster/Makefile.am b/sca-cpp/trunk/samples/store-cluster/Makefile.am
index f5e8c988eb..e9aab86f10 100644
--- a/sca-cpp/trunk/samples/store-cluster/Makefile.am
+++ b/sca-cpp/trunk/samples/store-cluster/Makefile.am
@@ -24,7 +24,7 @@ if WANT_QUEUE
 dist_sample_SCRIPTS = start stop ssl-start ssl-stop proxy-conf proxy-ssl-conf server-conf server-ssl-conf tunnel-ssl-conf sqldb-master-conf sqldb-standby-conf
 sampledir = $(prefix)/samples/store-cluster
 
-nobase_dist_sample_DATA = htdocs/*.html htdocs/domains/*/*.html domains/*/*.py domains/*/*.composite shared/*.composite
+nobase_dist_sample_DATA = htdocs/*.html htdocs/*/*.html htdocs/domains/*/*.html htdocs/domains/*/*/*.html domains/*/*.py domains/*/*.composite shared/*.composite
 
 dist_noinst_SCRIPTS = server-test
 #TESTS = server-test
diff --git a/sca-cpp/trunk/samples/store-vhost/Makefile.am b/sca-cpp/trunk/samples/store-vhost/Makefile.am
index 8623f468fb..6c7dba1808 100644
--- a/sca-cpp/trunk/samples/store-vhost/Makefile.am
+++ b/sca-cpp/trunk/samples/store-vhost/Makefile.am
@@ -20,7 +20,7 @@ if WANT_PYTHON
 dist_sample_SCRIPTS = start stop ssl-start uec2-start
 sampledir = $(prefix)/samples/store-vhost
 
-nobase_dist_sample_DATA = htdocs/*.html htdocs/domains/*/*.html domains/*/*.py domains/*/*.composite
+nobase_dist_sample_DATA = htdocs/*.html htdocs/domains/*/*.html domains/*/*.py domains/*/*.composite shared/*.composite
 
 dist_noinst_SCRIPTS = server-test
 #TESTS = server-test
diff --git a/sca-cpp/trunk/samples/store-vhost/domains/jane/store.composite b/sca-cpp/trunk/samples/store-vhost/domains/jane/store.composite
index 0c94bd81d2..01553025d9 100644
--- a/sca-cpp/trunk/samples/store-vhost/domains/jane/store.composite
+++ b/sca-cpp/trunk/samples/store-vhost/domains/jane/store.composite
@@ -59,12 +59,4 @@
         </service>        
     </component>     
 
-    <component name="Cache">
-        <implementation.cpp path="../../../../components/cache" library="libmemcache"/>
-        <service name="Cache">
-            <t:binding.atom uri="cache"/>
-        </service>
-        <property name="servers">localhost:11211</property>
-    </component>     
-
 </composite>
diff --git a/sca-cpp/trunk/samples/store-vhost/domains/joe/store.composite b/sca-cpp/trunk/samples/store-vhost/domains/joe/store.composite
index 0c94bd81d2..01553025d9 100644
--- a/sca-cpp/trunk/samples/store-vhost/domains/joe/store.composite
+++ b/sca-cpp/trunk/samples/store-vhost/domains/joe/store.composite
@@ -59,12 +59,4 @@
         </service>        
     </component>     
 
-    <component name="Cache">
-        <implementation.cpp path="../../../../components/cache" library="libmemcache"/>
-        <service name="Cache">
-            <t:binding.atom uri="cache"/>
-        </service>
-        <property name="servers">localhost:11211</property>
-    </component>     
-
 </composite>
diff --git a/sca-cpp/trunk/samples/store-vhost/shared/shared.composite b/sca-cpp/trunk/samples/store-vhost/shared/shared.composite
new file mode 100644
index 0000000000..55a0c1f8d6
--- /dev/null
+++ b/sca-cpp/trunk/samples/store-vhost/shared/shared.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
+  targetNamespace="http://shared"
+  name="shared">
+        
+    <component name="Cache">
+        <implementation.cpp path="../../../components/cache" library="libmemcache"/>
+        <service name="Cache">
+            <t:binding.atom uri="cache"/>
+        </service>
+        <property name="servers">localhost:11211</property>
+    </component>     
+
+</composite>
diff --git a/sca-cpp/trunk/samples/store-vhost/ssl-start b/sca-cpp/trunk/samples/store-vhost/ssl-start
index f765533883..719f54fae2 100755
--- a/sca-cpp/trunk/samples/store-vhost/ssl-start
+++ b/sca-cpp/trunk/samples/store-vhost/ssl-start
@@ -31,6 +31,10 @@
 ../../modules/server/server-conf tmp
 ../../modules/python/python-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
+# Configure SCA Composite
+SCAContribution `pwd`/shared/
+SCAComposite shared.composite
+
 # Configure SCA Composite for mass dynamic virtual Hosting
 SCAVirtualContribution `pwd`/domains/
 SCAVirtualComposite store.composite
diff --git a/sca-cpp/trunk/samples/store-vhost/start b/sca-cpp/trunk/samples/store-vhost/start
index 9f218807f9..16ffe351ec 100755
--- a/sca-cpp/trunk/samples/store-vhost/start
+++ b/sca-cpp/trunk/samples/store-vhost/start
@@ -22,6 +22,10 @@
 ../../modules/server/server-conf tmp
 ../../modules/python/python-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
+# Configure SCA Composite
+SCAContribution `pwd`/shared/
+SCAComposite shared.composite
+
 # Configure SCA Composite for mass dynamic virtual hosting
 SCAVirtualContribution `pwd`/domains/
 SCAVirtualComposite store.composite
diff --git a/sca-cpp/trunk/ubuntu/Makefile.am b/sca-cpp/trunk/ubuntu/Makefile.am
index c65569fbef..640f464bec 100644
--- a/sca-cpp/trunk/ubuntu/Makefile.am
+++ b/sca-cpp/trunk/ubuntu/Makefile.am
@@ -15,5 +15,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-dist_noinst_SCRIPTS = ip-redirect ip-redirect-all ubuntu-bin-image ubuntu-bin-all-image ubuntu-dev-image ubuntu-dev-all-image ubuntu-gcc-4.5 ubuntu-install ubuntu-install-all uec2-bin-image uec2-bin-all-image uec2-dev-image uec2-dev-all-image uec2-conf uec2-setenv uec2-ssh uec2-start uec2-status uec2-stop
+dist_ubuntu_SCRIPTS = ip-redirect ip-redirect-all uec2-conf uec2-setenv uec2-ssh uec2-start uec2-status uec2-stop
+ubuntudir=$(prefix)/ubuntu
+
+dist_noinst_SCRIPTS = ubuntu-bin-image ubuntu-bin-all-image ubuntu-dev-image ubuntu-dev-all-image ubuntu-gcc-4.5 ubuntu-install ubuntu-install-all uec2-bin-image uec2-bin-all-image uec2-dev-image uec2-dev-all-image