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 2006/09/08 18:37:47 UTC
svn commit: r441557 - in /incubator/tuscany/cpp/sca/runtime:
core/src/tuscany/sca/core/ extensions/cpp/src/tuscany/sca/cpp/
extensions/ruby/src/tuscany/sca/ruby/
extensions/ws/service/axis2c/src/tuscany/sca/ws/
Author: jsdelfino
Date: Fri Sep 8 09:37:43 2006
New Revision: 441557
URL: http://svn.apache.org/viewvc?view=rev&rev=441557
Log:
Moved getProxy() and getProxies() from ServiceProxy to CPPServiceProxy as these methods are really specific to C++ proxies
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.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
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.h?view=diff&rev=441557&r1=441556&r2=441557
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.h Fri Sep 8 09:37:43 2006
@@ -64,19 +64,6 @@
*/
Reference* getReference() const { return reference; };
- /**
- * Return an instance of the proxy created for this particular component and reference.
- * @return The proxy.
- */
- virtual void* getProxy() = 0;
-
- /**
- * Return a list of the proxies created for this particular component and reference.
- * @return The proxies.
- */
- typedef vector<void*> PROXIES;
- virtual PROXIES getProxies() = 0;
-
private:
/**
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=441557&r1=441556&r2=441557
==============================================================================
--- 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 Fri Sep 8 09:37:43 2006
@@ -169,7 +169,7 @@
LOGEXIT(1,"CPPServiceProxy::destructor");
}
- ServiceProxy::PROXIES CPPServiceProxy::getProxies()
+ CPPServiceProxy::PROXIES CPPServiceProxy::getProxies()
{
return proxies;
}
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=441557&r1=441556&r2=441557
==============================================================================
--- 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 Fri Sep 8 09:37:43 2006
@@ -78,6 +78,7 @@
* Return the proxies created for this particular component and reference.
* @return The proxies.
*/
+ typedef vector<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=441557&r1=441556&r2=441557
==============================================================================
--- 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 Fri Sep 8 09:37:43 2006
@@ -52,7 +52,7 @@
// --------------------------------------------
for (PROXIES::iterator iter = proxies.begin(); iter != proxies.end(); iter++)
{
- delete (ServiceProxy*)*iter;
+ delete *iter;
}
}
@@ -76,7 +76,7 @@
}
// Get a service proxy from the binding configured on the reference
- ServiceProxy* serviceProxy = reference->getBinding()->getServiceProxy();
+ CPPServiceProxy* serviceProxy = (CPPServiceProxy*)reference->getBinding()->getServiceProxy();
if (serviceProxy == NULL)
{
string message = "Reference ";
@@ -85,9 +85,9 @@
}
proxies.push_back(serviceProxy);
- ServiceProxy::PROXIES proxies = serviceProxy->getProxies();
+ CPPServiceProxy::PROXIES proxies = serviceProxy->getProxies();
ServiceList services(proxies.size());
- for (ServiceProxy::PROXIES::const_iterator iter = proxies.begin();
+ for (CPPServiceProxy::PROXIES::const_iterator iter = proxies.begin();
iter!=proxies.end();
iter++)
{
@@ -135,7 +135,7 @@
} // end switch
// Get a service proxy from the binding configured on the reference
- ServiceProxy* serviceProxy = reference->getBinding()->getServiceProxy();
+ CPPServiceProxy* serviceProxy = (CPPServiceProxy*)reference->getBinding()->getServiceProxy();
if (serviceProxy == NULL)
{
string message = "Reference ";
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=441557&r1=441556&r2=441557
==============================================================================
--- 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 Fri Sep 8 09:37:43 2006
@@ -29,7 +29,7 @@
#include "tuscany/sca/model/Service.h"
#include "tuscany/sca/model/Reference.h"
#include "tuscany/sca/core/ServiceWrapper.h"
-#include "tuscany/sca/core/ServiceProxy.h"
+#include "tuscany/sca/cpp/CPPServiceProxy.h"
using namespace osoa::sca;
@@ -113,12 +113,11 @@
*/
ServiceWrapper* getServiceWrapper(Service* target);
-
- typedef vector<ServiceProxy*> PROXIES;
/**
* A vector of the proxies created by this ComponentContext. The
* proxies will be destroyed when the ComponentContext is destroyed.
*/
+ typedef vector<CPPServiceProxy*> PROXIES;
PROXIES proxies;
};
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp?view=diff&rev=441557&r1=441556&r2=441557
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp Fri Sep 8 09:37:43 2006
@@ -59,7 +59,7 @@
// --------------------------------------------
for (PROXIES::iterator iter = proxies.begin(); iter != proxies.end(); iter++)
{
- delete (ServiceProxy*)*iter;
+ delete *iter;
}
}
@@ -88,8 +88,7 @@
// The locate service API is used from CPP clients so we are using
// our default service proxy here
- //TODO is that right?
- ServiceProxy* serviceProxy = new cpp::CPPServiceProxy(service);
+ CPPServiceProxy* serviceProxy = new CPPServiceProxy(service);
proxies.push_back(serviceProxy);
LOGEXIT(1, "CompositeContextImpl::locateService");
return serviceProxy->getProxy();
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h?view=diff&rev=441557&r1=441556&r2=441557
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h Fri Sep 8 09:37:43 2006
@@ -26,7 +26,7 @@
#include "osoa/sca/CompositeContext.h"
#include "tuscany/sca/model/Composite.h"
#include "tuscany/sca/model/Component.h"
-#include "tuscany/sca/core/ServiceProxy.h"
+#include "tuscany/sca/cpp/CPPServiceProxy.h"
using namespace osoa::sca;
@@ -86,7 +86,7 @@
* Vector of proxies created from calls to the locateService
* method.
*/
- typedef vector<tuscany::sca::ServiceProxy*> PROXIES;
+ typedef vector<CPPServiceProxy*> PROXIES;
PROXIES proxies;
};
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp?view=diff&rev=441557&r1=441556&r2=441557
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp Fri Sep 8 09:37:43 2006
@@ -58,9 +58,6 @@
serviceWrapper = referenceBinding->getTargetServiceBinding()->getServiceWrapper();
- // getProxy and getProxies will return "this"
- proxies.push_back(this);
-
LOGEXIT(1,"RubyServiceProxy::constructor");
}
@@ -81,9 +78,6 @@
// Get the service wrapper
serviceWrapper = service->getBinding()->getServiceWrapper();
- // getProxy and getProxies will return "this"
- proxies.push_back(this);
-
LOGEXIT(1,"RubyServiceProxy::constructor");
}
@@ -96,23 +90,6 @@
LOGEXIT(1,"RubyServiceProxy::destructor");
}
- ServiceProxy::PROXIES RubyServiceProxy::getProxies()
- {
- return proxies;
- }
-
- void* RubyServiceProxy::getProxy()
- {
- if (proxies.size() != 0)
- {
- return proxies[0];
- }
- else
- {
- return NULL;
- }
- }
-
} // End namespace ruby
} // End namespace sca
} // End namespace tuscany
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h?view=diff&rev=441557&r1=441556&r2=441557
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h Fri Sep 8 09:37:43 2006
@@ -67,18 +67,6 @@
*/
virtual ~RubyServiceProxy();
- /**
- * Return an instance of the proxy created for this particular component and reference.
- * @return The proxy.
- */
- virtual void* getProxy();
-
- /**
- * Return the proxies created for this particular component and reference.
- * @return The proxies.
- */
- virtual PROXIES getProxies();
-
private:
/**
@@ -86,11 +74,6 @@
*/
ServiceWrapper* serviceWrapper;
- /**
- * Holds the instances of the Ruby proxies.
- */
- PROXIES proxies;
-
};
} // End namespace ruby
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp?view=diff&rev=441557&r1=441556&r2=441557
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp Fri Sep 8 09:37:43 2006
@@ -58,9 +58,6 @@
WSReferenceBinding* referenceBinding = (WSReferenceBinding*)reference->getBinding();
serviceWrapper = referenceBinding->getTargetServiceBinding()->getServiceWrapper();
- // getProxy and getProxies will return "this"
- proxies.push_back(this);
-
LOGEXIT(1,"WSServiceProxy::constructor");
}
@@ -71,16 +68,6 @@
{
LOGENTRY(1,"WSServiceProxy::destructor");
LOGEXIT(1,"WSServiceProxy::destructor");
- }
-
- ServiceProxy::PROXIES WSServiceProxy::getProxies()
- {
- return proxies;
- }
-
- void* WSServiceProxy::getProxy()
- {
- return this;
}
///
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h?view=diff&rev=441557&r1=441556&r2=441557
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h Fri Sep 8 09:37:43 2006
@@ -70,18 +70,6 @@
virtual ~WSServiceProxy();
/**
- * Return an instance of the proxy created for this particular component and reference.
- * @return The proxy.
- */
- virtual void* getProxy();
-
- /**
- * Return the proxies created for this particular component and reference.
- * @return The proxies.
- */
- virtual PROXIES getProxies();
-
- /**
* Invoke the specified operation
*/
DataObjectPtr invoke(const char* operationName, DataObjectPtr inputDataObject);
@@ -95,11 +83,6 @@
*/
ServiceWrapper* serviceWrapper;
- /**
- * Holds the instances of the WS proxies.
- */
- PROXIES proxies;
-
};
} // End namespace ws
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org