Add build support for a minimum distribution using prebuilt dependencies from Ubuntu 9.10.

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

15 files changed, 72 insertions, 19 deletions

diff --git a/sca-cpp/trunk/modules/Makefile.am b/sca-cpp/trunk/modules/Makefile.am
index 9c47fd9fd8..2c74b1dbad 100644
--- a/sca-cpp/trunk/modules/Makefile.am
+++ b/sca-cpp/trunk/modules/Makefile.am
@@ -17,6 +17,3 @@
 
 SUBDIRS = scheme atom rss json scdl http rss server python wsgi java
 
-includedir = $(prefix)/include/modules
-nobase_include_HEADERS = */*.hpp
-
diff --git a/sca-cpp/trunk/modules/atom/Makefile.am b/sca-cpp/trunk/modules/atom/Makefile.am
index 6eccee83c7..9a628ca969 100644
--- a/sca-cpp/trunk/modules/atom/Makefile.am
+++ b/sca-cpp/trunk/modules/atom/Makefile.am
@@ -15,6 +15,9 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/modules/atom
+
 atom_test_SOURCES = atom-test.cpp
 atom_test_LDFLAGS = -lxml2
 
diff --git a/sca-cpp/trunk/modules/http/Makefile.am b/sca-cpp/trunk/modules/http/Makefile.am
index 224fcc1557..795137b6ca 100644
--- a/sca-cpp/trunk/modules/http/Makefile.am
+++ b/sca-cpp/trunk/modules/http/Makefile.am
@@ -17,6 +17,9 @@
 
 INCLUDES = -I${HTTPD_INCLUDE}
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/modules/http
+
 dist_mod_SCRIPTS = httpd-conf httpd-start httpd-stop httpd-restart httpd-ca-conf httpd-cert-conf httpd-ssl-conf
 moddir=$(prefix)/modules/http
 
@@ -26,16 +29,21 @@ curl_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 curl_get_SOURCES = curl-get.cpp
 curl_get_LDFLAGS = -lxml2 -lcurl -lmozjs
 
-mod_DATA = httpd.prefix curl.prefix
+mod_DATA = httpd.prefix httpd-apachectl.prefix httpd-modules.prefix curl.prefix
 nobase_dist_mod_DATA = conf/*
 
 EXTRA_DIST = htdocs/index.html
 
 httpd.prefix: $(top_builddir)/config.status
 	echo ${HTTPD_PREFIX} >httpd.prefix
+httpd-apachectl.prefix: $(top_builddir)/config.status
+	echo ${HTTPD_APACHECTL_PREFIX} >httpd-apachectl.prefix
+httpd-modules.prefix: $(top_builddir)/config.status
+	echo ${HTTPD_MODULES_PREFIX} >httpd-modules.prefix
 curl.prefix: $(top_builddir)/config.status
 	echo ${CURL_PREFIX} >curl.prefix
 
 dist_noinst_SCRIPTS = httpd-test http-test
 noinst_PROGRAMS = curl-test curl-get
 TESTS = httpd-test http-test
+
diff --git a/sca-cpp/trunk/modules/http/curl.hpp b/sca-cpp/trunk/modules/http/curl.hpp
index 3d11ac56b1..61f40eb475 100644
--- a/sca-cpp/trunk/modules/http/curl.hpp
+++ b/sca-cpp/trunk/modules/http/curl.hpp
@@ -26,6 +26,7 @@
  * CURL HTTP client functions.
  */
 
+#include <unistd.h>
 #include <curl/curl.h>
 #include <curl/types.h>
 #include <curl/easy.h>
diff --git a/sca-cpp/trunk/modules/http/httpd-conf b/sca-cpp/trunk/modules/http/httpd-conf
index fa3ce09fc9..f720f40abd 100755
--- a/sca-cpp/trunk/modules/http/httpd-conf
+++ b/sca-cpp/trunk/modules/http/httpd-conf
@@ -25,6 +25,7 @@ port=$3
 htdocs=`readlink -f $4`
 user=`id -un`
 group=`id -gn`
+modules_prefix=`cat $here/httpd-modules.prefix`
 
 mkdir -p $root
 mkdir -p $root/logs
@@ -34,6 +35,31 @@ cat >$root/conf/httpd.conf <<EOF
 
 # Set server name
 ServerName $host
