tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r1030527 - in /tuscany/sca-cpp/trunk/components: cache/ chat/ log/ nosqldb/ queue/ sqldb/ webservice/
Date Wed, 03 Nov 2010 16:40:20 GMT
Author: jsdelfino
Date: Wed Nov  3 16:40:19 2010
New Revision: 1030527

URL: http://svn.apache.org/viewvc?rev=1030527&view=rev
Log:
Add .componentType files describing the utility components. Refactor chat component in two
separate components for sending and receiving messages.

Added:
    tuscany/sca-cpp/trunk/components/cache/datacache.componentType
    tuscany/sca-cpp/trunk/components/cache/memcache.componentType
    tuscany/sca-cpp/trunk/components/cache/memocache.componentType
    tuscany/sca-cpp/trunk/components/chat/chat-sender.componentType
    tuscany/sca-cpp/trunk/components/chat/chat-sender.cpp
      - copied, changed from r1030526, tuscany/sca-cpp/trunk/components/chat/chatter.cpp
    tuscany/sca-cpp/trunk/components/chat/chat-sendreceiver.componentType
    tuscany/sca-cpp/trunk/components/chat/chat-sendreceiver.cpp
      - copied, changed from r1030526, tuscany/sca-cpp/trunk/components/chat/chatter.cpp
    tuscany/sca-cpp/trunk/components/log/log.componentType
    tuscany/sca-cpp/trunk/components/log/logger.componentType
    tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.componentType
    tuscany/sca-cpp/trunk/components/queue/queue-listener.componentType
    tuscany/sca-cpp/trunk/components/queue/queue-sender.componentType
    tuscany/sca-cpp/trunk/components/sqldb/sqldb.componentType
    tuscany/sca-cpp/trunk/components/webservice/webservice-client.componentType
    tuscany/sca-cpp/trunk/components/webservice/webservice-listener.componentType
Removed:
    tuscany/sca-cpp/trunk/components/chat/chatter.cpp
Modified:
    tuscany/sca-cpp/trunk/components/cache/Makefile.am
    tuscany/sca-cpp/trunk/components/chat/Makefile.am
    tuscany/sca-cpp/trunk/components/chat/chat.composite
    tuscany/sca-cpp/trunk/components/log/Makefile.am
    tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am
    tuscany/sca-cpp/trunk/components/queue/Makefile.am
    tuscany/sca-cpp/trunk/components/sqldb/Makefile.am
    tuscany/sca-cpp/trunk/components/webservice/Makefile.am

Modified: tuscany/sca-cpp/trunk/components/cache/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/Makefile.am?rev=1030527&r1=1030526&r2=1030527&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/cache/Makefile.am Wed Nov  3 16:40:19 2010
@@ -25,7 +25,7 @@ comp_DATA = memcached.prefix
 memcached.prefix: $(top_builddir)/config.status
 	echo ${MEMCACHED_PREFIX} >memcached.prefix
 
-EXTRA_DIST = cache.composite
+EXTRA_DIST = cache.composite memcache.componentType datacache.componentType memocache.componentType
*.scm
 
 comp_LTLIBRARIES = libmemcache.la libdatacache.la libmemocache.la
 noinst_DATA = libmemcache.so libdatacache.so libmemocache.so

Added: tuscany/sca-cpp/trunk/components/cache/datacache.componentType
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/datacache.componentType?rev=1030527&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/datacache.componentType (added)
+++ tuscany/sca-cpp/trunk/components/cache/datacache.componentType Wed Nov  3 16:40:19 2010
@@ -0,0 +1,30 @@
+<?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:t="http://tuscany.apache.org/xmlns/sca/1.1"
+  targetNamespace="http://tuscany.apache.org/xmlns/sca/components">
+        
+    <service name="datacache"/>
+    <reference name="l1reader"/>
+    <reference name="l1writer"/>
+    <reference name="l2reader"/>
+    <reference name="l2writer"/>
+
+</composite>

