Moved server configuration to HTTPD postConfig phase, to avoid running configuration commands twice and added a way for runtime modules and components to handle start/restart/stop events. Improved build scripts a little, to not depend on external environment variables.

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

11 files changed, 11 insertions, 23 deletions

diff --git a/sca-cpp/trunk/test/store-cpp/currency-converter.cpp b/sca-cpp/trunk/test/store-cpp/currency-converter.cpp
index a48fd46021..5f0702490a 100644
--- a/sca-cpp/trunk/test/store-cpp/currency-converter.cpp
+++ b/sca-cpp/trunk/test/store-cpp/currency-converter.cpp
@@ -61,7 +61,7 @@ const tuscany::value apply(const tuscany::list<tuscany::value>& params) {
         return tuscany::store::convert(cadr(params), caddr(params), cadddr(params));
     if (func == "symbol")
         return tuscany::store::symbol(cadr(params));
-    return tuscany::mkfailure<tuscany::value>(tuscany::string("Function not supported: ") + func);
+    return tuscany::mkfailure<tuscany::value>();
 }
 
 }
diff --git a/sca-cpp/trunk/test/store-cpp/fruits-catalog.cpp b/sca-cpp/trunk/test/store-cpp/fruits-catalog.cpp
index f0c9472177..20f2bd35f7 100644
--- a/sca-cpp/trunk/test/store-cpp/fruits-catalog.cpp
+++ b/sca-cpp/trunk/test/store-cpp/fruits-catalog.cpp
@@ -79,7 +79,7 @@ const tuscany::value apply(const tuscany::list<tuscany::value>& params) {
         return tuscany::store::get(cadr(params), caddr(params));
     if (func == "listMethods")
         return tuscany::store::listMethods(cadr(params), caddr(params));
-    return tuscany::mkfailure<tuscany::value>(tuscany::string("Function not supported: ") + func);
+    return tuscany::mkfailure<tuscany::value>();
 }
 
 }
diff --git a/sca-cpp/trunk/test/store-cpp/shopping-cart.cpp b/sca-cpp/trunk/test/store-cpp/shopping-cart.cpp
index 072c90512f..5dcbc88ee9 100644
--- a/sca-cpp/trunk/test/store-cpp/shopping-cart.cpp
+++ b/sca-cpp/trunk/test/store-cpp/shopping-cart.cpp
@@ -157,7 +157,7 @@ const tuscany::value apply(const tuscany::list<tuscany::value>& params) {
         return tuscany::store::gettotal(cadr(params));
     if (func == "listMethods")
         return tuscany::store::listMethods(cadr(params));
-    return tuscany::mkfailure<tuscany::value>(tuscany::string("Function not supported: ") + func);
+    return tuscany::mkfailure<tuscany::value>();
 }
 
 }
diff --git a/sca-cpp/trunk/test/store-cpp/start b/sca-cpp/trunk/test/store-cpp/start
index 982aca812b..06410aca01 100755
--- a/sca-cpp/trunk/test/store-cpp/start
+++ b/sca-cpp/trunk/test/store-cpp/start
@@ -21,14 +21,11 @@
 ../../modules/server/server-conf tmp
 ../../modules/server/cpp-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
-
-<Location />
 SCAContribution `pwd`/
 SCAComposite store.composite
-</Location>
 EOF
 
-apachectl -k start -d `pwd`/tmp
+../../modules/http/httpd-start tmp
 
 mc="memcached -l 127.0.0.1 -m 4 -p 11211"
 $mc &
diff --git a/sca-cpp/trunk/test/store-cpp/stop b/sca-cpp/trunk/test/store-cpp/stop
index 34731dbbe1..07231ee7ce 100755
--- a/sca-cpp/trunk/test/store-cpp/stop
+++ b/sca-cpp/trunk/test/store-cpp/stop
@@ -17,7 +17,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-apachectl -k stop -d `pwd`/tmp
+../../modules/http/httpd-stop tmp
 mc="memcached -l 127.0.0.1 -m 4 -p 11211"
 kill `ps -f | grep -v grep | grep "$mc" | awk '{ print $2 }'`
 
