From c806c7288d793c187b2badf0e0337a5809d381c4 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Mon, 17 Oct 2011 01:45:00 +0200 Subject: [PATCH] Feature #789: Move ozones api files one level up zona.rb can be found directly in ozones lib/ dir. Install script updated accordingly. --- install.sh | 16 ++++++++-------- src/ozones/Client/lib/{api => }/zona.rb | 0 .../Client/lib/{api => }/zona/OZonesElement.rb | 0 .../Client/lib/{api => }/zona/OZonesJSON.rb | 0 .../Client/lib/{api => }/zona/OZonesPool.rb | 0 .../Client/lib/{api => }/zona/VDCElement.rb | 0 src/ozones/Client/lib/{api => }/zona/VDCPool.rb | 0 .../Client/lib/{api => }/zona/ZoneElement.rb | 0 src/ozones/Client/lib/{api => }/zona/ZonePool.rb | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename src/ozones/Client/lib/{api => }/zona.rb (100%) rename src/ozones/Client/lib/{api => }/zona/OZonesElement.rb (100%) rename src/ozones/Client/lib/{api => }/zona/OZonesJSON.rb (100%) rename src/ozones/Client/lib/{api => }/zona/OZonesPool.rb (100%) rename src/ozones/Client/lib/{api => }/zona/VDCElement.rb (100%) rename src/ozones/Client/lib/{api => }/zona/VDCPool.rb (100%) rename src/ozones/Client/lib/{api => }/zona/ZoneElement.rb (100%) rename src/ozones/Client/lib/{api => }/zona/ZonePool.rb (100%) diff --git a/install.sh b/install.sh index 4b79fbb55e..f7404fca77 100755 --- a/install.sh +++ b/install.sh @@ -1059,15 +1059,15 @@ OZONES_LIB_ZONE_FILES="src/ozones/Server/lib/OZones/Zones.rb \ src/ozones/Server/lib/OZones/AggregatedImages.rb \ src/ozones/Server/lib/OZones/AggregatedTemplates.rb" -OZONES_LIB_API_FILES="src/ozones/Client/lib/api/zona.rb" +OZONES_LIB_API_FILES="src/ozones/Client/lib/zona.rb" -OZONES_LIB_API_ZONA_FILES="src/ozones/Client/lib/api/zona/ZoneElement.rb \ - src/ozones/Client/lib/api/zona/OZonesPool.rb \ - src/ozones/Client/lib/api/zona/OZonesJSON.rb \ - src/ozones/Client/lib/api/zona/VDCPool.rb \ - src/ozones/Client/lib/api/zona/VDCElement.rb \ - src/ozones/Client/lib/api/zona/OZonesElement.rb \ - src/ozones/Client/lib/api/zona/ZonePool.rb" +OZONES_LIB_API_ZONA_FILES="src/ozones/Client/lib/zona/ZoneElement.rb \ + src/ozones/Client/lib/zona/OZonesPool.rb \ + src/ozones/Client/lib/zona/OZonesJSON.rb \ + src/ozones/Client/lib/zona/VDCPool.rb \ + src/ozones/Client/lib/zona/VDCElement.rb \ + src/ozones/Client/lib/zona/OZonesElement.rb \ + src/ozones/Client/lib/zona/ZonePool.rb" OZONES_PUBLIC_VENDOR_JQUERY=$SUNSTONE_PUBLIC_VENDOR_JQUERY diff --git a/src/ozones/Client/lib/api/zona.rb b/src/ozones/Client/lib/zona.rb similarity index 100% rename from src/ozones/Client/lib/api/zona.rb rename to src/ozones/Client/lib/zona.rb diff --git a/src/ozones/Client/lib/api/zona/OZonesElement.rb b/src/ozones/Client/lib/zona/OZonesElement.rb similarity index 100% rename from src/ozones/Client/lib/api/zona/OZonesElement.rb rename to src/ozones/Client/lib/zona/OZonesElement.rb diff --git a/src/ozones/Client/lib/api/zona/OZonesJSON.rb b/src/ozones/Client/lib/zona/OZonesJSON.rb similarity index 100% rename from src/ozones/Client/lib/api/zona/OZonesJSON.rb rename to src/ozones/Client/lib/zona/OZonesJSON.rb diff --git a/src/ozones/Client/lib/api/zona/OZonesPool.rb b/src/ozones/Client/lib/zona/OZonesPool.rb similarity index 100% rename from src/ozones/Client/lib/api/zona/OZonesPool.rb rename to src/ozones/Client/lib/zona/OZonesPool.rb diff --git a/src/ozones/Client/lib/api/zona/VDCElement.rb b/src/ozones/Client/lib/zona/VDCElement.rb similarity index 100% rename from src/ozones/Client/lib/api/zona/VDCElement.rb rename to src/ozones/Client/lib/zona/VDCElement.rb diff --git a/src/ozones/Client/lib/api/zona/VDCPool.rb b/src/ozones/Client/lib/zona/VDCPool.rb similarity index 100% rename from src/ozones/Client/lib/api/zona/VDCPool.rb rename to src/ozones/Client/lib/zona/VDCPool.rb diff --git a/src/ozones/Client/lib/api/zona/ZoneElement.rb b/src/ozones/Client/lib/zona/ZoneElement.rb similarity index 100% rename from src/ozones/Client/lib/api/zona/ZoneElement.rb rename to src/ozones/Client/lib/zona/ZoneElement.rb diff --git a/src/ozones/Client/lib/api/zona/ZonePool.rb b/src/ozones/Client/lib/zona/ZonePool.rb similarity index 100% rename from src/ozones/Client/lib/api/zona/ZonePool.rb rename to src/ozones/Client/lib/zona/ZonePool.rb