You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2006/08/28 07:58:35 UTC
svn commit: r437547 - in /incubator/tuscany/cpp/sca/runtime:
core/src/tuscany/sca/extension/ core/src/tuscany/sca/model/ extensions/cpp/
Author: robbinspg
Date: Sun Aug 27 22:58:34 2006
New Revision: 437547
URL: http://svn.apache.org/viewvc?rev=437547&view=rev
Log:
Make ImplementationExtension consistent with InterfaceExtension
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPImplementationExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPImplementationExtension.h
incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPInterfaceExtension.cpp
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h?rev=437547&r1=437546&r2=437547&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h Sun Aug 27 22:58:34 2006
@@ -58,7 +58,7 @@
*/
virtual const string& getExtensionTypeQName() = 0;
- virtual void loadModelElement(commonj::sdo::DataObjectPtr scdlImplementation, model::Component* component) = 0;
+ virtual tuscany::sca::model::Implementation* getImplementation(commonj::sdo::DataObjectPtr scdlImplementation) = 0;
//virtual ServiceWrapper* getServiceWrapper(model::Service* service) = 0;
};
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp?rev=437547&r1=437546&r2=437547&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp Sun Aug 27 22:58:34 2006
@@ -361,7 +361,7 @@
ImplementationExtension* implExtension = runtime->getImplementationExtension(implTypeQname);
if (implExtension)
{
- implExtension->loadModelElement(impl, component);
+ component->setImplementation(implExtension->getImplementation(impl));
}
else
{
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPImplementationExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPImplementationExtension.cpp?rev=437547&r1=437546&r2=437547&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPImplementationExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPImplementationExtension.cpp Sun Aug 27 22:58:34 2006
@@ -52,8 +52,7 @@
// ===================================================================
// loadModelElement - load the info from implementation.cpp
// ===================================================================
- void CPPImplementationExtension::loadModelElement(commonj::sdo::DataObjectPtr scdlImplementation,
- model::Component* component)
+ tuscany::sca::model::Implementation* CPPImplementationExtension::getImplementation(commonj::sdo::DataObjectPtr scdlImplementation)
{
string implType = scdlImplementation->getType().getName();
if (implType == "CPPImplementation")
@@ -62,10 +61,10 @@
string header = scdlImplementation->getCString("header");
string className = scdlImplementation->getCString("class");
// The following works for now ONLY bacause CPPImplementation is identical
- // to tusscany::sca::model::CPPIplementation
- CPPImplementation* cppImpl = new CPPImplementation(library, header, className);
- component->setImplementation(cppImpl);
+ // to tusscany::sca::model::CPPIplementation which will be removed soon!
+ return new CPPImplementation(library, header, className);
}
+ return 0;
}
} // End namespace cpp
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPImplementationExtension.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPImplementationExtension.h?rev=437547&r1=437546&r2=437547&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPImplementationExtension.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPImplementationExtension.h Sun Aug 27 22:58:34 2006
@@ -53,7 +53,7 @@
*/
virtual const string& getExtensionTypeQName() {return typeQName;}
- virtual void loadModelElement(commonj::sdo::DataObjectPtr scdlImplementation, model::Component* component);
+ virtual tuscany::sca::model::Implementation* getImplementation(commonj::sdo::DataObjectPtr scdlImplementation);
private:
static const string extensionName;
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPInterfaceExtension.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPInterfaceExtension.cpp?rev=437547&r1=437546&r2=437547&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPInterfaceExtension.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/CPPInterfaceExtension.cpp Sun Aug 27 22:58:34 2006
@@ -62,7 +62,9 @@
string className = scdlInterface->getCString("class");
string scope = scdlInterface->getCString("scope");
bool remotable = scdlInterface->getBoolean("remotable");
-
+
+ // The following works for now ONLY bacause CPPInterface is identical
+ // to tusscany::sca::model::CPPInterface which will be removed soon!
return new CPPInterface(header, className, scope, remotable);
}
return 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org