Improve support for HTTP verbs and enable calls inside a domain without having to repeat the domain name in all the URLs.

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

12 files changed, 533 insertions, 9 deletions

diff --git a/sca-cpp/trunk/components/http/Makefile.am b/sca-cpp/trunk/components/http/Makefile.am
index 4388ec8057..1a081b8da6 100644
--- a/sca-cpp/trunk/components/http/Makefile.am
+++ b/sca-cpp/trunk/components/http/Makefile.am
@@ -19,8 +19,8 @@ compdir=$(prefix)/components/http
 
 EXTRA_DIST = http.composite httpget.componentType httpdelete.componentType *.scm
 
-comp_LTLIBRARIES = libhttpget.la libhttpdelete.la
-noinst_DATA = libhttpget.so libhttpdelete.so
+comp_LTLIBRARIES = libhttpget.la libhttpdelete.la libhttppost.la libhttpput.la
+noinst_DATA = libhttpget.so libhttpdelete.so libhttppost.so libhttpput.so
 
 libhttpget_la_SOURCES = httpget.cpp
 libhttpget_la_LDFLAGS = -lxml2 -lmozjs -curl
@@ -32,6 +32,21 @@ libhttpdelete_la_LDFLAGS = -lxml2 -lmozjs -curl
 libhttpdelete.so:
 	ln -s .libs/libhttpdelete.so
 
+libhttppost_la_SOURCES = httppost.cpp
+libhttppost_la_LDFLAGS = -lxml2 -lmozjs -curl
+libhttppost.so:
+	ln -s .libs/libhttppost.so
+
+libhttpput_la_SOURCES = httpput.cpp
+libhttpput_la_LDFLAGS = -lxml2 -lmozjs -curl
+libhttpput.so:
+	ln -s .libs/libhttpput.so
+
+libhttppatch_la_SOURCES = httppatch.cpp
+libhttppatch_la_LDFLAGS = -lxml2 -lmozjs -curl
+libhttppatch.so:
+	ln -s .libs/libhttppatch.so
+
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
diff --git a/sca-cpp/trunk/components/http/client-test.cpp b/sca-cpp/trunk/components/http/client-test.cpp
index a83bf55252..3ce9f1ae68 100644
--- a/sca-cpp/trunk/components/http/client-test.cpp
+++ b/sca-cpp/trunk/components/http/client-test.cpp
@@ -36,15 +36,16 @@
 namespace tuscany {
 namespace http {
 
-const string uri("http://localhost:8090/httpget");
+const string getURI("http://localhost:8090/httpget");
+const string postURI("http://localhost:8090/httppost");
+const string putURI("http://localhost:8090/httpput");
+const string deleteURI("http://localhost:8090/httpdelete");
 
 bool testGet() {
     http::CURLSession cs("", "", "", "");
 
-    const failable<value> val = http::get(uri, cs);
+    const failable<value> val = http::get(getURI, cs);
     assert(hasContent(val));
-    assert(contains(string(car<value>(cadr<value>(content(val)))), "It works"));
-
     return true;
 }
 
@@ -53,9 +54,8 @@ struct getLoop {
     getLoop(http::CURLSession cs) : cs(cs) {
     }
     const bool operator()() const {
-        const failable<value> val = http::get(uri, cs);
+        const failable<value> val = http::get(getURI, cs);
         assert(hasContent(val));
-        assert(contains(string(car<value>(cadr<value>(content(val)))), "It works"));
         return true;
     }
 };
@@ -69,6 +69,30 @@ bool testGetPerf() {
     return true;
 }
 
+bool testPost() {
+    http::CURLSession cs("", "", "", "");
+
+    const failable<value> val = http::get(postURI, cs);
+    assert(hasContent(val));
+    return true;
+}
+
+bool testPut() {
+    http::CURLSession cs("", "", "", "");
+
+    const failable<value> val = http::get(putURI, cs);
+    assert(hasContent(val));
+    return true;
+}
+
+bool testDelete() {
+    http::CURLSession cs("", "", "", "");
+
+    const failable<value> val = http::get(deleteURI, cs);
+    assert(hasContent(val));
+    return true;
+}
+
 }
 }
 
