tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robbin...@apache.org
Subject svn commit: r450797 - in /incubator/tuscany/cpp/sca/runtime/extensions/cpp/src: ./ osoa/sca/ tuscany/sca/cpp/
Date Thu, 28 Sep 2006 10:45:11 GMT
Author: robbinspg
Date: Thu Sep 28 03:45:10 2006
New Revision: 450797

URL: http://svn.apache.org/viewvc?view=rev&rev=450797
Log:
Update interfaces to latest 0.95 C++ C&I spec
The spec now uses std::list in place of ServiceList

Note: I don't think multiplicity works anyway but this change does not make anything fail!

Removed:
    incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ServiceList.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ServiceList.h
Modified:
    incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/Makefile.am
    incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
    incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
    incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h

Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/Makefile.am?view=diff&rev=450797&r1=450796&r2=450797
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/Makefile.am Thu Sep 28 03:45:10 2006
@@ -9,7 +9,6 @@
 libtuscany_sca_cpp_la_SOURCES = \
 osoa/sca/ComponentContext.cpp \
 osoa/sca/CompositeContext.cpp \
-osoa/sca/ServiceList.cpp \
 tuscany/sca/cpp/ComponentContextImpl.cpp \
 tuscany/sca/cpp/CompositeContextImpl.cpp \
 tuscany/sca/cpp/CPPExtension.cpp \

Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp?view=diff&rev=450797&r1=450796&r2=450797
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp Thu
Sep 28 03:45:10 2006
@@ -105,7 +105,7 @@
         // ===========
         // getServices
         // ===========
-        ServiceList ComponentContext::getServices(const std::string& referenceName)
+        std::list<void*> ComponentContext::getServices(const std::string& referenceName)
         {
             return impl->getServices(referenceName);
         }

Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h?view=diff&rev=450797&r1=450796&r2=450797
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h Thu Sep
28 03:45:10 2006
@@ -21,9 +21,9 @@
 #define osoa_sca_componentcontext_h
 
 #include "osoa/sca/export.h"
-#include "osoa/sca/ServiceList.h"
 #include "commonj/sdo/SDO.h"
 #include <string>
+#include <list>
 namespace osoa
 {
     namespace sca
@@ -58,7 +58,7 @@
              * the name of a reference configured in the component type file for
              * this component.
              */
-            virtual ServiceList getServices(const std::string& referenceName);
+            virtual std::list<void*> getServices(const std::string& referenceName);
 
             /** 
              * Get the configured properties for the component.

Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp?view=diff&rev=450797&r1=450796&r2=450797
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
(original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
Thu Sep 28 03:45:10 2006
@@ -164,7 +164,7 @@
                 // Delete the proxies
                 if (destructor != NULL && proxies.size() != 0)
                 {
-                    destructor(proxies[0]);
+                    destructor(*proxies.begin());
                 }
                 LOGEXIT(1,"CPPServiceProxy::destructor");
             }
@@ -178,7 +178,7 @@
             {
                 if (proxies.size() != 0)
                 {
-                    return proxies[0];
+                    return *proxies.begin();
                 }
                 else
                 {

Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h?view=diff&rev=450797&r1=450796&r2=450797
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
(original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
Thu Sep 28 03:45:10 2006
@@ -78,7 +78,7 @@
                  * Return the proxies created for this particular component and reference.
                  * @return The proxies.
                  */
-                typedef vector<void*> PROXIES;
+                typedef std::list<void*> PROXIES;
                 virtual PROXIES getProxies();
     
             private:

Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp?view=diff&rev=450797&r1=450796&r2=450797
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
(original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
Thu Sep 28 03:45:10 2006
@@ -53,7 +53,7 @@
         // ==========================================================================
         // getServices: return a list of Proxies for services wired to this reference
         // ==========================================================================
-        ServiceList ComponentContextImpl::getServices(const std::string& referenceName)
+        std::list<void*> ComponentContextImpl::getServices(const std::string& referenceName)
         {
             LOGENTRY(1, "ComponentContextImpl::getServices");
             
@@ -77,16 +77,7 @@
                 throw ServiceNotFoundException(message.c_str());
             }
             
-            CPPServiceProxy::PROXIES proxies = serviceProxy->getProxies();
-            ServiceList services(proxies.size());
-            for (CPPServiceProxy::PROXIES::const_iterator iter = proxies.begin();
-            iter!=proxies.end();
-            iter++)
-            {
-                services.addService(*iter);
-            }
-            
-            return services;
+            return serviceProxy->getProxies();
             
         } // End getServices()
         

Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h?view=diff&rev=450797&r1=450796&r2=450797
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
(original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
Thu Sep 28 03:45:10 2006
@@ -23,7 +23,6 @@
 #include <vector>
 using std::vector;
 
-#include "osoa/sca/ServiceList.h"
 #include "osoa/sca/ComponentContext.h"
 #include "tuscany/sca/model/Component.h"
 #include "tuscany/sca/model/Service.h"
@@ -67,7 +66,7 @@
             /** 
              * See ComponentContext.
              */
-            virtual ServiceList getServices(const std::string& referenceName);
+            virtual std::list<void*> getServices(const std::string& referenceName);
 
             /** 
              * See ComponentContext.



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message