Added: tuscany/sca-cpp/trunk/components/cache/memcache.componentType
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcache.componentType?rev=1030527&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcache.componentType (added)
+++ tuscany/sca-cpp/trunk/components/cache/memcache.componentType Wed Nov  3 16:40:19 2010
@@ -0,0 +1,28 @@
+<?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="memcache"/>
+    <property name="servers" type="xsd:string">localhost</property>
+
+</composite>

Added: tuscany/sca-cpp/trunk/components/cache/memocache.componentType
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memocache.componentType?rev=1030527&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memocache.componentType (added)
+++ tuscany/sca-cpp/trunk/components/cache/memocache.componentType Wed Nov  3 16:40:19 2010
@@ -0,0 +1,28 @@
+<?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:t="http://tuscany.apache.org/xmlns/sca/1.1"
+  targetNamespace="http://tuscany.apache.org/xmlns/sca/components">
+        
+    <service name="memocache"/>
+    <reference name="relay"/>
+    <reference name="cache"/>
+
+</composite>

Modified: tuscany/sca-cpp/trunk/components/chat/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/chat/Makefile.am?rev=1030527&r1=1030526&r2=1030527&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/chat/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/chat/Makefile.am Wed Nov  3 16:40:19 2010
@@ -31,14 +31,20 @@ comp_DATA = vysper.prefix
 vysper.prefix: $(top_builddir)/config.status
 	echo ${VYSPER_PREFIX} >vysper.prefix
 
-EXTRA_DIST = chat.composite *.scm
+EXTRA_DIST = chat.composite chat-sendreceiver.componentType chat-sender.componentType *.scm
 
-comp_LTLIBRARIES = libchatter.la
-libchatter_la_SOURCES = chatter.cpp
-libchatter_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl -lresolv
-noinst_DATA = libchatter.so
-libchatter.so:
-	ln -s .libs/libchatter.so
+comp_LTLIBRARIES = libchat-sendreceiver.la libchat-sender.la
+noinst_DATA = libchat-sendreceiver.so libchat-sender.so
+
+libchat_sendreceiver_la_SOURCES = chat-sendreceiver.cpp
+libchat_sendreceiver_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl
-lresolv
+libchat-sendreceiver.so:
+	ln -s .libs/libchat-sendreceiver.so
+
+libchat_sender_la_SOURCES = chat-sender.cpp
+libchat_sender_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl -lresolv
+libchat-sender.so:
+	ln -s .libs/libchat-sender.so
 
 xmpp_test_SOURCES = xmpp-test.cpp
 xmpp_test_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl -lresolv

Added: tuscany/sca-cpp/trunk/components/chat/chat-sender.componentType
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/chat/chat-sender.componentType?rev=1030527&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/components/chat/chat-sender.componentType (added)
+++ tuscany/sca-cpp/trunk/components/chat/chat-sender.componentType Wed Nov  3 16:40:19 2010
@@ -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="send"/>
+    <property name="jid" type="xsd:string"/>
+    <property name="password" type="xsd:string"/>
+
+</composite>

Copied: tuscany/sca-cpp/trunk/components/chat/chat-sender.cpp (from r1030526, tuscany/sca-cpp/trunk/components/chat/chatter.cpp)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/chat/chat-sender.cpp?p2=tuscany/sca-cpp/trunk/components/chat/chat-sender.cpp&p1=tuscany/sca-cpp/trunk/components/chat/chatter.cpp&r1=1030526&r2=1030527&rev=1030527&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/chat/chatter.cpp (original)
+++ tuscany/sca-cpp/trunk/components/chat/chat-sender.cpp Wed Nov  3 16:40:19 2010
@@ -20,7 +20,7 @@
 /* $Rev$ $Date$ */
 
 /**
- * XMPP chatter component implementation.
+ * XMPP chat sender component implementation.
  */
 
 #include "string.hpp"
