diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/bindings/qmf2/examples/cpp/agent.cpp | 6 | ||||
| -rwxr-xr-x | cpp/bindings/qmf2/examples/python/agent.py | 3 | ||||
| -rw-r--r-- | cpp/bindings/qmf2/python/qmf2.py | 10 | ||||
| -rw-r--r-- | cpp/bindings/qmf2/qmf2.i | 2 | ||||
| -rw-r--r-- | cpp/bindings/qmf2/ruby/qmf2.rb | 4 |
5 files changed, 14 insertions, 11 deletions
diff --git a/cpp/bindings/qmf2/examples/cpp/agent.cpp b/cpp/bindings/qmf2/examples/cpp/agent.cpp index e680ffeeeb..3ec42c8d86 100644 --- a/cpp/bindings/qmf2/examples/cpp/agent.cpp +++ b/cpp/bindings/qmf2/examples/cpp/agent.cpp @@ -60,7 +60,7 @@ ExampleAgent::ExampleAgent(const string& url) // // Create and open a messaging connection to a broker. // - connection = qpid::messaging::Connection(url); + connection = qpid::messaging::Connection(url, "{reconnect:True}"); connection.open(); // @@ -132,7 +132,7 @@ void ExampleAgent::populateData() // // Create a control object and give it to the agent session to manage. // - control = Data(sch_control.getSchemaId()); + control = Data(sch_control); control.setProperty("state", "OPERATIONAL"); control.setProperty("methodCount", 0); controlAddr = session.addData(control, "singleton"); @@ -178,7 +178,7 @@ bool ExampleAgent::method(AgentEvent& event) if (event.getArguments()["useString"]) session.raiseException(event, event.getArguments()["stringVal"]); else { - Data ex(sch_exception.getSchemaId()); + Data ex(sch_exception); ex.setProperty("whatHappened", "It Failed"); ex.setProperty("howBad", 75); ex.setProperty("details", event.getArguments()["details"]); diff --git a/cpp/bindings/qmf2/examples/python/agent.py b/cpp/bindings/qmf2/examples/python/agent.py index d354106042..84d2fe4615 100755 --- a/cpp/bindings/qmf2/examples/python/agent.py +++ b/cpp/bindings/qmf2/examples/python/agent.py @@ -34,7 +34,7 @@ class ExampleAgent(AgentHandler): ## ## Create and open a messaging connection to a broker. ## - self.connection = cqpid.Connection(url) + self.connection = cqpid.Connection(url, "{reconnect:True}") self.session = None self.connection.open() @@ -42,7 +42,6 @@ class ExampleAgent(AgentHandler): ## Create, configure, and open a QMFv2 agent session using the connection. ## self.session = AgentSession(self.connection, "{interval:30}") - self.session.setDomain("test") self.session.setVendor('profitron.com') self.session.setProduct('blastinator') self.session.setAttribute('attr1', 1000) diff --git a/cpp/bindings/qmf2/python/qmf2.py b/cpp/bindings/qmf2/python/qmf2.py index 285b47ebbe..28e40d59ca 100644 --- a/cpp/bindings/qmf2/python/qmf2.py +++ b/cpp/bindings/qmf2/python/qmf2.py @@ -385,10 +385,8 @@ class Data(object): self._impl = cqmf2.Data() elif arg.__class__ == cqmf2.Data: self._impl = arg - elif arg.__class__ == SchemaId: - self._impl = cqmf2.Data(arg._impl) elif arg.__class__ == Schema: - self._impl = cqmf2.Data(arg.getSchemaId()._impl) + self._impl = cqmf2.Data(arg._impl) else: raise Exception("Unsupported initializer for Data") self._schema = None @@ -444,6 +442,7 @@ class Data(object): ## validate that we have the right number of arguments supplied, and marshall them ## into a map for transmission. ## + arglist = [] methods = self._schema.getMethods() for m in methods: if m.getName() == name: @@ -683,6 +682,11 @@ class SchemaProperty(object): """ return self._impl.getName() + def getType(self): + """ + """ + return self._impl.getType() + def getAccess(self): """ """ diff --git a/cpp/bindings/qmf2/qmf2.i b/cpp/bindings/qmf2/qmf2.i index 73b7563498..a09a95168f 100644 --- a/cpp/bindings/qmf2/qmf2.i +++ b/cpp/bindings/qmf2/qmf2.i @@ -33,6 +33,7 @@ #include <qmf/SchemaMethod.h> #include <qmf/SchemaProperty.h> #include <qmf/SchemaTypes.h> +#include <qmf/Subscription.h> %} @@ -54,6 +55,7 @@ %include <qmf/SchemaMethod.h> %include <qmf/SchemaProperty.h> %include <qmf/SchemaTypes.h> +%include <qmf/Subscription.h> %{ diff --git a/cpp/bindings/qmf2/ruby/qmf2.rb b/cpp/bindings/qmf2/ruby/qmf2.rb index 97e71c642b..6c6dbf357d 100644 --- a/cpp/bindings/qmf2/ruby/qmf2.rb +++ b/cpp/bindings/qmf2/ruby/qmf2.rb @@ -250,10 +250,8 @@ module Qmf2 @impl = Cqmf2::Data.new elsif arg.class == Cqmf2::Data @impl = arg - elsif arg.class == SchemaId - @impl = Cqmf2::Data(arg.impl) elsif arg.class == Schema - @impl = Cqmf2::Data(arg.impl.getSchemaId) + @impl = Cqmf2::Data(arg.impl) else raise "Unsupported initializer for Data" end |