From c10b9630caca6fda9b991a29fcb76eb0e2a745bc Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 12 Sep 2011 18:15:07 +0200 Subject: [PATCH] Remove duplicated JSONUtils file --- install.sh | 2 +- src/ozones/Server/models/JSONUtils.rb | 87 --------------------------- 2 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 src/ozones/Server/models/JSONUtils.rb diff --git a/install.sh b/install.sh index a2aada53ec..8a28e0d9cd 100755 --- a/install.sh +++ b/install.sh @@ -1033,7 +1033,7 @@ OZONES_ETC_FILES="src/ozones/Server/etc/ozones-server.conf" OZONES_MODELS_FILES="src/ozones/Server/models/OzonesServer.rb \ src/ozones/Server/models/Auth.rb \ src/ozones/Server/models/OCAInteraction.rb \ - src/ozones/Server/models/JSONUtils.rb" + src/sunstone/models/OpenNebulaJSON/JSONUtils.rb" OZONES_TEMPLATE_FILES="src/ozones/Server/templates/index.html \ src/ozones/Server/templates/login.html" diff --git a/src/ozones/Server/models/JSONUtils.rb b/src/ozones/Server/models/JSONUtils.rb deleted file mode 100644 index 85a23d9bb2..0000000000 --- a/src/ozones/Server/models/JSONUtils.rb +++ /dev/null @@ -1,87 +0,0 @@ -# -------------------------------------------------------------------------- # -# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); you may # -# not use this file except in compliance with the License. You may obtain # -# a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -#--------------------------------------------------------------------------- # - -require 'json' - -module JSONUtils - def to_json - begin - JSON.pretty_generate self.to_hash - rescue Exception => e - OpenNebula::Error.new(e.message) - end - end - - def parse_json(json_str, root_element) - begin - hash = JSON.parse(json_str) - rescue Exception => e - return OpenNebula::Error.new(e.message) - end - - if hash.has_key?(root_element) - return hash[root_element] - else - return OpenNebula::Error.new("Error parsing JSON: Wrong resource type") - end - end - - def template_to_str(attributes, indent=true) - if indent - ind_enter="\n" - ind_tab=' ' - else - ind_enter='' - ind_tab=' ' - end - - str=attributes.collect do |key, value| - if value - str_line="" - if value.class==Array && !value.empty? - value.each do |value2| - str_line << key.to_s.upcase << "=[" << ind_enter - if value2 && value2.class==Hash - str_line << value2.collect do |key3, value3| - str = ind_tab + key3.to_s.upcase + "=" - str += "\"#{value3.to_s}\"" if value3 - str - end.compact.join(",\n") - end - str_line << "\n]\n" - end - - elsif value.class==Hash && !value.empty? - str_line << key.to_s.upcase << "=[" << ind_enter - - str_line << value.collect do |key3, value3| - str = ind_tab + key3.to_s.upcase + "=" - str += "\"#{value3.to_s}\"" if value3 - str - end.compact.join(",\n") - - str_line << "\n]\n" - - else - str_line<