+PidFile $root/logs/httpd.pid
+
+# Minimal set of modules
+LoadModule authn_file_module ${modules_prefix}/modules/mod_authn_file.so
+LoadModule authn_default_module ${modules_prefix}/modules/mod_authn_default.so
+LoadModule authz_host_module ${modules_prefix}/modules/mod_authz_host.so
+LoadModule authz_groupfile_module ${modules_prefix}/modules/mod_authz_groupfile.so
+LoadModule authz_user_module ${modules_prefix}/modules/mod_authz_user.so
+LoadModule authz_default_module ${modules_prefix}/modules/mod_authz_default.so
+LoadModule auth_basic_module ${modules_prefix}/modules/mod_auth_basic.so
+LoadModule filter_module ${modules_prefix}/modules/mod_filter.so
+LoadModule proxy_module ${modules_prefix}/modules/mod_proxy.so
+LoadModule proxy_connect_module ${modules_prefix}/modules/mod_proxy_connect.so
+LoadModule proxy_http_module ${modules_prefix}/modules/mod_proxy_http.so
+LoadModule proxy_balancer_module ${modules_prefix}/modules/mod_proxy_balancer.so
+LoadModule ssl_module ${modules_prefix}/modules/mod_ssl.so
+LoadModule mime_module ${modules_prefix}/modules/mod_mime.so
+LoadModule status_module ${modules_prefix}/modules/mod_status.so
+LoadModule asis_module ${modules_prefix}/modules/mod_asis.so
+LoadModule negotiation_module ${modules_prefix}/modules/mod_negotiation.so
+LoadModule dir_module ${modules_prefix}/modules/mod_dir.so
+LoadModule rewrite_module ${modules_prefix}/modules/mod_rewrite.so
+<IfModule !log_config_module>
+LoadModule log_config_module ${modules_prefix}/modules/mod_log_config.so
+</IfModule>
 
 # Basic security precautions
 User $user
diff --git a/sca-cpp/trunk/modules/http/httpd-restart b/sca-cpp/trunk/modules/http/httpd-restart
index 92f27eb0df..3e3b687f98 100755
--- a/sca-cpp/trunk/modules/http/httpd-restart
+++ b/sca-cpp/trunk/modules/http/httpd-restart
@@ -21,5 +21,5 @@
 here=`readlink -f $0`; here=`dirname $here`
 root=`readlink -f $1`
 
-httpd_prefix=`cat $here/httpd.prefix`
-$httpd_prefix/bin/apachectl -k graceful -d $root
+apachectl=`cat $here/httpd-apachectl.prefix`
+$apachectl -k graceful -d $root -f $root/conf/httpd.conf
diff --git a/sca-cpp/trunk/modules/http/httpd-start b/sca-cpp/trunk/modules/http/httpd-start
index 91fc5284af..5c006d1b54 100755
--- a/sca-cpp/trunk/modules/http/httpd-start
+++ b/sca-cpp/trunk/modules/http/httpd-start
@@ -21,5 +21,5 @@
 here=`readlink -f $0`; here=`dirname $here`
 root=`readlink -f $1`
 
-httpd_prefix=`cat $here/httpd.prefix`
-$httpd_prefix/bin/apachectl -E $root/logs/error_log -k start -d $root
+apachectl=`cat $here/httpd-apachectl.prefix`
+$apachectl -E $root/logs/error_log -k start -d $root -f $root/conf/httpd.conf
diff --git a/sca-cpp/trunk/modules/http/httpd-stop b/sca-cpp/trunk/modules/http/httpd-stop
index 7f4fe94629..09ac5d035f 100755
--- a/sca-cpp/trunk/modules/http/httpd-stop
+++ b/sca-cpp/trunk/modules/http/httpd-stop
@@ -21,5 +21,5 @@
 here=`readlink -f $0`; here=`dirname $here`
 root=`readlink -f $1`
 
-httpd_prefix=`cat $here/httpd.prefix`
-$httpd_prefix/bin/apachectl -k graceful-stop -d $root
+apachectl=`cat $here/httpd-apachectl.prefix`
+$apachectl -k graceful-stop -d $root -f $root/conf/httpd.conf
diff --git a/sca-cpp/trunk/modules/java/Makefile.am b/sca-cpp/trunk/modules/java/Makefile.am
index 0369121b73..39b7ad550a 100644
--- a/sca-cpp/trunk/modules/java/Makefile.am
+++ b/sca-cpp/trunk/modules/java/Makefile.am
@@ -16,12 +16,14 @@
 #  under the License.
 
 JAVAROOT = $(top_builddir)/modules/java
-libdir = $(prefix)/modules/java
 
 if WANT_JAVA
 
 INCLUDES = -I${JAVA_INCLUDE}
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/modules/java
+
 dist_mod_SCRIPTS = java-conf
 moddir = $(prefix)/modules/java
 
@@ -32,7 +34,7 @@ java.prefix: $(top_builddir)/config.status
 
 EXTRA_DIST = domain-test.composite
 
-lib_LTLIBRARIES = libmod_tuscany_java.la
+mod_LTLIBRARIES = libmod_tuscany_java.la
 libmod_tuscany_java_la_SOURCES = mod-java.cpp
 libmod_tuscany_java_la_LDFLAGS = -lxml2 -lcurl -lmozjs ${JAVA_LDFLAGS}
 noinst_DATA = libmod_tuscany_java.so
@@ -48,14 +50,14 @@ java_test_LDFLAGS = ${JAVA_LDFLAGS}
 java_shell_SOURCES = java-shell.cpp
 java_shell_LDFLAGS = ${JAVA_LDFLAGS}
 