@@ -33,6 +33,7 @@
 
 namespace tuscany {
 namespace chat {
+namespace sender {
 
 /**
  * Post an item to an XMPP JID.
@@ -49,38 +50,27 @@ const failable<value> post(const list<va
 }
 
 /**
- * A relay function that posts the XMPP messages it receives to a relay component reference.
+ * Subscribe and listen to an XMPP session.
  */
-class relay {
+class noop {
 public:
-    relay(const lambda<value(const list<value>&)>& rel) : rel(rel) {
+    noop() {
     }
 
-    const failable<bool> operator()(const value& jid, const value& val, unused
XMPPClient& xc) const {
-        if (isNil(rel))
-            return true;
-        debug(jid, "chat::relay::jid");
-        debug(val, "chat::relay::value");
-        const value res = rel(mklist<value>("post", mklist<value>(jid), val));
+    const failable<bool> operator()(unused const value& jid, unused const value&
val, unused XMPPClient& xc) const {
         return true;
     }
-
-private:
-    const lambda<value(const list<value>&)> rel;
 };
 
-/**
- * Subscribe and listen to an XMPP session.
- */
 class subscribe {
 public:
-    subscribe(const lambda<failable<bool>(const value&, const value&, XMPPClient&)>&
l, XMPPClient& xc) : l(l), xc(xc) {
+    subscribe(XMPPClient& xc) : xc(xc) {
     }
 
     const failable<bool> operator()() const {
         gc_pool pool;
         debug("chat::subscribe::listen");
-        const failable<bool> r = listen(l, const_cast<XMPPClient&>(xc));
+        const failable<bool> r = listen(noop(), const_cast<XMPPClient&>(xc));
         debug("chat::subscribe::stopped");
         return r;
     }
@@ -93,9 +83,9 @@ private:
 /**
  * Chatter component lambda function
  */
-class chatter {
+class chatSender {
 public:
-    chatter(XMPPClient& xc, worker& w) : xc(xc), w(w) {
+    chatSender(XMPPClient& xc, worker& w) : xc(xc), w(w) {
     }
 
     const value operator()(const list<value>& params) const {
@@ -103,15 +93,15 @@ public:
         if (func == "post")
             return post(cdr(params), const_cast<XMPPClient&>(xc));
 
-        // Stop the chatter component
+        // Stop the chat sender component
         if (func != "stop")
             return tuscany::mkfailure<tuscany::value>();
-        debug("chat::chatter::stop");
+        debug("chat::sender::stop");
 
         // Disconnect and shutdown the worker thread
         disconnect(const_cast<XMPPClient&>(xc));
         cancel(const_cast<worker&>(w));
-        debug("chat::chatter::stopped");
+        debug("chat::sender::stopped");
 
         return failable<value>(value(lambda<value(const list<value>&)>()));
     }
@@ -125,10 +115,8 @@ private:
  * Start the component.
  */
 const failable<value> start(const list<value>& params) {
-    // Extract the relay reference and the XMPP JID and password
-    const bool hasRelay = !isNil(cddr(params));
-    const value rel = hasRelay? car(params) : value(lambda<value(const list<value>&)>());
-    const list<value> props = hasRelay? cdr(params) : params;
+    // Extract the the XMPP JID and password
+    const list<value> props = params;
     const value jid = ((lambda<value(list<value>)>)car(props))(list<value>());
     const value pass = ((lambda<value(list<value>)>)cadr(props))(list<value>());
 
@@ -140,22 +128,22 @@ const failable<value> start(const list<v
 
     // Listen and relay messages in a worker thread
     worker w(3);
-    const lambda<failable<bool>(const value&, const value&, XMPPClient&)>
rl = relay(rel);
-    submit<failable<bool> >(w, lambda<failable<bool>()>(subscribe(rl,
xc)));
+    submit<failable<bool> >(w, lambda<failable<bool>()>(subscribe(xc)));
 
-    // Return the chatter component lambda function
-    return value(lambda<value(const list<value>&)>(chatter(xc, w)));
+    // Return the chat sender component lambda function
+    return value(lambda<value(const list<value>&)>(chatSender(xc, w)));
 }
 
 }
 }
+}
 
 extern "C" {
 
 const tuscany::value apply(const tuscany::list<tuscany::value>& params) {
     const tuscany::value func(car(params));
     if (func == "start")
-        return tuscany::chat::start(cdr(params));
+        return tuscany::chat::sender::start(cdr(params));
     return tuscany::mkfailure<tuscany::value>();
 }
 

Added: tuscany/sca-cpp/trunk/components/chat/chat-sendreceiver.componentType
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/chat/chat-sendreceiver.componentType?rev=1030527&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/components/chat/chat-sendreceiver.componentType (added)
+++ tuscany/sca-cpp/trunk/components/chat/chat-sendreceiver.componentType Wed Nov  3 16:40:19
2010
@@ -0,0 +1,30 @@
+<?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="send"/>
+    <reference name="relay"/>
+    <property name="jid" type="xsd:string"/>
+    <property name="password" type="xsd:string"/>
+
+</composite>

Copied: tuscany/sca-cpp/trunk/components/chat/chat-sendreceiver.cpp (from r1030526, tuscany/sca-cpp/trunk/components/chat/chatter.cpp)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/chat/chat-sendreceiver.cpp?p2=tuscany/sca-cpp/trunk/components/chat/chat-sendreceiver.cpp&p1=tuscany/sca-cpp/trunk/components/chat/chatter.cpp&r1=1030526&r2=1030527&rev=1030527&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/chat/chatter.cpp (original)
+++ tuscany/sca-cpp/trunk/components/chat/chat-sendreceiver.cpp Wed Nov  3 16:40:19 2010
@@ -20,7 +20,7 @@
 /* $Rev$ $Date$ */
 
 /**
- * XMPP chatter component implementation.
+ * XMPP chat sender/receiver component implementation.
  */
 
 #include "string.hpp"
@@ -33,6 +33,7 @@
 
 namespace tuscany {
 namespace chat {
+namespace sendreceiver {
 
 /**
  * Post an item to an XMPP JID.
@@ -91,11 +92,11 @@ private:
 };
 
 /**
- * Chatter component lambda function
+ * Chat sender/receiver component lambda function
  */
-class chatter {
+class chatSenderReceiver {
 public:
-    chatter(XMPPClient& xc, worker& w) : xc(xc), w(w) {
+    chatSenderReceiver(XMPPClient& xc, worker& w) : xc(xc), w(w) {
     }
 
     const value operator()(const list<value>& params) const {
@@ -103,15 +104,15 @@ public:
         if (func == "post")
             return post(cdr(params), const_cast<XMPPClient&>(xc));
 
-        // Stop the chatter component
+        // Stop the chat sender/receiver component
         if (func != "stop")
             return tuscany::mkfailure<tuscany::value>();
-        debug("chat::chatter::stop");
+        debug("chat::sendreceiver::stop");
 
         // Disconnect and shutdown the worker thread
         disconnect(const_cast<XMPPClient&>(xc));
         cancel(const_cast<worker&>(w));
-        debug("chat::chatter::stopped");
+        debug("chat::sendreceiver::stopped");
 
         return failable<value>(value(lambda<value(const list<value>&)>()));
     }
@@ -143,19 +144,20 @@ const failable<value> start(const list<v
     const lambda<failable<bool>(const value&, const value&, XMPPClient&)>
rl = relay(rel);
     submit<failable<bool> >(w, lambda<failable<bool>()>(subscribe(rl,
xc)));
 
-    // Return the chatter component lambda function
-    return value(lambda<value(const list<value>&)>(chatter(xc, w)));
+    // Return the chat sender/receiver component lambda function
+    return value(lambda<value(const list<value>&)>(chatSenderReceiver(xc,
w)));
 }
 
 }
 }
+}
 
 extern "C" {
 
 const tuscany::value apply(const tuscany::list<tuscany::value>& params) {
     const tuscany::value func(car(params));
     if (func == "start")
-        return tuscany::chat::start(cdr(params));
+        return tuscany::chat::sendreceiver::start(cdr(params));
     return tuscany::mkfailure<tuscany::value>();
 }
 

Modified: tuscany/sca-cpp/trunk/components/chat/chat.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/chat/chat.composite?rev=1030527&r1=1030526&r2=1030527&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/chat/chat.composite (original)
+++ tuscany/sca-cpp/trunk/components/chat/chat.composite Wed Nov  3 16:40:19 2010
@@ -23,7 +23,7 @@
   name="chat">
         
     <component name="print-sender">
-        <implementation.cpp path="." library="libchatter"/>
+        <implementation.cpp path="." library="libchat-sender"/>
         <property name="jid">sca1@localhost</property>
         <property name="password">sca1</property>
         <service name="print-sender">
@@ -32,7 +32,7 @@
     </component>
 
     <component name="print-chatter">
-        <implementation.cpp path="." library="libchatter"/>
+        <implementation.cpp path="." library="libchat-sendreceiver"/>
         <property name="jid">sca2@localhost</property>
         <property name="password">sca2</property>
         <service name="print-chatter">

Modified: tuscany/sca-cpp/trunk/components/log/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/log/Makefile.am?rev=1030527&r1=1030526&r2=1030527&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/log/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/log/Makefile.am Wed Nov  3 16:40:19 2010
@@ -32,7 +32,7 @@ scribe.prefix: $(top_builddir)/config.st
 thrift.prefix: $(top_builddir)/config.status
 	echo ${THRIFT_PREFIX} >thrift.prefix
 
-EXTRA_DIST = log.composite *.scm *.thrift
+EXTRA_DIST = log.composite log.componentType logger.componentType *.scm *.thrift
 
 BUILT_SOURCES=gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp gen-cpp/scribe_constants.cpp
gen-cpp/scribe.cpp gen-cpp/scribe_types.cpp gen-cpp/FacebookService.cpp gen-cpp/scribe.h
 gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp gen-cpp/scribe_constants.cpp gen-cpp/scribe.cpp
gen-cpp/scribe_types.cpp gen-cpp/FacebookService.cpp gen-cpp/scribe.h: scribe.thrift

Added: tuscany/sca-cpp/trunk/components/log/log.componentType
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/log/log.componentType?rev=1030527&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/components/log/log.componentType (added)
+++ tuscany/sca-cpp/trunk/components/log/log.componentType Wed Nov  3 16:40:19 2010
@@ -0,0 +1,28 @@
+<?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="log"/>
+    <property name="category" type="xsd:string">default</property>
+
+</composite>

Added: tuscany/sca-cpp/trunk/components/log/logger.componentType
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/log/logger.componentType?rev=1030527&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/components/log/logger.componentType (added)
+++ tuscany/sca-cpp/trunk/components/log/logger.componentType Wed Nov  3 16:40:19 2010
@@ -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="logger"/>
+    <reference name="relay"/>
+    <property name="category" type="xsd:string">default</property>
+
+</composite>

Modified: tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am?rev=1030527&r1=1030526&r2=1030527&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/nosqldb/Makefile.am Wed Nov  3 16:40:19 2010
@@ -27,7 +27,7 @@ comp_DATA = tinycdb.prefix
 tinycdb.prefix: $(top_builddir)/config.status
 	echo ${TINYCDB_PREFIX} >tinycdb.prefix
 
-EXTRA_DIST = nosqldb.composite
+EXTRA_DIST = nosqldb.composite nosqldb.componentType
 
 comp_LTLIBRARIES = libnosqldb.la
 noinst_DATA = libnosqldb.so

Added: tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.componentType
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.componentType?rev=1030527&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.componentType (added)
+++ tuscany/sca-cpp/trunk/components/nosqldb/nosqldb.componentType Wed Nov  3 16:40:19 2010
@@ -0,0 +1,28 @@
+<?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="nosqldb"/>
+    <property name="dbname" type="xsd:string"/>
+
+</composite>

Modified: tuscany/sca-cpp/trunk/components/queue/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/queue/Makefile.am?rev=1030527&r1=1030526&r2=1030527&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/queue/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/queue/Makefile.am Wed Nov  3 16:40:19 2010
@@ -29,7 +29,7 @@ comp_DATA = qpidc.prefix
 qpidc.prefix: $(top_builddir)/config.status
 	echo ${QPIDC_PREFIX} >qpidc.prefix
 
-EXTRA_DIST = queue.composite *.scm
+EXTRA_DIST = queue.composite queue-sender.componentType queue-listener.componentType *.scm
 
 comp_LTLIBRARIES = libqueue-sender.la libqueue-listener.la
 noinst_DATA = libqueue-sender.so libqueue-listener.so

Added: tuscany/sca-cpp/trunk/components/queue/queue-listener.componentType
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/queue/queue-listener.componentType?rev=1030527&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/components/queue/queue-listener.componentType (added)
+++ tuscany/sca-cpp/trunk/components/queue/queue-listener.componentType Wed Nov  3 16:40:19
2010
@@ -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">
+        
+  <reference name="relay"/>
+  <property name="key" type="xsd:string"/>
+  <property name="queue" type="xsd:string"/>
+
+</composite>

Added: tuscany/sca-cpp/trunk/components/queue/queue-sender.componentType
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/queue/queue-sender.componentType?rev=1030527&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/components/queue/queue-sender.componentType (added)
+++ tuscany/sca-cpp/trunk/components/queue/queue-sender.componentType Wed Nov  3 16:40:19
2010
@@ -0,0 +1,28 @@
+<?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="sender"/>
+    <property name="key" type="xsd:string"/>
+
+</composite>

Modified: tuscany/sca-cpp/trunk/components/sqldb/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/sqldb/Makefile.am?rev=1030527&r1=1030526&r2=1030527&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/sqldb/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/sqldb/Makefile.am Wed Nov  3 16:40:19 2010
@@ -29,7 +29,7 @@ comp_DATA = pgsql.prefix
 pgsql.prefix: $(top_builddir)/config.status
 	echo ${PGSQL_PREFIX} >pgsql.prefix
 
-EXTRA_DIST = sqldb.composite
+EXTRA_DIST = sqldb.composite sqldb.componentType
 
 comp_LTLIBRARIES = libsqldb.la
 noinst_DATA = libsqldb.so

Added: tuscany/sca-cpp/trunk/components/sqldb/sqldb.componentType
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/sqldb/sqldb.componentType?rev=1030527&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/components/sqldb/sqldb.componentType (added)
+++ tuscany/sca-cpp/trunk/components/sqldb/sqldb.componentType Wed Nov  3 16:40:19 2010
@@ -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="sqldb"/>
+    <property name="conninfo" type="xsd:string">host=localhost port=5432 dbname=db</property>
+    <property name="table" type=xsd:string"/>
+
+</composite>

Modified: tuscany/sca-cpp/trunk/components/webservice/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/webservice/Makefile.am?rev=1030527&r1=1030526&r2=1030527&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/webservice/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/webservice/Makefile.am Wed Nov  3 16:40:19 2010
@@ -27,7 +27,7 @@ compdir=$(prefix)/components/webservice
 
 comp_DATA = axis2c.prefix axis2.xml services.xml module.xml
 
-EXTRA_DIST = webservice.composite axis2.xml services.xml module.xml *.scm
+EXTRA_DIST = webservice.composite webservice-client.componentType webservice-listener.componentType
axis2.xml services.xml module.xml *.scm
 
 axis2c.prefix: $(top_builddir)/config.status
 	echo ${AXIS2C_PREFIX} >axis2c.prefix

Added: tuscany/sca-cpp/trunk/components/webservice/webservice-client.componentType
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/webservice/webservice-client.componentType?rev=1030527&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/components/webservice/webservice-client.componentType (added)
+++ tuscany/sca-cpp/trunk/components/webservice/webservice-client.componentType Wed Nov  3
16:40:19 2010
@@ -0,0 +1,28 @@
+<?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="client"/>
+    <property name="uri" type="xsd:string"/>
+
+</composite>

Added: tuscany/sca-cpp/trunk/components/webservice/webservice-listener.componentType
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/webservice/webservice-listener.componentType?rev=1030527&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/components/webservice/webservice-listener.componentType (added)
+++ tuscany/sca-cpp/trunk/components/webservice/webservice-listener.componentType Wed Nov
 3 16:40:19 2010
@@ -0,0 +1,28 @@
+<?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="service"/>
+    <reference name="relay"/>
+
+</composite>



Mime
View raw message