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 2007/07/17 13:19:14 UTC
svn commit: r556881 - in /incubator/tuscany/cpp/sca/runtime:
core/src/tuscany/sca/model/ extensions/cpp/src/tuscany/sca/cpp/model/
extensions/php/src/tuscany/sca/php/model/
extensions/python/src/tuscany/sca/python/model/
extensions/rest/service/httpd/s...
Author: robbinspg
Date: Tue Jul 17 04:18:57 2007
New Revision: 556881
URL: http://svn.apache.org/viewvc?view=rev&rev=556881
Log:
TUSCANY-1439 Apply Brady's patch
I had to fix one compile error in RubyReferenceBinding
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.h
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp
incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp
incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp Tue Jul 17 04:18:57 2007
@@ -44,7 +44,7 @@
void CompositeReferenceBinding::configure(ServiceBinding *binding)
{
- targetServiceBinding = binding;
+ setTargetServiceBinding(binding);
}
ServiceProxy* CompositeReferenceBinding::getServiceProxy()
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h Tue Jul 17 04:18:57 2007
@@ -71,11 +71,6 @@
*/
SCA_API virtual ServiceProxy* getServiceProxy();
- /**
- * Returns the target service binding.
- */
- ServiceBinding* getTargetServiceBinding() const { return targetServiceBinding; };
-
/**
* Returns the binding URI.
* @return The binding URI.
@@ -89,11 +84,6 @@
* component.
*/
ServiceProxy* serviceProxy;
-
- /**
- * The service binding of the target
- */
- ServiceBinding* targetServiceBinding;
/**
* The binding URI
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp Tue Jul 17 04:18:57 2007
@@ -39,7 +39,7 @@
// Constructor
ReferenceBinding::ReferenceBinding(Reference *reference, const string& uri) :
- Binding(uri), reference(reference)
+ Binding(uri), reference(reference), targetServiceBinding(0)
{
logentry();
}
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.h?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ReferenceBinding.h Tue Jul 17 04:18:57 2007
@@ -83,14 +83,30 @@
* @return The reference.
*/
SCA_API Reference* getReference() const { return reference; };
-
+
+ /**
+ * Returns the target service binding.
+ */
+ SCA_API ServiceBinding* getTargetServiceBinding() const { return targetServiceBinding; };
+
+ protected:
+
+ /**
+ * Sets the target service binding.
+ */
+ SCA_API void setTargetServiceBinding(ServiceBinding* binding) { targetServiceBinding = binding; };
+
private:
/**
* The reference configured with the binding.
*/
Reference* reference;
-
+
+ /**
+ * The service binding of the target
+ */
+ ServiceBinding* targetServiceBinding;
};
} // End namespace model
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp Tue Jul 17 04:18:57 2007
@@ -35,7 +35,7 @@
// Constructor
CPPReferenceBinding::CPPReferenceBinding(Reference* reference)
- : ReferenceBinding(reference, ""), serviceProxy(NULL), targetServiceBinding(NULL)
+ : ReferenceBinding(reference, ""), serviceProxy(NULL)
{
}
@@ -51,7 +51,7 @@
void CPPReferenceBinding::configure(ServiceBinding* binding)
{
- targetServiceBinding = binding;
+ setTargetServiceBinding(binding);
serviceProxy = new CPPServiceProxy(getReference());
}
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h Tue Jul 17 04:18:57 2007
@@ -69,12 +69,7 @@
* Configure this binding from a service binding.
*/
virtual void configure(tuscany::sca::model::ServiceBinding* serviceBinding);
-
- /**
- * Returns the target service binding.
- */
- tuscany::sca::model::ServiceBinding* getTargetServiceBinding() const { return targetServiceBinding; };
-
+
private:
/**
@@ -82,11 +77,7 @@
* component.
*/
ServiceProxy* serviceProxy;
-
- /**
- * The service binding of the target
- */
- tuscany::sca::model::ServiceBinding* targetServiceBinding;
+
};
} // End namespace cpp
Modified: incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp Tue Jul 17 04:18:57 2007
@@ -51,7 +51,7 @@
void PHPReferenceBinding::configure(ServiceBinding* binding)
{
- targetServiceBinding = binding;
+ setTargetServiceBinding(binding);
serviceProxy = new PHPServiceProxy(getReference());
}
Modified: incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h Tue Jul 17 04:18:57 2007
@@ -65,12 +65,7 @@
* Configure this binding from a service binding.
*/
virtual void configure(tuscany::sca::model::ServiceBinding* serviceBinding);
-
- /**
- * Returns the target service binding.
- */
- tuscany::sca::model::ServiceBinding* getTargetServiceBinding() const { return targetServiceBinding; };
-
+
private:
/**
@@ -78,11 +73,6 @@
* component.
*/
ServiceProxy* serviceProxy;
-
- /**
- * The service binding of the target
- */
- tuscany::sca::model::ServiceBinding* targetServiceBinding;
};
} // End namespace php
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp Tue Jul 17 04:18:57 2007
@@ -51,7 +51,7 @@
void PythonReferenceBinding::configure(ServiceBinding* binding)
{
- targetServiceBinding = binding;
+ setTargetServiceBinding(binding);
serviceProxy = new PythonServiceProxy(getReference());
}
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h Tue Jul 17 04:18:57 2007
@@ -65,12 +65,7 @@
* Configure this binding from a service binding.
*/
virtual void configure(tuscany::sca::model::ServiceBinding* serviceBinding);
-
- /**
- * Returns the target service binding.
- */
- tuscany::sca::model::ServiceBinding* getTargetServiceBinding() const { return targetServiceBinding; };
-
+
private:
/**
@@ -78,11 +73,6 @@
* component.
*/
ServiceProxy* serviceProxy;
-
- /**
- * The service binding of the target
- */
- tuscany::sca::model::ServiceBinding* targetServiceBinding;
};
} // End namespace python
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp Tue Jul 17 04:18:57 2007
@@ -49,7 +49,7 @@
{
logentry();
- targetServiceBinding = binding;
+ setTargetServiceBinding(binding);
serviceProxy = new RESTServiceProxy(getReference());
}
Modified: incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h Tue Jul 17 04:18:57 2007
@@ -63,12 +63,7 @@
* client component.
*/
virtual ServiceProxy* getServiceProxy();
-
- /**
- * Returns the target service binding.
- */
- tuscany::sca::model::ServiceBinding* getTargetServiceBinding() const { return targetServiceBinding; };
-
+
private:
/**
@@ -76,11 +71,6 @@
* component.
*/
ServiceProxy* serviceProxy;
-
- /**
- * The service binding of the target
- */
- tuscany::sca::model::ServiceBinding* targetServiceBinding;
};
} // End namespace rest
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp Tue Jul 17 04:18:57 2007
@@ -34,7 +34,7 @@
// Constructor
RubyReferenceBinding::RubyReferenceBinding(Reference* reference)
- : ReferenceBinding(reference, ""), serviceProxy(NULL), targetServiceBinding(NULL)
+ : ReferenceBinding(reference, ""), serviceProxy(NULL)
{
}
@@ -50,7 +50,7 @@
void RubyReferenceBinding::configure(ServiceBinding* binding)
{
- targetServiceBinding = binding;
+ setTargetServiceBinding(binding);
serviceProxy = new RubyServiceProxy(getReference());
}
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h Tue Jul 17 04:18:57 2007
@@ -66,12 +66,7 @@
* Configure this binding from a service binding.
*/
virtual void configure(tuscany::sca::model::ServiceBinding* serviceBinding);
-
- /**
- * Returns the target service binding.
- */
- tuscany::sca::model::ServiceBinding* getTargetServiceBinding() const { return targetServiceBinding; };
-
+
private:
/**
@@ -79,11 +74,6 @@
* component.
*/
ServiceProxy* serviceProxy;
-
- /**
- * The service binding of the target
- */
- tuscany::sca::model::ServiceBinding* targetServiceBinding;
};
} // End namespace ruby
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp Tue Jul 17 04:18:57 2007
@@ -134,7 +134,7 @@
{
logentry();
- targetServiceBinding = binding;
+ setTargetServiceBinding(binding);
serviceProxy = new WSServiceProxy(getReference());
}
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h?view=diff&rev=556881&r1=556880&r2=556881
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h Tue Jul 17 04:18:57 2007
@@ -96,12 +96,7 @@
* @return The SOAP version to use.
*/
std::string getSOAPVersion() const { return soapVersion; };
-
- /**
- * Returns the target service binding.
- */
- tuscany::sca::model::ServiceBinding* getTargetServiceBinding() const { return targetServiceBinding; };
-
+
private:
/**
@@ -139,11 +134,6 @@
* component.
*/
ServiceProxy* serviceProxy;
-
- /**
- * The service binding of the target
- */
- tuscany::sca::model::ServiceBinding* targetServiceBinding;
};
} // End namespace ws
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org