diff options
| -rw-r--r-- | apps/samples/http2im/http2im.scxml | 49 | ||||
| -rw-r--r-- | contrib/build-scripts/pidgin-configure | 2 | ||||
| -rw-r--r-- | src/uscxml/server/HTTPServer.cpp | 3 | ||||
| -rw-r--r-- | test/samples/uscxml/test-instant-messaging.scxml | 10 |
4 files changed, 56 insertions, 8 deletions
diff --git a/apps/samples/http2im/http2im.scxml b/apps/samples/http2im/http2im.scxml new file mode 100644 index 0000000..a2b2090 --- /dev/null +++ b/apps/samples/http2im/http2im.scxml @@ -0,0 +1,49 @@ +<scxml datamodel="ecmascript" name="http2im"> + + <script src="http://uscxml.tk.informatik.tu-darmstadt.de/scripts/dump.js" /> + <state id="idle"> + <onentry> + <!-- <send event="dump" delay="100ms" /> --> + </onentry> + + <invoke type="instant-messaging" id="im"> + <param name="username" expr="'uscxml@diogenes.local'" /> + <param name="password" expr="'uscxml'" /> + <param name="protocol" expr="'prpl-jabber'" /> + <finalize> + <script> + print("-----------------\n"); + dump(_event);</script> + </finalize> + </invoke> + + <transition event="http.get"> + <script> + print("-----------------\n"); + dump(_event);</script> + <respond status="200" to="_event.origin" /> + <send target="#_im" event="im.send"> + <param name="receiver" expr="'sradomski@diogenes.local'" /> + <content expr="_event.data.query.msg" /> + </send> + </transition> + + <transition event="im.buddy.status.changed"> + <!-- <script>print("\n\n"); dump(_invokers['im']);</script> --> + </transition> + + <transition event="im.signed.on"> + <!-- <send target="#_im" event="im.buddy.add"> + <param name="name" expr="'sradomski@diogenes.local'" /> + <param name="msg" expr="'Please add me as a contact!'" /> + </send> --> + <!-- <script>print("\n\n"); dump(_invokers['im']);</script> --> + <send target="#_im" event="im.send"> + <param name="receiver" expr="'sradomski@diogenes.local'" /> + <param name="data" expr="someBinaryData" /> <!-- Unsupported :( --> + <content><![CDATA[Have a look <a href="http://www.heise.de">here</a>]]></content> + </send> + </transition> + + </state> +</scxml>
\ No newline at end of file diff --git a/contrib/build-scripts/pidgin-configure b/contrib/build-scripts/pidgin-configure index 34a9ffe..016cf0f 100644 --- a/contrib/build-scripts/pidgin-configure +++ b/contrib/build-scripts/pidgin-configure @@ -1 +1 @@ -./configure --disable-nls --disable-gtkui --disable-consoleui --disable-gstreamer --disable-vv --disable-meanwhile --disable-avahi --disable-dbus --disable-gnome-keyring --disable-kwallet --disable-nss --disable-gnutls --disable-tcl --disable-perl --disable-tk --enable-static --with-pic
\ No newline at end of file +LIBS="-lz" ./configure --disable-nls --disable-gtkui --disable-consoleui --disable-gstreamer --disable-vv --disable-meanwhile --disable-avahi --disable-dbus --disable-gnome-keyring --disable-kwallet --disable-nss --disable-gnutls --disable-tcl --disable-perl --disable-tk --enable-static --with-pic
\ No newline at end of file diff --git a/src/uscxml/server/HTTPServer.cpp b/src/uscxml/server/HTTPServer.cpp index 6b24cd8..de78ba9 100644 --- a/src/uscxml/server/HTTPServer.cpp +++ b/src/uscxml/server/HTTPServer.cpp @@ -550,8 +550,7 @@ bool HTTPServer::registerServlet(const std::string& path, HTTPServlet* servlet) servlet->setURL(servletURL.str()); INSTANCE->_httpServlets[suffixedPath] = servlet; - -// LOG(INFO) << "HTTP Servlet listening at: " << servletURL.str() << std::endl; + LOG(INFO) << "HTTP Servlet listening at: " << servletURL.str() << std::endl; // register callback evhttp_set_cb(INSTANCE->_http, ("/" + suffixedPath).c_str(), HTTPServer::httpRecvReqCallback, servlet); diff --git a/test/samples/uscxml/test-instant-messaging.scxml b/test/samples/uscxml/test-instant-messaging.scxml index e7f8555..dccaa75 100644 --- a/test/samples/uscxml/test-instant-messaging.scxml +++ b/test/samples/uscxml/test-instant-messaging.scxml @@ -16,7 +16,7 @@ </onentry> <invoke type="instant-messaging" id="im"> - <param name="username" expr="'uscxml@localhost'" /> + <param name="username" expr="'uscxml@diogenes.local'" /> <param name="password" expr="'uscxml'" /> <param name="protocol" expr="'prpl-jabber'" /> <finalize> @@ -39,12 +39,12 @@ <transition event="im.signed.on"> <!-- <send target="#_im" event="im.buddy.add"> - <param name="name" expr="'sradomski@localhost'" /> + <param name="name" expr="'sradomski@diogenes.local'" /> <param name="msg" expr="'Please add me as a contact!'" /> - </send> - <script>print("\n\n"); dump(_invokers['im']);</script> --> + </send> --> + <!-- <script>print("\n\n"); dump(_invokers['im']);</script> --> <send target="#_im" event="im.send"> - <param name="receiver" expr="'sradomski@localhost'" /> + <param name="receiver" expr="'sradomski@diogenes.local'" /> <param name="data" expr="someBinaryData" /> <!-- Unsupported :( --> <content><![CDATA[Have a look <a href="http://www.heise.de">here</a>]]></content> </send> |