Author: jsdelfino
Date: Mon Sep 11 21:32:27 2006
New Revision: 442448
URL: http://svn.apache.org/viewvc?view=rev&rev=442448
Log:
Removed the conversational attribute from ServiceType and ReferenceType as it
is defined on Interface
Modified:
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/Contract.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.h
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=442448&r1=442447&r2=442448
==============================================================================
---
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
Mon Sep 11 21:32:27 2006
@@ -45,7 +45,7 @@
// Initialize the component type, service type and service
ComponentType* componentType = getType();
ServiceType* serviceType = new ServiceType(
- componentType, "", intface, callbackInterface,
conversational);
+ componentType, "", intface, callbackInterface);
componentType->addServiceType(serviceType);
service = new Service(this, serviceType);
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=442448&r1=442447&r2=442448
==============================================================================
---
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
Mon Sep 11 21:32:27 2006
@@ -48,7 +48,7 @@
// Initialize the component type, reference type and reference
ComponentType* componentType = getType();
ReferenceType* referenceType = new ReferenceType(
- componentType, "", intface, callbackInterface,
conversational, multiplicity);
+ componentType, "", intface, callbackInterface,
multiplicity);
componentType->addReferenceType(referenceType);
reference = new Reference(this, referenceType);
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.cpp?view=diff&rev=442448&r1=442447&r2=442448
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.cpp
(original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.cpp
Mon Sep 11 21:32:27 2006
@@ -30,8 +30,8 @@
{
// Constructor
- Contract::Contract(Interface *intface, Interface*
callbackInterface, bool conversational) :
- iface(intface), callbackInterface(callbackInterface),
conversational(conversational)
+ Contract::Contract(Interface *intface, Interface*
callbackInterface) :
+ iface(intface), callbackInterface(callbackInterface)
{
}
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.h?view=diff&rev=442448&r1=442447&r2=442448
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.h
(original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/Contract.h Mon
Sep 11 21:32:27 2006
@@ -45,7 +45,7 @@
/**
* Constructor.
*/
- SCA_API Contract(Interface* intface, Interface*
callbackInterface, bool conversational);
+ SCA_API Contract(Interface* intface, Interface*
callbackInterface);
/**
* Destructor.
@@ -64,12 +64,6 @@
*/
SCA_API Interface* getCallbackInterface() const { return
callbackInterface; }
- /**
- * Returns true if the interface contract is conversational.
- * @return True if the interface contract is conversational
- */
- SCA_API bool isConversational() const { return
conversational; }
-
private:
/**
@@ -82,11 +76,6 @@
*/
Interface* callbackInterface;
- /**
- * True if the interface contract is conversational
- */
- bool conversational;
-
};
} // End namespace model
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=442448&r1=442447&r2=442448
==============================================================================
---
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
Mon Sep 11 21:32:27 2006
@@ -437,7 +437,7 @@
{
Interface* iface = getInterface(composite,
serviceTypes[i]);
ServiceType* serviceType = new ServiceType(
- componentType, serviceTypes[i]->getCString("name"),
iface, NULL, false);
+ componentType, serviceTypes[i]->getCString("name"),
iface, NULL);
componentType->addServiceType(serviceType);
}
}
@@ -464,7 +464,7 @@
Interface* iface = getInterface(composite, refs[i]);
ReferenceType* referenceType = new ReferenceType(
- componentType, refs[i]->getCString("name"), iface,
NULL, false, multiplicity);
+ componentType, refs[i]->getCString("name"), iface,
NULL, multiplicity);
componentType->addReferenceType(referenceType);
}
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.cpp?view=diff&rev=442448&r1=442447&r2=442448
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
Mon Sep 11 21:32:27 2006
@@ -31,8 +31,8 @@
// Constructor
ReferenceType::ReferenceType(ComponentType* componentType, const
string& name,
- Interface* intface, Interface* callbackInterface, bool
conversational, Multiplicity multiplicity)
- : Contract(intface, callbackInterface, conversational),
+ Interface* intface, Interface* callbackInterface, Multiplicity
multiplicity)
+ : Contract(intface, callbackInterface),
componentType(componentType), name(name),
multiplicity(multiplicity)
{
}
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.h?view=diff&rev=442448&r1=442447&r2=442448
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.h
(original)
+++
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceType.h
Mon Sep 11 21:32:27 2006
@@ -62,7 +62,7 @@
* @param name The name of the reference.
*/
SCA_API ReferenceType(ComponentType* componentType, const
string& name,
- Interface* intface, Interface* callbackInterface, bool
conversational, Multiplicity multiplicity);
+ Interface* intface, Interface* callbackInterface,
Multiplicity multiplicity);
/**
* Destructor.
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp?view=diff&rev=442448&r1=442447&r2=442448
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.cpp
Mon Sep 11 21:32:27 2006
@@ -30,8 +30,8 @@
// Constructor
ServiceType::ServiceType(ComponentType* componentType, const
string& name,
- Interface* intface, Interface* callbackInterface, bool
conversational)
- : Contract(intface, callbackInterface, conversational),
+ Interface* intface, Interface* callbackInterface)
+ : Contract(intface, callbackInterface),
componentType(componentType), name(name)
{
}
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.h
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.h?view=diff&rev=442448&r1=442447&r2=442448
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.h
(original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ServiceType.h
Mon Sep 11 21:32:27 2006
@@ -49,7 +49,7 @@
* @param name The name of the service.
*/
SCA_API ServiceType(ComponentType* componentType, const
string& name,
- Interface* intface, Interface* callbackInterface, bool
conversational);
+ Interface* intface, Interface* callbackInterface);
/**
* Destructor.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