-dist_noinst_JAVA = org/apache/tuscany/*.java test/*.java
+dist_mod_JAVA = org/apache/tuscany/*.java test/*.java
 jardir = ${prefix}/modules/java
 jarfile = libmod-tuscany-java-${PACKAGE_VERSION}.jar
 jar_DATA = ${jarfile}
-${jarfile}: ${noinst_JAVA}
+${jarfile}: ${dist_mod_JAVA}
 	${JAR} cf $@ org/apache/tuscany/*.class
 
-CLEANFILES = classnoinst.stamp ${jarfile} org/apache/tuscany/*.class	test/*.class
+CLEANFILES = *.stamp ${jarfile} org/apache/tuscany/*.class	test/*.class
 
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
diff --git a/sca-cpp/trunk/modules/json/Makefile.am b/sca-cpp/trunk/modules/json/Makefile.am
index fd00ebb4af..7b5b3878db 100644
--- a/sca-cpp/trunk/modules/json/Makefile.am
+++ b/sca-cpp/trunk/modules/json/Makefile.am
@@ -15,6 +15,9 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/modules/json
+
 json_test_SOURCES = json-test.cpp
 json_test_LDFLAGS = -lmozjs 
 
diff --git a/sca-cpp/trunk/modules/python/Makefile.am b/sca-cpp/trunk/modules/python/Makefile.am
index f8b200d96a..2f56b9a1db 100644
--- a/sca-cpp/trunk/modules/python/Makefile.am
+++ b/sca-cpp/trunk/modules/python/Makefile.am
@@ -15,12 +15,14 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-libdir = $(prefix)/modules/python
 
 if WANT_PYTHON
 
 INCLUDES = -I${PYTHON_INCLUDE}
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/modules/python
+
 dist_mod_SCRIPTS = python-conf
 moddir = $(prefix)/modules/python
 
@@ -31,7 +33,7 @@ python.prefix: $(top_builddir)/config.status
 
 EXTRA_DIST = domain-test.composite client-test.py server-test.py
 
-lib_LTLIBRARIES = libmod_tuscany_python.la
+mod_LTLIBRARIES = libmod_tuscany_python.la
 libmod_tuscany_python_la_SOURCES = mod-python.cpp
 libmod_tuscany_python_la_LDFLAGS = -lxml2 -lcurl -lmozjs -L${PYTHON_LIB} -R${PYTHON_LIB} -lpython2.6
 noinst_DATA = libmod_tuscany_python.so
diff --git a/sca-cpp/trunk/modules/rss/Makefile.am b/sca-cpp/trunk/modules/rss/Makefile.am
index 5254eacb25..06a67f3c3f 100644
--- a/sca-cpp/trunk/modules/rss/Makefile.am
+++ b/sca-cpp/trunk/modules/rss/Makefile.am
@@ -15,6 +15,9 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/modules/rss
+
 rss_test_SOURCES = rss-test.cpp
 rss_test_LDFLAGS = -lxml2
 
diff --git a/sca-cpp/trunk/modules/scdl/Makefile.am b/sca-cpp/trunk/modules/scdl/Makefile.am
index bbd9c1500b..09cbd35ec0 100644
--- a/sca-cpp/trunk/modules/scdl/Makefile.am
+++ b/sca-cpp/trunk/modules/scdl/Makefile.am
@@ -15,6 +15,9 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/modules/scdl
+
 scdl_test_SOURCES = scdl-test.cpp
 scdl_test_LDFLAGS = -lxml2
 
diff --git a/sca-cpp/trunk/modules/scheme/Makefile.am b/sca-cpp/trunk/modules/scheme/Makefile.am
index 40a6ba930f..c2a32af923 100644
--- a/sca-cpp/trunk/modules/scheme/Makefile.am
+++ b/sca-cpp/trunk/modules/scheme/Makefile.am
@@ -15,6 +15,9 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/modules/scheme
+
 eval_test_SOURCES = eval-test.cpp
 
 eval_shell_SOURCES = eval-shell.cpp
diff --git a/sca-cpp/trunk/modules/server/Makefile.am b/sca-cpp/trunk/modules/server/Makefile.am
index d68a288d52..30c89da85d 100644
--- a/sca-cpp/trunk/modules/server/Makefile.am
+++ b/sca-cpp/trunk/modules/server/Makefile.am
@@ -17,13 +17,15 @@
 
 INCLUDES = -I${HTTPD_INCLUDE}
 
+incl_HEADERS = *.hpp
+incldir = $(prefix)/include/modules/server
+
 dist_mod_SCRIPTS = cpp-conf scheme-conf server-conf
 moddir = $(prefix)/modules/server
 
 EXTRA_DIST = domain-test.composite client-test.scm server-test.scm htdocs/*.xml htdocs/*.txt htdocs/*.html
 
-lib_LTLIBRARIES = libmod_tuscany_eval.la libmod_tuscany_wiring.la
-libdir = $(prefix)/modules/server
+mod_LTLIBRARIES = libmod_tuscany_eval.la libmod_tuscany_wiring.la
 noinst_DATA = libmod_tuscany_eval.so libmod_tuscany_wiring.so
 
 libmod_tuscany_eval_la_SOURCES = mod-eval.cpp