From e620fe76290eda17620d54e49c08690d07dce98b Mon Sep 17 00:00:00 2001 From: Paulo Meirelles Date: Wed, 19 Sep 2012 17:41:11 -0300 Subject: [PATCH] [Mezuro] renamed *.yaml to *.yml --- plugins/mezuro/SERVICE | 1 - plugins/mezuro/lib/kalibro/model.rb | 2 +- plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb | 4 ++-- plugins/mezuro/licenses.yaml.example | 69 --------------------------------------------------------------------- plugins/mezuro/licenses.yml.example | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/service.yaml.example | 2 -- plugins/mezuro/service.yml.example | 1 + plugins/mezuro/test/features/echo_port_test.rb | 2 +- 8 files changed, 74 insertions(+), 76 deletions(-) delete mode 100644 plugins/mezuro/SERVICE delete mode 100644 plugins/mezuro/licenses.yaml.example create mode 100644 plugins/mezuro/licenses.yml.example delete mode 100644 plugins/mezuro/service.yaml.example create mode 100644 plugins/mezuro/service.yml.example diff --git a/plugins/mezuro/SERVICE b/plugins/mezuro/SERVICE deleted file mode 100644 index 1240a60..0000000 --- a/plugins/mezuro/SERVICE +++ /dev/null @@ -1 +0,0 @@ -http://valinhos.ime.usp.br:50688/KalibroService/ \ No newline at end of file diff --git a/plugins/mezuro/lib/kalibro/model.rb b/plugins/mezuro/lib/kalibro/model.rb index 38b807a..7da2a03 100644 --- a/plugins/mezuro/lib/kalibro/model.rb +++ b/plugins/mezuro/lib/kalibro/model.rb @@ -88,7 +88,7 @@ class Kalibro::Model end def self.client(endpoint) - service_address = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/service.yaml") + service_address = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/service.yml") Savon::Client.new("#{service_address}#{endpoint}Endpoint/?wsdl") end diff --git a/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb b/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb index 4e0c4e5..82b12e9 100644 --- a/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb +++ b/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb @@ -11,7 +11,7 @@ class MezuroPlugin::Helpers::ContentViewerHelper end def self.create_license_options - options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yaml") + options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yml") options = options.split(";") formated_options = [] options.each { |option| formated_options << [option, option] } @@ -50,7 +50,7 @@ class MezuroPlugin::Helpers::ContentViewerHelper end def self.get_license_option(selected) - options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yaml") + options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yml") options.split(";") selected_option = options.find { |license| license == selected } end diff --git a/plugins/mezuro/licenses.yaml.example b/plugins/mezuro/licenses.yaml.example deleted file mode 100644 index d3f910e..0000000 --- a/plugins/mezuro/licenses.yaml.example +++ /dev/null @@ -1,69 +0,0 @@ -Academic Free License 3.0 (AFL-3.0); -Affero GNU Public License (AGPL-3.0); -Adaptive Public License (APL-1.0); -Apache License 2.0 (Apache-2.0); -Apple Public Source License (APSL-2.0); -Artistic license 2.0 (Artistic-2.0); -Attribution Assurance Licenses (AAL); -BSD 3-Clause "New" or "Revised" License (BSD-3-Clause); -BSD 2-Clause "Simplified" or "FreeBSD" License (BSD-2-Clause); -Boost Software License (BSL-1.0); -Computer Associates Trusted Open Source License 1.1 (CATOSL-1.1); -Common Development and Distribution License 1.0 (CDDL-1.0); -Common Public Attribution License 1.0 (CPAL-1.0); -CUA Office Public License Version 1.0 (CUA-OPL-1.0); -EU DataGrid Software License (EUDatagrid); -Eclipse Public License 1.0 (EPL-1.0); -Educational Community License, Version 2.0 (ECL-2.0); -Eiffel Forum License V2.0 (EFL-2.0); -Entessa Public License (Entessa); -European Union Public License, Version 1.1 (EUPL-1.1); -Fair License (FAIR); -Frameworx License (Frameworx-1.0); -GNU Affero General Public License v3 (AGPL-3.0); -GNU General Public License version 2.0 (GPL-2.0); -GNU General Public License version 3.0 (GPL-3.0); -GNU Library or "Lesser" General Public License version 2.1 (LGPL-2.1); -GNU Library or "Lesser" General Public License version 3.0 (LGPL-3.0); -Historical Permission Notice and Disclaimer (HPND); -IBM Public License 1.0 (IPL-1.0); -IPA Font License (IPA); -ISC License (ISC); -LaTeX Project Public License 1.3c (LPPL-1.3c); -Lucent Public License Version 1.02 (LPL-1.02); -MirOS Licence (MirOS); -Microsoft Public License (Ms-PL); -Microsoft Reciprocal License (Ms-RL); -MIT license (MIT); -Motosoto License (Motosoto); -Mozilla Public License 2.0 (MPL-2.0); -Multics License (Multics); -NASA Open Source Agreement 1.3 (NASA 1.3); -NTP License (NTP); -Naumen Public License (Naumen); -Nethack General Public License (NGPL); -Nokia Open Source License (Nokia); -Non-Profit Open Software License 3.0 (NPOSL-3.0); -OCLC Research Public License 2.0 (OCLC-2.0); -Open Font License 1.1 (OFL 1.1); -Open Group Test Suite License (OGTSL); -Open Software License 3.0 (OSL-3.0); -PHP License 3.0 (PHP-3.0); -The PostgreSQL License (PostgreSQL); -Python License (Python-2.0); -CNRI Python license (CNRI-Python); -Q Public License (QPL-1.0); -RealNetworks Public Source License V1.0 (RPSL-1.0); -Reciprocal Public License 1.5 (RPL-1.5); -Ricoh Source Code Public License (RSCPL); -Simple Public License 2.0 (SimPL-2.0); -Sleepycat License (Sleepycat); -Sun Public License 1.0 (SPL-1.0); -Sybase Open Watcom Public License 1.0 (Watcom-1.0); -University of Illinois/NCSA Open Source License (NCSA); -Vovida Software License v. 1.0 (VSL-1.0); -W3C License (W3C); -wxWindows Library License (WXwindows); -X.Net License (Xnet); -Zope Public License 2.0 (ZPL-2.0); -zlib/libpng license (Zlib); diff --git a/plugins/mezuro/licenses.yml.example b/plugins/mezuro/licenses.yml.example new file mode 100644 index 0000000..d3f910e --- /dev/null +++ b/plugins/mezuro/licenses.yml.example @@ -0,0 +1,69 @@ +Academic Free License 3.0 (AFL-3.0); +Affero GNU Public License (AGPL-3.0); +Adaptive Public License (APL-1.0); +Apache License 2.0 (Apache-2.0); +Apple Public Source License (APSL-2.0); +Artistic license 2.0 (Artistic-2.0); +Attribution Assurance Licenses (AAL); +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause); +BSD 2-Clause "Simplified" or "FreeBSD" License (BSD-2-Clause); +Boost Software License (BSL-1.0); +Computer Associates Trusted Open Source License 1.1 (CATOSL-1.1); +Common Development and Distribution License 1.0 (CDDL-1.0); +Common Public Attribution License 1.0 (CPAL-1.0); +CUA Office Public License Version 1.0 (CUA-OPL-1.0); +EU DataGrid Software License (EUDatagrid); +Eclipse Public License 1.0 (EPL-1.0); +Educational Community License, Version 2.0 (ECL-2.0); +Eiffel Forum License V2.0 (EFL-2.0); +Entessa Public License (Entessa); +European Union Public License, Version 1.1 (EUPL-1.1); +Fair License (FAIR); +Frameworx License (Frameworx-1.0); +GNU Affero General Public License v3 (AGPL-3.0); +GNU General Public License version 2.0 (GPL-2.0); +GNU General Public License version 3.0 (GPL-3.0); +GNU Library or "Lesser" General Public License version 2.1 (LGPL-2.1); +GNU Library or "Lesser" General Public License version 3.0 (LGPL-3.0); +Historical Permission Notice and Disclaimer (HPND); +IBM Public License 1.0 (IPL-1.0); +IPA Font License (IPA); +ISC License (ISC); +LaTeX Project Public License 1.3c (LPPL-1.3c); +Lucent Public License Version 1.02 (LPL-1.02); +MirOS Licence (MirOS); +Microsoft Public License (Ms-PL); +Microsoft Reciprocal License (Ms-RL); +MIT license (MIT); +Motosoto License (Motosoto); +Mozilla Public License 2.0 (MPL-2.0); +Multics License (Multics); +NASA Open Source Agreement 1.3 (NASA 1.3); +NTP License (NTP); +Naumen Public License (Naumen); +Nethack General Public License (NGPL); +Nokia Open Source License (Nokia); +Non-Profit Open Software License 3.0 (NPOSL-3.0); +OCLC Research Public License 2.0 (OCLC-2.0); +Open Font License 1.1 (OFL 1.1); +Open Group Test Suite License (OGTSL); +Open Software License 3.0 (OSL-3.0); +PHP License 3.0 (PHP-3.0); +The PostgreSQL License (PostgreSQL); +Python License (Python-2.0); +CNRI Python license (CNRI-Python); +Q Public License (QPL-1.0); +RealNetworks Public Source License V1.0 (RPSL-1.0); +Reciprocal Public License 1.5 (RPL-1.5); +Ricoh Source Code Public License (RSCPL); +Simple Public License 2.0 (SimPL-2.0); +Sleepycat License (Sleepycat); +Sun Public License 1.0 (SPL-1.0); +Sybase Open Watcom Public License 1.0 (Watcom-1.0); +University of Illinois/NCSA Open Source License (NCSA); +Vovida Software License v. 1.0 (VSL-1.0); +W3C License (W3C); +wxWindows Library License (WXwindows); +X.Net License (Xnet); +Zope Public License 2.0 (ZPL-2.0); +zlib/libpng license (Zlib); diff --git a/plugins/mezuro/service.yaml.example b/plugins/mezuro/service.yaml.example deleted file mode 100644 index 1e7b949..0000000 --- a/plugins/mezuro/service.yaml.example +++ /dev/null @@ -1,2 +0,0 @@ -http://localhost:8080/KalibroService/ -# http://valinhos.ime.usp.br:50688/KalibroService/ diff --git a/plugins/mezuro/service.yml.example b/plugins/mezuro/service.yml.example new file mode 100644 index 0000000..e2127f2 --- /dev/null +++ b/plugins/mezuro/service.yml.example @@ -0,0 +1 @@ +http://localhost:8080/KalibroService/ diff --git a/plugins/mezuro/test/features/echo_port_test.rb b/plugins/mezuro/test/features/echo_port_test.rb index 9ebdfd6..af7e73d 100644 --- a/plugins/mezuro/test/features/echo_port_test.rb +++ b/plugins/mezuro/test/features/echo_port_test.rb @@ -9,7 +9,7 @@ class EchoPortTest < ActiveSupport::TestCase def setup @port = Kalibro::Client::Port.new('Echo') - address = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/service.yaml") + address = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/service.yml") address['KalibroService'] = 'KalibroFake' @port.service_address=(address); end -- libgit2 0.21.2