Author: robbinspg
Date: Fri Oct 6 01:09:11 2006
New Revision: 453523
URL: http://svn.apache.org/viewvc?view=rev&rev=453523
Log:
TUSCANY-798 - revert change
Pass 0 to ComponentType constructor from Composite constructor
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
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?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
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
Fri Oct 6 01:09:11 2006
@@ -29,6 +29,7 @@
#include "tuscany/sca/model/Component.h"
#include "tuscany/sca/model/Service.h"
#include "tuscany/sca/core/ServiceWrapper.h"
+#include "tuscany/sca/model/Composite.h"
#include "commonj/sdo/SDO.h"
@@ -66,7 +67,7 @@
* Get an implementation from a DataObject representing
* an SCDL implementation element
*/
- virtual ComponentType*
getImplementation(commonj::sdo::DataObjectPtr scdlImplementation) = 0;
+ virtual ComponentType* getImplementation(Composite* composite,
commonj::sdo::DataObjectPtr scdlImplementation) = 0;
};
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.cpp
Fri Oct 6 01:09:11 2006
@@ -43,8 +43,8 @@
{
// Constructor
- ComponentType::ComponentType(const string& name)
- : name(name)
+ ComponentType::ComponentType(Composite* composite, const string&
name)
+ : composite(composite), name(name)
{
LOGENTRY(1, "ComponentType::constructor");
LOGEXIT(1, "ComponentType::constructor");
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.h?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.h
(original)
+++
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ComponentType.h
Fri Oct 6 01:09:11 2006
@@ -57,7 +57,7 @@
/**
* Constructor
*/
- SCA_API ComponentType(const string& name);
+ SCA_API ComponentType(Composite* composite, const string&
name);
/**
* Destructor.
@@ -70,6 +70,11 @@
SCA_API const string& getName() const { return name; };
/**
+ * Returns the composite containing this component type
+ */
+ SCA_API Composite* getComposite() const { return composite; };
+
+ /**
* Add a new service type to this component type.
* @param serviceType The service type to add.
*/
@@ -144,6 +149,11 @@
* The name of the component type
*/
string name;
+
+ /**
+ * The composite containing this component type
+ */
+ Composite* composite;
/**
* Map of all the service types defined on this component.
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.cpp?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.cpp
(original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Composite.cpp
Fri Oct 6 01:09:11 2006
@@ -40,7 +40,7 @@
// Constructor
Composite::Composite(const string& name, const string& root)
- : ComponentType(name), root(root)
+ : ComponentType(0, name), root(root)
{
LOGENTRY(1, "Composite::constructor");
LOGEXIT(1, "Composite::constructor");
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
Fri Oct 6 01:09:11 2006
@@ -39,7 +39,7 @@
// Constructor
CompositeReference::CompositeReference(Composite* composite, const
string& name,
Interface* intface, Interface* callbackInterface, bool
conversational, ReferenceType::Multiplicity multiplicity) :
- Component(composite, name, new ComponentType(name))
+ Component(composite, name, new ComponentType(composite, name))
{
LOGENTRY(1, "CompositeReference::constructor");
LOGINFO_1(2, "CompositeReference::constructor:
CompositeReference name: %s", name.c_str());
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeService.cpp
Fri Oct 6 01:09:11 2006
@@ -42,7 +42,7 @@
CompositeService::CompositeService(Composite* composite, const
string& name,
Interface* intface, Interface* callbackInterface, bool
conversational,
ReferenceType::Multiplicity multiplicity) :
- Component(composite, name, new ComponentType(name))
+ Component(composite, name, new ComponentType(composite, name))
{
LOGENTRY(1, "CompositeService::constructor");
LOGINFO_1(2, "CompositeService::constructor: CompositeService
name: %s", name.c_str());
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?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
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
Fri Oct 6 01:09:11 2006
@@ -340,7 +340,7 @@
ImplementationExtension* implExtension =
runtime->getImplementationExtension(implTypeQname);
if (implExtension)
{
- componentType = implExtension->getImplementation(impl);
+ componentType =
implExtension->getImplementation(composite, impl);
// -----------------------
// Load the .componentType
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
Fri Oct 6 01:09:11 2006
@@ -55,7 +55,7 @@
//
===================================================================
// loadModelElement - load the info from implementation.cpp
//
===================================================================
- ComponentType*
CPPImplementationExtension::getImplementation(DataObjectPtr scdlImplementation)
+ ComponentType*
CPPImplementationExtension::getImplementation(Composite *composite,
DataObjectPtr scdlImplementation)
{
string implType = scdlImplementation->getType().getName();
if (implType == "CPPImplementation")
@@ -90,7 +90,7 @@
Utils::rTokeniseString(".h", headerStub, headerStub, tmp);
CPPImplementation* cppImpl = new CPPImplementation(
- library, header, headerPath, headerStub,
className, scope);
+ composite, library, header, headerPath,
headerStub, className, scope);
return cppImpl;
}
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
Fri Oct 6 01:09:11 2006
@@ -55,7 +55,7 @@
*/
virtual const string& getExtensionTypeQName() {return
typeQName;}
- virtual ComponentType* getImplementation(DataObjectPtr
scdlImplementation);
+ virtual ComponentType* getImplementation(Composite* composite,
DataObjectPtr scdlImplementation);
private:
static const string extensionName;
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
Fri Oct 6 01:09:11 2006
@@ -38,9 +38,9 @@
{
// Constructor
- CPPImplementation::CPPImplementation(const string& library, const
string& header,
+ CPPImplementation::CPPImplementation(Composite* composite, const
string& library, const string& header,
const string&headerPath, const string& headerStub, const
string& className, Scope scope)
- : ComponentType(headerPath + headerStub),
+ : ComponentType(composite, headerPath + headerStub),
library(library), header(header), headerPath(headerPath),
headerStub(headerStub), className(className), scope(scope)
{
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
Fri Oct 6 01:09:11 2006
@@ -60,7 +60,7 @@
* @param className Name of the class in the header file
(could be a blank string
* if this is not specified).
*/
- CPPImplementation(const string& library, const string& header,
const string&headerPath,
+ CPPImplementation(Composite* composite, const string& library,
const string& header, const string&headerPath,
const string& headerStub, const string& className,
Scope scope);
/**
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
Fri Oct 6 01:09:11 2006
@@ -55,7 +55,7 @@
//
===================================================================
// loadModelElement - load the info from implementation.php
//
===================================================================
- ComponentType*
PHPImplementationExtension::getImplementation(DataObjectPtr scdlImplementation)
+ ComponentType*
PHPImplementationExtension::getImplementation(Composite *composite,
DataObjectPtr scdlImplementation)
{
string implType = scdlImplementation->getType().getName();
if (implType == "PHPImplementation")
@@ -63,7 +63,7 @@
string module = scdlImplementation->getCString("module");
string className = scdlImplementation->getCString("class");
- PHPImplementation* phpImpl = new PHPImplementation(module,
className);
+ PHPImplementation* phpImpl = new
PHPImplementation(composite, module, className);
return phpImpl;
}
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
Fri Oct 6 01:09:11 2006
@@ -55,7 +55,7 @@
*/
virtual const string& getExtensionTypeQName() {return
typeQName;}
- virtual ComponentType* getImplementation(DataObjectPtr
scdlImplementation);
+ virtual ComponentType* getImplementation(Composite* composite,
DataObjectPtr scdlImplementation);
private:
static const string extensionName;
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
Fri Oct 6 01:09:11 2006
@@ -37,8 +37,8 @@
{
// Constructor
- PHPImplementation::PHPImplementation(const string& module, const
string& className)
- : ComponentType(module),
+ PHPImplementation::PHPImplementation(Composite* composite, const
string& module, const string& className)
+ : ComponentType(composite, module),
module(module), className(className)
{
LOGENTRY(1,"PHPImplementation::constructor");
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
Fri Oct 6 01:09:11 2006
@@ -45,13 +45,14 @@
public:
/**
* Constructor.
+ * @param composite Composite containing this implementation.
* @param module Name of the module.
* @param modulePath Path to the module (could be a blank
string
* if this is not specified).
* @param className Name of the class in the module (could be
a blank string
* if this is not specified).
*/
- PHPImplementation(const string& module, const string&
className);
+ PHPImplementation(Composite* composite, const string& module,
const string& className);
/**
* Destructor
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
Fri Oct 6 01:09:11 2006
@@ -56,7 +56,7 @@
//
===================================================================
// loadModelElement - load the info from implementation.python
//
===================================================================
- ComponentType*
PythonImplementationExtension::getImplementation(DataObjectPtr
scdlImplementation)
+ ComponentType*
PythonImplementationExtension::getImplementation(Composite *composite,
DataObjectPtr scdlImplementation)
{
string implType = scdlImplementation->getType().getName();
if (implType == "PythonImplementation")
@@ -76,7 +76,7 @@
scope = PythonImplementation::STATELESS;
}
- PythonImplementation* pythonImpl = new
PythonImplementation(module, path, className, scope);
+ PythonImplementation* pythonImpl = new
PythonImplementation(composite, module, path, className, scope);
return pythonImpl;
}
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
Fri Oct 6 01:09:11 2006
@@ -56,7 +56,7 @@
*/
virtual const string& getExtensionTypeQName() {return
typeQName;}
- virtual ComponentType* getImplementation(DataObjectPtr
scdlImplementation);
+ virtual ComponentType* getImplementation(Composite* composite,
DataObjectPtr scdlImplementation);
private:
static const string extensionName;
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
Fri Oct 6 01:09:11 2006
@@ -38,8 +38,8 @@
// Constructor
PythonImplementation::PythonImplementation(
- const string& module, const string& modulePath, const string&
className, Scope scope)
- : ComponentType(modulePath + "/" + module),
+ Composite* composite, const string& module, const string&
modulePath, const string& className, Scope scope)
+ : ComponentType(composite, modulePath + "/" + module),
module(module), modulePath(modulePath),
className(className), scope(scope)
{
LOGENTRY(1,"PythonImplementation::constructor");
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
Fri Oct 6 01:09:11 2006
@@ -55,13 +55,14 @@
/**
* Constructor.
+ * @param composite The composite containing this
implementation.
* @param module Name of the module.
* @param modulePath Path to the module (could be a blank
string
* if this is not specified).
* @param className Name of the class in the module (could be
a blank string
* if this is not specified).
*/
- PythonImplementation(const string& module, const string&
modulePath, const string& className, Scope scope);
+ PythonImplementation(Composite* composite, const string&
module, const string& modulePath, const string& className, Scope scope);
/**
* Destructor
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
Fri Oct 6 01:09:11 2006
@@ -55,7 +55,7 @@
//
===================================================================
// loadModelElement - load the info from implementation.ruby
//
===================================================================
- ComponentType*
RubyImplementationExtension::getImplementation(DataObjectPtr scdlImplementation)
+ ComponentType*
RubyImplementationExtension::getImplementation(Composite *composite,
DataObjectPtr scdlImplementation)
{
string implType = scdlImplementation->getType().getName();
if (implType == "RubyImplementation")
@@ -64,7 +64,7 @@
string className = scdlImplementation->getCString("class");
string script = scdlImplementation->getCString("script");
- RubyImplementation* rubyImpl = new
RubyImplementation(module, className, script);
+ RubyImplementation* rubyImpl = new
RubyImplementation(composite, module, className, script);
return rubyImpl;
}
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
Fri Oct 6 01:09:11 2006
@@ -55,7 +55,7 @@
*/
virtual const string& getExtensionTypeQName() {return
typeQName;}
- virtual ComponentType* getImplementation(DataObjectPtr
scdlImplementation);
+ virtual ComponentType* getImplementation(Composite* composite,
DataObjectPtr scdlImplementation);
private:
static const string extensionName;
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
Fri Oct 6 01:09:11 2006
@@ -43,8 +43,8 @@
VALUE RubyImplementation::xmlDocumentClass = 0;
// Constructor
- RubyImplementation::RubyImplementation(const string& module, const
string& className, const string& script)
- : ComponentType(script.substr(0, script.find_last_of('.'))),
+ RubyImplementation::RubyImplementation(Composite* composite, const
string& module, const string& className, const string& script)
+ : ComponentType(composite, script.substr(0,
script.find_last_of('.'))),
module(module), className(className), script(script)
{
loadClass();
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h?view=diff&rev=453523&r1=453522&r2=453523
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
Fri Oct 6 01:09:11 2006
@@ -48,11 +48,12 @@
public:
/**
* Constructor.
+ * @param composite The composite containing this
implementation.
* @param module Name of the Ruby module.
* @param className Name of the Ruby implementation class.
* @param script Path of the Ruby script.
*/
- RubyImplementation(const string& module, const string&
className, const string& script);
+ RubyImplementation(Composite* composite, const string& module,
const string& className, const string& script);
/**
* Destructor
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
