From 67a33f23e9f35cc94bd9af36b1f9b47338ad3484 Mon Sep 17 00:00:00 2001 From: Olivier Mehani Date: Tue, 23 Sep 2014 11:39:55 +1000 Subject: [PATCH 1/2] Restore OMF-5 backward compatibility * Map old bindProperty to setProperty, and issue a warning that it is deprecated; * Don't complain about 'version' is deprecated and not supported; * Use path instead of bin_path; fixes: #1804 Signed-off-by: Olivier Mehani --- omf_ec/lib/omf_ec/app_definition.rb | 3 --- omf_ec/lib/omf_ec/context/app_context.rb | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/omf_ec/lib/omf_ec/app_definition.rb b/omf_ec/lib/omf_ec/app_definition.rb index db449464..d010753d 100644 --- a/omf_ec/lib/omf_ec/app_definition.rb +++ b/omf_ec/lib/omf_ec/app_definition.rb @@ -41,11 +41,8 @@ def define_measurement_point(mp) end end - warn_removed :version - def path=(arg) @properties[:binary_path] = arg - warn_deprecation :path=, :binary_path= end def shortDescription=(arg) diff --git a/omf_ec/lib/omf_ec/context/app_context.rb b/omf_ec/lib/omf_ec/context/app_context.rb index 5185b5f1..9e8ccf4d 100644 --- a/omf_ec/lib/omf_ec/context/app_context.rb +++ b/omf_ec/lib/omf_ec/context/app_context.rb @@ -24,6 +24,11 @@ def initialize(name, group) end end + def bindProperty(key, property_value) + warn_deprecation :bindProperty, :setProperty + setProperty(key, property_value) + end + def setProperty(key, property_value) app_def_param = app_def.properties.parameters raise OEDLUnknownProperty.new(key, "Unknown parameter '#{key}' for application "+ From 8b1691395e4c47a7fa5752395826ee7538914552 Mon Sep 17 00:00:00 2001 From: Olivier Mehani Date: Thu, 9 Oct 2014 16:24:17 +1100 Subject: [PATCH 2/2] Partial revert of 67a33f2 for bindProperty Signed-off-by: Olivier Mehani --- omf_ec/lib/omf_ec/context/app_context.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/omf_ec/lib/omf_ec/context/app_context.rb b/omf_ec/lib/omf_ec/context/app_context.rb index 9e8ccf4d..5185b5f1 100644 --- a/omf_ec/lib/omf_ec/context/app_context.rb +++ b/omf_ec/lib/omf_ec/context/app_context.rb @@ -24,11 +24,6 @@ def initialize(name, group) end end - def bindProperty(key, property_value) - warn_deprecation :bindProperty, :setProperty - setProperty(key, property_value) - end - def setProperty(key, property_value) app_def_param = app_def.properties.parameters raise OEDLUnknownProperty.new(key, "Unknown parameter '#{key}' for application "+