You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2010/01/11 09:30:18 UTC
svn commit: r897791 [2/2] - in /tuscany/sca-cpp/trunk: ./ components/
components/cache/ etc/ kernel/ modules/ modules/atom/ modules/http/
modules/json/ modules/python/ modules/python/htdocs/ modules/scdl/
modules/scheme/ modules/server/ test/store-pyth...
Modified: tuscany/sca-cpp/trunk/modules/server/mod-eval.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/mod-eval.cpp?rev=897791&r1=897790&r2=897791&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/mod-eval.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/server/mod-eval.cpp Mon Jan 11 08:30:15 2010
@@ -20,418 +20,34 @@
/* $Rev$ $Date$ */
/**
- * HTTPD module used to eval component implementations.
+ * HTTPD module used to eval C++ and Scheme component implementations.
*/
#include "string.hpp"
-#include "stream.hpp"
#include "function.hpp"
#include "list.hpp"
-#include "tree.hpp"
#include "value.hpp"
-#include "element.hpp"
#include "monad.hpp"
-#include "../atom/atom.hpp"
-#include "../json/json.hpp"
-#include "../scdl/scdl.hpp"
-#include "../http/curl.hpp"
-#include "../http/httpd.hpp"
+#include "mod-eval.hpp"
#include "mod-scheme.hpp"
#include "mod-cpp.hpp"
-#include "mod-python.hpp"
-
-extern "C" {
-extern module AP_MODULE_DECLARE_DATA mod_tuscany_eval;
-}
namespace tuscany {
namespace server {
namespace modeval {
/**
- * Server configuration.
- */
-class ServerConf {
-public:
- ServerConf(server_rec* s) : s(s), home(""), wiringServerName("") {
- }
-
- const server_rec* s;
- string home;
- string wiringServerName;
-};
-
-/**
- * Directory configuration.
- */
-class DirConf {
-public:
- DirConf(char* dirspec) : dirspec(dirspec), contributionPath(""), compositeName("") {
- }
- const char* dirspec;
- string contributionPath;
- string compositeName;
- list<value> implementations;
-};
-
-/**
- * Convert a result represented as a content + failure pair to a
- * failable monad.
- */
-const failable<value> failableResult(const list<value>& v) {
- if (isNil(cdr(v)))
- return car(v);
- return mkfailure<value>(string(cadr(v)));
-}
-
-/**
- * Handle an HTTP GET.
- */
-const failable<int> get(request_rec* r, const lambda<value(const list<value>&)>& impl) {
- debug(r->uri, "modeval::get::uri");
-
- // Inspect the query string
- const list<list<value> > args = httpd::queryArgs(r);
- const list<value> ia = assoc(value("id"), args);
- const list<value> ma = assoc(value("method"), args);
-
- // Evaluate a JSON-RPC request and return a JSON result
- if (!isNil(ia) && !isNil(ma)) {
-
- // Extract the request id, method and params
- const value id = cadr(ia);
- const value func = c_str(json::funcName(string(cadr(ma))));
-
- // Apply the requested function
- const failable<value> val = failableResult(impl(cons(func, httpd::queryParams(args))));
- if (!hasContent(val))
- return mkfailure<int>(reason(val));
-
- // Return JSON result
- json::JSONContext cx;
- return httpd::writeResult(json::jsonResult(id, content(val), cx), "application/json-rpc", r);
- }
-
- // Evaluate an ATOM GET request and return an ATOM feed representing a collection of resources
- const list<value> path(httpd::pathValues(r->uri));
- if (isNil(cddr(path))) {
- const failable<value> val = failableResult(impl(cons<value>("getall", list<value>())));
- if (!hasContent(val))
- return mkfailure<int>(reason(val));
- return httpd::writeResult(atom::writeATOMFeed(atom::feedValuesToElements(content(val))), "application/atom+xml;type=feed", r);
- }
-
- // Evaluate an ATOM GET and return an ATOM entry representing a resource
- const failable<value> val = failableResult(impl(cons<value>("get", mklist<value>(caddr(path)))));
- if (!hasContent(val))
- return mkfailure<int>(reason(val));
- return httpd::writeResult(atom::writeATOMEntry(atom::entryValuesToElements(content(val))), "application/atom+xml;type=entry", r);
-}
-
-/**
- * Handle an HTTP POST.
- */
-const failable<int> post(request_rec* r, const lambda<value(const list<value>&)>& impl) {
- const list<string> ls = httpd::read(r);
- debug(r->uri, "modeval::post::url");
- debug(ls, "modeval::post::input");
-
- // Evaluate a JSON-RPC request and return a JSON result
- const string ct = httpd::contentType(r);
- if (contains(ct, "application/json-rpc") || contains(ct, "text/plain")) {
- json::JSONContext cx;
- const list<value> json = elementsToValues(content(json::readJSON(ls, cx)));
- const list<list<value> > args = httpd::postArgs(json);
-
- // Extract the request id, method and params
- const value id = cadr(assoc(value("id"), args));
- const value func = c_str(json::funcName(cadr(assoc(value("method"), args))));
- const list<value> params = (list<value>)cadr(assoc(value("params"), args));
-
- // Evaluate the request expression
- const failable<value> val = failableResult(impl(cons<value>(func, params)));
- if (!hasContent(val))
- return mkfailure<int>(reason(val));
-
- // Return JSON result
- return httpd::writeResult(json::jsonResult(id, content(val), cx), "application/json-rpc", r);
- }
-
- // Evaluate an ATOM POST request and return the location of the corresponding created resource
- if (contains(ct, "application/atom+xml")) {
-
- // Evaluate the request expression
- const value entry = atom::entryValue(content(atom::readEntry(ls)));
- const failable<value> val = failableResult(impl(cons<value>("post", mklist<value>(entry))));
- if (!hasContent(val))
- return mkfailure<int>(reason(val));
-
- // Return the created resource location
- apr_table_setn(r->headers_out, "Location", apr_pstrdup(r->pool, httpd::url(content(val), r)));
- r->status = HTTP_CREATED;
- return OK;
- }
-
- return HTTP_NOT_IMPLEMENTED;
-}
-
-/**
- * Handle an HTTP PUT.
- */
-const failable<int> put(request_rec* r, const lambda<value(const list<value>&)>& impl) {
- const list<string> ls = httpd::read(r);
- debug(r->uri, "modeval::put::url");
- debug(ls, "modeval::put::input");
-
- // Evaluate an ATOM PUT request and update the corresponding resource
- const list<value> path(httpd::pathValues(r->uri));
- const value entry = atom::entryValue(content(atom::readEntry(ls)));
- const failable<value> val = failableResult(impl(cons<value>("put", mklist<value>(caddr(path), entry))));
- if (!hasContent(val))
- return mkfailure<int>(reason(val));
- if (val == value(false))
- return HTTP_NOT_FOUND;
- return OK;
-}
-
-/**
- * Handle an HTTP DELETE.
- */
-const failable<int> del(request_rec* r, const lambda<value(const list<value>&)>& impl) {
- debug(r->uri, "modeval::delete::url");
-
- // Evaluate an ATOM delete request
- const list<value> path(httpd::pathValues(r->uri));
- if (isNil(cddr(path))) {
-
- // Delete a collection of resources
- const failable<value> val = failableResult(impl(cons<value>("deleteall", list<value>())));
- if (!hasContent(val))
- return mkfailure<int>(reason(val));
- if (val == value(false))
- return HTTP_NOT_FOUND;
- return OK;
- }
-
- // Delete a resource
- const failable<value> val = failableResult(impl(cons<value>("delete", mklist<value>(caddr(path)))));
- if (!hasContent(val))
- return mkfailure<int>(reason(val));
- if (val == value(false))
- return HTTP_NOT_FOUND;
- return OK;
-}
-
-/**
- * Translate a component request.
- */
-int translate(request_rec *r) {
- gc_scoped_pool pool(r->pool);
- if (strncmp(r->uri, "/components/", 12) != 0)
- return DECLINED;
- r->handler = "mod_tuscany_eval";
- return OK;
-}
-
-/**
- * HTTP request handler.
- */
-int handler(request_rec *r) {
- gc_scoped_pool pool(r->pool);
- if(strcmp(r->handler, "mod_tuscany_eval"))
- return DECLINED;
- httpdDebugRequest(r, "modeval::handler::input");
-
- // Set up the read policy
- const int rc = httpd::setupReadPolicy(r);
- if(rc != OK)
- return rc;
-
- // Get the component implementation lambda
- DirConf& dc = httpd::dirConf<DirConf>(r, &mod_tuscany_eval);
- const list<value> path(httpd::pathValues(r->uri));
- const list<value> impl(assoctree<value>(cadr(path), dc.implementations));
- if (isNil(impl))
- return HTTP_NOT_FOUND;
-
- // Handle HTTP method
- const lambda<value(const list<value>&)> l(cadr<value>(impl));
- if (r->header_only)
- return OK;
- if(r->method_number == M_GET)
- return httpd::reportStatus(get(r, l));
- if(r->method_number == M_POST)
- return httpd::reportStatus(post(r, l));
- if(r->method_number == M_PUT)
- return httpd::reportStatus(put(r, l));
- if(r->method_number == M_DELETE)
- return httpd::reportStatus(del(r, l));
- return HTTP_NOT_IMPLEMENTED;
-}
-
-/**
- * Convert a list of component references to a list of HTTP proxy lambdas.
- */
-const value mkproxy(const value& ref, const string& base) {
- return lambda<value(const list<value>&)>(http::proxy(base + string(scdl::name(ref))));
-}
-
-const list<value> proxies(const list<value>& refs, const string& base) {
- if (isNil(refs))
- return refs;
- return cons(mkproxy(car(refs), base), proxies(cdr(refs), base));
-}
-
-/**
* Return a configured component implementation.
* For now only Scheme and C++ implementations are supported.
*/
const failable<lambda<value(const list<value>&)> > readImplementation(const string& itype, const string& path, const list<value>& px) {
if (contains(itype, ".scheme"))
return modscheme::readImplementation(path, px);
- if (contains(itype, ".python"))
- return modpython::readImplementation(path, px);
if (contains(itype, ".cpp"))
return modcpp::readImplementation(path, px);
return mkfailure<lambda<value(const list<value>&)> >(string("Unsupported implementation type: ") + itype);
}
-const value confImplementation(DirConf& dc, ServerConf& sc, server_rec& server, const value& comp) {
- const value impl = scdl::implementation(comp);
- const string path = dc.contributionPath + string(scdl::uri(impl));
-
- // Convert component references to configured proxy lambdas
- ostringstream base;
- if (sc.wiringServerName == "")
- base << (server.server_scheme == NULL? "http" : server.server_scheme)
- << "://" << (server.server_hostname == NULL? "localhost" : server.server_hostname)
- << ":" << (server.port == 0? 80 : server.port)
- << "/references/" << string(scdl::name(comp)) << "/";
- else
- base << sc.wiringServerName << "/references/" << string(scdl::name(comp)) << "/";
- const list<value> px(proxies(scdl::references(comp), str(base)));
-
- // Read and configure the implementation
- const failable<lambda<value(const list<value>&)> > cimpl(readImplementation(elementName(impl), path, px));
- if (!hasContent(cimpl))
- return reason(cimpl);
- return content(cimpl);
}
-
-/**
- * Return a tree of component-name + configured-implementation pairs.
- */
-const list<value> componentToImplementationAssoc(DirConf& dc, ServerConf& sc, server_rec& server, const list<value>& c) {
- if (isNil(c))
- return c;
- return cons<value>(mklist<value>(scdl::name(car(c)), confImplementation(dc, sc, server, car(c))), componentToImplementationAssoc(dc, sc, server, cdr(c)));
-}
-
-const list<value> componentToImplementationTree(DirConf& dc, ServerConf& sc, server_rec& server, const list<value>& c) {
- return mkbtree(sort(componentToImplementationAssoc(dc, sc, server, c)));
}
-
-/**
- * Read the components declared in a composite.
- */
-const failable<list<value> > readComponents(const string& path) {
- ifstream is(path);
- if (fail(is))
- return mkfailure<list<value> >(string("Could not read composite: ") + path);
- return scdl::components(readXML(streamList(is)));
-}
-
-/**
- * Configure the components declared in the deployed composite.
- */
-const bool confComponents(DirConf& dc, ServerConf& sc, server_rec& server) {
- if (dc.contributionPath == "" || dc.compositeName == "")
- return true;
- const failable<list<value> > comps = readComponents(dc.contributionPath + dc.compositeName);
- if (!hasContent(comps))
- return true;
- dc.implementations = componentToImplementationTree(dc, sc, server, content(comps));
- debug(dc.implementations, "modeval::confComponents::implementations");
- return true;
-}
-
-/**
- * Configuration commands.
- */
-const char *confHome(cmd_parms *cmd, unused void *c, const char *arg) {
- gc_scoped_pool pool(cmd->pool);
- ServerConf& sc = httpd::serverConf<ServerConf>(cmd, &mod_tuscany_eval);
- sc.home = arg;
- return NULL;
-}
-const char *confWiringServerName(cmd_parms *cmd, unused void *c, const char *arg) {
- gc_scoped_pool pool(cmd->pool);
- ServerConf& sc = httpd::serverConf<ServerConf>(cmd, &mod_tuscany_eval);
- sc.wiringServerName = arg;
- return NULL;
-}
-const char *confContribution(cmd_parms *cmd, void *c, const char *arg) {
- gc_scoped_pool pool(cmd->pool);
- ServerConf& sc = httpd::serverConf<ServerConf>(cmd, &mod_tuscany_eval);
- DirConf& dc = *(DirConf*)c;
- dc.contributionPath = arg;
- confComponents(dc, sc, *cmd->server);
- return NULL;
-}
-const char *confComposite(cmd_parms *cmd, void *c, const char *arg) {
- gc_scoped_pool pool(cmd->pool);
- ServerConf& sc = httpd::serverConf<ServerConf>(cmd, &mod_tuscany_eval);
- DirConf& dc = *(DirConf*)c;
- dc.compositeName = arg;
- confComponents(dc, sc, *cmd->server);
- return NULL;
-}
-
-/**
- * HTTP server module declaration.
- */
-const command_rec commands[] = {
- AP_INIT_TAKE1("TuscanyHome", (const char*(*)())confHome, NULL, RSRC_CONF, "Tuscany home directory"),
- AP_INIT_TAKE1("SCAWiringServerName", (const char*(*)())confWiringServerName, NULL, RSRC_CONF, "SCA wiring server name"),
- AP_INIT_TAKE1("SCAContribution", (const char*(*)())confContribution, NULL, ACCESS_CONF, "SCA contribution location"),
- AP_INIT_TAKE1("SCAComposite", (const char*(*)())confComposite, NULL, ACCESS_CONF, "SCA composite location"),
- {NULL, NULL, NULL, 0, NO_ARGS, NULL}
-};
-
-int postConfig(unused apr_pool_t *p, unused apr_pool_t *plog, unused apr_pool_t *ptemp, unused server_rec *s) {
- return OK;
-}
-
-void childInit(apr_pool_t* p, server_rec* svr_rec) {
- gc_scoped_pool pool(p);
- ServerConf* c = (ServerConf*)ap_get_module_config(svr_rec->module_config, &mod_tuscany_eval);
- if(c == NULL) {
- cerr << "[Tuscany] Due to one or more errors mod_tuscany_eval loading failed. Causing apache to stop loading." << endl;
- exit(APEXIT_CHILDFATAL);
- }
-}
-
-void registerHooks(unused apr_pool_t *p) {
- ap_hook_post_config(postConfig, NULL, NULL, APR_HOOK_MIDDLE);
- ap_hook_child_init(childInit, NULL, NULL, APR_HOOK_MIDDLE);
- ap_hook_handler(handler, NULL, NULL, APR_HOOK_MIDDLE);
- ap_hook_translate_name(translate, NULL, NULL, APR_HOOK_FIRST);
-}
-
-}
-}
-}
-
-extern "C" {
-
-module AP_MODULE_DECLARE_DATA mod_tuscany_eval = {
- STANDARD20_MODULE_STUFF,
- // dir config and merger
- tuscany::httpd::makeDirConf<tuscany::server::modeval::DirConf>, NULL,
- // server config and merger
- tuscany::httpd::makeServerConf<tuscany::server::modeval::ServerConf>, NULL,
- // commands and hooks
- tuscany::server::modeval::commands, tuscany::server::modeval::registerHooks
-};
-
}
Copied: tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp (from r897790, tuscany/sca-cpp/trunk/modules/server/mod-eval.cpp)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp?p2=tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp&p1=tuscany/sca-cpp/trunk/modules/server/mod-eval.cpp&r1=897790&r2=897791&rev=897791&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/mod-eval.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp Mon Jan 11 08:30:15 2010
@@ -36,9 +36,6 @@
#include "../scdl/scdl.hpp"
#include "../http/curl.hpp"
#include "../http/httpd.hpp"
-#include "mod-scheme.hpp"
-#include "mod-cpp.hpp"
-#include "mod-python.hpp"
extern "C" {
extern module AP_MODULE_DECLARE_DATA mod_tuscany_eval;
@@ -282,19 +279,7 @@
return cons(mkproxy(car(refs), base), proxies(cdr(refs), base));
}
-/**
- * Return a configured component implementation.
- * For now only Scheme and C++ implementations are supported.
- */
-const failable<lambda<value(const list<value>&)> > readImplementation(const string& itype, const string& path, const list<value>& px) {
- if (contains(itype, ".scheme"))
- return modscheme::readImplementation(path, px);
- if (contains(itype, ".python"))
- return modpython::readImplementation(path, px);
- if (contains(itype, ".cpp"))
- return modcpp::readImplementation(path, px);
- return mkfailure<lambda<value(const list<value>&)> >(string("Unsupported implementation type: ") + itype);
-}
+extern const failable<lambda<value(const list<value>&)> > readImplementation(const string& itype, const string& path, const list<value>& px);
const value confImplementation(DirConf& dc, ServerConf& sc, server_rec& server, const value& comp) {
const value impl = scdl::implementation(comp);
Modified: tuscany/sca-cpp/trunk/modules/server/mod-scheme.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/mod-scheme.hpp?rev=897791&r1=897790&r2=897791&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/mod-scheme.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/server/mod-scheme.hpp Mon Jan 11 08:30:15 2010
@@ -32,7 +32,6 @@
#include "function.hpp"
#include "list.hpp"
#include "value.hpp"
-#include "debug.hpp"
#include "monad.hpp"
#include "../scheme/eval.hpp"
#include "../http/httpd.hpp"
Modified: tuscany/sca-cpp/trunk/modules/server/mod-wiring.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/mod-wiring.cpp?rev=897791&r1=897790&r2=897791&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/mod-wiring.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/server/mod-wiring.cpp Mon Jan 11 08:30:15 2010
@@ -31,7 +31,6 @@
#include "list.hpp"
#include "tree.hpp"
#include "value.hpp"
-#include "debug.hpp"
#include "monad.hpp"
#include "../scdl/scdl.hpp"
#include "../http/httpd.hpp"
Copied: tuscany/sca-cpp/trunk/modules/server/scheme-conf (from r897790, tuscany/sca-cpp/trunk/modules/server/server-conf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/scheme-conf?p2=tuscany/sca-cpp/trunk/modules/server/scheme-conf&p1=tuscany/sca-cpp/trunk/modules/server/server-conf&r1=897790&r2=897791&rev=897791&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/server-conf (original)
+++ tuscany/sca-cpp/trunk/modules/server/scheme-conf Mon Jan 11 08:30:15 2010
@@ -17,15 +17,10 @@
# specific language governing permissions and limitations
# under the License.
-# Generate a server conf
+# Generate a scheme server conf
here=`readlink -f $0`; here=`dirname $here`
root=`readlink -f $1`
-mkdir -p $root
-mkdir -p $root/logs
-mkdir -p $root/conf
cat >>$root/conf/httpd.conf <<EOF
LoadModule mod_tuscany_eval $here/.libs/libmod_tuscany_eval.so
-LoadModule mod_tuscany_wiring $here/.libs/libmod_tuscany_wiring.so
EOF
-
Modified: tuscany/sca-cpp/trunk/modules/server/server-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/server-conf?rev=897791&r1=897790&r2=897791&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/server-conf (original)
+++ tuscany/sca-cpp/trunk/modules/server/server-conf Mon Jan 11 08:30:15 2010
@@ -25,7 +25,5 @@
mkdir -p $root/logs
mkdir -p $root/conf
cat >>$root/conf/httpd.conf <<EOF
-LoadModule mod_tuscany_eval $here/.libs/libmod_tuscany_eval.so
LoadModule mod_tuscany_wiring $here/.libs/libmod_tuscany_wiring.so
EOF
-
Modified: tuscany/sca-cpp/trunk/modules/server/server-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/server-test?rev=897791&r1=897790&r2=897791&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/server-test (original)
+++ tuscany/sca-cpp/trunk/modules/server/server-test Mon Jan 11 08:30:15 2010
@@ -20,6 +20,7 @@
# Setup
../http/httpd-conf tmp 8090 htdocs
./server-conf tmp
+./scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
<Location />
Modified: tuscany/sca-cpp/trunk/modules/server/wiring-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/wiring-test?rev=897791&r1=897790&r2=897791&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/wiring-test (original)
+++ tuscany/sca-cpp/trunk/modules/server/wiring-test Mon Jan 11 08:30:15 2010
@@ -22,6 +22,7 @@
# Setup
../http/httpd-conf tmp 8090 htdocs
./server-conf tmp
+./scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
<Location />
Modified: tuscany/sca-cpp/trunk/test/store-python/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-python/Makefile.am?rev=897791&r1=897790&r2=897791&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-python/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/test/store-python/Makefile.am Mon Jan 11 08:30:15 2010
@@ -15,5 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+if WANT_PYTHON
+
TESTS = server-test
+endif
Modified: tuscany/sca-cpp/trunk/test/store-python/server-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-python/server-test?rev=897791&r1=897790&r2=897791&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-python/server-test (original)
+++ tuscany/sca-cpp/trunk/test/store-python/server-test Mon Jan 11 08:30:15 2010
@@ -22,6 +22,7 @@
# Setup
../../modules/http/httpd-conf tmp 8090 htdocs
../../modules/server/server-conf tmp
+../../modules/python/python-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
<Location />
Modified: tuscany/sca-cpp/trunk/test/store-scheme/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-scheme/Makefile.am?rev=897791&r1=897790&r2=897791&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-scheme/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/test/store-scheme/Makefile.am Mon Jan 11 08:30:15 2010
@@ -17,10 +17,7 @@
noinst_PROGRAMS = script-test
-INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE} -I${APR_INCLUDE} -I${JS_INCLUDE}
-
script_test_SOURCES = script-test.cpp
-script_test_LDADD = -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -L${JS_LIB} -lmozjs
+script_test_LDADD = -lxml2 -lmozjs
TESTS = script-test server-test
-
Modified: tuscany/sca-cpp/trunk/test/store-scheme/server-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-scheme/server-test?rev=897791&r1=897790&r2=897791&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-scheme/server-test (original)
+++ tuscany/sca-cpp/trunk/test/store-scheme/server-test Mon Jan 11 08:30:15 2010
@@ -22,6 +22,7 @@
# Setup
../../modules/http/httpd-conf tmp 8090 htdocs
../../modules/server/server-conf tmp
+../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
<Location />