diff --git a/sca-cpp/trunk/test/store-java/start b/sca-cpp/trunk/test/store-java/start
index 43a2b90c2a..3f669f0111 100755
--- a/sca-cpp/trunk/test/store-java/start
+++ b/sca-cpp/trunk/test/store-java/start
@@ -21,16 +21,13 @@
 ../../modules/server/server-conf tmp
 ../../modules/java/java-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
-
-<Location />
 SCAContribution `pwd`/
 SCAComposite store.composite
-</Location>
 EOF
 
 export CLASSPATH=`pwd`/../../modules/java/libmod-tuscany-java-1.0.jar:`pwd`
 
-apachectl -k start -d `pwd`/tmp
+../../modules/http/httpd-start tmp
 
 mc="memcached -l 127.0.0.1 -m 4 -p 11211"
 $mc &
diff --git a/sca-cpp/trunk/test/store-java/stop b/sca-cpp/trunk/test/store-java/stop
index 3c4f59e76e..54b22172bb 100755
--- a/sca-cpp/trunk/test/store-java/stop
+++ b/sca-cpp/trunk/test/store-java/stop
@@ -19,7 +19,7 @@
 
 export CLASSPATH=`pwd`/../../modules/java/libmod-tuscany-java-1.0.jar:`pwd`
 
-apachectl -k stop -d `pwd`/tmp
+../../modules/http/httpd-stop tmp
 mc="memcached -l 127.0.0.1 -m 4 -p 11211"
 kill `ps -f | grep -v grep | grep "$mc" | awk '{ print $2 }'`
 
diff --git a/sca-cpp/trunk/test/store-python/start b/sca-cpp/trunk/test/store-python/start
index 9e85a84cb4..33758b75fd 100755
--- a/sca-cpp/trunk/test/store-python/start
+++ b/sca-cpp/trunk/test/store-python/start
@@ -21,14 +21,11 @@
 ../../modules/server/server-conf tmp
 ../../modules/python/python-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
-
-<Location />
 SCAContribution `pwd`/
 SCAComposite store.composite
-</Location>
 EOF
 
-apachectl -k start -d `pwd`/tmp
+../../modules/http/httpd-start tmp
 
 mc="memcached -l 127.0.0.1 -m 4 -p 11211"
 $mc &
diff --git a/sca-cpp/trunk/test/store-python/stop b/sca-cpp/trunk/test/store-python/stop
index 34731dbbe1..07231ee7ce 100755
--- a/sca-cpp/trunk/test/store-python/stop
+++ b/sca-cpp/trunk/test/store-python/stop
@@ -17,7 +17,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-apachectl -k stop -d `pwd`/tmp
+../../modules/http/httpd-stop tmp
 mc="memcached -l 127.0.0.1 -m 4 -p 11211"
 kill `ps -f | grep -v grep | grep "$mc" | awk '{ print $2 }'`
 
diff --git a/sca-cpp/trunk/test/store-scheme/start b/sca-cpp/trunk/test/store-scheme/start
index cc0ec9b5ea..398e21c8e4 100755
--- a/sca-cpp/trunk/test/store-scheme/start
+++ b/sca-cpp/trunk/test/store-scheme/start
@@ -21,14 +21,11 @@
 ../../modules/server/server-conf tmp
 ../../modules/server/scheme-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
-
-<Location />
 SCAContribution `pwd`/
 SCAComposite store.composite
-</Location>
 EOF
 
-apachectl -k start -d `pwd`/tmp
+../../modules/http/httpd-start tmp
 
 mc="memcached -l 127.0.0.1 -m 4 -p 11211"
 $mc &
diff --git a/sca-cpp/trunk/test/store-scheme/stop b/sca-cpp/trunk/test/store-scheme/stop
index 34731dbbe1..07231ee7ce 100755
--- a/sca-cpp/trunk/test/store-scheme/stop
+++ b/sca-cpp/trunk/test/store-scheme/stop
@@ -17,7 +17,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-apachectl -k stop -d `pwd`/tmp
+../../modules/http/httpd-stop tmp
 mc="memcached -l 127.0.0.1 -m 4 -p 11211"
 kill `ps -f | grep -v grep | grep "$mc" | awk '{ print $2 }'`