@@ -77,6 +101,9 @@ int main() {
 
     tuscany::http::testGet();
     tuscany::http::testGetPerf();
+    tuscany::http::testPost();
+    tuscany::http::testPut();
+    tuscany::http::testDelete();
 
     tuscany::cout << "OK" << tuscany::endl;
 
diff --git a/sca-cpp/trunk/components/http/content-test.scm b/sca-cpp/trunk/components/http/content-test.scm
new file mode 100644
index 0000000000..f381546190
--- /dev/null
+++ b/sca-cpp/trunk/components/http/content-test.scm
@@ -0,0 +1,23 @@
+;  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.
+
+; Content test case
+
+(define (get id)
+    (list (list 'entry '(title "Item") '(id "111") '(content (item (name "Apple") (currencyCode "USD") (currencySymbol "$") (price 2.99)))))
+)
+
diff --git a/sca-cpp/trunk/components/http/http.composite b/sca-cpp/trunk/components/http/http.composite
index 43d9fb6413..48fe1c3b55 100644
--- a/sca-cpp/trunk/components/http/http.composite
+++ b/sca-cpp/trunk/components/http/http.composite
@@ -29,6 +29,41 @@
         <reference name="url" target="url-test"/>
     </component>
 
+    <component name="httppost">
+        <implementation.cpp path="." library="libhttppost"/>
+        <service name="httppost">
+            <binding.http uri="httppost"/>
+        </service>
+        <reference name="url" target="url-test"/>
+        <reference name="content" target="content-test"/>
+    </component>
+
+    <component name="httpput">
+        <implementation.cpp path="." library="libhttpput"/>
+        <service name="httpput">
+            <binding.http uri="httpput"/>
+        </service>
+        <reference name="url" target="url-test"/>
+        <reference name="content" target="content-test"/>
+    </component>
+
+    <component name="httppatch">
+        <implementation.cpp path="." library="libhttppatch"/>
+        <service name="httppatch">
+            <binding.http uri="httppatch"/>
+        </service>
+        <reference name="url" target="url-test"/>
+        <reference name="content" target="content-test"/>
+    </component>
+
+    <component name="httpdelete">
+        <implementation.cpp path="." library="libhttpdelete"/>
+        <service name="httpdelete">
+            <binding.http uri="httpdelete"/>
+        </service>
+        <reference name="url" target="url-test"/>
+    </component>
+
     <component name="url-test">
         <implementation.scheme script="url-test.scm"/>
         <service name="url-test">
@@ -36,4 +71,18 @@
         </service>
     </component>
 
+    <component name="content-test">
+        <implementation.scheme script="content-test.scm"/>
+        <service name="content-test">
+            <binding.http uri="content-test"/>
+        </service>
+    </component>
+
+    <component name="scheme-test">
+        <implementation.scheme script="server-test.scm"/>
+        <service name="test">
+            <binding.http uri="test"/>
+        </service>
+    </component>     
+
 </composite>
diff --git a/sca-cpp/trunk/components/http/httppatch.componentType b/sca-cpp/trunk/components/http/httppatch.componentType
new file mode 100644
index 0000000000..8f3173be85
--- /dev/null
+++ b/sca-cpp/trunk/components/http/httppatch.componentType
@@ -0,0 +1,29 @@
+<?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.    
+-->
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
+  targetNamespace="http://tuscany.apache.org/xmlns/sca/components">
+        
+    <service name="http"/>
+    <reference name="url"/>
+    <reference name="content"/>
+
+</composite>
diff --git a/sca-cpp/trunk/components/http/httppatch.cpp b/sca-cpp/trunk/components/http/httppatch.cpp
new file mode 100644
index 0000000000..4debca045e
--- /dev/null
+++ b/sca-cpp/trunk/components/http/httppatch.cpp
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+
+/* $Rev$ $Date$ */
+
+/**
+ * HTTP client component implementation.
+ */
+
+#include "string.hpp"
+#include "function.hpp"
+#include "list.hpp"
+#include "value.hpp"
+#include "monad.hpp"
+#include "../../modules/http/http.hpp"
+
+namespace tuscany {
+namespace httppatch {
+
+/**
+ * Evaluate an HTTP patch.
+ */
+const failable<value> get(const lambda<value(const list<value>&)> url, const lambda<value(const list<value>&)> val, http::CURLSession& ch) {
+    debug("httppatch::get");
+    const value u = url(mklist<value>("get", list<value>()));
+    const value v = val(mklist<value>("get", list<value>()));
+    debug(u, "httppatch::get::url");
+    debug(v, "httppatch::get::val");
+    return http::patch(v, u, ch);
+}
+
+/**
+ * Component implementation lambda function.
+ */
+class applyhttp {
+public:
+    applyhttp(const lambda<value(const list<value>&)> url, const lambda<value(const list<value>&)> val, http::CURLSession& ch) : url(url), val(val), ch(ch) {
+    }
+
+    const value operator()(const list<value>& params) const {
+        debug(params, "httppatch::applyhttp::params");
+        const value func(car(params));
+        if (func == "get")
+            return get(url, val, ch);
+        return tuscany::mkfailure<tuscany::value>();
+    }
+
+private:
+    const lambda<value(const list<value>&)> url;
+    const lambda<value(const list<value>&)> val;
+    http::CURLSession& ch;
+};
+
+/**
+ * Start the component.
+ */
+const failable<value> start(const list<value>& params) {
+    // Create a CURL session
+    http::CURLSession& ch = *(new (gc_new<http::CURLSession>()) http::CURLSession("", "", "", ""));
+
+    // Return the component implementation lambda function
+    return value(lambda<value(const list<value>&)>(applyhttp(car(params), cadr(params), ch)));
+}
+
+}
+}
+
+extern "C" {
+
+const tuscany::value apply(const tuscany::list<tuscany::value>& params) {
+    const tuscany::value func(car(params));
+    if (func == "start")
+        return tuscany::httppatch::start(cdr(params));
+    return tuscany::mkfailure<tuscany::value>();
+}
+
+}
diff --git a/sca-cpp/trunk/components/http/httppost.componentType b/sca-cpp/trunk/components/http/httppost.componentType
new file mode 100644
index 0000000000..8f3173be85
--- /dev/null
+++ b/sca-cpp/trunk/components/http/httppost.componentType
@@ -0,0 +1,29 @@
+<?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.    
+-->
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
+  targetNamespace="http://tuscany.apache.org/xmlns/sca/components">
+        
+    <service name="http"/>
+    <reference name="url"/>
+    <reference name="content"/>
+
+</composite>
diff --git a/sca-cpp/trunk/components/http/httppost.cpp b/sca-cpp/trunk/components/http/httppost.cpp
new file mode 100644
index 0000000000..9784c4513c
--- /dev/null
+++ b/sca-cpp/trunk/components/http/httppost.cpp
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+
+/* $Rev$ $Date$ */
+
+/**
+ * HTTP client component implementation.
+ */
+
+#include "string.hpp"
+#include "function.hpp"
+#include "list.hpp"
+#include "value.hpp"
+#include "monad.hpp"
+#include "../../modules/http/http.hpp"
+
+namespace tuscany {
+namespace httppost {
+
+/**
+ * Evaluate an HTTP post.
+ */
+const failable<value> get(const lambda<value(const list<value>&)> url, const lambda<value(const list<value>&)> val, http::CURLSession& ch) {
+    debug("httppost::get");
+    const value u = url(mklist<value>("get", list<value>()));
+    const value v = val(mklist<value>("get", list<value>()));
+    debug(u, "httppost::get::url");
+    debug(v, "httppost::get::val");
+    return http::post(v, u, ch);
+}
+
+/**
+ * Component implementation lambda function.
+ */
+class applyhttp {
+public:
+    applyhttp(const lambda<value(const list<value>&)> url, const lambda<value(const list<value>&)> val, http::CURLSession& ch) : url(url), val(val), ch(ch) {
+    }
+
+    const value operator()(const list<value>& params) const {
+        debug(params, "httppost::applyhttp::params");
+        const value func(car(params));
+        if (func == "get")
+            return get(url, val, ch);
+        return tuscany::mkfailure<tuscany::value>();
+    }
+
+private:
+    const lambda<value(const list<value>&)> url;
+    const lambda<value(const list<value>&)> val;
+    http::CURLSession& ch;
+};
+
+/**
+ * Start the component.
+ */
+const failable<value> start(const list<value>& params) {
+    // Create a CURL session
+    http::CURLSession& ch = *(new (gc_new<http::CURLSession>()) http::CURLSession("", "", "", ""));
+
+    // Return the component implementation lambda function
+    return value(lambda<value(const list<value>&)>(applyhttp(car(params), cadr(params), ch)));
+}
+
+}
+}
+
+extern "C" {
+
+const tuscany::value apply(const tuscany::list<tuscany::value>& params) {
+    const tuscany::value func(car(params));
+    if (func == "start")
+        return tuscany::httppost::start(cdr(params));
+    return tuscany::mkfailure<tuscany::value>();
+}
+
+}
diff --git a/sca-cpp/trunk/components/http/httpput.componentType b/sca-cpp/trunk/components/http/httpput.componentType
new file mode 100644
index 0000000000..8f3173be85
--- /dev/null
+++ b/sca-cpp/trunk/components/http/httpput.componentType
@@ -0,0 +1,29 @@
+<?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.    
+-->
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
+  targetNamespace="http://tuscany.apache.org/xmlns/sca/components">
+        
+    <service name="http"/>
+    <reference name="url"/>
+    <reference name="content"/>
+
+</composite>
diff --git a/sca-cpp/trunk/components/http/httpput.cpp b/sca-cpp/trunk/components/http/httpput.cpp
new file mode 100644
index 0000000000..4ec63dabce
--- /dev/null
+++ b/sca-cpp/trunk/components/http/httpput.cpp
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+
+/* $Rev$ $Date$ */
+
+/**
+ * HTTP client component implementation.
+ */
+
+#include "string.hpp"
+#include "function.hpp"
+#include "list.hpp"
+#include "value.hpp"
+#include "monad.hpp"
+#include "../../modules/http/http.hpp"
+
+namespace tuscany {
+namespace httpput {
+
+/**
+ * Evaluate an HTTP put.
+ */
+const failable<value> get(const lambda<value(const list<value>&)> url, const lambda<value(const list<value>&)> val, http::CURLSession& ch) {
+    debug("httpput::get");
+    const value u = url(mklist<value>("get", list<value>()));
+    const value v = val(mklist<value>("get", list<value>()));
+    debug(u, "httpput::get::url");
+    debug(v, "httpput::get::val");
+    return http::put(v, u, ch);
+}
+
+/**
+ * Component implementation lambda function.
+ */
+class applyhttp {
+public:
+    applyhttp(const lambda<value(const list<value>&)> url, const lambda<value(const list<value>&)> val, http::CURLSession& ch) : url(url), val(val), ch(ch) {
+    }
+
+    const value operator()(const list<value>& params) const {
+        debug(params, "httpput::applyhttp::params");
+        const value func(car(params));
+        if (func == "get")
+            return get(url, val, ch);
+        return tuscany::mkfailure<tuscany::value>();
+    }
+
+private:
+    const lambda<value(const list<value>&)> url;
+    const lambda<value(const list<value>&)> val;
+    http::CURLSession& ch;
+};
+
+/**
+ * Start the component.
+ */
+const failable<value> start(const list<value>& params) {
+    // Create a CURL session
+    http::CURLSession& ch = *(new (gc_new<http::CURLSession>()) http::CURLSession("", "", "", ""));
+
+    // Return the component implementation lambda function
+    return value(lambda<value(const list<value>&)>(applyhttp(car(params), cadr(params), ch)));
+}
+
+}
+}
+
+extern "C" {
+
+const tuscany::value apply(const tuscany::list<tuscany::value>& params) {
+    const tuscany::value func(car(params));
+    if (func == "start")
+        return tuscany::httpput::start(cdr(params));
+    return tuscany::mkfailure<tuscany::value>();
+}
+
+}
diff --git a/sca-cpp/trunk/components/http/server-test.scm b/sca-cpp/trunk/components/http/server-test.scm
new file mode 100644
index 0000000000..4bbff6e5c2
--- /dev/null
+++ b/sca-cpp/trunk/components/http/server-test.scm
@@ -0,0 +1,44 @@
+;  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.
+
+; JSON-RPC test case
+
+(define (echo x) x)
+
+; ATOMPub test case
+
+(define (get id)
+  (if (nul id)
+    '((feed (title "Sample Feed") (id "123456789") (entry
+       (((title "Item") (id "111") (content (item (name "Apple") (currencyCode "USD") (currencySymbol "$") (price 2.99))))
+        ((title "Item") (id "222") (content (item (name "Orange") (currencyCode "USD") (currencySymbol "$") (price 3.55))))
+        ((title "Item") (id "333") (content (item (name "Pear") (currencyCode "USD") (currencySymbol "$") (price 1.55))))))))
+    
+    (list (list 'entry '(title "Item") (list 'id (car id)) '(content (item (name "Apple") (currencyCode "USD") (currencySymbol "$") (price 2.99))))))
+)
+
+(define (post collection item)
+  '("123456789")
+)
+
+(define (put id item)
+  true
+)
+
+(define (delete id)
+  true
+)
diff --git a/sca-cpp/trunk/components/http/url-test.scm b/sca-cpp/trunk/components/http/url-test.scm
index 29e6629aa5..37a5b345b2 100644
--- a/sca-cpp/trunk/components/http/url-test.scm
+++ b/sca-cpp/trunk/components/http/url-test.scm
@@ -18,6 +18,6 @@
 ; URL test case
 
 (define (get id)
-    "http://localhost:8090/index.html"
+    "http://localhost:8090/test"
 )