From d23b32500f0868507d07e60d4491d81ca45c234e Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Fri, 14 Apr 2017 23:08:55 +0100 Subject: [PATCH] relocate repo files so ND2 is the only code --- Netdisco/Build.PL => Build.PL | 0 Netdisco/Changes => Changes | 0 Netdisco/MANIFEST => MANIFEST | 0 Netdisco/MANIFEST.SKIP => MANIFEST.SKIP | 0 Netdisco/META.json => META.json | 0 Netdisco/META.yml => META.yml | 0 Makefile.PL | 15 - Netdisco/LICENCE | 24 - Netdisco/README.md => README.md | 0 Web-Plugin-Observium/Changes | 15 - Web-Plugin-Observium/LICENCE | 24 - Web-Plugin-Observium/MANIFEST | 18 - Web-Plugin-Observium/META.yml | 27 - Web-Plugin-Observium/Makefile.PL | 15 - Web-Plugin-Observium/inc/Module/Install.pm | 470 ------------ .../inc/Module/Install/Base.pm | 83 -- .../inc/Module/Install/Can.pm | 154 ---- .../inc/Module/Install/Fetch.pm | 93 --- .../inc/Module/Install/Makefile.pm | 418 ---------- .../inc/Module/Install/Metadata.pm | 722 ------------------ .../inc/Module/Install/Share.pm | 96 --- .../inc/Module/Install/Win32.pm | 64 -- .../inc/Module/Install/WriteAll.pm | 63 -- .../lib/App/NetdiscoX/Web/Plugin/Observium.pm | 94 --- .../plugin/observium/device_port_column.tt | 6 - .../views/plugin/observium/observium.css | 6 - .../share/views/plugin/observium/observium.js | 25 - Web-Plugin-RANCID/Changes | 21 - Web-Plugin-RANCID/LICENCE | 24 - Web-Plugin-RANCID/MANIFEST | 16 - Web-Plugin-RANCID/META.yml | 27 - Web-Plugin-RANCID/Makefile.PL | 15 - Web-Plugin-RANCID/inc/Module/Install.pm | 470 ------------ Web-Plugin-RANCID/inc/Module/Install/Base.pm | 83 -- Web-Plugin-RANCID/inc/Module/Install/Can.pm | 154 ---- Web-Plugin-RANCID/inc/Module/Install/Fetch.pm | 93 --- .../inc/Module/Install/Makefile.pm | 418 ---------- .../inc/Module/Install/Metadata.pm | 722 ------------------ Web-Plugin-RANCID/inc/Module/Install/Share.pm | 96 --- Web-Plugin-RANCID/inc/Module/Install/Win32.pm | 64 -- .../inc/Module/Install/WriteAll.pm | 63 -- .../lib/App/NetdiscoX/Web/Plugin/RANCID.pm | 152 ---- .../views/plugin/rancid/device_details.tt | 3 - {Netdisco/bin => bin}/nd-dbic-versions | 0 {Netdisco/bin => bin}/nd-import-topology | 0 {Netdisco/bin => bin}/netdisco-daemon | 0 {Netdisco/bin => bin}/netdisco-daemon-fg | 0 {Netdisco/bin => bin}/netdisco-db-deploy | 0 {Netdisco/bin => bin}/netdisco-deploy | 0 {Netdisco/bin => bin}/netdisco-do | 0 {Netdisco/bin => bin}/netdisco-rancid-export | 0 {Netdisco/bin => bin}/netdisco-sshcollector | 0 {Netdisco/bin => bin}/netdisco-web | 0 {Netdisco/bin => bin}/netdisco-web-fg | 0 inc/Module/Install.pm | 470 ------------ inc/Module/Install/Base.pm | 83 -- inc/Module/Install/Can.pm | 154 ---- inc/Module/Install/Fetch.pm | 93 --- inc/Module/Install/Makefile.pm | 418 ---------- inc/Module/Install/Metadata.pm | 722 ------------------ inc/Module/Install/Win32.pm | 64 -- inc/Module/Install/WriteAll.pm | 63 -- {Netdisco/lib => lib}/App/Netdisco.pm | 0 .../App/Netdisco/AnyEvent/Nbtstat.pm | 0 .../lib => lib}/App/Netdisco/Configuration.pm | 0 .../lib => lib}/App/Netdisco/Core/Arpnip.pm | 0 .../lib => lib}/App/Netdisco/Core/Discover.pm | 0 .../lib => lib}/App/Netdisco/Core/Macsuck.pm | 0 .../lib => lib}/App/Netdisco/Core/Nbtstat.pm | 0 {Netdisco/lib => lib}/App/Netdisco/DB.pm | 0 .../App/Netdisco/DB/ExplicitLocking.pm | 0 .../App/Netdisco/DB/Result/Admin.pm | 0 .../App/Netdisco/DB/Result/Community.pm | 0 .../App/Netdisco/DB/Result/Device.pm | 0 .../App/Netdisco/DB/Result/DeviceIp.pm | 0 .../App/Netdisco/DB/Result/DeviceModule.pm | 0 .../App/Netdisco/DB/Result/DevicePort.pm | 0 .../App/Netdisco/DB/Result/DevicePortLog.pm | 0 .../App/Netdisco/DB/Result/DevicePortPower.pm | 0 .../App/Netdisco/DB/Result/DevicePortSsid.pm | 0 .../App/Netdisco/DB/Result/DevicePortVlan.pm | 0 .../Netdisco/DB/Result/DevicePortWireless.pm | 0 .../App/Netdisco/DB/Result/DevicePower.pm | 0 .../App/Netdisco/DB/Result/DeviceRoute.pm | 0 .../App/Netdisco/DB/Result/DeviceVlan.pm | 0 .../lib => lib}/App/Netdisco/DB/Result/Log.pm | 0 .../App/Netdisco/DB/Result/Node.pm | 0 .../App/Netdisco/DB/Result/NodeIp.pm | 0 .../App/Netdisco/DB/Result/NodeMonitor.pm | 0 .../App/Netdisco/DB/Result/NodeNbt.pm | 0 .../App/Netdisco/DB/Result/NodeWireless.pm | 0 .../lib => lib}/App/Netdisco/DB/Result/Oui.pm | 0 .../App/Netdisco/DB/Result/Process.pm | 0 .../App/Netdisco/DB/Result/Session.pm | 0 .../App/Netdisco/DB/Result/Subnet.pm | 0 .../App/Netdisco/DB/Result/Topology.pm | 0 .../App/Netdisco/DB/Result/User.pm | 0 .../App/Netdisco/DB/Result/UserLog.pm | 0 .../Netdisco/DB/Result/Virtual/ActiveNode.pm | 0 .../DB/Result/Virtual/ActiveNodeWithAge.pm | 0 .../DB/Result/Virtual/ApRadioChannelPower.pm | 0 .../App/Netdisco/DB/Result/Virtual/CidrIps.pm | 0 .../DB/Result/Virtual/DeviceDnsMismatch.pm | 0 .../Netdisco/DB/Result/Virtual/DeviceLinks.pm | 0 .../DB/Result/Virtual/DevicePoeStatus.pm | 0 .../DB/Result/Virtual/DuplexMismatch.pm | 0 .../DB/Result/Virtual/GenericReport.pm | 0 .../App/Netdisco/DB/Result/Virtual/NodeIp4.pm | 0 .../App/Netdisco/DB/Result/Virtual/NodeIp6.pm | 0 .../Netdisco/DB/Result/Virtual/NodeMonitor.pm | 0 .../Netdisco/DB/Result/Virtual/NodeWithAge.pm | 0 .../DB/Result/Virtual/NodesDiscovered.pm | 0 .../DB/Result/Virtual/OrphanedDevices.pm | 0 .../DB/Result/Virtual/PollerPerformance.pm | 0 .../DB/Result/Virtual/PortUtilization.pm | 0 .../Netdisco/DB/Result/Virtual/SlowDevices.pm | 0 .../DB/Result/Virtual/SubnetUtilization.pm | 0 .../DB/Result/Virtual/UnDirEdgesAgg.pm | 0 .../Result/Virtual/UndiscoveredNeighbors.pm | 0 .../Netdisco/DB/Result/Virtual/UserRole.pm | 0 .../lib => lib}/App/Netdisco/DB/ResultSet.pm | 0 .../App/Netdisco/DB/ResultSet/Admin.pm | 0 .../App/Netdisco/DB/ResultSet/Device.pm | 0 .../App/Netdisco/DB/ResultSet/DeviceModule.pm | 0 .../App/Netdisco/DB/ResultSet/DevicePort.pm | 0 .../Netdisco/DB/ResultSet/DevicePortLog.pm | 0 .../Netdisco/DB/ResultSet/DevicePortSsid.pm | 0 .../App/Netdisco/DB/ResultSet/DevicePower.pm | 0 .../App/Netdisco/DB/ResultSet/Node.pm | 0 .../App/Netdisco/DB/ResultSet/NodeIp.pm | 0 .../App/Netdisco/DB/ResultSet/NodeNbt.pm | 0 .../App/Netdisco/DB/ResultSet/NodeWireless.pm | 0 .../App/Netdisco/DB/ResultSet/Subnet.pm | 0 .../App-Netdisco-DB-1-2-PostgreSQL.sql | 0 .../App-Netdisco-DB-10-11-PostgreSQL.sql | 0 .../App-Netdisco-DB-11-12-PostgreSQL.sql | 0 .../App-Netdisco-DB-12-13-PostgreSQL.sql | 0 .../App-Netdisco-DB-13-14-PostgreSQL.sql | 0 .../App-Netdisco-DB-14-15-PostgreSQL.sql | 0 .../App-Netdisco-DB-15-16-PostgreSQL.sql | 0 .../App-Netdisco-DB-16-17-PostgreSQL.sql | 0 .../App-Netdisco-DB-17-18-PostgreSQL.sql | 0 .../App-Netdisco-DB-18-19-PostgreSQL.sql | 0 .../App-Netdisco-DB-19-20-PostgreSQL.sql | 0 .../App-Netdisco-DB-2-3-PostgreSQL.sql | 0 .../App-Netdisco-DB-20-21-PostgreSQL.sql | 0 .../App-Netdisco-DB-21-22-PostgreSQL.sql | 0 .../App-Netdisco-DB-22-23-PostgreSQL.sql | 0 .../App-Netdisco-DB-23-24-PostgreSQL.sql | 0 .../App-Netdisco-DB-24-25-PostgreSQL.sql | 0 .../App-Netdisco-DB-25-26-PostgreSQL.sql | 0 .../App-Netdisco-DB-26-27-PostgreSQL.sql | 0 .../App-Netdisco-DB-27-28-PostgreSQL.sql | 0 .../App-Netdisco-DB-28-29-PostgreSQL.sql | 0 .../App-Netdisco-DB-29-30-PostgreSQL.sql | 0 .../App-Netdisco-DB-3-4-PostgreSQL.sql | 0 .../App-Netdisco-DB-30-31-PostgreSQL.sql | 0 .../App-Netdisco-DB-31-32-PostgreSQL.sql | 0 .../App-Netdisco-DB-32-33-PostgreSQL.sql | 0 .../App-Netdisco-DB-33-34-PostgreSQL.sql | 0 .../App-Netdisco-DB-34-35-PostgreSQL.sql | 0 .../App-Netdisco-DB-35-36-PostgreSQL.sql | 0 .../App-Netdisco-DB-36-37-PostgreSQL.sql | 0 .../App-Netdisco-DB-37-38-PostgreSQL.sql | 0 .../App-Netdisco-DB-38-39-PostgreSQL.sql | 0 .../App-Netdisco-DB-39-40-PostgreSQL.sql | 0 .../App-Netdisco-DB-4-5-PostgreSQL.sql | 0 .../App-Netdisco-DB-40-41-PostgreSQL.sql | 0 .../App-Netdisco-DB-5-6-PostgreSQL.sql | 0 .../App-Netdisco-DB-6-7-PostgreSQL.sql | 0 .../App-Netdisco-DB-7-8-PostgreSQL.sql | 0 .../App-Netdisco-DB-8-9-PostgreSQL.sql | 0 .../App-Netdisco-DB-9-10-PostgreSQL.sql | 0 .../lib => lib}/App/Netdisco/Daemon/Job.pm | 0 .../lib => lib}/App/Netdisco/Daemon/Util.pm | 0 .../App/Netdisco/Daemon/Worker/Common.pm | 0 .../Worker/Interactive/DeviceActions.pm | 0 .../Daemon/Worker/Interactive/PortActions.pm | 0 .../App/Netdisco/Daemon/Worker/Manager.pm | 0 .../App/Netdisco/Daemon/Worker/Poller.pm | 0 .../Netdisco/Daemon/Worker/Poller/Arpnip.pm | 0 .../Netdisco/Daemon/Worker/Poller/Common.pm | 0 .../Netdisco/Daemon/Worker/Poller/Device.pm | 0 .../Netdisco/Daemon/Worker/Poller/Expiry.pm | 0 .../Netdisco/Daemon/Worker/Poller/Macsuck.pm | 0 .../Netdisco/Daemon/Worker/Poller/Nbtstat.pm | 0 .../App/Netdisco/Daemon/Worker/Scheduler.pm | 0 .../lib => lib}/App/Netdisco/Environment.pm | 0 .../lib => lib}/App/Netdisco/GenericDB.pm | 0 .../GenericDB/Result/Virtual/GenericReport.pm | 0 .../lib => lib}/App/Netdisco/JobQueue.pm | 0 .../App/Netdisco/JobQueue/PostgreSQL.pm | 0 .../App/Netdisco/Manual/BSDInstall.pod | 0 .../App/Netdisco/Manual/Configuration.pod | 0 .../App/Netdisco/Manual/Deployment.pod | 0 .../App/Netdisco/Manual/Developing.pod | 0 .../App/Netdisco/Manual/ReleaseNotes.pod | 0 .../App/Netdisco/Manual/Systemd.pod | 0 .../App/Netdisco/Manual/Troubleshooting.pod | 0 .../App/Netdisco/Manual/Vendors.pod | 0 .../App/Netdisco/Manual/WritingPlugins.pod | 0 .../App/Netdisco/SSHCollector/Platform/ACE.pm | 0 .../App/Netdisco/SSHCollector/Platform/ASA.pm | 0 .../Netdisco/SSHCollector/Platform/BigIP.pm | 0 .../Netdisco/SSHCollector/Platform/CPVSX.pm | 0 .../Netdisco/SSHCollector/Platform/FreeBSD.pm | 0 .../SSHCollector/Platform/GAIAEmbedded.pm | 0 .../App/Netdisco/SSHCollector/Platform/IOS.pm | 0 .../Netdisco/SSHCollector/Platform/IOSXR.pm | 0 .../Netdisco/SSHCollector/Platform/Linux.pm | 0 .../SSHCollector/Platform/PaloAlto.pm | 0 .../lib => lib}/App/Netdisco/Util/DNS.pm | 0 .../lib => lib}/App/Netdisco/Util/Daemon.pm | 0 .../lib => lib}/App/Netdisco/Util/Device.pm | 0 .../App/Netdisco/Util/ExpandParams.pm | 0 .../lib => lib}/App/Netdisco/Util/Graph.pm | 0 .../lib => lib}/App/Netdisco/Util/Node.pm | 0 .../App/Netdisco/Util/NodeMonitor.pm | 0 .../lib => lib}/App/Netdisco/Util/Noop.pm | 0 .../App/Netdisco/Util/Permission.pm | 0 .../lib => lib}/App/Netdisco/Util/Port.pm | 0 .../lib => lib}/App/Netdisco/Util/PortMAC.pm | 0 .../lib => lib}/App/Netdisco/Util/SNMP.pm | 0 .../lib => lib}/App/Netdisco/Util/Web.pm | 0 {Netdisco/lib => lib}/App/Netdisco/Web.pm | 0 .../lib => lib}/App/Netdisco/Web/AdminTask.pm | 0 .../App/Netdisco/Web/Auth/Provider/DBIC.pm | 0 .../lib => lib}/App/Netdisco/Web/AuthN.pm | 0 .../lib => lib}/App/Netdisco/Web/Device.pm | 0 .../App/Netdisco/Web/GenericReport.pm | 0 .../lib => lib}/App/Netdisco/Web/Password.pm | 0 .../lib => lib}/App/Netdisco/Web/Plugin.pm | 0 .../Netdisco/Web/Plugin/AdminTask/JobQueue.pm | 0 .../Web/Plugin/AdminTask/NodeMonitor.pm | 0 .../Web/Plugin/AdminTask/OrphanedDevices.pm | 0 .../Web/Plugin/AdminTask/PollerPerformance.pm | 0 .../Web/Plugin/AdminTask/PseudoDevice.pm | 0 .../Web/Plugin/AdminTask/SlowDevices.pm | 0 .../Netdisco/Web/Plugin/AdminTask/Topology.pm | 0 .../Plugin/AdminTask/UndiscoveredNeighbors.pm | 0 .../Netdisco/Web/Plugin/AdminTask/UserLog.pm | 0 .../Netdisco/Web/Plugin/AdminTask/Users.pm | 0 .../Netdisco/Web/Plugin/Device/Addresses.pm | 0 .../App/Netdisco/Web/Plugin/Device/Details.pm | 0 .../App/Netdisco/Web/Plugin/Device/Modules.pm | 0 .../Netdisco/Web/Plugin/Device/Neighbors.pm | 0 .../App/Netdisco/Web/Plugin/Device/Ports.pm | 0 .../App/Netdisco/Web/Plugin/Inventory.pm | 0 .../Web/Plugin/Report/ApChannelDist.pm | 0 .../Netdisco/Web/Plugin/Report/ApClients.pm | 0 .../Web/Plugin/Report/ApRadioChannelPower.pm | 0 .../Web/Plugin/Report/DeviceAddrNoDNS.pm | 0 .../Web/Plugin/Report/DeviceByLocation.pm | 0 .../Web/Plugin/Report/DeviceDnsMismatch.pm | 0 .../Web/Plugin/Report/DevicePoeStatus.pm | 0 .../Web/Plugin/Report/DuplexMismatch.pm | 0 .../Netdisco/Web/Plugin/Report/HalfDuplex.pm | 0 .../Web/Plugin/Report/InventoryByModelByOS.pm | 0 .../Netdisco/Web/Plugin/Report/IpInventory.pm | 0 .../Web/Plugin/Report/ModuleInventory.pm | 0 .../App/Netdisco/Web/Plugin/Report/Netbios.pm | 0 .../Web/Plugin/Report/NodeMultiIPs.pm | 0 .../Netdisco/Web/Plugin/Report/NodeVendor.pm | 0 .../Web/Plugin/Report/NodesDiscovered.pm | 0 .../Web/Plugin/Report/PortAdminDown.pm | 0 .../Web/Plugin/Report/PortBlocking.pm | 0 .../App/Netdisco/Web/Plugin/Report/PortLog.pm | 0 .../Web/Plugin/Report/PortMultiNodes.pm | 0 .../Netdisco/Web/Plugin/Report/PortSsid.pm | 0 .../Web/Plugin/Report/PortUtilization.pm | 0 .../Web/Plugin/Report/SsidInventory.pm | 0 .../Web/Plugin/Report/SubnetUtilization.pm | 0 .../Web/Plugin/Report/VlanInventory.pm | 0 .../App/Netdisco/Web/Plugin/Search/Device.pm | 0 .../App/Netdisco/Web/Plugin/Search/Node.pm | 0 .../App/Netdisco/Web/Plugin/Search/Port.pm | 0 .../App/Netdisco/Web/Plugin/Search/VLAN.pm | 0 .../App/Netdisco/Web/PortControl.pm | 0 .../lib => lib}/App/Netdisco/Web/Report.pm | 0 .../lib => lib}/App/Netdisco/Web/Search.pm | 0 .../lib => lib}/App/Netdisco/Web/Static.pm | 0 .../App/Netdisco/Web/Statistics.pm | 0 .../lib => lib}/App/Netdisco/Web/TypeAhead.pm | 0 .../Template/NetdiscoTemplateToolkit.pm | 0 {Netdisco/lib => lib}/auto/App/Netdisco | 0 {Netdisco/share => share}/config.yml | 0 .../environments/deployment.yml | 0 {Netdisco/share => share}/public/500.html | 0 .../public/css/bootstrap-tree.css | 0 .../public/css/bootstrap.min.css | 0 .../public/css/dataTables.bootstrap.css | 0 .../public/css/daterangepicker-bs2.css | 0 .../public/css/font-awesome.min.css | 0 .../public/css/jquery.qtip.min.css | 0 .../share => share}/public/css/nd_print.css | 0 .../share => share}/public/css/netdisco.css | 0 .../smoothness/images/animated-overlay.gif | Bin .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_flat_75_ffffff_40x100.png | Bin .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin .../images/ui-bg_glass_65_ffffff_1x400.png | Bin .../images/ui-bg_glass_75_dadada_1x400.png | Bin .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin .../images/ui-icons_222222_256x240.png | Bin .../images/ui-icons_2e83ff_256x240.png | Bin .../images/ui-icons_454545_256x240.png | Bin .../images/ui-icons_888888_256x240.png | Bin .../images/ui-icons_cd0a0a_256x240.png | Bin .../css/smoothness/jquery-ui.custom.min.css | 0 .../share => share}/public/css/toastr.css | 0 {Netdisco/share => share}/public/dispatch.cgi | 0 .../share => share}/public/dispatch.fcgi | 0 .../public/font/FontAwesome.otf | Bin .../public/font/fontawesome-webfont.eot | Bin .../public/font/fontawesome-webfont.svg | 0 .../public/font/fontawesome-webfont.ttf | Bin .../public/font/fontawesome-webfont.woff | Bin .../public/images/crystalclear_mag.png | Bin .../public/images/diagona_settings.png | Bin .../public/images/dusseldorf_settings.png | Bin .../public/images/glyphicons_072_bookmark.png | Bin .../public/images/matte_basic_pin.png | Bin .../public/images/navbar_disco.png | Bin .../public/images/sort_asc.png | Bin .../public/images/sort_asc_disabled.png | Bin .../public/images/sort_both.png | Bin .../public/images/sort_desc.png | Bin .../public/images/sort_desc_disabled.png | Bin .../public/images/splashyfish_left.png | Bin .../public/images/splashyfish_right.png | Bin .../public/images/tango_sweep.png | Bin .../public/images/vaga_copy.png | Bin .../public/javascripts/bootstrap.min.js | 0 .../public/javascripts/d3.min.js | 0 .../javascripts/dataTables.bootstrap.js | 0 .../dataTables.ip-address-detect.js | 0 .../javascripts/dataTables.ip-address-sort.js | 0 .../public/javascripts/daterangepicker.js | 0 .../share => share}/public/javascripts/he.js | 0 .../public/javascripts/jquery-deserialize.js | 0 .../public/javascripts/jquery-history.js | 0 .../public/javascripts/jquery-latest.min.js | 0 .../javascripts/jquery-ui.custom.min.js | 0 .../public/javascripts/jquery.cookie.js | 0 .../javascripts/jquery.dataTables.min.js | 0 .../public/javascripts/jquery.floatThead.js | 0 .../public/javascripts/jquery.qtip.min.js | 0 .../public/javascripts/moment.min.js | 0 .../public/javascripts/natural.js | 0 .../public/javascripts/netdisco.js | 0 .../javascripts/netdisco_portcontrol.js | 0 .../public/javascripts/portsort.js | 0 .../public/javascripts/toastr.js | 0 .../public/javascripts/underscore.min.js | 0 {Netdisco/share => share}/views/admintask.tt | 0 .../views/ajax/admintask/jobqueue.tt | 0 .../views/ajax/admintask/nodemonitor.tt | 0 .../views/ajax/admintask/orphaned.tt | 0 .../views/ajax/admintask/orphaned_csv.tt | 0 .../views/ajax/admintask/performance.tt | 0 .../views/ajax/admintask/pseudodevice.tt | 0 .../views/ajax/admintask/slowdevices.tt | 0 .../views/ajax/admintask/topology.tt | 0 .../ajax/admintask/undiscoveredneighbors.tt | 0 .../admintask/undiscoveredneighbors_csv.tt | 0 .../views/ajax/admintask/userlog.tt | 0 .../views/ajax/admintask/users.tt | 0 .../views/ajax/admintask/users_csv.tt | 0 .../views/ajax/datatabledefaults.tt | 0 .../views/ajax/device/addresses.tt | 0 .../views/ajax/device/addresses_csv.tt | 0 .../views/ajax/device/details.tt | 0 .../views/ajax/device/modules.tt | 0 .../views/ajax/device/netmap.tt | 0 .../views/ajax/device/ports.tt | 0 .../views/ajax/device/ports_csv.tt | 0 .../views/ajax/report/apchanneldist.tt | 0 .../views/ajax/report/apchanneldist_csv.tt | 0 .../views/ajax/report/apclients.tt | 0 .../views/ajax/report/apclients_csv.tt | 0 .../views/ajax/report/apradiochannelpower.tt | 0 .../ajax/report/apradiochannelpower_csv.tt | 0 .../views/ajax/report/deviceaddrnodns.tt | 0 .../views/ajax/report/deviceaddrnodns_csv.tt | 0 .../views/ajax/report/devicebylocation.tt | 0 .../views/ajax/report/devicebylocation_csv.tt | 0 .../views/ajax/report/devicednsmismatch.tt | 0 .../ajax/report/devicednsmismatch_csv.tt | 0 .../views/ajax/report/devicepoestatus.tt | 0 .../views/ajax/report/devicepoestatus_csv.tt | 0 .../views/ajax/report/duplexmismatch.tt | 0 .../views/ajax/report/duplexmismatch_csv.tt | 0 .../views/ajax/report/generic_report.tt | 0 .../views/ajax/report/generic_report_csv.tt | 0 .../views/ajax/report/halfduplex.tt | 0 .../views/ajax/report/halfduplex_csv.tt | 0 .../views/ajax/report/inventorybymodelbyos.tt | 0 .../views/ajax/report/ipinventory.tt | 0 .../views/ajax/report/ipinventory_csv.tt | 0 .../views/ajax/report/moduleinventory.tt | 0 .../views/ajax/report/moduleinventory_csv.tt | 0 .../views/ajax/report/netbios.tt | 0 .../views/ajax/report/netbios_csv.tt | 0 .../views/ajax/report/nodemultiips.tt | 0 .../views/ajax/report/nodemultiips_csv.tt | 0 .../views/ajax/report/nodesdiscovered.tt | 0 .../views/ajax/report/nodesdiscovered_csv.tt | 0 .../views/ajax/report/nodevendor.tt | 0 .../views/ajax/report/nodevendor_csv.tt | 0 .../views/ajax/report/portadmindown.tt | 0 .../views/ajax/report/portadmindown_csv.tt | 0 .../views/ajax/report/portblocking.tt | 0 .../views/ajax/report/portblocking_csv.tt | 0 .../views/ajax/report/portlog.tt | 0 .../views/ajax/report/portmultinodes.tt | 0 .../views/ajax/report/portmultinodes_csv.tt | 0 .../views/ajax/report/portssid.tt | 0 .../views/ajax/report/portssid_csv.tt | 0 .../views/ajax/report/portutilization.tt | 0 .../views/ajax/report/portutilization_csv.tt | 0 .../views/ajax/report/subnets.tt | 0 .../views/ajax/report/subnets_csv.tt | 0 .../views/ajax/report/vlaninventory.tt | 0 .../views/ajax/report/vlaninventory_csv.tt | 0 .../views/ajax/search/device.tt | 0 .../views/ajax/search/device_csv.tt | 0 .../views/ajax/search/node_by_ip.tt | 0 .../views/ajax/search/node_by_mac.tt | 0 .../share => share}/views/ajax/search/port.tt | 0 .../views/ajax/search/port_csv.tt | 0 .../share => share}/views/ajax/search/vlan.tt | 0 .../views/ajax/search/vlan_csv.tt | 0 .../share => share}/views/ajax/statistics.tt | 0 {Netdisco/share => share}/views/device.tt | 0 {Netdisco/share => share}/views/index.tt | 0 {Netdisco/share => share}/views/inventory.tt | 0 .../share => share}/views/js/admintask.js | 0 .../views/js/bootstrap-tree.js | 0 {Netdisco/share => share}/views/js/common.js | 0 {Netdisco/share => share}/views/js/device.js | 0 {Netdisco/share => share}/views/js/report.js | 0 {Netdisco/share => share}/views/js/search.js | 0 .../share => share}/views/layouts/main.tt | 0 {Netdisco/share => share}/views/password.tt | 0 {Netdisco/share => share}/views/plugin.tt | 0 {Netdisco/share => share}/views/report.tt | 0 {Netdisco/share => share}/views/search.tt | 0 .../views/sidebar/device/netmap.tt | 0 .../views/sidebar/device/ports.tt | 0 .../views/sidebar/report/generic_report.tt | 0 .../views/sidebar/report/ipinventory.tt | 0 .../views/sidebar/report/moduleinventory.tt | 0 .../views/sidebar/report/netbios.tt | 0 .../views/sidebar/report/nodesdiscovered.tt | 0 .../views/sidebar/report/nodevendor.tt | 0 .../views/sidebar/report/portlog.tt | 0 .../views/sidebar/report/portmultinodes.tt | 0 .../views/sidebar/report/portssid.tt | 0 .../views/sidebar/report/subnets.tt | 0 .../views/sidebar/search/device.tt | 0 .../views/sidebar/search/node.tt | 0 .../views/sidebar/search/port.tt | 0 {Netdisco/t => t}/10-sort_port.t | 0 {Netdisco/t => t}/11-portsort.t | 0 {Netdisco/t => t}/html/portsort.html | 0 {Netdisco/t => t}/js/qunit-tap.js | 0 {Netdisco/t => t}/js/run_qunit.js | 0 469 files changed, 6920 deletions(-) rename Netdisco/Build.PL => Build.PL (100%) rename Netdisco/Changes => Changes (100%) rename Netdisco/MANIFEST => MANIFEST (100%) rename Netdisco/MANIFEST.SKIP => MANIFEST.SKIP (100%) rename Netdisco/META.json => META.json (100%) rename Netdisco/META.yml => META.yml (100%) delete mode 100644 Makefile.PL delete mode 100644 Netdisco/LICENCE rename Netdisco/README.md => README.md (100%) delete mode 100644 Web-Plugin-Observium/Changes delete mode 100644 Web-Plugin-Observium/LICENCE delete mode 100644 Web-Plugin-Observium/MANIFEST delete mode 100644 Web-Plugin-Observium/META.yml delete mode 100644 Web-Plugin-Observium/Makefile.PL delete mode 100644 Web-Plugin-Observium/inc/Module/Install.pm delete mode 100644 Web-Plugin-Observium/inc/Module/Install/Base.pm delete mode 100644 Web-Plugin-Observium/inc/Module/Install/Can.pm delete mode 100644 Web-Plugin-Observium/inc/Module/Install/Fetch.pm delete mode 100644 Web-Plugin-Observium/inc/Module/Install/Makefile.pm delete mode 100644 Web-Plugin-Observium/inc/Module/Install/Metadata.pm delete mode 100644 Web-Plugin-Observium/inc/Module/Install/Share.pm delete mode 100644 Web-Plugin-Observium/inc/Module/Install/Win32.pm delete mode 100644 Web-Plugin-Observium/inc/Module/Install/WriteAll.pm delete mode 100644 Web-Plugin-Observium/lib/App/NetdiscoX/Web/Plugin/Observium.pm delete mode 100644 Web-Plugin-Observium/share/views/plugin/observium/device_port_column.tt delete mode 100644 Web-Plugin-Observium/share/views/plugin/observium/observium.css delete mode 100644 Web-Plugin-Observium/share/views/plugin/observium/observium.js delete mode 100644 Web-Plugin-RANCID/Changes delete mode 100644 Web-Plugin-RANCID/LICENCE delete mode 100644 Web-Plugin-RANCID/MANIFEST delete mode 100644 Web-Plugin-RANCID/META.yml delete mode 100644 Web-Plugin-RANCID/Makefile.PL delete mode 100644 Web-Plugin-RANCID/inc/Module/Install.pm delete mode 100644 Web-Plugin-RANCID/inc/Module/Install/Base.pm delete mode 100644 Web-Plugin-RANCID/inc/Module/Install/Can.pm delete mode 100644 Web-Plugin-RANCID/inc/Module/Install/Fetch.pm delete mode 100644 Web-Plugin-RANCID/inc/Module/Install/Makefile.pm delete mode 100644 Web-Plugin-RANCID/inc/Module/Install/Metadata.pm delete mode 100644 Web-Plugin-RANCID/inc/Module/Install/Share.pm delete mode 100644 Web-Plugin-RANCID/inc/Module/Install/Win32.pm delete mode 100644 Web-Plugin-RANCID/inc/Module/Install/WriteAll.pm delete mode 100644 Web-Plugin-RANCID/lib/App/NetdiscoX/Web/Plugin/RANCID.pm delete mode 100644 Web-Plugin-RANCID/share/views/plugin/rancid/device_details.tt rename {Netdisco/bin => bin}/nd-dbic-versions (100%) rename {Netdisco/bin => bin}/nd-import-topology (100%) rename {Netdisco/bin => bin}/netdisco-daemon (100%) rename {Netdisco/bin => bin}/netdisco-daemon-fg (100%) rename {Netdisco/bin => bin}/netdisco-db-deploy (100%) rename {Netdisco/bin => bin}/netdisco-deploy (100%) rename {Netdisco/bin => bin}/netdisco-do (100%) rename {Netdisco/bin => bin}/netdisco-rancid-export (100%) rename {Netdisco/bin => bin}/netdisco-sshcollector (100%) rename {Netdisco/bin => bin}/netdisco-web (100%) rename {Netdisco/bin => bin}/netdisco-web-fg (100%) delete mode 100644 inc/Module/Install.pm delete mode 100644 inc/Module/Install/Base.pm delete mode 100644 inc/Module/Install/Can.pm delete mode 100644 inc/Module/Install/Fetch.pm delete mode 100644 inc/Module/Install/Makefile.pm delete mode 100644 inc/Module/Install/Metadata.pm delete mode 100644 inc/Module/Install/Win32.pm delete mode 100644 inc/Module/Install/WriteAll.pm rename {Netdisco/lib => lib}/App/Netdisco.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/AnyEvent/Nbtstat.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Configuration.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Core/Arpnip.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Core/Discover.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Core/Macsuck.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Core/Nbtstat.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/ExplicitLocking.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Admin.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Community.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Device.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/DeviceIp.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/DeviceModule.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/DevicePort.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/DevicePortLog.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/DevicePortPower.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/DevicePortSsid.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/DevicePortVlan.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/DevicePortWireless.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/DevicePower.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/DeviceRoute.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/DeviceVlan.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Log.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Node.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/NodeIp.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/NodeMonitor.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/NodeNbt.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/NodeWireless.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Oui.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Process.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Session.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Subnet.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Topology.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/User.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/UserLog.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/ActiveNode.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/ApRadioChannelPower.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/CidrIps.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/DeviceDnsMismatch.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/DevicePoeStatus.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/DuplexMismatch.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/GenericReport.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/NodeIp4.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/NodeIp6.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/NodeMonitor.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/NodesDiscovered.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/OrphanedDevices.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/PollerPerformance.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/PortUtilization.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/SlowDevices.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/SubnetUtilization.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/UnDirEdgesAgg.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/UndiscoveredNeighbors.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/Result/Virtual/UserRole.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/ResultSet.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/ResultSet/Admin.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/ResultSet/Device.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/ResultSet/DeviceModule.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/ResultSet/DevicePort.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/ResultSet/DevicePortLog.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/ResultSet/DevicePortSsid.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/ResultSet/DevicePower.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/ResultSet/Node.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/ResultSet/NodeIp.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/ResultSet/NodeNbt.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/ResultSet/NodeWireless.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/ResultSet/Subnet.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-1-2-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-10-11-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-11-12-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-12-13-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-13-14-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-14-15-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-15-16-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-16-17-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-17-18-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-18-19-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-19-20-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-2-3-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-20-21-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-21-22-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-22-23-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-23-24-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-24-25-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-25-26-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-26-27-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-27-28-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-28-29-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-29-30-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-4-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-30-31-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-31-32-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-32-33-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-33-34-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-34-35-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-35-36-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-36-37-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-37-38-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-38-39-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-39-40-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-5-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-40-41-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-5-6-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-6-7-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-7-8-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/DB/schema_versions/App-Netdisco-DB-9-10-PostgreSQL.sql (100%) rename {Netdisco/lib => lib}/App/Netdisco/Daemon/Job.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Daemon/Util.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Daemon/Worker/Common.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Daemon/Worker/Manager.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Daemon/Worker/Poller.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Daemon/Worker/Poller/Arpnip.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Daemon/Worker/Poller/Common.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Daemon/Worker/Poller/Device.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Daemon/Worker/Poller/Expiry.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Daemon/Worker/Poller/Macsuck.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Daemon/Worker/Poller/Nbtstat.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Daemon/Worker/Scheduler.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Environment.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/GenericDB.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/GenericDB/Result/Virtual/GenericReport.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/JobQueue.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/JobQueue/PostgreSQL.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Manual/BSDInstall.pod (100%) rename {Netdisco/lib => lib}/App/Netdisco/Manual/Configuration.pod (100%) rename {Netdisco/lib => lib}/App/Netdisco/Manual/Deployment.pod (100%) rename {Netdisco/lib => lib}/App/Netdisco/Manual/Developing.pod (100%) rename {Netdisco/lib => lib}/App/Netdisco/Manual/ReleaseNotes.pod (100%) rename {Netdisco/lib => lib}/App/Netdisco/Manual/Systemd.pod (100%) rename {Netdisco/lib => lib}/App/Netdisco/Manual/Troubleshooting.pod (100%) rename {Netdisco/lib => lib}/App/Netdisco/Manual/Vendors.pod (100%) rename {Netdisco/lib => lib}/App/Netdisco/Manual/WritingPlugins.pod (100%) rename {Netdisco/lib => lib}/App/Netdisco/SSHCollector/Platform/ACE.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/SSHCollector/Platform/ASA.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/SSHCollector/Platform/BigIP.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/SSHCollector/Platform/CPVSX.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/SSHCollector/Platform/FreeBSD.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/SSHCollector/Platform/GAIAEmbedded.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/SSHCollector/Platform/IOS.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/SSHCollector/Platform/IOSXR.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/SSHCollector/Platform/Linux.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/SSHCollector/Platform/PaloAlto.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Util/DNS.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Util/Daemon.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Util/Device.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Util/ExpandParams.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Util/Graph.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Util/Node.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Util/NodeMonitor.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Util/Noop.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Util/Permission.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Util/Port.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Util/PortMAC.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Util/SNMP.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Util/Web.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/AdminTask.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Auth/Provider/DBIC.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/AuthN.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Device.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/GenericReport.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Password.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/AdminTask/JobQueue.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/AdminTask/NodeMonitor.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/AdminTask/OrphanedDevices.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/AdminTask/PollerPerformance.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/AdminTask/SlowDevices.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/AdminTask/Topology.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/AdminTask/UndiscoveredNeighbors.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/AdminTask/UserLog.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/AdminTask/Users.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Device/Addresses.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Device/Details.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Device/Modules.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Device/Neighbors.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Device/Ports.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Inventory.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/ApChannelDist.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/ApClients.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/ApRadioChannelPower.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/DeviceAddrNoDNS.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/DeviceByLocation.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/DeviceDnsMismatch.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/DevicePoeStatus.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/DuplexMismatch.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/HalfDuplex.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/InventoryByModelByOS.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/IpInventory.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/Netbios.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/NodeMultiIPs.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/NodeVendor.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/NodesDiscovered.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/PortBlocking.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/PortLog.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/PortSsid.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/PortUtilization.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/SsidInventory.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Report/VlanInventory.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Search/Device.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Search/Node.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Search/Port.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Plugin/Search/VLAN.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/PortControl.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Report.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Search.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Static.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/Statistics.pm (100%) rename {Netdisco/lib => lib}/App/Netdisco/Web/TypeAhead.pm (100%) rename {Netdisco/lib => lib}/Dancer/Template/NetdiscoTemplateToolkit.pm (100%) rename {Netdisco/lib => lib}/auto/App/Netdisco (100%) rename {Netdisco/share => share}/config.yml (100%) rename {Netdisco/share => share}/environments/deployment.yml (100%) rename {Netdisco/share => share}/public/500.html (100%) rename {Netdisco/share => share}/public/css/bootstrap-tree.css (100%) rename {Netdisco/share => share}/public/css/bootstrap.min.css (100%) rename {Netdisco/share => share}/public/css/dataTables.bootstrap.css (100%) rename {Netdisco/share => share}/public/css/daterangepicker-bs2.css (100%) rename {Netdisco/share => share}/public/css/font-awesome.min.css (100%) rename {Netdisco/share => share}/public/css/jquery.qtip.min.css (100%) rename {Netdisco/share => share}/public/css/nd_print.css (100%) rename {Netdisco/share => share}/public/css/netdisco.css (100%) rename {Netdisco/share => share}/public/css/smoothness/images/animated-overlay.gif (100%) rename {Netdisco/share => share}/public/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename {Netdisco/share => share}/public/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png (100%) rename {Netdisco/share => share}/public/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png (100%) rename {Netdisco/share => share}/public/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png (100%) rename {Netdisco/share => share}/public/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png (100%) rename {Netdisco/share => share}/public/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png (100%) rename {Netdisco/share => share}/public/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png (100%) rename {Netdisco/share => share}/public/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%) rename {Netdisco/share => share}/public/css/smoothness/images/ui-icons_222222_256x240.png (100%) rename {Netdisco/share => share}/public/css/smoothness/images/ui-icons_2e83ff_256x240.png (100%) rename {Netdisco/share => share}/public/css/smoothness/images/ui-icons_454545_256x240.png (100%) rename {Netdisco/share => share}/public/css/smoothness/images/ui-icons_888888_256x240.png (100%) rename {Netdisco/share => share}/public/css/smoothness/images/ui-icons_cd0a0a_256x240.png (100%) rename {Netdisco/share => share}/public/css/smoothness/jquery-ui.custom.min.css (100%) rename {Netdisco/share => share}/public/css/toastr.css (100%) rename {Netdisco/share => share}/public/dispatch.cgi (100%) rename {Netdisco/share => share}/public/dispatch.fcgi (100%) rename {Netdisco/share => share}/public/font/FontAwesome.otf (100%) rename {Netdisco/share => share}/public/font/fontawesome-webfont.eot (100%) rename {Netdisco/share => share}/public/font/fontawesome-webfont.svg (100%) rename {Netdisco/share => share}/public/font/fontawesome-webfont.ttf (100%) rename {Netdisco/share => share}/public/font/fontawesome-webfont.woff (100%) rename {Netdisco/share => share}/public/images/crystalclear_mag.png (100%) rename {Netdisco/share => share}/public/images/diagona_settings.png (100%) rename {Netdisco/share => share}/public/images/dusseldorf_settings.png (100%) rename {Netdisco/share => share}/public/images/glyphicons_072_bookmark.png (100%) rename {Netdisco/share => share}/public/images/matte_basic_pin.png (100%) rename {Netdisco/share => share}/public/images/navbar_disco.png (100%) rename {Netdisco/share => share}/public/images/sort_asc.png (100%) rename {Netdisco/share => share}/public/images/sort_asc_disabled.png (100%) rename {Netdisco/share => share}/public/images/sort_both.png (100%) rename {Netdisco/share => share}/public/images/sort_desc.png (100%) rename {Netdisco/share => share}/public/images/sort_desc_disabled.png (100%) rename {Netdisco/share => share}/public/images/splashyfish_left.png (100%) rename {Netdisco/share => share}/public/images/splashyfish_right.png (100%) rename {Netdisco/share => share}/public/images/tango_sweep.png (100%) rename {Netdisco/share => share}/public/images/vaga_copy.png (100%) rename {Netdisco/share => share}/public/javascripts/bootstrap.min.js (100%) rename {Netdisco/share => share}/public/javascripts/d3.min.js (100%) rename {Netdisco/share => share}/public/javascripts/dataTables.bootstrap.js (100%) rename {Netdisco/share => share}/public/javascripts/dataTables.ip-address-detect.js (100%) rename {Netdisco/share => share}/public/javascripts/dataTables.ip-address-sort.js (100%) rename {Netdisco/share => share}/public/javascripts/daterangepicker.js (100%) rename {Netdisco/share => share}/public/javascripts/he.js (100%) rename {Netdisco/share => share}/public/javascripts/jquery-deserialize.js (100%) rename {Netdisco/share => share}/public/javascripts/jquery-history.js (100%) rename {Netdisco/share => share}/public/javascripts/jquery-latest.min.js (100%) rename {Netdisco/share => share}/public/javascripts/jquery-ui.custom.min.js (100%) rename {Netdisco/share => share}/public/javascripts/jquery.cookie.js (100%) rename {Netdisco/share => share}/public/javascripts/jquery.dataTables.min.js (100%) rename {Netdisco/share => share}/public/javascripts/jquery.floatThead.js (100%) rename {Netdisco/share => share}/public/javascripts/jquery.qtip.min.js (100%) rename {Netdisco/share => share}/public/javascripts/moment.min.js (100%) rename {Netdisco/share => share}/public/javascripts/natural.js (100%) rename {Netdisco/share => share}/public/javascripts/netdisco.js (100%) rename {Netdisco/share => share}/public/javascripts/netdisco_portcontrol.js (100%) rename {Netdisco/share => share}/public/javascripts/portsort.js (100%) rename {Netdisco/share => share}/public/javascripts/toastr.js (100%) rename {Netdisco/share => share}/public/javascripts/underscore.min.js (100%) rename {Netdisco/share => share}/views/admintask.tt (100%) rename {Netdisco/share => share}/views/ajax/admintask/jobqueue.tt (100%) rename {Netdisco/share => share}/views/ajax/admintask/nodemonitor.tt (100%) rename {Netdisco/share => share}/views/ajax/admintask/orphaned.tt (100%) rename {Netdisco/share => share}/views/ajax/admintask/orphaned_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/admintask/performance.tt (100%) rename {Netdisco/share => share}/views/ajax/admintask/pseudodevice.tt (100%) rename {Netdisco/share => share}/views/ajax/admintask/slowdevices.tt (100%) rename {Netdisco/share => share}/views/ajax/admintask/topology.tt (100%) rename {Netdisco/share => share}/views/ajax/admintask/undiscoveredneighbors.tt (100%) rename {Netdisco/share => share}/views/ajax/admintask/undiscoveredneighbors_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/admintask/userlog.tt (100%) rename {Netdisco/share => share}/views/ajax/admintask/users.tt (100%) rename {Netdisco/share => share}/views/ajax/admintask/users_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/datatabledefaults.tt (100%) rename {Netdisco/share => share}/views/ajax/device/addresses.tt (100%) rename {Netdisco/share => share}/views/ajax/device/addresses_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/device/details.tt (100%) rename {Netdisco/share => share}/views/ajax/device/modules.tt (100%) rename {Netdisco/share => share}/views/ajax/device/netmap.tt (100%) rename {Netdisco/share => share}/views/ajax/device/ports.tt (100%) rename {Netdisco/share => share}/views/ajax/device/ports_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/apchanneldist.tt (100%) rename {Netdisco/share => share}/views/ajax/report/apchanneldist_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/apclients.tt (100%) rename {Netdisco/share => share}/views/ajax/report/apclients_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/apradiochannelpower.tt (100%) rename {Netdisco/share => share}/views/ajax/report/apradiochannelpower_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/deviceaddrnodns.tt (100%) rename {Netdisco/share => share}/views/ajax/report/deviceaddrnodns_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/devicebylocation.tt (100%) rename {Netdisco/share => share}/views/ajax/report/devicebylocation_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/devicednsmismatch.tt (100%) rename {Netdisco/share => share}/views/ajax/report/devicednsmismatch_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/devicepoestatus.tt (100%) rename {Netdisco/share => share}/views/ajax/report/devicepoestatus_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/duplexmismatch.tt (100%) rename {Netdisco/share => share}/views/ajax/report/duplexmismatch_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/generic_report.tt (100%) rename {Netdisco/share => share}/views/ajax/report/generic_report_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/halfduplex.tt (100%) rename {Netdisco/share => share}/views/ajax/report/halfduplex_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/inventorybymodelbyos.tt (100%) rename {Netdisco/share => share}/views/ajax/report/ipinventory.tt (100%) rename {Netdisco/share => share}/views/ajax/report/ipinventory_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/moduleinventory.tt (100%) rename {Netdisco/share => share}/views/ajax/report/moduleinventory_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/netbios.tt (100%) rename {Netdisco/share => share}/views/ajax/report/netbios_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/nodemultiips.tt (100%) rename {Netdisco/share => share}/views/ajax/report/nodemultiips_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/nodesdiscovered.tt (100%) rename {Netdisco/share => share}/views/ajax/report/nodesdiscovered_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/nodevendor.tt (100%) rename {Netdisco/share => share}/views/ajax/report/nodevendor_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/portadmindown.tt (100%) rename {Netdisco/share => share}/views/ajax/report/portadmindown_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/portblocking.tt (100%) rename {Netdisco/share => share}/views/ajax/report/portblocking_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/portlog.tt (100%) rename {Netdisco/share => share}/views/ajax/report/portmultinodes.tt (100%) rename {Netdisco/share => share}/views/ajax/report/portmultinodes_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/portssid.tt (100%) rename {Netdisco/share => share}/views/ajax/report/portssid_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/portutilization.tt (100%) rename {Netdisco/share => share}/views/ajax/report/portutilization_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/subnets.tt (100%) rename {Netdisco/share => share}/views/ajax/report/subnets_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/report/vlaninventory.tt (100%) rename {Netdisco/share => share}/views/ajax/report/vlaninventory_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/search/device.tt (100%) rename {Netdisco/share => share}/views/ajax/search/device_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/search/node_by_ip.tt (100%) rename {Netdisco/share => share}/views/ajax/search/node_by_mac.tt (100%) rename {Netdisco/share => share}/views/ajax/search/port.tt (100%) rename {Netdisco/share => share}/views/ajax/search/port_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/search/vlan.tt (100%) rename {Netdisco/share => share}/views/ajax/search/vlan_csv.tt (100%) rename {Netdisco/share => share}/views/ajax/statistics.tt (100%) rename {Netdisco/share => share}/views/device.tt (100%) rename {Netdisco/share => share}/views/index.tt (100%) rename {Netdisco/share => share}/views/inventory.tt (100%) rename {Netdisco/share => share}/views/js/admintask.js (100%) rename {Netdisco/share => share}/views/js/bootstrap-tree.js (100%) rename {Netdisco/share => share}/views/js/common.js (100%) rename {Netdisco/share => share}/views/js/device.js (100%) rename {Netdisco/share => share}/views/js/report.js (100%) rename {Netdisco/share => share}/views/js/search.js (100%) rename {Netdisco/share => share}/views/layouts/main.tt (100%) rename {Netdisco/share => share}/views/password.tt (100%) rename {Netdisco/share => share}/views/plugin.tt (100%) rename {Netdisco/share => share}/views/report.tt (100%) rename {Netdisco/share => share}/views/search.tt (100%) rename {Netdisco/share => share}/views/sidebar/device/netmap.tt (100%) rename {Netdisco/share => share}/views/sidebar/device/ports.tt (100%) rename {Netdisco/share => share}/views/sidebar/report/generic_report.tt (100%) rename {Netdisco/share => share}/views/sidebar/report/ipinventory.tt (100%) rename {Netdisco/share => share}/views/sidebar/report/moduleinventory.tt (100%) rename {Netdisco/share => share}/views/sidebar/report/netbios.tt (100%) rename {Netdisco/share => share}/views/sidebar/report/nodesdiscovered.tt (100%) rename {Netdisco/share => share}/views/sidebar/report/nodevendor.tt (100%) rename {Netdisco/share => share}/views/sidebar/report/portlog.tt (100%) rename {Netdisco/share => share}/views/sidebar/report/portmultinodes.tt (100%) rename {Netdisco/share => share}/views/sidebar/report/portssid.tt (100%) rename {Netdisco/share => share}/views/sidebar/report/subnets.tt (100%) rename {Netdisco/share => share}/views/sidebar/search/device.tt (100%) rename {Netdisco/share => share}/views/sidebar/search/node.tt (100%) rename {Netdisco/share => share}/views/sidebar/search/port.tt (100%) rename {Netdisco/t => t}/10-sort_port.t (100%) rename {Netdisco/t => t}/11-portsort.t (100%) rename {Netdisco/t => t}/html/portsort.html (100%) rename {Netdisco/t => t}/js/qunit-tap.js (100%) rename {Netdisco/t => t}/js/run_qunit.js (100%) diff --git a/Netdisco/Build.PL b/Build.PL similarity index 100% rename from Netdisco/Build.PL rename to Build.PL diff --git a/Netdisco/Changes b/Changes similarity index 100% rename from Netdisco/Changes rename to Changes diff --git a/Netdisco/MANIFEST b/MANIFEST similarity index 100% rename from Netdisco/MANIFEST rename to MANIFEST diff --git a/Netdisco/MANIFEST.SKIP b/MANIFEST.SKIP similarity index 100% rename from Netdisco/MANIFEST.SKIP rename to MANIFEST.SKIP diff --git a/Netdisco/META.json b/META.json similarity index 100% rename from Netdisco/META.json rename to META.json diff --git a/Netdisco/META.yml b/META.yml similarity index 100% rename from Netdisco/META.yml rename to META.yml diff --git a/Makefile.PL b/Makefile.PL deleted file mode 100644 index 33976c17..00000000 --- a/Makefile.PL +++ /dev/null @@ -1,15 +0,0 @@ -use inc::Module::Install; - -name 'App-Netdisco'; -license 'bsd'; -all_from 'Netdisco/lib/App/Netdisco.pm'; - -build_subdirs 'Netdisco'; - -resources - homepage => 'http://netdisco.org/', - bugtracker => 'http://sourceforge.net/p/netdisco/bugs/', - repository => 'git://git.code.sf.net/p/netdisco/netdisco-ng', - MailingList => 'https://lists.sourceforge.net/lists/listinfo/netdisco-users'; - -WriteAll; diff --git a/Netdisco/LICENCE b/Netdisco/LICENCE deleted file mode 100644 index acff9c0b..00000000 --- a/Netdisco/LICENCE +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (c) 2012, The Netdisco Developer Team -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Netdisco Project nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE NETDISCO DEVELOPER TEAM BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Netdisco/README.md b/README.md similarity index 100% rename from Netdisco/README.md rename to README.md diff --git a/Web-Plugin-Observium/Changes b/Web-Plugin-Observium/Changes deleted file mode 100644 index 2710e182..00000000 --- a/Web-Plugin-Observium/Changes +++ /dev/null @@ -1,15 +0,0 @@ -2.003000 - 2014-02-04 - - * Change to using location and open_in_same_window - -2.002001 - 2014-02-27 - - * Fix config param name - -2.002000 - 2014-02-27 - - * Support HTTPS with http_secure parameter - -2.001000 - 2013-12-08 - - * Initial release diff --git a/Web-Plugin-Observium/LICENCE b/Web-Plugin-Observium/LICENCE deleted file mode 100644 index acff9c0b..00000000 --- a/Web-Plugin-Observium/LICENCE +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (c) 2012, The Netdisco Developer Team -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Netdisco Project nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE NETDISCO DEVELOPER TEAM BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Web-Plugin-Observium/MANIFEST b/Web-Plugin-Observium/MANIFEST deleted file mode 100644 index 99516c15..00000000 --- a/Web-Plugin-Observium/MANIFEST +++ /dev/null @@ -1,18 +0,0 @@ -Changes -inc/Module/Install.pm -inc/Module/Install/Base.pm -inc/Module/Install/Can.pm -inc/Module/Install/Fetch.pm -inc/Module/Install/Makefile.pm -inc/Module/Install/Metadata.pm -inc/Module/Install/Share.pm -inc/Module/Install/Win32.pm -inc/Module/Install/WriteAll.pm -lib/App/NetdiscoX/Web/Plugin/Observium.pm -LICENCE -Makefile.PL -MANIFEST This list of files -META.yml -share/views/plugin/observium/device_port_column.tt -share/views/plugin/observium/observium.css -share/views/plugin/observium/observium.js diff --git a/Web-Plugin-Observium/META.yml b/Web-Plugin-Observium/META.yml deleted file mode 100644 index 215776ba..00000000 --- a/Web-Plugin-Observium/META.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -abstract: 'Port Traffic Links and Thumbnail Graphs from Observium' -author: - - 'Oliver Gorwits ' -build_requires: - ExtUtils::MakeMaker: 6.36 -configure_requires: - ExtUtils::MakeMaker: 6.36 -distribution_type: module -dynamic_config: 1 -generated_by: 'Module::Install version 1.06' -license: bsd -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 -name: App-NetdiscoX-Web-Plugin-Observium -no_index: - directory: - - inc - - share -resources: - MailingList: https://lists.sourceforge.net/lists/listinfo/netdisco-users - bugtracker: http://sourceforge.net/p/netdisco/bugs/ - homepage: http://netdisco.org/ - license: http://opensource.org/licenses/bsd-license.php - repository: git://git.code.sf.net/p/netdisco/netdisco-ng -version: '2.003000' diff --git a/Web-Plugin-Observium/Makefile.PL b/Web-Plugin-Observium/Makefile.PL deleted file mode 100644 index 8515e1a0..00000000 --- a/Web-Plugin-Observium/Makefile.PL +++ /dev/null @@ -1,15 +0,0 @@ -use inc::Module::Install; - -name 'App-NetdiscoX-Web-Plugin-Observium'; -license 'bsd'; -all_from 'lib/App/NetdiscoX/Web/Plugin/Observium.pm'; - -install_share 'share'; - -resources - homepage => 'http://netdisco.org/', - bugtracker => 'http://sourceforge.net/p/netdisco/bugs/', - repository => 'git://git.code.sf.net/p/netdisco/netdisco-ng', - MailingList => 'https://lists.sourceforge.net/lists/listinfo/netdisco-users'; - -WriteAll; diff --git a/Web-Plugin-Observium/inc/Module/Install.pm b/Web-Plugin-Observium/inc/Module/Install.pm deleted file mode 100644 index 4ecf46b9..00000000 --- a/Web-Plugin-Observium/inc/Module/Install.pm +++ /dev/null @@ -1,470 +0,0 @@ -#line 1 -package Module::Install; - -# For any maintainers: -# The load order for Module::Install is a bit magic. -# It goes something like this... -# -# IF ( host has Module::Install installed, creating author mode ) { -# 1. Makefile.PL calls "use inc::Module::Install" -# 2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install -# 3. The installed version of inc::Module::Install loads -# 4. inc::Module::Install calls "require Module::Install" -# 5. The ./inc/ version of Module::Install loads -# } ELSE { -# 1. Makefile.PL calls "use inc::Module::Install" -# 2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install -# 3. The ./inc/ version of Module::Install loads -# } - -use 5.005; -use strict 'vars'; -use Cwd (); -use File::Find (); -use File::Path (); - -use vars qw{$VERSION $MAIN}; -BEGIN { - # All Module::Install core packages now require synchronised versions. - # This will be used to ensure we don't accidentally load old or - # different versions of modules. - # This is not enforced yet, but will be some time in the next few - # releases once we can make sure it won't clash with custom - # Module::Install extensions. - $VERSION = '1.06'; - - # Storage for the pseudo-singleton - $MAIN = undef; - - *inc::Module::Install::VERSION = *VERSION; - @inc::Module::Install::ISA = __PACKAGE__; - -} - -sub import { - my $class = shift; - my $self = $class->new(@_); - my $who = $self->_caller; - - #------------------------------------------------------------- - # all of the following checks should be included in import(), - # to allow "eval 'require Module::Install; 1' to test - # installation of Module::Install. (RT #51267) - #------------------------------------------------------------- - - # Whether or not inc::Module::Install is actually loaded, the - # $INC{inc/Module/Install.pm} is what will still get set as long as - # the caller loaded module this in the documented manner. - # If not set, the caller may NOT have loaded the bundled version, and thus - # they may not have a MI version that works with the Makefile.PL. This would - # result in false errors or unexpected behaviour. And we don't want that. - my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; - unless ( $INC{$file} ) { die <<"END_DIE" } - -Please invoke ${\__PACKAGE__} with: - - use inc::${\__PACKAGE__}; - -not: - - use ${\__PACKAGE__}; - -END_DIE - - # This reportedly fixes a rare Win32 UTC file time issue, but - # as this is a non-cross-platform XS module not in the core, - # we shouldn't really depend on it. See RT #24194 for detail. - # (Also, this module only supports Perl 5.6 and above). - eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006; - - # If the script that is loading Module::Install is from the future, - # then make will detect this and cause it to re-run over and over - # again. This is bad. Rather than taking action to touch it (which - # is unreliable on some platforms and requires write permissions) - # for now we should catch this and refuse to run. - if ( -f $0 ) { - my $s = (stat($0))[9]; - - # If the modification time is only slightly in the future, - # sleep briefly to remove the problem. - my $a = $s - time; - if ( $a > 0 and $a < 5 ) { sleep 5 } - - # Too far in the future, throw an error. - my $t = time; - if ( $s > $t ) { die <<"END_DIE" } - -Your installer $0 has a modification time in the future ($s > $t). - -This is known to create infinite loops in make. - -Please correct this, then run $0 again. - -END_DIE - } - - - # Build.PL was formerly supported, but no longer is due to excessive - # difficulty in implementing every single feature twice. - if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } - -Module::Install no longer supports Build.PL. - -It was impossible to maintain duel backends, and has been deprecated. - -Please remove all Build.PL files and only use the Makefile.PL installer. - -END_DIE - - #------------------------------------------------------------- - - # To save some more typing in Module::Install installers, every... - # use inc::Module::Install - # ...also acts as an implicit use strict. - $^H |= strict::bits(qw(refs subs vars)); - - #------------------------------------------------------------- - - unless ( -f $self->{file} ) { - foreach my $key (keys %INC) { - delete $INC{$key} if $key =~ /Module\/Install/; - } - - local $^W; - require "$self->{path}/$self->{dispatch}.pm"; - File::Path::mkpath("$self->{prefix}/$self->{author}"); - $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); - $self->{admin}->init; - @_ = ($class, _self => $self); - goto &{"$self->{name}::import"}; - } - - local $^W; - *{"${who}::AUTOLOAD"} = $self->autoload; - $self->preload; - - # Unregister loader and worker packages so subdirs can use them again - delete $INC{'inc/Module/Install.pm'}; - delete $INC{'Module/Install.pm'}; - - # Save to the singleton - $MAIN = $self; - - return 1; -} - -sub autoload { - my $self = shift; - my $who = $self->_caller; - my $cwd = Cwd::cwd(); - my $sym = "${who}::AUTOLOAD"; - $sym->{$cwd} = sub { - my $pwd = Cwd::cwd(); - if ( my $code = $sym->{$pwd} ) { - # Delegate back to parent dirs - goto &$code unless $cwd eq $pwd; - } - unless ($$sym =~ s/([^:]+)$//) { - # XXX: it looks like we can't retrieve the missing function - # via $$sym (usually $main::AUTOLOAD) in this case. - # I'm still wondering if we should slurp Makefile.PL to - # get some context or not ... - my ($package, $file, $line) = caller; - die <<"EOT"; -Unknown function is found at $file line $line. -Execution of $file aborted due to runtime errors. - -If you're a contributor to a project, you may need to install -some Module::Install extensions from CPAN (or other repository). -If you're a user of a module, please contact the author. -EOT - } - my $method = $1; - if ( uc($method) eq $method ) { - # Do nothing - return; - } elsif ( $method =~ /^_/ and $self->can($method) ) { - # Dispatch to the root M:I class - return $self->$method(@_); - } - - # Dispatch to the appropriate plugin - unshift @_, ( $self, $1 ); - goto &{$self->can('call')}; - }; -} - -sub preload { - my $self = shift; - unless ( $self->{extensions} ) { - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ); - } - - my @exts = @{$self->{extensions}}; - unless ( @exts ) { - @exts = $self->{admin}->load_all_extensions; - } - - my %seen; - foreach my $obj ( @exts ) { - while (my ($method, $glob) = each %{ref($obj) . '::'}) { - next unless $obj->can($method); - next if $method =~ /^_/; - next if $method eq uc($method); - $seen{$method}++; - } - } - - my $who = $self->_caller; - foreach my $name ( sort keys %seen ) { - local $^W; - *{"${who}::$name"} = sub { - ${"${who}::AUTOLOAD"} = "${who}::$name"; - goto &{"${who}::AUTOLOAD"}; - }; - } -} - -sub new { - my ($class, %args) = @_; - - delete $INC{'FindBin.pm'}; - { - # to suppress the redefine warning - local $SIG{__WARN__} = sub {}; - require FindBin; - } - - # ignore the prefix on extension modules built from top level. - my $base_path = Cwd::abs_path($FindBin::Bin); - unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) { - delete $args{prefix}; - } - return $args{_self} if $args{_self}; - - $args{dispatch} ||= 'Admin'; - $args{prefix} ||= 'inc'; - $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); - $args{bundle} ||= 'inc/BUNDLES'; - $args{base} ||= $base_path; - $class =~ s/^\Q$args{prefix}\E:://; - $args{name} ||= $class; - $args{version} ||= $class->VERSION; - unless ( $args{path} ) { - $args{path} = $args{name}; - $args{path} =~ s!::!/!g; - } - $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm"; - $args{wrote} = 0; - - bless( \%args, $class ); -} - -sub call { - my ($self, $method) = @_; - my $obj = $self->load($method) or return; - splice(@_, 0, 2, $obj); - goto &{$obj->can($method)}; -} - -sub load { - my ($self, $method) = @_; - - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ) unless $self->{extensions}; - - foreach my $obj (@{$self->{extensions}}) { - return $obj if $obj->can($method); - } - - my $admin = $self->{admin} or die <<"END_DIE"; -The '$method' method does not exist in the '$self->{prefix}' path! -Please remove the '$self->{prefix}' directory and run $0 again to load it. -END_DIE - - my $obj = $admin->load($method, 1); - push @{$self->{extensions}}, $obj; - - $obj; -} - -sub load_extensions { - my ($self, $path, $top) = @_; - - my $should_reload = 0; - unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) { - unshift @INC, $self->{prefix}; - $should_reload = 1; - } - - foreach my $rv ( $self->find_extensions($path) ) { - my ($file, $pkg) = @{$rv}; - next if $self->{pathnames}{$pkg}; - - local $@; - my $new = eval { local $^W; require $file; $pkg->can('new') }; - unless ( $new ) { - warn $@ if $@; - next; - } - $self->{pathnames}{$pkg} = - $should_reload ? delete $INC{$file} : $INC{$file}; - push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); - } - - $self->{extensions} ||= []; -} - -sub find_extensions { - my ($self, $path) = @_; - - my @found; - File::Find::find( sub { - my $file = $File::Find::name; - return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; - my $subpath = $1; - return if lc($subpath) eq lc($self->{dispatch}); - - $file = "$self->{path}/$subpath.pm"; - my $pkg = "$self->{name}::$subpath"; - $pkg =~ s!/!::!g; - - # If we have a mixed-case package name, assume case has been preserved - # correctly. Otherwise, root through the file to locate the case-preserved - # version of the package name. - if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { - my $content = Module::Install::_read($subpath . '.pm'); - my $in_pod = 0; - foreach ( split //, $content ) { - $in_pod = 1 if /^=\w/; - $in_pod = 0 if /^=cut/; - next if ($in_pod || /^=cut/); # skip pod text - next if /^\s*#/; # and comments - if ( m/^\s*package\s+($pkg)\s*;/i ) { - $pkg = $1; - last; - } - } - } - - push @found, [ $file, $pkg ]; - }, $path ) if -d $path; - - @found; -} - - - - - -##################################################################### -# Common Utility Functions - -sub _caller { - my $depth = 0; - my $call = caller($depth); - while ( $call eq __PACKAGE__ ) { - $depth++; - $call = caller($depth); - } - return $call; -} - -# Done in evals to avoid confusing Perl::MinimumVersion -eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; -sub _read { - local *FH; - open( FH, '<', $_[0] ) or die "open($_[0]): $!"; - my $string = do { local $/; }; - close FH or die "close($_[0]): $!"; - return $string; -} -END_NEW -sub _read { - local *FH; - open( FH, "< $_[0]" ) or die "open($_[0]): $!"; - my $string = do { local $/; }; - close FH or die "close($_[0]): $!"; - return $string; -} -END_OLD - -sub _readperl { - my $string = Module::Install::_read($_[0]); - $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; - $string =~ s/(\n)\n*__(?:DATA|END)__\b.*\z/$1/s; - $string =~ s/\n\n=\w+.+?\n\n=cut\b.+?\n+/\n\n/sg; - return $string; -} - -sub _readpod { - my $string = Module::Install::_read($_[0]); - $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; - return $string if $_[0] =~ /\.pod\z/; - $string =~ s/(^|\n=cut\b.+?\n+)[^=\s].+?\n(\n=\w+|\z)/$1$2/sg; - $string =~ s/\n*=pod\b[^\n]*\n+/\n\n/sg; - $string =~ s/\n*=cut\b[^\n]*\n+/\n\n/sg; - $string =~ s/^\n+//s; - return $string; -} - -# Done in evals to avoid confusing Perl::MinimumVersion -eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; -sub _write { - local *FH; - open( FH, '>', $_[0] ) or die "open($_[0]): $!"; - foreach ( 1 .. $#_ ) { - print FH $_[$_] or die "print($_[0]): $!"; - } - close FH or die "close($_[0]): $!"; -} -END_NEW -sub _write { - local *FH; - open( FH, "> $_[0]" ) or die "open($_[0]): $!"; - foreach ( 1 .. $#_ ) { - print FH $_[$_] or die "print($_[0]): $!"; - } - close FH or die "close($_[0]): $!"; -} -END_OLD - -# _version is for processing module versions (eg, 1.03_05) not -# Perl versions (eg, 5.8.1). -sub _version ($) { - my $s = shift || 0; - my $d =()= $s =~ /(\.)/g; - if ( $d >= 2 ) { - # Normalise multipart versions - $s =~ s/(\.)(\d{1,3})/sprintf("$1%03d",$2)/eg; - } - $s =~ s/^(\d+)\.?//; - my $l = $1 || 0; - my @v = map { - $_ . '0' x (3 - length $_) - } $s =~ /(\d{1,3})\D?/g; - $l = $l . '.' . join '', @v if @v; - return $l + 0; -} - -sub _cmp ($$) { - _version($_[1]) <=> _version($_[2]); -} - -# Cloned from Params::Util::_CLASS -sub _CLASS ($) { - ( - defined $_[0] - and - ! ref $_[0] - and - $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s - ) ? $_[0] : undef; -} - -1; - -# Copyright 2008 - 2012 Adam Kennedy. diff --git a/Web-Plugin-Observium/inc/Module/Install/Base.pm b/Web-Plugin-Observium/inc/Module/Install/Base.pm deleted file mode 100644 index 802844aa..00000000 --- a/Web-Plugin-Observium/inc/Module/Install/Base.pm +++ /dev/null @@ -1,83 +0,0 @@ -#line 1 -package Module::Install::Base; - -use strict 'vars'; -use vars qw{$VERSION}; -BEGIN { - $VERSION = '1.06'; -} - -# Suspend handler for "redefined" warnings -BEGIN { - my $w = $SIG{__WARN__}; - $SIG{__WARN__} = sub { $w }; -} - -#line 42 - -sub new { - my $class = shift; - unless ( defined &{"${class}::call"} ) { - *{"${class}::call"} = sub { shift->_top->call(@_) }; - } - unless ( defined &{"${class}::load"} ) { - *{"${class}::load"} = sub { shift->_top->load(@_) }; - } - bless { @_ }, $class; -} - -#line 61 - -sub AUTOLOAD { - local $@; - my $func = eval { shift->_top->autoload } or return; - goto &$func; -} - -#line 75 - -sub _top { - $_[0]->{_top}; -} - -#line 90 - -sub admin { - $_[0]->_top->{admin} - or - Module::Install::Base::FakeAdmin->new; -} - -#line 106 - -sub is_admin { - ! $_[0]->admin->isa('Module::Install::Base::FakeAdmin'); -} - -sub DESTROY {} - -package Module::Install::Base::FakeAdmin; - -use vars qw{$VERSION}; -BEGIN { - $VERSION = $Module::Install::Base::VERSION; -} - -my $fake; - -sub new { - $fake ||= bless(\@_, $_[0]); -} - -sub AUTOLOAD {} - -sub DESTROY {} - -# Restore warning handler -BEGIN { - $SIG{__WARN__} = $SIG{__WARN__}->(); -} - -1; - -#line 159 diff --git a/Web-Plugin-Observium/inc/Module/Install/Can.pm b/Web-Plugin-Observium/inc/Module/Install/Can.pm deleted file mode 100644 index 22167b8f..00000000 --- a/Web-Plugin-Observium/inc/Module/Install/Can.pm +++ /dev/null @@ -1,154 +0,0 @@ -#line 1 -package Module::Install::Can; - -use strict; -use Config (); -use ExtUtils::MakeMaker (); -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -# check if we can load some module -### Upgrade this to not have to load the module if possible -sub can_use { - my ($self, $mod, $ver) = @_; - $mod =~ s{::|\\}{/}g; - $mod .= '.pm' unless $mod =~ /\.pm$/i; - - my $pkg = $mod; - $pkg =~ s{/}{::}g; - $pkg =~ s{\.pm$}{}i; - - local $@; - eval { require $mod; $pkg->VERSION($ver || 0); 1 }; -} - -# Check if we can run some command -sub can_run { - my ($self, $cmd) = @_; - - my $_cmd = $cmd; - return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); - - for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { - next if $dir eq ''; - require File::Spec; - my $abs = File::Spec->catfile($dir, $cmd); - return $abs if (-x $abs or $abs = MM->maybe_command($abs)); - } - - return; -} - -# Can our C compiler environment build XS files -sub can_xs { - my $self = shift; - - # Ensure we have the CBuilder module - $self->configure_requires( 'ExtUtils::CBuilder' => 0.27 ); - - # Do we have the configure_requires checker? - local $@; - eval "require ExtUtils::CBuilder;"; - if ( $@ ) { - # They don't obey configure_requires, so it is - # someone old and delicate. Try to avoid hurting - # them by falling back to an older simpler test. - return $self->can_cc(); - } - - # Do we have a working C compiler - my $builder = ExtUtils::CBuilder->new( - quiet => 1, - ); - unless ( $builder->have_compiler ) { - # No working C compiler - return 0; - } - - # Write a C file representative of what XS becomes - require File::Temp; - my ( $FH, $tmpfile ) = File::Temp::tempfile( - "compilexs-XXXXX", - SUFFIX => '.c', - ); - binmode $FH; - print $FH <<'END_C'; -#include "EXTERN.h" -#include "perl.h" -#include "XSUB.h" - -int main(int argc, char **argv) { - return 0; -} - -int boot_sanexs() { - return 1; -} - -END_C - close $FH; - - # Can the C compiler access the same headers XS does - my @libs = (); - my $object = undef; - eval { - local $^W = 0; - $object = $builder->compile( - source => $tmpfile, - ); - @libs = $builder->link( - objects => $object, - module_name => 'sanexs', - ); - }; - my $result = $@ ? 0 : 1; - - # Clean up all the build files - foreach ( $tmpfile, $object, @libs ) { - next unless defined $_; - 1 while unlink; - } - - return $result; -} - -# Can we locate a (the) C compiler -sub can_cc { - my $self = shift; - my @chunks = split(/ /, $Config::Config{cc}) or return; - - # $Config{cc} may contain args; try to find out the program part - while (@chunks) { - return $self->can_run("@chunks") || (pop(@chunks), next); - } - - return; -} - -# Fix Cygwin bug on maybe_command(); -if ( $^O eq 'cygwin' ) { - require ExtUtils::MM_Cygwin; - require ExtUtils::MM_Win32; - if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) { - *ExtUtils::MM_Cygwin::maybe_command = sub { - my ($self, $file) = @_; - if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) { - ExtUtils::MM_Win32->maybe_command($file); - } else { - ExtUtils::MM_Unix->maybe_command($file); - } - } - } -} - -1; - -__END__ - -#line 236 diff --git a/Web-Plugin-Observium/inc/Module/Install/Fetch.pm b/Web-Plugin-Observium/inc/Module/Install/Fetch.pm deleted file mode 100644 index bee0c4fb..00000000 --- a/Web-Plugin-Observium/inc/Module/Install/Fetch.pm +++ /dev/null @@ -1,93 +0,0 @@ -#line 1 -package Module::Install::Fetch; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub get_file { - my ($self, %args) = @_; - my ($scheme, $host, $path, $file) = - $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; - - if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) { - $args{url} = $args{ftp_url} - or (warn("LWP support unavailable!\n"), return); - ($scheme, $host, $path, $file) = - $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; - } - - $|++; - print "Fetching '$file' from $host... "; - - unless (eval { require Socket; Socket::inet_aton($host) }) { - warn "'$host' resolve failed!\n"; - return; - } - - return unless $scheme eq 'ftp' or $scheme eq 'http'; - - require Cwd; - my $dir = Cwd::getcwd(); - chdir $args{local_dir} or return if exists $args{local_dir}; - - if (eval { require LWP::Simple; 1 }) { - LWP::Simple::mirror($args{url}, $file); - } - elsif (eval { require Net::FTP; 1 }) { eval { - # use Net::FTP to get past firewall - my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600); - $ftp->login("anonymous", 'anonymous@example.com'); - $ftp->cwd($path); - $ftp->binary; - $ftp->get($file) or (warn("$!\n"), return); - $ftp->quit; - } } - elsif (my $ftp = $self->can_run('ftp')) { eval { - # no Net::FTP, fallback to ftp.exe - require FileHandle; - my $fh = FileHandle->new; - - local $SIG{CHLD} = 'IGNORE'; - unless ($fh->open("|$ftp -n")) { - warn "Couldn't open ftp: $!\n"; - chdir $dir; return; - } - - my @dialog = split(/\n/, <<"END_FTP"); -open $host -user anonymous anonymous\@example.com -cd $path -binary -get $file $file -quit -END_FTP - foreach (@dialog) { $fh->print("$_\n") } - $fh->close; - } } - else { - warn "No working 'ftp' program available!\n"; - chdir $dir; return; - } - - unless (-f $file) { - warn "Fetching failed: $@\n"; - chdir $dir; return; - } - - return if exists $args{size} and -s $file != $args{size}; - system($args{run}) if exists $args{run}; - unlink($file) if $args{remove}; - - print(((!exists $args{check_for} or -e $args{check_for}) - ? "done!" : "failed! ($!)"), "\n"); - chdir $dir; return !$?; -} - -1; diff --git a/Web-Plugin-Observium/inc/Module/Install/Makefile.pm b/Web-Plugin-Observium/inc/Module/Install/Makefile.pm deleted file mode 100644 index 7052f365..00000000 --- a/Web-Plugin-Observium/inc/Module/Install/Makefile.pm +++ /dev/null @@ -1,418 +0,0 @@ -#line 1 -package Module::Install::Makefile; - -use strict 'vars'; -use ExtUtils::MakeMaker (); -use Module::Install::Base (); -use Fcntl qw/:flock :seek/; - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub Makefile { $_[0] } - -my %seen = (); - -sub prompt { - shift; - - # Infinite loop protection - my @c = caller(); - if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) { - die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; - } - - # In automated testing or non-interactive session, always use defaults - if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) { - local $ENV{PERL_MM_USE_DEFAULT} = 1; - goto &ExtUtils::MakeMaker::prompt; - } else { - goto &ExtUtils::MakeMaker::prompt; - } -} - -# Store a cleaned up version of the MakeMaker version, -# since we need to behave differently in a variety of -# ways based on the MM version. -my $makemaker = eval $ExtUtils::MakeMaker::VERSION; - -# If we are passed a param, do a "newer than" comparison. -# Otherwise, just return the MakeMaker version. -sub makemaker { - ( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0 -} - -# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified -# as we only need to know here whether the attribute is an array -# or a hash or something else (which may or may not be appendable). -my %makemaker_argtype = ( - C => 'ARRAY', - CONFIG => 'ARRAY', -# CONFIGURE => 'CODE', # ignore - DIR => 'ARRAY', - DL_FUNCS => 'HASH', - DL_VARS => 'ARRAY', - EXCLUDE_EXT => 'ARRAY', - EXE_FILES => 'ARRAY', - FUNCLIST => 'ARRAY', - H => 'ARRAY', - IMPORTS => 'HASH', - INCLUDE_EXT => 'ARRAY', - LIBS => 'ARRAY', # ignore '' - MAN1PODS => 'HASH', - MAN3PODS => 'HASH', - META_ADD => 'HASH', - META_MERGE => 'HASH', - PL_FILES => 'HASH', - PM => 'HASH', - PMLIBDIRS => 'ARRAY', - PMLIBPARENTDIRS => 'ARRAY', - PREREQ_PM => 'HASH', - CONFIGURE_REQUIRES => 'HASH', - SKIP => 'ARRAY', - TYPEMAPS => 'ARRAY', - XS => 'HASH', -# VERSION => ['version',''], # ignore -# _KEEP_AFTER_FLUSH => '', - - clean => 'HASH', - depend => 'HASH', - dist => 'HASH', - dynamic_lib=> 'HASH', - linkext => 'HASH', - macro => 'HASH', - postamble => 'HASH', - realclean => 'HASH', - test => 'HASH', - tool_autosplit => 'HASH', - - # special cases where you can use makemaker_append - CCFLAGS => 'APPENDABLE', - DEFINE => 'APPENDABLE', - INC => 'APPENDABLE', - LDDLFLAGS => 'APPENDABLE', - LDFROM => 'APPENDABLE', -); - -sub makemaker_args { - my ($self, %new_args) = @_; - my $args = ( $self->{makemaker_args} ||= {} ); - foreach my $key (keys %new_args) { - if ($makemaker_argtype{$key}) { - if ($makemaker_argtype{$key} eq 'ARRAY') { - $args->{$key} = [] unless defined $args->{$key}; - unless (ref $args->{$key} eq 'ARRAY') { - $args->{$key} = [$args->{$key}] - } - push @{$args->{$key}}, - ref $new_args{$key} eq 'ARRAY' - ? @{$new_args{$key}} - : $new_args{$key}; - } - elsif ($makemaker_argtype{$key} eq 'HASH') { - $args->{$key} = {} unless defined $args->{$key}; - foreach my $skey (keys %{ $new_args{$key} }) { - $args->{$key}{$skey} = $new_args{$key}{$skey}; - } - } - elsif ($makemaker_argtype{$key} eq 'APPENDABLE') { - $self->makemaker_append($key => $new_args{$key}); - } - } - else { - if (defined $args->{$key}) { - warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n}; - } - $args->{$key} = $new_args{$key}; - } - } - return $args; -} - -# For mm args that take multiple space-seperated args, -# append an argument to the current list. -sub makemaker_append { - my $self = shift; - my $name = shift; - my $args = $self->makemaker_args; - $args->{$name} = defined $args->{$name} - ? join( ' ', $args->{$name}, @_ ) - : join( ' ', @_ ); -} - -sub build_subdirs { - my $self = shift; - my $subdirs = $self->makemaker_args->{DIR} ||= []; - for my $subdir (@_) { - push @$subdirs, $subdir; - } -} - -sub clean_files { - my $self = shift; - my $clean = $self->makemaker_args->{clean} ||= {}; - %$clean = ( - %$clean, - FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_), - ); -} - -sub realclean_files { - my $self = shift; - my $realclean = $self->makemaker_args->{realclean} ||= {}; - %$realclean = ( - %$realclean, - FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_), - ); -} - -sub libs { - my $self = shift; - my $libs = ref $_[0] ? shift : [ shift ]; - $self->makemaker_args( LIBS => $libs ); -} - -sub inc { - my $self = shift; - $self->makemaker_args( INC => shift ); -} - -sub _wanted_t { -} - -sub tests_recursive { - my $self = shift; - my $dir = shift || 't'; - unless ( -d $dir ) { - die "tests_recursive dir '$dir' does not exist"; - } - my %tests = map { $_ => 1 } split / /, ($self->tests || ''); - require File::Find; - File::Find::find( - sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 }, - $dir - ); - $self->tests( join ' ', sort keys %tests ); -} - -sub write { - my $self = shift; - die "&Makefile->write() takes no arguments\n" if @_; - - # Check the current Perl version - my $perl_version = $self->perl_version; - if ( $perl_version ) { - eval "use $perl_version; 1" - or die "ERROR: perl: Version $] is installed, " - . "but we need version >= $perl_version"; - } - - # Make sure we have a new enough MakeMaker - require ExtUtils::MakeMaker; - - if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) { - # This previous attempted to inherit the version of - # ExtUtils::MakeMaker in use by the module author, but this - # was found to be untenable as some authors build releases - # using future dev versions of EU:MM that nobody else has. - # Instead, #toolchain suggests we use 6.59 which is the most - # stable version on CPAN at time of writing and is, to quote - # ribasushi, "not terminally fucked, > and tested enough". - # TODO: We will now need to maintain this over time to push - # the version up as new versions are released. - $self->build_requires( 'ExtUtils::MakeMaker' => 6.59 ); - $self->configure_requires( 'ExtUtils::MakeMaker' => 6.59 ); - } else { - # Allow legacy-compatibility with 5.005 by depending on the - # most recent EU:MM that supported 5.005. - $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 ); - $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 ); - } - - # Generate the MakeMaker params - my $args = $self->makemaker_args; - $args->{DISTNAME} = $self->name; - $args->{NAME} = $self->module_name || $self->name; - $args->{NAME} =~ s/-/::/g; - $args->{VERSION} = $self->version or die <<'EOT'; -ERROR: Can't determine distribution version. Please specify it -explicitly via 'version' in Makefile.PL, or set a valid $VERSION -in a module, and provide its file path via 'version_from' (or -'all_from' if you prefer) in Makefile.PL. -EOT - - if ( $self->tests ) { - my @tests = split ' ', $self->tests; - my %seen; - $args->{test} = { - TESTS => (join ' ', grep {!$seen{$_}++} @tests), - }; - } elsif ( $Module::Install::ExtraTests::use_extratests ) { - # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness. - # So, just ignore our xt tests here. - } elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) { - $args->{test} = { - TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ), - }; - } - if ( $] >= 5.005 ) { - $args->{ABSTRACT} = $self->abstract; - $args->{AUTHOR} = join ', ', @{$self->author || []}; - } - if ( $self->makemaker(6.10) ) { - $args->{NO_META} = 1; - #$args->{NO_MYMETA} = 1; - } - if ( $self->makemaker(6.17) and $self->sign ) { - $args->{SIGN} = 1; - } - unless ( $self->is_admin ) { - delete $args->{SIGN}; - } - if ( $self->makemaker(6.31) and $self->license ) { - $args->{LICENSE} = $self->license; - } - - my $prereq = ($args->{PREREQ_PM} ||= {}); - %$prereq = ( %$prereq, - map { @$_ } # flatten [module => version] - map { @$_ } - grep $_, - ($self->requires) - ); - - # Remove any reference to perl, PREREQ_PM doesn't support it - delete $args->{PREREQ_PM}->{perl}; - - # Merge both kinds of requires into BUILD_REQUIRES - my $build_prereq = ($args->{BUILD_REQUIRES} ||= {}); - %$build_prereq = ( %$build_prereq, - map { @$_ } # flatten [module => version] - map { @$_ } - grep $_, - ($self->configure_requires, $self->build_requires) - ); - - # Remove any reference to perl, BUILD_REQUIRES doesn't support it - delete $args->{BUILD_REQUIRES}->{perl}; - - # Delete bundled dists from prereq_pm, add it to Makefile DIR - my $subdirs = ($args->{DIR} || []); - if ($self->bundles) { - my %processed; - foreach my $bundle (@{ $self->bundles }) { - my ($mod_name, $dist_dir) = @$bundle; - delete $prereq->{$mod_name}; - $dist_dir = File::Basename::basename($dist_dir); # dir for building this module - if (not exists $processed{$dist_dir}) { - if (-d $dist_dir) { - # List as sub-directory to be processed by make - push @$subdirs, $dist_dir; - } - # Else do nothing: the module is already present on the system - $processed{$dist_dir} = undef; - } - } - } - - unless ( $self->makemaker('6.55_03') ) { - %$prereq = (%$prereq,%$build_prereq); - delete $args->{BUILD_REQUIRES}; - } - - if ( my $perl_version = $self->perl_version ) { - eval "use $perl_version; 1" - or die "ERROR: perl: Version $] is installed, " - . "but we need version >= $perl_version"; - - if ( $self->makemaker(6.48) ) { - $args->{MIN_PERL_VERSION} = $perl_version; - } - } - - if ($self->installdirs) { - warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS}; - $args->{INSTALLDIRS} = $self->installdirs; - } - - my %args = map { - ( $_ => $args->{$_} ) } grep {defined($args->{$_} ) - } keys %$args; - - my $user_preop = delete $args{dist}->{PREOP}; - if ( my $preop = $self->admin->preop($user_preop) ) { - foreach my $key ( keys %$preop ) { - $args{dist}->{$key} = $preop->{$key}; - } - } - - my $mm = ExtUtils::MakeMaker::WriteMakefile(%args); - $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile'); -} - -sub fix_up_makefile { - my $self = shift; - my $makefile_name = shift; - my $top_class = ref($self->_top) || ''; - my $top_version = $self->_top->VERSION || ''; - - my $preamble = $self->preamble - ? "# Preamble by $top_class $top_version\n" - . $self->preamble - : ''; - my $postamble = "# Postamble by $top_class $top_version\n" - . ($self->postamble || ''); - - local *MAKEFILE; - open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; - eval { flock MAKEFILE, LOCK_EX }; - my $makefile = do { local $/; }; - - $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; - $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; - $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g; - $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m; - $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m; - - # Module::Install will never be used to build the Core Perl - # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks - # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist - $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m; - #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m; - - # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well. - $makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g; - - # XXX - This is currently unused; not sure if it breaks other MM-users - # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg; - - seek MAKEFILE, 0, SEEK_SET; - truncate MAKEFILE, 0; - print MAKEFILE "$preamble$makefile$postamble" or die $!; - close MAKEFILE or die $!; - - 1; -} - -sub preamble { - my ($self, $text) = @_; - $self->{preamble} = $text . $self->{preamble} if defined $text; - $self->{preamble}; -} - -sub postamble { - my ($self, $text) = @_; - $self->{postamble} ||= $self->admin->postamble; - $self->{postamble} .= $text if defined $text; - $self->{postamble} -} - -1; - -__END__ - -#line 544 diff --git a/Web-Plugin-Observium/inc/Module/Install/Metadata.pm b/Web-Plugin-Observium/inc/Module/Install/Metadata.pm deleted file mode 100644 index 58430f30..00000000 --- a/Web-Plugin-Observium/inc/Module/Install/Metadata.pm +++ /dev/null @@ -1,722 +0,0 @@ -#line 1 -package Module::Install::Metadata; - -use strict 'vars'; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -my @boolean_keys = qw{ - sign -}; - -my @scalar_keys = qw{ - name - module_name - abstract - version - distribution_type - tests - installdirs -}; - -my @tuple_keys = qw{ - configure_requires - build_requires - requires - recommends - bundles - resources -}; - -my @resource_keys = qw{ - homepage - bugtracker - repository -}; - -my @array_keys = qw{ - keywords - author -}; - -*authors = \&author; - -sub Meta { shift } -sub Meta_BooleanKeys { @boolean_keys } -sub Meta_ScalarKeys { @scalar_keys } -sub Meta_TupleKeys { @tuple_keys } -sub Meta_ResourceKeys { @resource_keys } -sub Meta_ArrayKeys { @array_keys } - -foreach my $key ( @boolean_keys ) { - *$key = sub { - my $self = shift; - if ( defined wantarray and not @_ ) { - return $self->{values}->{$key}; - } - $self->{values}->{$key} = ( @_ ? $_[0] : 1 ); - return $self; - }; -} - -foreach my $key ( @scalar_keys ) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} if defined wantarray and !@_; - $self->{values}->{$key} = shift; - return $self; - }; -} - -foreach my $key ( @array_keys ) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} if defined wantarray and !@_; - $self->{values}->{$key} ||= []; - push @{$self->{values}->{$key}}, @_; - return $self; - }; -} - -foreach my $key ( @resource_keys ) { - *$key = sub { - my $self = shift; - unless ( @_ ) { - return () unless $self->{values}->{resources}; - return map { $_->[1] } - grep { $_->[0] eq $key } - @{ $self->{values}->{resources} }; - } - return $self->{values}->{resources}->{$key} unless @_; - my $uri = shift or die( - "Did not provide a value to $key()" - ); - $self->resources( $key => $uri ); - return 1; - }; -} - -foreach my $key ( grep { $_ ne "resources" } @tuple_keys) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} unless @_; - my @added; - while ( @_ ) { - my $module = shift or last; - my $version = shift || 0; - push @added, [ $module, $version ]; - } - push @{ $self->{values}->{$key} }, @added; - return map {@$_} @added; - }; -} - -# Resource handling -my %lc_resource = map { $_ => 1 } qw{ - homepage - license - bugtracker - repository -}; - -sub resources { - my $self = shift; - while ( @_ ) { - my $name = shift or last; - my $value = shift or next; - if ( $name eq lc $name and ! $lc_resource{$name} ) { - die("Unsupported reserved lowercase resource '$name'"); - } - $self->{values}->{resources} ||= []; - push @{ $self->{values}->{resources} }, [ $name, $value ]; - } - $self->{values}->{resources}; -} - -# Aliases for build_requires that will have alternative -# meanings in some future version of META.yml. -sub test_requires { shift->build_requires(@_) } -sub install_requires { shift->build_requires(@_) } - -# Aliases for installdirs options -sub install_as_core { $_[0]->installdirs('perl') } -sub install_as_cpan { $_[0]->installdirs('site') } -sub install_as_site { $_[0]->installdirs('site') } -sub install_as_vendor { $_[0]->installdirs('vendor') } - -sub dynamic_config { - my $self = shift; - my $value = @_ ? shift : 1; - if ( $self->{values}->{dynamic_config} ) { - # Once dynamic we never change to static, for safety - return 0; - } - $self->{values}->{dynamic_config} = $value ? 1 : 0; - return 1; -} - -# Convenience command -sub static_config { - shift->dynamic_config(0); -} - -sub perl_version { - my $self = shift; - return $self->{values}->{perl_version} unless @_; - my $version = shift or die( - "Did not provide a value to perl_version()" - ); - - # Normalize the version - $version = $self->_perl_version($version); - - # We don't support the really old versions - unless ( $version >= 5.005 ) { - die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; - } - - $self->{values}->{perl_version} = $version; -} - -sub all_from { - my ( $self, $file ) = @_; - - unless ( defined($file) ) { - my $name = $self->name or die( - "all_from called with no args without setting name() first" - ); - $file = join('/', 'lib', split(/-/, $name)) . '.pm'; - $file =~ s{.*/}{} unless -e $file; - unless ( -e $file ) { - die("all_from cannot find $file from $name"); - } - } - unless ( -f $file ) { - die("The path '$file' does not exist, or is not a file"); - } - - $self->{values}{all_from} = $file; - - # Some methods pull from POD instead of code. - # If there is a matching .pod, use that instead - my $pod = $file; - $pod =~ s/\.pm$/.pod/i; - $pod = $file unless -e $pod; - - # Pull the different values - $self->name_from($file) unless $self->name; - $self->version_from($file) unless $self->version; - $self->perl_version_from($file) unless $self->perl_version; - $self->author_from($pod) unless @{$self->author || []}; - $self->license_from($pod) unless $self->license; - $self->abstract_from($pod) unless $self->abstract; - - return 1; -} - -sub provides { - my $self = shift; - my $provides = ( $self->{values}->{provides} ||= {} ); - %$provides = (%$provides, @_) if @_; - return $provides; -} - -sub auto_provides { - my $self = shift; - return $self unless $self->is_admin; - unless (-e 'MANIFEST') { - warn "Cannot deduce auto_provides without a MANIFEST, skipping\n"; - return $self; - } - # Avoid spurious warnings as we are not checking manifest here. - local $SIG{__WARN__} = sub {1}; - require ExtUtils::Manifest; - local *ExtUtils::Manifest::manicheck = sub { return }; - - require Module::Build; - my $build = Module::Build->new( - dist_name => $self->name, - dist_version => $self->version, - license => $self->license, - ); - $self->provides( %{ $build->find_dist_packages || {} } ); -} - -sub feature { - my $self = shift; - my $name = shift; - my $features = ( $self->{values}->{features} ||= [] ); - my $mods; - - if ( @_ == 1 and ref( $_[0] ) ) { - # The user used ->feature like ->features by passing in the second - # argument as a reference. Accomodate for that. - $mods = $_[0]; - } else { - $mods = \@_; - } - - my $count = 0; - push @$features, ( - $name => [ - map { - ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_ - } @$mods - ] - ); - - return @$features; -} - -sub features { - my $self = shift; - while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) { - $self->feature( $name, @$mods ); - } - return $self->{values}->{features} - ? @{ $self->{values}->{features} } - : (); -} - -sub no_index { - my $self = shift; - my $type = shift; - push @{ $self->{values}->{no_index}->{$type} }, @_ if $type; - return $self->{values}->{no_index}; -} - -sub read { - my $self = shift; - $self->include_deps( 'YAML::Tiny', 0 ); - - require YAML::Tiny; - my $data = YAML::Tiny::LoadFile('META.yml'); - - # Call methods explicitly in case user has already set some values. - while ( my ( $key, $value ) = each %$data ) { - next unless $self->can($key); - if ( ref $value eq 'HASH' ) { - while ( my ( $module, $version ) = each %$value ) { - $self->can($key)->($self, $module => $version ); - } - } else { - $self->can($key)->($self, $value); - } - } - return $self; -} - -sub write { - my $self = shift; - return $self unless $self->is_admin; - $self->admin->write_meta; - return $self; -} - -sub version_from { - require ExtUtils::MM_Unix; - my ( $self, $file ) = @_; - $self->version( ExtUtils::MM_Unix->parse_version($file) ); - - # for version integrity check - $self->makemaker_args( VERSION_FROM => $file ); -} - -sub abstract_from { - require ExtUtils::MM_Unix; - my ( $self, $file ) = @_; - $self->abstract( - bless( - { DISTNAME => $self->name }, - 'ExtUtils::MM_Unix' - )->parse_abstract($file) - ); -} - -# Add both distribution and module name -sub name_from { - my ($self, $file) = @_; - if ( - Module::Install::_read($file) =~ m/ - ^ \s* - package \s* - ([\w:]+) - \s* ; - /ixms - ) { - my ($name, $module_name) = ($1, $1); - $name =~ s{::}{-}g; - $self->name($name); - unless ( $self->module_name ) { - $self->module_name($module_name); - } - } else { - die("Cannot determine name from $file\n"); - } -} - -sub _extract_perl_version { - if ( - $_[0] =~ m/ - ^\s* - (?:use|require) \s* - v? - ([\d_\.]+) - \s* ; - /ixms - ) { - my $perl_version = $1; - $perl_version =~ s{_}{}g; - return $perl_version; - } else { - return; - } -} - -sub perl_version_from { - my $self = shift; - my $perl_version=_extract_perl_version(Module::Install::_read($_[0])); - if ($perl_version) { - $self->perl_version($perl_version); - } else { - warn "Cannot determine perl version info from $_[0]\n"; - return; - } -} - -sub author_from { - my $self = shift; - my $content = Module::Install::_read($_[0]); - if ($content =~ m/ - =head \d \s+ (?:authors?)\b \s* - ([^\n]*) - | - =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s* - .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s* - ([^\n]*) - /ixms) { - my $author = $1 || $2; - - # XXX: ugly but should work anyway... - if (eval "require Pod::Escapes; 1") { - # Pod::Escapes has a mapping table. - # It's in core of perl >= 5.9.3, and should be installed - # as one of the Pod::Simple's prereqs, which is a prereq - # of Pod::Text 3.x (see also below). - $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } - { - defined $2 - ? chr($2) - : defined $Pod::Escapes::Name2character_number{$1} - ? chr($Pod::Escapes::Name2character_number{$1}) - : do { - warn "Unknown escape: E<$1>"; - "E<$1>"; - }; - }gex; - } - elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) { - # Pod::Text < 3.0 has yet another mapping table, - # though the table name of 2.x and 1.x are different. - # (1.x is in core of Perl < 5.6, 2.x is in core of - # Perl < 5.9.3) - my $mapping = ($Pod::Text::VERSION < 2) - ? \%Pod::Text::HTML_Escapes - : \%Pod::Text::ESCAPES; - $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } - { - defined $2 - ? chr($2) - : defined $mapping->{$1} - ? $mapping->{$1} - : do { - warn "Unknown escape: E<$1>"; - "E<$1>"; - }; - }gex; - } - else { - $author =~ s{E}{<}g; - $author =~ s{E}{>}g; - } - $self->author($author); - } else { - warn "Cannot determine author info from $_[0]\n"; - } -} - -#Stolen from M::B -my %license_urls = ( - perl => 'http://dev.perl.org/licenses/', - apache => 'http://apache.org/licenses/LICENSE-2.0', - apache_1_1 => 'http://apache.org/licenses/LICENSE-1.1', - artistic => 'http://opensource.org/licenses/artistic-license.php', - artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php', - lgpl => 'http://opensource.org/licenses/lgpl-license.php', - lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php', - lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html', - bsd => 'http://opensource.org/licenses/bsd-license.php', - gpl => 'http://opensource.org/licenses/gpl-license.php', - gpl2 => 'http://opensource.org/licenses/gpl-2.0.php', - gpl3 => 'http://opensource.org/licenses/gpl-3.0.html', - mit => 'http://opensource.org/licenses/mit-license.php', - mozilla => 'http://opensource.org/licenses/mozilla1.1.php', - open_source => undef, - unrestricted => undef, - restrictive => undef, - unknown => undef, -); - -sub license { - my $self = shift; - return $self->{values}->{license} unless @_; - my $license = shift or die( - 'Did not provide a value to license()' - ); - $license = __extract_license($license) || lc $license; - $self->{values}->{license} = $license; - - # Automatically fill in license URLs - if ( $license_urls{$license} ) { - $self->resources( license => $license_urls{$license} ); - } - - return 1; -} - -sub _extract_license { - my $pod = shift; - my $matched; - return __extract_license( - ($matched) = $pod =~ m/ - (=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?) - (=head \d.*|=cut.*|)\z - /xms - ) || __extract_license( - ($matched) = $pod =~ m/ - (=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?) - (=head \d.*|=cut.*|)\z - /xms - ); -} - -sub __extract_license { - my $license_text = shift or return; - my @phrases = ( - '(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1, - '(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1, - 'Artistic and GPL' => 'perl', 1, - 'GNU general public license' => 'gpl', 1, - 'GNU public license' => 'gpl', 1, - 'GNU lesser general public license' => 'lgpl', 1, - 'GNU lesser public license' => 'lgpl', 1, - 'GNU library general public license' => 'lgpl', 1, - 'GNU library public license' => 'lgpl', 1, - 'GNU Free Documentation license' => 'unrestricted', 1, - 'GNU Affero General Public License' => 'open_source', 1, - '(?:Free)?BSD license' => 'bsd', 1, - 'Artistic license 2\.0' => 'artistic_2', 1, - 'Artistic license' => 'artistic', 1, - 'Apache (?:Software )?license' => 'apache', 1, - 'GPL' => 'gpl', 1, - 'LGPL' => 'lgpl', 1, - 'BSD' => 'bsd', 1, - 'Artistic' => 'artistic', 1, - 'MIT' => 'mit', 1, - 'Mozilla Public License' => 'mozilla', 1, - 'Q Public License' => 'open_source', 1, - 'OpenSSL License' => 'unrestricted', 1, - 'SSLeay License' => 'unrestricted', 1, - 'zlib License' => 'open_source', 1, - 'proprietary' => 'proprietary', 0, - ); - while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { - $pattern =~ s#\s+#\\s+#gs; - if ( $license_text =~ /\b$pattern\b/i ) { - return $license; - } - } - return ''; -} - -sub license_from { - my $self = shift; - if (my $license=_extract_license(Module::Install::_read($_[0]))) { - $self->license($license); - } else { - warn "Cannot determine license info from $_[0]\n"; - return 'unknown'; - } -} - -sub _extract_bugtracker { - my @links = $_[0] =~ m#L<( - https?\Q://rt.cpan.org/\E[^>]+| - https?\Q://github.com/\E[\w_]+/[\w_]+/issues| - https?\Q://code.google.com/p/\E[\w_\-]+/issues/list - )>#gx; - my %links; - @links{@links}=(); - @links=keys %links; - return @links; -} - -sub bugtracker_from { - my $self = shift; - my $content = Module::Install::_read($_[0]); - my @links = _extract_bugtracker($content); - unless ( @links ) { - warn "Cannot determine bugtracker info from $_[0]\n"; - return 0; - } - if ( @links > 1 ) { - warn "Found more than one bugtracker link in $_[0]\n"; - return 0; - } - - # Set the bugtracker - bugtracker( $links[0] ); - return 1; -} - -sub requires_from { - my $self = shift; - my $content = Module::Install::_readperl($_[0]); - my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg; - while ( @requires ) { - my $module = shift @requires; - my $version = shift @requires; - $self->requires( $module => $version ); - } -} - -sub test_requires_from { - my $self = shift; - my $content = Module::Install::_readperl($_[0]); - my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; - while ( @requires ) { - my $module = shift @requires; - my $version = shift @requires; - $self->test_requires( $module => $version ); - } -} - -# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to -# numbers (eg, 5.006001 or 5.008009). -# Also, convert double-part versions (eg, 5.8) -sub _perl_version { - my $v = $_[-1]; - $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e; - $v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e; - $v =~ s/(\.\d\d\d)000$/$1/; - $v =~ s/_.+$//; - if ( ref($v) ) { - # Numify - $v = $v + 0; - } - return $v; -} - -sub add_metadata { - my $self = shift; - my %hash = @_; - for my $key (keys %hash) { - warn "add_metadata: $key is not prefixed with 'x_'.\n" . - "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/; - $self->{values}->{$key} = $hash{$key}; - } -} - - -###################################################################### -# MYMETA Support - -sub WriteMyMeta { - die "WriteMyMeta has been deprecated"; -} - -sub write_mymeta_yaml { - my $self = shift; - - # We need YAML::Tiny to write the MYMETA.yml file - unless ( eval { require YAML::Tiny; 1; } ) { - return 1; - } - - # Generate the data - my $meta = $self->_write_mymeta_data or return 1; - - # Save as the MYMETA.yml file - print "Writing MYMETA.yml\n"; - YAML::Tiny::DumpFile('MYMETA.yml', $meta); -} - -sub write_mymeta_json { - my $self = shift; - - # We need JSON to write the MYMETA.json file - unless ( eval { require JSON; 1; } ) { - return 1; - } - - # Generate the data - my $meta = $self->_write_mymeta_data or return 1; - - # Save as the MYMETA.yml file - print "Writing MYMETA.json\n"; - Module::Install::_write( - 'MYMETA.json', - JSON->new->pretty(1)->canonical->encode($meta), - ); -} - -sub _write_mymeta_data { - my $self = shift; - - # If there's no existing META.yml there is nothing we can do - return undef unless -f 'META.yml'; - - # We need Parse::CPAN::Meta to load the file - unless ( eval { require Parse::CPAN::Meta; 1; } ) { - return undef; - } - - # Merge the perl version into the dependencies - my $val = $self->Meta->{values}; - my $perl = delete $val->{perl_version}; - if ( $perl ) { - $val->{requires} ||= []; - my $requires = $val->{requires}; - - # Canonize to three-dot version after Perl 5.6 - if ( $perl >= 5.006 ) { - $perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e - } - unshift @$requires, [ perl => $perl ]; - } - - # Load the advisory META.yml file - my @yaml = Parse::CPAN::Meta::LoadFile('META.yml'); - my $meta = $yaml[0]; - - # Overwrite the non-configure dependency hashs - delete $meta->{requires}; - delete $meta->{build_requires}; - delete $meta->{recommends}; - if ( exists $val->{requires} ) { - $meta->{requires} = { map { @$_ } @{ $val->{requires} } }; - } - if ( exists $val->{build_requires} ) { - $meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } }; - } - - return $meta; -} - -1; diff --git a/Web-Plugin-Observium/inc/Module/Install/Share.pm b/Web-Plugin-Observium/inc/Module/Install/Share.pm deleted file mode 100644 index 4e2b602a..00000000 --- a/Web-Plugin-Observium/inc/Module/Install/Share.pm +++ /dev/null @@ -1,96 +0,0 @@ -#line 1 -package Module::Install::Share; - -use strict; -use Module::Install::Base (); -use File::Find (); -use ExtUtils::Manifest (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub install_share { - my $self = shift; - my $dir = @_ ? pop : 'share'; - my $type = @_ ? shift : 'dist'; - unless ( defined $type and $type eq 'module' or $type eq 'dist' ) { - die "Illegal or invalid share dir type '$type'"; - } - unless ( defined $dir and -d $dir ) { - require Carp; - Carp::croak("Illegal or missing directory install_share param: '$dir'"); - } - - # Split by type - my $S = ($^O eq 'MSWin32') ? "\\" : "\/"; - - my $root; - if ( $type eq 'dist' ) { - die "Too many parameters to install_share" if @_; - - # Set up the install - $root = "\$(INST_LIB)${S}auto${S}share${S}dist${S}\$(DISTNAME)"; - } else { - my $module = Module::Install::_CLASS($_[0]); - unless ( defined $module ) { - die "Missing or invalid module name '$_[0]'"; - } - $module =~ s/::/-/g; - - $root = "\$(INST_LIB)${S}auto${S}share${S}module${S}$module"; - } - - my $manifest = -r 'MANIFEST' ? ExtUtils::Manifest::maniread() : undef; - my $skip_checker = $ExtUtils::Manifest::VERSION >= 1.54 - ? ExtUtils::Manifest::maniskip() - : ExtUtils::Manifest::_maniskip(); - my $postamble = ''; - my $perm_dir = eval($ExtUtils::MakeMaker::VERSION) >= 6.52 ? '$(PERM_DIR)' : 755; - File::Find::find({ - no_chdir => 1, - wanted => sub { - my $path = File::Spec->abs2rel($_, $dir); - if (-d $_) { - return if $skip_checker->($File::Find::name); - $postamble .=<<"END"; -\t\$(NOECHO) \$(MKPATH) "$root${S}$path" -\t\$(NOECHO) \$(CHMOD) $perm_dir "$root${S}$path" -END - } - else { - return if ref $manifest - && !exists $manifest->{$File::Find::name}; - return if $skip_checker->($File::Find::name); - $postamble .=<<"END"; -\t\$(NOECHO) \$(CP) "$dir${S}$path" "$root${S}$path" -END - } - }, - }, $dir); - - # Set up the install - $self->postamble(<<"END_MAKEFILE"); -config :: -$postamble - -END_MAKEFILE - - # The above appears to behave incorrectly when used with old versions - # of ExtUtils::Install (known-bad on RHEL 3, with 5.8.0) - # So when we need to install a share directory, make sure we add a - # dependency on a moderately new version of ExtUtils::MakeMaker. - $self->build_requires( 'ExtUtils::MakeMaker' => '6.11' ); - - # 99% of the time we don't want to index a shared dir - $self->no_index( directory => $dir ); -} - -1; - -__END__ - -#line 154 diff --git a/Web-Plugin-Observium/inc/Module/Install/Win32.pm b/Web-Plugin-Observium/inc/Module/Install/Win32.pm deleted file mode 100644 index eeaa3fed..00000000 --- a/Web-Plugin-Observium/inc/Module/Install/Win32.pm +++ /dev/null @@ -1,64 +0,0 @@ -#line 1 -package Module::Install::Win32; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -# determine if the user needs nmake, and download it if needed -sub check_nmake { - my $self = shift; - $self->load('can_run'); - $self->load('get_file'); - - require Config; - return unless ( - $^O eq 'MSWin32' and - $Config::Config{make} and - $Config::Config{make} =~ /^nmake\b/i and - ! $self->can_run('nmake') - ); - - print "The required 'nmake' executable not found, fetching it...\n"; - - require File::Basename; - my $rv = $self->get_file( - url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe', - ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe', - local_dir => File::Basename::dirname($^X), - size => 51928, - run => 'Nmake15.exe /o > nul', - check_for => 'Nmake.exe', - remove => 1, - ); - - die <<'END_MESSAGE' unless $rv; - -------------------------------------------------------------------------------- - -Since you are using Microsoft Windows, you will need the 'nmake' utility -before installation. It's available at: - - http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe - or - ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe - -Please download the file manually, save it to a directory in %PATH% (e.g. -C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to -that directory, and run "Nmake15.exe" from there; that will create the -'nmake.exe' file needed by this module. - -You may then resume the installation process described in README. - -------------------------------------------------------------------------------- -END_MESSAGE - -} - -1; diff --git a/Web-Plugin-Observium/inc/Module/Install/WriteAll.pm b/Web-Plugin-Observium/inc/Module/Install/WriteAll.pm deleted file mode 100644 index 85d8018c..00000000 --- a/Web-Plugin-Observium/inc/Module/Install/WriteAll.pm +++ /dev/null @@ -1,63 +0,0 @@ -#line 1 -package Module::Install::WriteAll; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = qw{Module::Install::Base}; - $ISCORE = 1; -} - -sub WriteAll { - my $self = shift; - my %args = ( - meta => 1, - sign => 0, - inline => 0, - check_nmake => 1, - @_, - ); - - $self->sign(1) if $args{sign}; - $self->admin->WriteAll(%args) if $self->is_admin; - - $self->check_nmake if $args{check_nmake}; - unless ( $self->makemaker_args->{PL_FILES} ) { - # XXX: This still may be a bit over-defensive... - unless ($self->makemaker(6.25)) { - $self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL'; - } - } - - # Until ExtUtils::MakeMaker support MYMETA.yml, make sure - # we clean it up properly ourself. - $self->realclean_files('MYMETA.yml'); - - if ( $args{inline} ) { - $self->Inline->write; - } else { - $self->Makefile->write; - } - - # The Makefile write process adds a couple of dependencies, - # so write the META.yml files after the Makefile. - if ( $args{meta} ) { - $self->Meta->write; - } - - # Experimental support for MYMETA - if ( $ENV{X_MYMETA} ) { - if ( $ENV{X_MYMETA} eq 'JSON' ) { - $self->Meta->write_mymeta_json; - } else { - $self->Meta->write_mymeta_yaml; - } - } - - return 1; -} - -1; diff --git a/Web-Plugin-Observium/lib/App/NetdiscoX/Web/Plugin/Observium.pm b/Web-Plugin-Observium/lib/App/NetdiscoX/Web/Plugin/Observium.pm deleted file mode 100644 index 5b0fd4a2..00000000 --- a/Web-Plugin-Observium/lib/App/NetdiscoX/Web/Plugin/Observium.pm +++ /dev/null @@ -1,94 +0,0 @@ -package App::NetdiscoX::Web::Plugin::Observium; - -our $VERSION = '2.003000'; - -use Dancer ':syntax'; -use App::Netdisco::Web::Plugin; - -use File::ShareDir 'dist_dir'; -register_template_path( - dist_dir( 'App-NetdiscoX-Web-Plugin-Observium' )); - -register_device_port_column({ - name => 'observium', - position => 'mid', - label => 'Traffic', - default => 'on', -}); - -register_css('observium'); -register_javascript('observium'); - -=head1 NAME - -App::NetdiscoX::Web::Plugin::Observium - Port Traffic Links and Thumbnail Graphs from Observium - -=head1 SYNOPSIS - - # in your ~/environments/deployment.yml file - - extra_web_plugins: - - X::Observium - - plugin_observium: - location: "https://web-server.example.com/" - open_in_same_window: false - -=head1 Description - -This is a plugin for the L network management application. It -adds a column to the Device Ports table named "Traffic" with a link and -thumbnail graph for the port, taken from a local Observium installation. - -=head1 Configuration - -Create an entry in your C<~/environments/deployment.yml> file named -"C", containing the following settings: - -=head2 location - -Value: String, Required. - -Full URL to your local Observium server, including HTTP/HTTPS scheme (as in -the example above). - -=head2 open_in_same_window - -Value: Boolean. Default: false. - -If set to true, the hyperlink is configured to open the port's Observium page -in the same browser window or tab as Netdisco. The default is false. - -=head1 AUTHOR - -Oliver Gorwits - -=head1 COPYRIGHT AND LICENSE - -This software is copyright (c) 2013 by The Netdisco Developer Team. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Netdisco Project nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE NETDISCO DEVELOPER TEAM BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -=cut - -true; diff --git a/Web-Plugin-Observium/share/views/plugin/observium/device_port_column.tt b/Web-Plugin-Observium/share/views/plugin/observium/device_port_column.tt deleted file mode 100644 index 05a687d2..00000000 --- a/Web-Plugin-Observium/share/views/plugin/observium/device_port_column.tt +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/Web-Plugin-Observium/share/views/plugin/observium/observium.css b/Web-Plugin-Observium/share/views/plugin/observium/observium.css deleted file mode 100644 index 143e9e36..00000000 --- a/Web-Plugin-Observium/share/views/plugin/observium/observium.css +++ /dev/null @@ -1,6 +0,0 @@ -.nd_observium-style { - min-width: none; - max-width: none; - margin-top: 5px; - margin-left: 15px; -} diff --git a/Web-Plugin-Observium/share/views/plugin/observium/observium.js b/Web-Plugin-Observium/share/views/plugin/observium/observium.js deleted file mode 100644 index d4652bec..00000000 --- a/Web-Plugin-Observium/share/views/plugin/observium/observium.js +++ /dev/null @@ -1,25 +0,0 @@ -$(document).ready(function() { - - // bind qtip2 event to all future .nd_observium buttons - $('#ports_pane').on('mouseover', '.nd_observium', function(event) { - $(this).qtip({ - overwrite: false, - content: { - attr: 'data-content' - }, - show: { - event: event.type, - ready: true - }, - position: { - my: 'left center', - at: 'right centre', - target: 'mouse' - }, - style: { - classes: 'qtip-bootstrap nd_observium-style' - } - }); - }); - -}); diff --git a/Web-Plugin-RANCID/Changes b/Web-Plugin-RANCID/Changes deleted file mode 100644 index fc192f7a..00000000 --- a/Web-Plugin-RANCID/Changes +++ /dev/null @@ -1,21 +0,0 @@ -2.004000 - 2014-07-13 - - * Added by_hostname config option support - -2.003002 - 2014-05-03 - - * POD fixups - -2.003001 - 2014-02-04 - - * Change to use %DEVICE% as well - full url must be configured in location - * Fix bug in check_acl call - -2.002000 - 2014-02-04 - - * Support for netdisco-rancid-export config for GROUP name - * Change to use location and open_in_same_window - -2.001000 - 2013-12-08 - - * Initial release diff --git a/Web-Plugin-RANCID/LICENCE b/Web-Plugin-RANCID/LICENCE deleted file mode 100644 index acff9c0b..00000000 --- a/Web-Plugin-RANCID/LICENCE +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (c) 2012, The Netdisco Developer Team -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Netdisco Project nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE NETDISCO DEVELOPER TEAM BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Web-Plugin-RANCID/MANIFEST b/Web-Plugin-RANCID/MANIFEST deleted file mode 100644 index 0898aa7e..00000000 --- a/Web-Plugin-RANCID/MANIFEST +++ /dev/null @@ -1,16 +0,0 @@ -Changes -inc/Module/Install.pm -inc/Module/Install/Base.pm -inc/Module/Install/Can.pm -inc/Module/Install/Fetch.pm -inc/Module/Install/Makefile.pm -inc/Module/Install/Metadata.pm -inc/Module/Install/Share.pm -inc/Module/Install/Win32.pm -inc/Module/Install/WriteAll.pm -lib/App/NetdiscoX/Web/Plugin/RANCID.pm -LICENCE -Makefile.PL -MANIFEST This list of files -META.yml -share/views/plugin/rancid/device_details.tt diff --git a/Web-Plugin-RANCID/META.yml b/Web-Plugin-RANCID/META.yml deleted file mode 100644 index faa3136f..00000000 --- a/Web-Plugin-RANCID/META.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -abstract: 'Link to device backups in RANCID/WebSVN' -author: - - 'Oliver Gorwits ' -build_requires: - ExtUtils::MakeMaker: 6.36 -configure_requires: - ExtUtils::MakeMaker: 6.36 -distribution_type: module -dynamic_config: 1 -generated_by: 'Module::Install version 1.06' -license: bsd -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 -name: App-NetdiscoX-Web-Plugin-RANCID -no_index: - directory: - - inc - - share -resources: - MailingList: https://lists.sourceforge.net/lists/listinfo/netdisco-users - bugtracker: http://sourceforge.net/p/netdisco/bugs/ - homepage: http://netdisco.org/ - license: http://opensource.org/licenses/bsd-license.php - repository: git://git.code.sf.net/p/netdisco/netdisco-ng -version: 2.004000 diff --git a/Web-Plugin-RANCID/Makefile.PL b/Web-Plugin-RANCID/Makefile.PL deleted file mode 100644 index f12615ed..00000000 --- a/Web-Plugin-RANCID/Makefile.PL +++ /dev/null @@ -1,15 +0,0 @@ -use inc::Module::Install; - -name 'App-NetdiscoX-Web-Plugin-RANCID'; -license 'bsd'; -all_from 'lib/App/NetdiscoX/Web/Plugin/RANCID.pm'; - -install_share 'share'; - -resources - homepage => 'http://netdisco.org/', - bugtracker => 'http://sourceforge.net/p/netdisco/bugs/', - repository => 'git://git.code.sf.net/p/netdisco/netdisco-ng', - MailingList => 'https://lists.sourceforge.net/lists/listinfo/netdisco-users'; - -WriteAll; diff --git a/Web-Plugin-RANCID/inc/Module/Install.pm b/Web-Plugin-RANCID/inc/Module/Install.pm deleted file mode 100644 index 4ecf46b9..00000000 --- a/Web-Plugin-RANCID/inc/Module/Install.pm +++ /dev/null @@ -1,470 +0,0 @@ -#line 1 -package Module::Install; - -# For any maintainers: -# The load order for Module::Install is a bit magic. -# It goes something like this... -# -# IF ( host has Module::Install installed, creating author mode ) { -# 1. Makefile.PL calls "use inc::Module::Install" -# 2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install -# 3. The installed version of inc::Module::Install loads -# 4. inc::Module::Install calls "require Module::Install" -# 5. The ./inc/ version of Module::Install loads -# } ELSE { -# 1. Makefile.PL calls "use inc::Module::Install" -# 2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install -# 3. The ./inc/ version of Module::Install loads -# } - -use 5.005; -use strict 'vars'; -use Cwd (); -use File::Find (); -use File::Path (); - -use vars qw{$VERSION $MAIN}; -BEGIN { - # All Module::Install core packages now require synchronised versions. - # This will be used to ensure we don't accidentally load old or - # different versions of modules. - # This is not enforced yet, but will be some time in the next few - # releases once we can make sure it won't clash with custom - # Module::Install extensions. - $VERSION = '1.06'; - - # Storage for the pseudo-singleton - $MAIN = undef; - - *inc::Module::Install::VERSION = *VERSION; - @inc::Module::Install::ISA = __PACKAGE__; - -} - -sub import { - my $class = shift; - my $self = $class->new(@_); - my $who = $self->_caller; - - #------------------------------------------------------------- - # all of the following checks should be included in import(), - # to allow "eval 'require Module::Install; 1' to test - # installation of Module::Install. (RT #51267) - #------------------------------------------------------------- - - # Whether or not inc::Module::Install is actually loaded, the - # $INC{inc/Module/Install.pm} is what will still get set as long as - # the caller loaded module this in the documented manner. - # If not set, the caller may NOT have loaded the bundled version, and thus - # they may not have a MI version that works with the Makefile.PL. This would - # result in false errors or unexpected behaviour. And we don't want that. - my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; - unless ( $INC{$file} ) { die <<"END_DIE" } - -Please invoke ${\__PACKAGE__} with: - - use inc::${\__PACKAGE__}; - -not: - - use ${\__PACKAGE__}; - -END_DIE - - # This reportedly fixes a rare Win32 UTC file time issue, but - # as this is a non-cross-platform XS module not in the core, - # we shouldn't really depend on it. See RT #24194 for detail. - # (Also, this module only supports Perl 5.6 and above). - eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006; - - # If the script that is loading Module::Install is from the future, - # then make will detect this and cause it to re-run over and over - # again. This is bad. Rather than taking action to touch it (which - # is unreliable on some platforms and requires write permissions) - # for now we should catch this and refuse to run. - if ( -f $0 ) { - my $s = (stat($0))[9]; - - # If the modification time is only slightly in the future, - # sleep briefly to remove the problem. - my $a = $s - time; - if ( $a > 0 and $a < 5 ) { sleep 5 } - - # Too far in the future, throw an error. - my $t = time; - if ( $s > $t ) { die <<"END_DIE" } - -Your installer $0 has a modification time in the future ($s > $t). - -This is known to create infinite loops in make. - -Please correct this, then run $0 again. - -END_DIE - } - - - # Build.PL was formerly supported, but no longer is due to excessive - # difficulty in implementing every single feature twice. - if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } - -Module::Install no longer supports Build.PL. - -It was impossible to maintain duel backends, and has been deprecated. - -Please remove all Build.PL files and only use the Makefile.PL installer. - -END_DIE - - #------------------------------------------------------------- - - # To save some more typing in Module::Install installers, every... - # use inc::Module::Install - # ...also acts as an implicit use strict. - $^H |= strict::bits(qw(refs subs vars)); - - #------------------------------------------------------------- - - unless ( -f $self->{file} ) { - foreach my $key (keys %INC) { - delete $INC{$key} if $key =~ /Module\/Install/; - } - - local $^W; - require "$self->{path}/$self->{dispatch}.pm"; - File::Path::mkpath("$self->{prefix}/$self->{author}"); - $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); - $self->{admin}->init; - @_ = ($class, _self => $self); - goto &{"$self->{name}::import"}; - } - - local $^W; - *{"${who}::AUTOLOAD"} = $self->autoload; - $self->preload; - - # Unregister loader and worker packages so subdirs can use them again - delete $INC{'inc/Module/Install.pm'}; - delete $INC{'Module/Install.pm'}; - - # Save to the singleton - $MAIN = $self; - - return 1; -} - -sub autoload { - my $self = shift; - my $who = $self->_caller; - my $cwd = Cwd::cwd(); - my $sym = "${who}::AUTOLOAD"; - $sym->{$cwd} = sub { - my $pwd = Cwd::cwd(); - if ( my $code = $sym->{$pwd} ) { - # Delegate back to parent dirs - goto &$code unless $cwd eq $pwd; - } - unless ($$sym =~ s/([^:]+)$//) { - # XXX: it looks like we can't retrieve the missing function - # via $$sym (usually $main::AUTOLOAD) in this case. - # I'm still wondering if we should slurp Makefile.PL to - # get some context or not ... - my ($package, $file, $line) = caller; - die <<"EOT"; -Unknown function is found at $file line $line. -Execution of $file aborted due to runtime errors. - -If you're a contributor to a project, you may need to install -some Module::Install extensions from CPAN (or other repository). -If you're a user of a module, please contact the author. -EOT - } - my $method = $1; - if ( uc($method) eq $method ) { - # Do nothing - return; - } elsif ( $method =~ /^_/ and $self->can($method) ) { - # Dispatch to the root M:I class - return $self->$method(@_); - } - - # Dispatch to the appropriate plugin - unshift @_, ( $self, $1 ); - goto &{$self->can('call')}; - }; -} - -sub preload { - my $self = shift; - unless ( $self->{extensions} ) { - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ); - } - - my @exts = @{$self->{extensions}}; - unless ( @exts ) { - @exts = $self->{admin}->load_all_extensions; - } - - my %seen; - foreach my $obj ( @exts ) { - while (my ($method, $glob) = each %{ref($obj) . '::'}) { - next unless $obj->can($method); - next if $method =~ /^_/; - next if $method eq uc($method); - $seen{$method}++; - } - } - - my $who = $self->_caller; - foreach my $name ( sort keys %seen ) { - local $^W; - *{"${who}::$name"} = sub { - ${"${who}::AUTOLOAD"} = "${who}::$name"; - goto &{"${who}::AUTOLOAD"}; - }; - } -} - -sub new { - my ($class, %args) = @_; - - delete $INC{'FindBin.pm'}; - { - # to suppress the redefine warning - local $SIG{__WARN__} = sub {}; - require FindBin; - } - - # ignore the prefix on extension modules built from top level. - my $base_path = Cwd::abs_path($FindBin::Bin); - unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) { - delete $args{prefix}; - } - return $args{_self} if $args{_self}; - - $args{dispatch} ||= 'Admin'; - $args{prefix} ||= 'inc'; - $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); - $args{bundle} ||= 'inc/BUNDLES'; - $args{base} ||= $base_path; - $class =~ s/^\Q$args{prefix}\E:://; - $args{name} ||= $class; - $args{version} ||= $class->VERSION; - unless ( $args{path} ) { - $args{path} = $args{name}; - $args{path} =~ s!::!/!g; - } - $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm"; - $args{wrote} = 0; - - bless( \%args, $class ); -} - -sub call { - my ($self, $method) = @_; - my $obj = $self->load($method) or return; - splice(@_, 0, 2, $obj); - goto &{$obj->can($method)}; -} - -sub load { - my ($self, $method) = @_; - - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ) unless $self->{extensions}; - - foreach my $obj (@{$self->{extensions}}) { - return $obj if $obj->can($method); - } - - my $admin = $self->{admin} or die <<"END_DIE"; -The '$method' method does not exist in the '$self->{prefix}' path! -Please remove the '$self->{prefix}' directory and run $0 again to load it. -END_DIE - - my $obj = $admin->load($method, 1); - push @{$self->{extensions}}, $obj; - - $obj; -} - -sub load_extensions { - my ($self, $path, $top) = @_; - - my $should_reload = 0; - unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) { - unshift @INC, $self->{prefix}; - $should_reload = 1; - } - - foreach my $rv ( $self->find_extensions($path) ) { - my ($file, $pkg) = @{$rv}; - next if $self->{pathnames}{$pkg}; - - local $@; - my $new = eval { local $^W; require $file; $pkg->can('new') }; - unless ( $new ) { - warn $@ if $@; - next; - } - $self->{pathnames}{$pkg} = - $should_reload ? delete $INC{$file} : $INC{$file}; - push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); - } - - $self->{extensions} ||= []; -} - -sub find_extensions { - my ($self, $path) = @_; - - my @found; - File::Find::find( sub { - my $file = $File::Find::name; - return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; - my $subpath = $1; - return if lc($subpath) eq lc($self->{dispatch}); - - $file = "$self->{path}/$subpath.pm"; - my $pkg = "$self->{name}::$subpath"; - $pkg =~ s!/!::!g; - - # If we have a mixed-case package name, assume case has been preserved - # correctly. Otherwise, root through the file to locate the case-preserved - # version of the package name. - if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { - my $content = Module::Install::_read($subpath . '.pm'); - my $in_pod = 0; - foreach ( split //, $content ) { - $in_pod = 1 if /^=\w/; - $in_pod = 0 if /^=cut/; - next if ($in_pod || /^=cut/); # skip pod text - next if /^\s*#/; # and comments - if ( m/^\s*package\s+($pkg)\s*;/i ) { - $pkg = $1; - last; - } - } - } - - push @found, [ $file, $pkg ]; - }, $path ) if -d $path; - - @found; -} - - - - - -##################################################################### -# Common Utility Functions - -sub _caller { - my $depth = 0; - my $call = caller($depth); - while ( $call eq __PACKAGE__ ) { - $depth++; - $call = caller($depth); - } - return $call; -} - -# Done in evals to avoid confusing Perl::MinimumVersion -eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; -sub _read { - local *FH; - open( FH, '<', $_[0] ) or die "open($_[0]): $!"; - my $string = do { local $/; }; - close FH or die "close($_[0]): $!"; - return $string; -} -END_NEW -sub _read { - local *FH; - open( FH, "< $_[0]" ) or die "open($_[0]): $!"; - my $string = do { local $/; }; - close FH or die "close($_[0]): $!"; - return $string; -} -END_OLD - -sub _readperl { - my $string = Module::Install::_read($_[0]); - $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; - $string =~ s/(\n)\n*__(?:DATA|END)__\b.*\z/$1/s; - $string =~ s/\n\n=\w+.+?\n\n=cut\b.+?\n+/\n\n/sg; - return $string; -} - -sub _readpod { - my $string = Module::Install::_read($_[0]); - $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; - return $string if $_[0] =~ /\.pod\z/; - $string =~ s/(^|\n=cut\b.+?\n+)[^=\s].+?\n(\n=\w+|\z)/$1$2/sg; - $string =~ s/\n*=pod\b[^\n]*\n+/\n\n/sg; - $string =~ s/\n*=cut\b[^\n]*\n+/\n\n/sg; - $string =~ s/^\n+//s; - return $string; -} - -# Done in evals to avoid confusing Perl::MinimumVersion -eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; -sub _write { - local *FH; - open( FH, '>', $_[0] ) or die "open($_[0]): $!"; - foreach ( 1 .. $#_ ) { - print FH $_[$_] or die "print($_[0]): $!"; - } - close FH or die "close($_[0]): $!"; -} -END_NEW -sub _write { - local *FH; - open( FH, "> $_[0]" ) or die "open($_[0]): $!"; - foreach ( 1 .. $#_ ) { - print FH $_[$_] or die "print($_[0]): $!"; - } - close FH or die "close($_[0]): $!"; -} -END_OLD - -# _version is for processing module versions (eg, 1.03_05) not -# Perl versions (eg, 5.8.1). -sub _version ($) { - my $s = shift || 0; - my $d =()= $s =~ /(\.)/g; - if ( $d >= 2 ) { - # Normalise multipart versions - $s =~ s/(\.)(\d{1,3})/sprintf("$1%03d",$2)/eg; - } - $s =~ s/^(\d+)\.?//; - my $l = $1 || 0; - my @v = map { - $_ . '0' x (3 - length $_) - } $s =~ /(\d{1,3})\D?/g; - $l = $l . '.' . join '', @v if @v; - return $l + 0; -} - -sub _cmp ($$) { - _version($_[1]) <=> _version($_[2]); -} - -# Cloned from Params::Util::_CLASS -sub _CLASS ($) { - ( - defined $_[0] - and - ! ref $_[0] - and - $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s - ) ? $_[0] : undef; -} - -1; - -# Copyright 2008 - 2012 Adam Kennedy. diff --git a/Web-Plugin-RANCID/inc/Module/Install/Base.pm b/Web-Plugin-RANCID/inc/Module/Install/Base.pm deleted file mode 100644 index 802844aa..00000000 --- a/Web-Plugin-RANCID/inc/Module/Install/Base.pm +++ /dev/null @@ -1,83 +0,0 @@ -#line 1 -package Module::Install::Base; - -use strict 'vars'; -use vars qw{$VERSION}; -BEGIN { - $VERSION = '1.06'; -} - -# Suspend handler for "redefined" warnings -BEGIN { - my $w = $SIG{__WARN__}; - $SIG{__WARN__} = sub { $w }; -} - -#line 42 - -sub new { - my $class = shift; - unless ( defined &{"${class}::call"} ) { - *{"${class}::call"} = sub { shift->_top->call(@_) }; - } - unless ( defined &{"${class}::load"} ) { - *{"${class}::load"} = sub { shift->_top->load(@_) }; - } - bless { @_ }, $class; -} - -#line 61 - -sub AUTOLOAD { - local $@; - my $func = eval { shift->_top->autoload } or return; - goto &$func; -} - -#line 75 - -sub _top { - $_[0]->{_top}; -} - -#line 90 - -sub admin { - $_[0]->_top->{admin} - or - Module::Install::Base::FakeAdmin->new; -} - -#line 106 - -sub is_admin { - ! $_[0]->admin->isa('Module::Install::Base::FakeAdmin'); -} - -sub DESTROY {} - -package Module::Install::Base::FakeAdmin; - -use vars qw{$VERSION}; -BEGIN { - $VERSION = $Module::Install::Base::VERSION; -} - -my $fake; - -sub new { - $fake ||= bless(\@_, $_[0]); -} - -sub AUTOLOAD {} - -sub DESTROY {} - -# Restore warning handler -BEGIN { - $SIG{__WARN__} = $SIG{__WARN__}->(); -} - -1; - -#line 159 diff --git a/Web-Plugin-RANCID/inc/Module/Install/Can.pm b/Web-Plugin-RANCID/inc/Module/Install/Can.pm deleted file mode 100644 index 22167b8f..00000000 --- a/Web-Plugin-RANCID/inc/Module/Install/Can.pm +++ /dev/null @@ -1,154 +0,0 @@ -#line 1 -package Module::Install::Can; - -use strict; -use Config (); -use ExtUtils::MakeMaker (); -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -# check if we can load some module -### Upgrade this to not have to load the module if possible -sub can_use { - my ($self, $mod, $ver) = @_; - $mod =~ s{::|\\}{/}g; - $mod .= '.pm' unless $mod =~ /\.pm$/i; - - my $pkg = $mod; - $pkg =~ s{/}{::}g; - $pkg =~ s{\.pm$}{}i; - - local $@; - eval { require $mod; $pkg->VERSION($ver || 0); 1 }; -} - -# Check if we can run some command -sub can_run { - my ($self, $cmd) = @_; - - my $_cmd = $cmd; - return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); - - for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { - next if $dir eq ''; - require File::Spec; - my $abs = File::Spec->catfile($dir, $cmd); - return $abs if (-x $abs or $abs = MM->maybe_command($abs)); - } - - return; -} - -# Can our C compiler environment build XS files -sub can_xs { - my $self = shift; - - # Ensure we have the CBuilder module - $self->configure_requires( 'ExtUtils::CBuilder' => 0.27 ); - - # Do we have the configure_requires checker? - local $@; - eval "require ExtUtils::CBuilder;"; - if ( $@ ) { - # They don't obey configure_requires, so it is - # someone old and delicate. Try to avoid hurting - # them by falling back to an older simpler test. - return $self->can_cc(); - } - - # Do we have a working C compiler - my $builder = ExtUtils::CBuilder->new( - quiet => 1, - ); - unless ( $builder->have_compiler ) { - # No working C compiler - return 0; - } - - # Write a C file representative of what XS becomes - require File::Temp; - my ( $FH, $tmpfile ) = File::Temp::tempfile( - "compilexs-XXXXX", - SUFFIX => '.c', - ); - binmode $FH; - print $FH <<'END_C'; -#include "EXTERN.h" -#include "perl.h" -#include "XSUB.h" - -int main(int argc, char **argv) { - return 0; -} - -int boot_sanexs() { - return 1; -} - -END_C - close $FH; - - # Can the C compiler access the same headers XS does - my @libs = (); - my $object = undef; - eval { - local $^W = 0; - $object = $builder->compile( - source => $tmpfile, - ); - @libs = $builder->link( - objects => $object, - module_name => 'sanexs', - ); - }; - my $result = $@ ? 0 : 1; - - # Clean up all the build files - foreach ( $tmpfile, $object, @libs ) { - next unless defined $_; - 1 while unlink; - } - - return $result; -} - -# Can we locate a (the) C compiler -sub can_cc { - my $self = shift; - my @chunks = split(/ /, $Config::Config{cc}) or return; - - # $Config{cc} may contain args; try to find out the program part - while (@chunks) { - return $self->can_run("@chunks") || (pop(@chunks), next); - } - - return; -} - -# Fix Cygwin bug on maybe_command(); -if ( $^O eq 'cygwin' ) { - require ExtUtils::MM_Cygwin; - require ExtUtils::MM_Win32; - if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) { - *ExtUtils::MM_Cygwin::maybe_command = sub { - my ($self, $file) = @_; - if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) { - ExtUtils::MM_Win32->maybe_command($file); - } else { - ExtUtils::MM_Unix->maybe_command($file); - } - } - } -} - -1; - -__END__ - -#line 236 diff --git a/Web-Plugin-RANCID/inc/Module/Install/Fetch.pm b/Web-Plugin-RANCID/inc/Module/Install/Fetch.pm deleted file mode 100644 index bee0c4fb..00000000 --- a/Web-Plugin-RANCID/inc/Module/Install/Fetch.pm +++ /dev/null @@ -1,93 +0,0 @@ -#line 1 -package Module::Install::Fetch; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub get_file { - my ($self, %args) = @_; - my ($scheme, $host, $path, $file) = - $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; - - if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) { - $args{url} = $args{ftp_url} - or (warn("LWP support unavailable!\n"), return); - ($scheme, $host, $path, $file) = - $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; - } - - $|++; - print "Fetching '$file' from $host... "; - - unless (eval { require Socket; Socket::inet_aton($host) }) { - warn "'$host' resolve failed!\n"; - return; - } - - return unless $scheme eq 'ftp' or $scheme eq 'http'; - - require Cwd; - my $dir = Cwd::getcwd(); - chdir $args{local_dir} or return if exists $args{local_dir}; - - if (eval { require LWP::Simple; 1 }) { - LWP::Simple::mirror($args{url}, $file); - } - elsif (eval { require Net::FTP; 1 }) { eval { - # use Net::FTP to get past firewall - my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600); - $ftp->login("anonymous", 'anonymous@example.com'); - $ftp->cwd($path); - $ftp->binary; - $ftp->get($file) or (warn("$!\n"), return); - $ftp->quit; - } } - elsif (my $ftp = $self->can_run('ftp')) { eval { - # no Net::FTP, fallback to ftp.exe - require FileHandle; - my $fh = FileHandle->new; - - local $SIG{CHLD} = 'IGNORE'; - unless ($fh->open("|$ftp -n")) { - warn "Couldn't open ftp: $!\n"; - chdir $dir; return; - } - - my @dialog = split(/\n/, <<"END_FTP"); -open $host -user anonymous anonymous\@example.com -cd $path -binary -get $file $file -quit -END_FTP - foreach (@dialog) { $fh->print("$_\n") } - $fh->close; - } } - else { - warn "No working 'ftp' program available!\n"; - chdir $dir; return; - } - - unless (-f $file) { - warn "Fetching failed: $@\n"; - chdir $dir; return; - } - - return if exists $args{size} and -s $file != $args{size}; - system($args{run}) if exists $args{run}; - unlink($file) if $args{remove}; - - print(((!exists $args{check_for} or -e $args{check_for}) - ? "done!" : "failed! ($!)"), "\n"); - chdir $dir; return !$?; -} - -1; diff --git a/Web-Plugin-RANCID/inc/Module/Install/Makefile.pm b/Web-Plugin-RANCID/inc/Module/Install/Makefile.pm deleted file mode 100644 index 7052f365..00000000 --- a/Web-Plugin-RANCID/inc/Module/Install/Makefile.pm +++ /dev/null @@ -1,418 +0,0 @@ -#line 1 -package Module::Install::Makefile; - -use strict 'vars'; -use ExtUtils::MakeMaker (); -use Module::Install::Base (); -use Fcntl qw/:flock :seek/; - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub Makefile { $_[0] } - -my %seen = (); - -sub prompt { - shift; - - # Infinite loop protection - my @c = caller(); - if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) { - die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; - } - - # In automated testing or non-interactive session, always use defaults - if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) { - local $ENV{PERL_MM_USE_DEFAULT} = 1; - goto &ExtUtils::MakeMaker::prompt; - } else { - goto &ExtUtils::MakeMaker::prompt; - } -} - -# Store a cleaned up version of the MakeMaker version, -# since we need to behave differently in a variety of -# ways based on the MM version. -my $makemaker = eval $ExtUtils::MakeMaker::VERSION; - -# If we are passed a param, do a "newer than" comparison. -# Otherwise, just return the MakeMaker version. -sub makemaker { - ( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0 -} - -# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified -# as we only need to know here whether the attribute is an array -# or a hash or something else (which may or may not be appendable). -my %makemaker_argtype = ( - C => 'ARRAY', - CONFIG => 'ARRAY', -# CONFIGURE => 'CODE', # ignore - DIR => 'ARRAY', - DL_FUNCS => 'HASH', - DL_VARS => 'ARRAY', - EXCLUDE_EXT => 'ARRAY', - EXE_FILES => 'ARRAY', - FUNCLIST => 'ARRAY', - H => 'ARRAY', - IMPORTS => 'HASH', - INCLUDE_EXT => 'ARRAY', - LIBS => 'ARRAY', # ignore '' - MAN1PODS => 'HASH', - MAN3PODS => 'HASH', - META_ADD => 'HASH', - META_MERGE => 'HASH', - PL_FILES => 'HASH', - PM => 'HASH', - PMLIBDIRS => 'ARRAY', - PMLIBPARENTDIRS => 'ARRAY', - PREREQ_PM => 'HASH', - CONFIGURE_REQUIRES => 'HASH', - SKIP => 'ARRAY', - TYPEMAPS => 'ARRAY', - XS => 'HASH', -# VERSION => ['version',''], # ignore -# _KEEP_AFTER_FLUSH => '', - - clean => 'HASH', - depend => 'HASH', - dist => 'HASH', - dynamic_lib=> 'HASH', - linkext => 'HASH', - macro => 'HASH', - postamble => 'HASH', - realclean => 'HASH', - test => 'HASH', - tool_autosplit => 'HASH', - - # special cases where you can use makemaker_append - CCFLAGS => 'APPENDABLE', - DEFINE => 'APPENDABLE', - INC => 'APPENDABLE', - LDDLFLAGS => 'APPENDABLE', - LDFROM => 'APPENDABLE', -); - -sub makemaker_args { - my ($self, %new_args) = @_; - my $args = ( $self->{makemaker_args} ||= {} ); - foreach my $key (keys %new_args) { - if ($makemaker_argtype{$key}) { - if ($makemaker_argtype{$key} eq 'ARRAY') { - $args->{$key} = [] unless defined $args->{$key}; - unless (ref $args->{$key} eq 'ARRAY') { - $args->{$key} = [$args->{$key}] - } - push @{$args->{$key}}, - ref $new_args{$key} eq 'ARRAY' - ? @{$new_args{$key}} - : $new_args{$key}; - } - elsif ($makemaker_argtype{$key} eq 'HASH') { - $args->{$key} = {} unless defined $args->{$key}; - foreach my $skey (keys %{ $new_args{$key} }) { - $args->{$key}{$skey} = $new_args{$key}{$skey}; - } - } - elsif ($makemaker_argtype{$key} eq 'APPENDABLE') { - $self->makemaker_append($key => $new_args{$key}); - } - } - else { - if (defined $args->{$key}) { - warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n}; - } - $args->{$key} = $new_args{$key}; - } - } - return $args; -} - -# For mm args that take multiple space-seperated args, -# append an argument to the current list. -sub makemaker_append { - my $self = shift; - my $name = shift; - my $args = $self->makemaker_args; - $args->{$name} = defined $args->{$name} - ? join( ' ', $args->{$name}, @_ ) - : join( ' ', @_ ); -} - -sub build_subdirs { - my $self = shift; - my $subdirs = $self->makemaker_args->{DIR} ||= []; - for my $subdir (@_) { - push @$subdirs, $subdir; - } -} - -sub clean_files { - my $self = shift; - my $clean = $self->makemaker_args->{clean} ||= {}; - %$clean = ( - %$clean, - FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_), - ); -} - -sub realclean_files { - my $self = shift; - my $realclean = $self->makemaker_args->{realclean} ||= {}; - %$realclean = ( - %$realclean, - FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_), - ); -} - -sub libs { - my $self = shift; - my $libs = ref $_[0] ? shift : [ shift ]; - $self->makemaker_args( LIBS => $libs ); -} - -sub inc { - my $self = shift; - $self->makemaker_args( INC => shift ); -} - -sub _wanted_t { -} - -sub tests_recursive { - my $self = shift; - my $dir = shift || 't'; - unless ( -d $dir ) { - die "tests_recursive dir '$dir' does not exist"; - } - my %tests = map { $_ => 1 } split / /, ($self->tests || ''); - require File::Find; - File::Find::find( - sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 }, - $dir - ); - $self->tests( join ' ', sort keys %tests ); -} - -sub write { - my $self = shift; - die "&Makefile->write() takes no arguments\n" if @_; - - # Check the current Perl version - my $perl_version = $self->perl_version; - if ( $perl_version ) { - eval "use $perl_version; 1" - or die "ERROR: perl: Version $] is installed, " - . "but we need version >= $perl_version"; - } - - # Make sure we have a new enough MakeMaker - require ExtUtils::MakeMaker; - - if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) { - # This previous attempted to inherit the version of - # ExtUtils::MakeMaker in use by the module author, but this - # was found to be untenable as some authors build releases - # using future dev versions of EU:MM that nobody else has. - # Instead, #toolchain suggests we use 6.59 which is the most - # stable version on CPAN at time of writing and is, to quote - # ribasushi, "not terminally fucked, > and tested enough". - # TODO: We will now need to maintain this over time to push - # the version up as new versions are released. - $self->build_requires( 'ExtUtils::MakeMaker' => 6.59 ); - $self->configure_requires( 'ExtUtils::MakeMaker' => 6.59 ); - } else { - # Allow legacy-compatibility with 5.005 by depending on the - # most recent EU:MM that supported 5.005. - $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 ); - $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 ); - } - - # Generate the MakeMaker params - my $args = $self->makemaker_args; - $args->{DISTNAME} = $self->name; - $args->{NAME} = $self->module_name || $self->name; - $args->{NAME} =~ s/-/::/g; - $args->{VERSION} = $self->version or die <<'EOT'; -ERROR: Can't determine distribution version. Please specify it -explicitly via 'version' in Makefile.PL, or set a valid $VERSION -in a module, and provide its file path via 'version_from' (or -'all_from' if you prefer) in Makefile.PL. -EOT - - if ( $self->tests ) { - my @tests = split ' ', $self->tests; - my %seen; - $args->{test} = { - TESTS => (join ' ', grep {!$seen{$_}++} @tests), - }; - } elsif ( $Module::Install::ExtraTests::use_extratests ) { - # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness. - # So, just ignore our xt tests here. - } elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) { - $args->{test} = { - TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ), - }; - } - if ( $] >= 5.005 ) { - $args->{ABSTRACT} = $self->abstract; - $args->{AUTHOR} = join ', ', @{$self->author || []}; - } - if ( $self->makemaker(6.10) ) { - $args->{NO_META} = 1; - #$args->{NO_MYMETA} = 1; - } - if ( $self->makemaker(6.17) and $self->sign ) { - $args->{SIGN} = 1; - } - unless ( $self->is_admin ) { - delete $args->{SIGN}; - } - if ( $self->makemaker(6.31) and $self->license ) { - $args->{LICENSE} = $self->license; - } - - my $prereq = ($args->{PREREQ_PM} ||= {}); - %$prereq = ( %$prereq, - map { @$_ } # flatten [module => version] - map { @$_ } - grep $_, - ($self->requires) - ); - - # Remove any reference to perl, PREREQ_PM doesn't support it - delete $args->{PREREQ_PM}->{perl}; - - # Merge both kinds of requires into BUILD_REQUIRES - my $build_prereq = ($args->{BUILD_REQUIRES} ||= {}); - %$build_prereq = ( %$build_prereq, - map { @$_ } # flatten [module => version] - map { @$_ } - grep $_, - ($self->configure_requires, $self->build_requires) - ); - - # Remove any reference to perl, BUILD_REQUIRES doesn't support it - delete $args->{BUILD_REQUIRES}->{perl}; - - # Delete bundled dists from prereq_pm, add it to Makefile DIR - my $subdirs = ($args->{DIR} || []); - if ($self->bundles) { - my %processed; - foreach my $bundle (@{ $self->bundles }) { - my ($mod_name, $dist_dir) = @$bundle; - delete $prereq->{$mod_name}; - $dist_dir = File::Basename::basename($dist_dir); # dir for building this module - if (not exists $processed{$dist_dir}) { - if (-d $dist_dir) { - # List as sub-directory to be processed by make - push @$subdirs, $dist_dir; - } - # Else do nothing: the module is already present on the system - $processed{$dist_dir} = undef; - } - } - } - - unless ( $self->makemaker('6.55_03') ) { - %$prereq = (%$prereq,%$build_prereq); - delete $args->{BUILD_REQUIRES}; - } - - if ( my $perl_version = $self->perl_version ) { - eval "use $perl_version; 1" - or die "ERROR: perl: Version $] is installed, " - . "but we need version >= $perl_version"; - - if ( $self->makemaker(6.48) ) { - $args->{MIN_PERL_VERSION} = $perl_version; - } - } - - if ($self->installdirs) { - warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS}; - $args->{INSTALLDIRS} = $self->installdirs; - } - - my %args = map { - ( $_ => $args->{$_} ) } grep {defined($args->{$_} ) - } keys %$args; - - my $user_preop = delete $args{dist}->{PREOP}; - if ( my $preop = $self->admin->preop($user_preop) ) { - foreach my $key ( keys %$preop ) { - $args{dist}->{$key} = $preop->{$key}; - } - } - - my $mm = ExtUtils::MakeMaker::WriteMakefile(%args); - $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile'); -} - -sub fix_up_makefile { - my $self = shift; - my $makefile_name = shift; - my $top_class = ref($self->_top) || ''; - my $top_version = $self->_top->VERSION || ''; - - my $preamble = $self->preamble - ? "# Preamble by $top_class $top_version\n" - . $self->preamble - : ''; - my $postamble = "# Postamble by $top_class $top_version\n" - . ($self->postamble || ''); - - local *MAKEFILE; - open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; - eval { flock MAKEFILE, LOCK_EX }; - my $makefile = do { local $/; }; - - $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; - $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; - $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g; - $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m; - $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m; - - # Module::Install will never be used to build the Core Perl - # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks - # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist - $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m; - #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m; - - # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well. - $makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g; - - # XXX - This is currently unused; not sure if it breaks other MM-users - # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg; - - seek MAKEFILE, 0, SEEK_SET; - truncate MAKEFILE, 0; - print MAKEFILE "$preamble$makefile$postamble" or die $!; - close MAKEFILE or die $!; - - 1; -} - -sub preamble { - my ($self, $text) = @_; - $self->{preamble} = $text . $self->{preamble} if defined $text; - $self->{preamble}; -} - -sub postamble { - my ($self, $text) = @_; - $self->{postamble} ||= $self->admin->postamble; - $self->{postamble} .= $text if defined $text; - $self->{postamble} -} - -1; - -__END__ - -#line 544 diff --git a/Web-Plugin-RANCID/inc/Module/Install/Metadata.pm b/Web-Plugin-RANCID/inc/Module/Install/Metadata.pm deleted file mode 100644 index 58430f30..00000000 --- a/Web-Plugin-RANCID/inc/Module/Install/Metadata.pm +++ /dev/null @@ -1,722 +0,0 @@ -#line 1 -package Module::Install::Metadata; - -use strict 'vars'; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -my @boolean_keys = qw{ - sign -}; - -my @scalar_keys = qw{ - name - module_name - abstract - version - distribution_type - tests - installdirs -}; - -my @tuple_keys = qw{ - configure_requires - build_requires - requires - recommends - bundles - resources -}; - -my @resource_keys = qw{ - homepage - bugtracker - repository -}; - -my @array_keys = qw{ - keywords - author -}; - -*authors = \&author; - -sub Meta { shift } -sub Meta_BooleanKeys { @boolean_keys } -sub Meta_ScalarKeys { @scalar_keys } -sub Meta_TupleKeys { @tuple_keys } -sub Meta_ResourceKeys { @resource_keys } -sub Meta_ArrayKeys { @array_keys } - -foreach my $key ( @boolean_keys ) { - *$key = sub { - my $self = shift; - if ( defined wantarray and not @_ ) { - return $self->{values}->{$key}; - } - $self->{values}->{$key} = ( @_ ? $_[0] : 1 ); - return $self; - }; -} - -foreach my $key ( @scalar_keys ) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} if defined wantarray and !@_; - $self->{values}->{$key} = shift; - return $self; - }; -} - -foreach my $key ( @array_keys ) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} if defined wantarray and !@_; - $self->{values}->{$key} ||= []; - push @{$self->{values}->{$key}}, @_; - return $self; - }; -} - -foreach my $key ( @resource_keys ) { - *$key = sub { - my $self = shift; - unless ( @_ ) { - return () unless $self->{values}->{resources}; - return map { $_->[1] } - grep { $_->[0] eq $key } - @{ $self->{values}->{resources} }; - } - return $self->{values}->{resources}->{$key} unless @_; - my $uri = shift or die( - "Did not provide a value to $key()" - ); - $self->resources( $key => $uri ); - return 1; - }; -} - -foreach my $key ( grep { $_ ne "resources" } @tuple_keys) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} unless @_; - my @added; - while ( @_ ) { - my $module = shift or last; - my $version = shift || 0; - push @added, [ $module, $version ]; - } - push @{ $self->{values}->{$key} }, @added; - return map {@$_} @added; - }; -} - -# Resource handling -my %lc_resource = map { $_ => 1 } qw{ - homepage - license - bugtracker - repository -}; - -sub resources { - my $self = shift; - while ( @_ ) { - my $name = shift or last; - my $value = shift or next; - if ( $name eq lc $name and ! $lc_resource{$name} ) { - die("Unsupported reserved lowercase resource '$name'"); - } - $self->{values}->{resources} ||= []; - push @{ $self->{values}->{resources} }, [ $name, $value ]; - } - $self->{values}->{resources}; -} - -# Aliases for build_requires that will have alternative -# meanings in some future version of META.yml. -sub test_requires { shift->build_requires(@_) } -sub install_requires { shift->build_requires(@_) } - -# Aliases for installdirs options -sub install_as_core { $_[0]->installdirs('perl') } -sub install_as_cpan { $_[0]->installdirs('site') } -sub install_as_site { $_[0]->installdirs('site') } -sub install_as_vendor { $_[0]->installdirs('vendor') } - -sub dynamic_config { - my $self = shift; - my $value = @_ ? shift : 1; - if ( $self->{values}->{dynamic_config} ) { - # Once dynamic we never change to static, for safety - return 0; - } - $self->{values}->{dynamic_config} = $value ? 1 : 0; - return 1; -} - -# Convenience command -sub static_config { - shift->dynamic_config(0); -} - -sub perl_version { - my $self = shift; - return $self->{values}->{perl_version} unless @_; - my $version = shift or die( - "Did not provide a value to perl_version()" - ); - - # Normalize the version - $version = $self->_perl_version($version); - - # We don't support the really old versions - unless ( $version >= 5.005 ) { - die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; - } - - $self->{values}->{perl_version} = $version; -} - -sub all_from { - my ( $self, $file ) = @_; - - unless ( defined($file) ) { - my $name = $self->name or die( - "all_from called with no args without setting name() first" - ); - $file = join('/', 'lib', split(/-/, $name)) . '.pm'; - $file =~ s{.*/}{} unless -e $file; - unless ( -e $file ) { - die("all_from cannot find $file from $name"); - } - } - unless ( -f $file ) { - die("The path '$file' does not exist, or is not a file"); - } - - $self->{values}{all_from} = $file; - - # Some methods pull from POD instead of code. - # If there is a matching .pod, use that instead - my $pod = $file; - $pod =~ s/\.pm$/.pod/i; - $pod = $file unless -e $pod; - - # Pull the different values - $self->name_from($file) unless $self->name; - $self->version_from($file) unless $self->version; - $self->perl_version_from($file) unless $self->perl_version; - $self->author_from($pod) unless @{$self->author || []}; - $self->license_from($pod) unless $self->license; - $self->abstract_from($pod) unless $self->abstract; - - return 1; -} - -sub provides { - my $self = shift; - my $provides = ( $self->{values}->{provides} ||= {} ); - %$provides = (%$provides, @_) if @_; - return $provides; -} - -sub auto_provides { - my $self = shift; - return $self unless $self->is_admin; - unless (-e 'MANIFEST') { - warn "Cannot deduce auto_provides without a MANIFEST, skipping\n"; - return $self; - } - # Avoid spurious warnings as we are not checking manifest here. - local $SIG{__WARN__} = sub {1}; - require ExtUtils::Manifest; - local *ExtUtils::Manifest::manicheck = sub { return }; - - require Module::Build; - my $build = Module::Build->new( - dist_name => $self->name, - dist_version => $self->version, - license => $self->license, - ); - $self->provides( %{ $build->find_dist_packages || {} } ); -} - -sub feature { - my $self = shift; - my $name = shift; - my $features = ( $self->{values}->{features} ||= [] ); - my $mods; - - if ( @_ == 1 and ref( $_[0] ) ) { - # The user used ->feature like ->features by passing in the second - # argument as a reference. Accomodate for that. - $mods = $_[0]; - } else { - $mods = \@_; - } - - my $count = 0; - push @$features, ( - $name => [ - map { - ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_ - } @$mods - ] - ); - - return @$features; -} - -sub features { - my $self = shift; - while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) { - $self->feature( $name, @$mods ); - } - return $self->{values}->{features} - ? @{ $self->{values}->{features} } - : (); -} - -sub no_index { - my $self = shift; - my $type = shift; - push @{ $self->{values}->{no_index}->{$type} }, @_ if $type; - return $self->{values}->{no_index}; -} - -sub read { - my $self = shift; - $self->include_deps( 'YAML::Tiny', 0 ); - - require YAML::Tiny; - my $data = YAML::Tiny::LoadFile('META.yml'); - - # Call methods explicitly in case user has already set some values. - while ( my ( $key, $value ) = each %$data ) { - next unless $self->can($key); - if ( ref $value eq 'HASH' ) { - while ( my ( $module, $version ) = each %$value ) { - $self->can($key)->($self, $module => $version ); - } - } else { - $self->can($key)->($self, $value); - } - } - return $self; -} - -sub write { - my $self = shift; - return $self unless $self->is_admin; - $self->admin->write_meta; - return $self; -} - -sub version_from { - require ExtUtils::MM_Unix; - my ( $self, $file ) = @_; - $self->version( ExtUtils::MM_Unix->parse_version($file) ); - - # for version integrity check - $self->makemaker_args( VERSION_FROM => $file ); -} - -sub abstract_from { - require ExtUtils::MM_Unix; - my ( $self, $file ) = @_; - $self->abstract( - bless( - { DISTNAME => $self->name }, - 'ExtUtils::MM_Unix' - )->parse_abstract($file) - ); -} - -# Add both distribution and module name -sub name_from { - my ($self, $file) = @_; - if ( - Module::Install::_read($file) =~ m/ - ^ \s* - package \s* - ([\w:]+) - \s* ; - /ixms - ) { - my ($name, $module_name) = ($1, $1); - $name =~ s{::}{-}g; - $self->name($name); - unless ( $self->module_name ) { - $self->module_name($module_name); - } - } else { - die("Cannot determine name from $file\n"); - } -} - -sub _extract_perl_version { - if ( - $_[0] =~ m/ - ^\s* - (?:use|require) \s* - v? - ([\d_\.]+) - \s* ; - /ixms - ) { - my $perl_version = $1; - $perl_version =~ s{_}{}g; - return $perl_version; - } else { - return; - } -} - -sub perl_version_from { - my $self = shift; - my $perl_version=_extract_perl_version(Module::Install::_read($_[0])); - if ($perl_version) { - $self->perl_version($perl_version); - } else { - warn "Cannot determine perl version info from $_[0]\n"; - return; - } -} - -sub author_from { - my $self = shift; - my $content = Module::Install::_read($_[0]); - if ($content =~ m/ - =head \d \s+ (?:authors?)\b \s* - ([^\n]*) - | - =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s* - .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s* - ([^\n]*) - /ixms) { - my $author = $1 || $2; - - # XXX: ugly but should work anyway... - if (eval "require Pod::Escapes; 1") { - # Pod::Escapes has a mapping table. - # It's in core of perl >= 5.9.3, and should be installed - # as one of the Pod::Simple's prereqs, which is a prereq - # of Pod::Text 3.x (see also below). - $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } - { - defined $2 - ? chr($2) - : defined $Pod::Escapes::Name2character_number{$1} - ? chr($Pod::Escapes::Name2character_number{$1}) - : do { - warn "Unknown escape: E<$1>"; - "E<$1>"; - }; - }gex; - } - elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) { - # Pod::Text < 3.0 has yet another mapping table, - # though the table name of 2.x and 1.x are different. - # (1.x is in core of Perl < 5.6, 2.x is in core of - # Perl < 5.9.3) - my $mapping = ($Pod::Text::VERSION < 2) - ? \%Pod::Text::HTML_Escapes - : \%Pod::Text::ESCAPES; - $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } - { - defined $2 - ? chr($2) - : defined $mapping->{$1} - ? $mapping->{$1} - : do { - warn "Unknown escape: E<$1>"; - "E<$1>"; - }; - }gex; - } - else { - $author =~ s{E}{<}g; - $author =~ s{E}{>}g; - } - $self->author($author); - } else { - warn "Cannot determine author info from $_[0]\n"; - } -} - -#Stolen from M::B -my %license_urls = ( - perl => 'http://dev.perl.org/licenses/', - apache => 'http://apache.org/licenses/LICENSE-2.0', - apache_1_1 => 'http://apache.org/licenses/LICENSE-1.1', - artistic => 'http://opensource.org/licenses/artistic-license.php', - artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php', - lgpl => 'http://opensource.org/licenses/lgpl-license.php', - lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php', - lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html', - bsd => 'http://opensource.org/licenses/bsd-license.php', - gpl => 'http://opensource.org/licenses/gpl-license.php', - gpl2 => 'http://opensource.org/licenses/gpl-2.0.php', - gpl3 => 'http://opensource.org/licenses/gpl-3.0.html', - mit => 'http://opensource.org/licenses/mit-license.php', - mozilla => 'http://opensource.org/licenses/mozilla1.1.php', - open_source => undef, - unrestricted => undef, - restrictive => undef, - unknown => undef, -); - -sub license { - my $self = shift; - return $self->{values}->{license} unless @_; - my $license = shift or die( - 'Did not provide a value to license()' - ); - $license = __extract_license($license) || lc $license; - $self->{values}->{license} = $license; - - # Automatically fill in license URLs - if ( $license_urls{$license} ) { - $self->resources( license => $license_urls{$license} ); - } - - return 1; -} - -sub _extract_license { - my $pod = shift; - my $matched; - return __extract_license( - ($matched) = $pod =~ m/ - (=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?) - (=head \d.*|=cut.*|)\z - /xms - ) || __extract_license( - ($matched) = $pod =~ m/ - (=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?) - (=head \d.*|=cut.*|)\z - /xms - ); -} - -sub __extract_license { - my $license_text = shift or return; - my @phrases = ( - '(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1, - '(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1, - 'Artistic and GPL' => 'perl', 1, - 'GNU general public license' => 'gpl', 1, - 'GNU public license' => 'gpl', 1, - 'GNU lesser general public license' => 'lgpl', 1, - 'GNU lesser public license' => 'lgpl', 1, - 'GNU library general public license' => 'lgpl', 1, - 'GNU library public license' => 'lgpl', 1, - 'GNU Free Documentation license' => 'unrestricted', 1, - 'GNU Affero General Public License' => 'open_source', 1, - '(?:Free)?BSD license' => 'bsd', 1, - 'Artistic license 2\.0' => 'artistic_2', 1, - 'Artistic license' => 'artistic', 1, - 'Apache (?:Software )?license' => 'apache', 1, - 'GPL' => 'gpl', 1, - 'LGPL' => 'lgpl', 1, - 'BSD' => 'bsd', 1, - 'Artistic' => 'artistic', 1, - 'MIT' => 'mit', 1, - 'Mozilla Public License' => 'mozilla', 1, - 'Q Public License' => 'open_source', 1, - 'OpenSSL License' => 'unrestricted', 1, - 'SSLeay License' => 'unrestricted', 1, - 'zlib License' => 'open_source', 1, - 'proprietary' => 'proprietary', 0, - ); - while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { - $pattern =~ s#\s+#\\s+#gs; - if ( $license_text =~ /\b$pattern\b/i ) { - return $license; - } - } - return ''; -} - -sub license_from { - my $self = shift; - if (my $license=_extract_license(Module::Install::_read($_[0]))) { - $self->license($license); - } else { - warn "Cannot determine license info from $_[0]\n"; - return 'unknown'; - } -} - -sub _extract_bugtracker { - my @links = $_[0] =~ m#L<( - https?\Q://rt.cpan.org/\E[^>]+| - https?\Q://github.com/\E[\w_]+/[\w_]+/issues| - https?\Q://code.google.com/p/\E[\w_\-]+/issues/list - )>#gx; - my %links; - @links{@links}=(); - @links=keys %links; - return @links; -} - -sub bugtracker_from { - my $self = shift; - my $content = Module::Install::_read($_[0]); - my @links = _extract_bugtracker($content); - unless ( @links ) { - warn "Cannot determine bugtracker info from $_[0]\n"; - return 0; - } - if ( @links > 1 ) { - warn "Found more than one bugtracker link in $_[0]\n"; - return 0; - } - - # Set the bugtracker - bugtracker( $links[0] ); - return 1; -} - -sub requires_from { - my $self = shift; - my $content = Module::Install::_readperl($_[0]); - my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg; - while ( @requires ) { - my $module = shift @requires; - my $version = shift @requires; - $self->requires( $module => $version ); - } -} - -sub test_requires_from { - my $self = shift; - my $content = Module::Install::_readperl($_[0]); - my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; - while ( @requires ) { - my $module = shift @requires; - my $version = shift @requires; - $self->test_requires( $module => $version ); - } -} - -# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to -# numbers (eg, 5.006001 or 5.008009). -# Also, convert double-part versions (eg, 5.8) -sub _perl_version { - my $v = $_[-1]; - $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e; - $v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e; - $v =~ s/(\.\d\d\d)000$/$1/; - $v =~ s/_.+$//; - if ( ref($v) ) { - # Numify - $v = $v + 0; - } - return $v; -} - -sub add_metadata { - my $self = shift; - my %hash = @_; - for my $key (keys %hash) { - warn "add_metadata: $key is not prefixed with 'x_'.\n" . - "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/; - $self->{values}->{$key} = $hash{$key}; - } -} - - -###################################################################### -# MYMETA Support - -sub WriteMyMeta { - die "WriteMyMeta has been deprecated"; -} - -sub write_mymeta_yaml { - my $self = shift; - - # We need YAML::Tiny to write the MYMETA.yml file - unless ( eval { require YAML::Tiny; 1; } ) { - return 1; - } - - # Generate the data - my $meta = $self->_write_mymeta_data or return 1; - - # Save as the MYMETA.yml file - print "Writing MYMETA.yml\n"; - YAML::Tiny::DumpFile('MYMETA.yml', $meta); -} - -sub write_mymeta_json { - my $self = shift; - - # We need JSON to write the MYMETA.json file - unless ( eval { require JSON; 1; } ) { - return 1; - } - - # Generate the data - my $meta = $self->_write_mymeta_data or return 1; - - # Save as the MYMETA.yml file - print "Writing MYMETA.json\n"; - Module::Install::_write( - 'MYMETA.json', - JSON->new->pretty(1)->canonical->encode($meta), - ); -} - -sub _write_mymeta_data { - my $self = shift; - - # If there's no existing META.yml there is nothing we can do - return undef unless -f 'META.yml'; - - # We need Parse::CPAN::Meta to load the file - unless ( eval { require Parse::CPAN::Meta; 1; } ) { - return undef; - } - - # Merge the perl version into the dependencies - my $val = $self->Meta->{values}; - my $perl = delete $val->{perl_version}; - if ( $perl ) { - $val->{requires} ||= []; - my $requires = $val->{requires}; - - # Canonize to three-dot version after Perl 5.6 - if ( $perl >= 5.006 ) { - $perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e - } - unshift @$requires, [ perl => $perl ]; - } - - # Load the advisory META.yml file - my @yaml = Parse::CPAN::Meta::LoadFile('META.yml'); - my $meta = $yaml[0]; - - # Overwrite the non-configure dependency hashs - delete $meta->{requires}; - delete $meta->{build_requires}; - delete $meta->{recommends}; - if ( exists $val->{requires} ) { - $meta->{requires} = { map { @$_ } @{ $val->{requires} } }; - } - if ( exists $val->{build_requires} ) { - $meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } }; - } - - return $meta; -} - -1; diff --git a/Web-Plugin-RANCID/inc/Module/Install/Share.pm b/Web-Plugin-RANCID/inc/Module/Install/Share.pm deleted file mode 100644 index 4e2b602a..00000000 --- a/Web-Plugin-RANCID/inc/Module/Install/Share.pm +++ /dev/null @@ -1,96 +0,0 @@ -#line 1 -package Module::Install::Share; - -use strict; -use Module::Install::Base (); -use File::Find (); -use ExtUtils::Manifest (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub install_share { - my $self = shift; - my $dir = @_ ? pop : 'share'; - my $type = @_ ? shift : 'dist'; - unless ( defined $type and $type eq 'module' or $type eq 'dist' ) { - die "Illegal or invalid share dir type '$type'"; - } - unless ( defined $dir and -d $dir ) { - require Carp; - Carp::croak("Illegal or missing directory install_share param: '$dir'"); - } - - # Split by type - my $S = ($^O eq 'MSWin32') ? "\\" : "\/"; - - my $root; - if ( $type eq 'dist' ) { - die "Too many parameters to install_share" if @_; - - # Set up the install - $root = "\$(INST_LIB)${S}auto${S}share${S}dist${S}\$(DISTNAME)"; - } else { - my $module = Module::Install::_CLASS($_[0]); - unless ( defined $module ) { - die "Missing or invalid module name '$_[0]'"; - } - $module =~ s/::/-/g; - - $root = "\$(INST_LIB)${S}auto${S}share${S}module${S}$module"; - } - - my $manifest = -r 'MANIFEST' ? ExtUtils::Manifest::maniread() : undef; - my $skip_checker = $ExtUtils::Manifest::VERSION >= 1.54 - ? ExtUtils::Manifest::maniskip() - : ExtUtils::Manifest::_maniskip(); - my $postamble = ''; - my $perm_dir = eval($ExtUtils::MakeMaker::VERSION) >= 6.52 ? '$(PERM_DIR)' : 755; - File::Find::find({ - no_chdir => 1, - wanted => sub { - my $path = File::Spec->abs2rel($_, $dir); - if (-d $_) { - return if $skip_checker->($File::Find::name); - $postamble .=<<"END"; -\t\$(NOECHO) \$(MKPATH) "$root${S}$path" -\t\$(NOECHO) \$(CHMOD) $perm_dir "$root${S}$path" -END - } - else { - return if ref $manifest - && !exists $manifest->{$File::Find::name}; - return if $skip_checker->($File::Find::name); - $postamble .=<<"END"; -\t\$(NOECHO) \$(CP) "$dir${S}$path" "$root${S}$path" -END - } - }, - }, $dir); - - # Set up the install - $self->postamble(<<"END_MAKEFILE"); -config :: -$postamble - -END_MAKEFILE - - # The above appears to behave incorrectly when used with old versions - # of ExtUtils::Install (known-bad on RHEL 3, with 5.8.0) - # So when we need to install a share directory, make sure we add a - # dependency on a moderately new version of ExtUtils::MakeMaker. - $self->build_requires( 'ExtUtils::MakeMaker' => '6.11' ); - - # 99% of the time we don't want to index a shared dir - $self->no_index( directory => $dir ); -} - -1; - -__END__ - -#line 154 diff --git a/Web-Plugin-RANCID/inc/Module/Install/Win32.pm b/Web-Plugin-RANCID/inc/Module/Install/Win32.pm deleted file mode 100644 index eeaa3fed..00000000 --- a/Web-Plugin-RANCID/inc/Module/Install/Win32.pm +++ /dev/null @@ -1,64 +0,0 @@ -#line 1 -package Module::Install::Win32; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -# determine if the user needs nmake, and download it if needed -sub check_nmake { - my $self = shift; - $self->load('can_run'); - $self->load('get_file'); - - require Config; - return unless ( - $^O eq 'MSWin32' and - $Config::Config{make} and - $Config::Config{make} =~ /^nmake\b/i and - ! $self->can_run('nmake') - ); - - print "The required 'nmake' executable not found, fetching it...\n"; - - require File::Basename; - my $rv = $self->get_file( - url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe', - ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe', - local_dir => File::Basename::dirname($^X), - size => 51928, - run => 'Nmake15.exe /o > nul', - check_for => 'Nmake.exe', - remove => 1, - ); - - die <<'END_MESSAGE' unless $rv; - -------------------------------------------------------------------------------- - -Since you are using Microsoft Windows, you will need the 'nmake' utility -before installation. It's available at: - - http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe - or - ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe - -Please download the file manually, save it to a directory in %PATH% (e.g. -C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to -that directory, and run "Nmake15.exe" from there; that will create the -'nmake.exe' file needed by this module. - -You may then resume the installation process described in README. - -------------------------------------------------------------------------------- -END_MESSAGE - -} - -1; diff --git a/Web-Plugin-RANCID/inc/Module/Install/WriteAll.pm b/Web-Plugin-RANCID/inc/Module/Install/WriteAll.pm deleted file mode 100644 index 85d8018c..00000000 --- a/Web-Plugin-RANCID/inc/Module/Install/WriteAll.pm +++ /dev/null @@ -1,63 +0,0 @@ -#line 1 -package Module::Install::WriteAll; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = qw{Module::Install::Base}; - $ISCORE = 1; -} - -sub WriteAll { - my $self = shift; - my %args = ( - meta => 1, - sign => 0, - inline => 0, - check_nmake => 1, - @_, - ); - - $self->sign(1) if $args{sign}; - $self->admin->WriteAll(%args) if $self->is_admin; - - $self->check_nmake if $args{check_nmake}; - unless ( $self->makemaker_args->{PL_FILES} ) { - # XXX: This still may be a bit over-defensive... - unless ($self->makemaker(6.25)) { - $self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL'; - } - } - - # Until ExtUtils::MakeMaker support MYMETA.yml, make sure - # we clean it up properly ourself. - $self->realclean_files('MYMETA.yml'); - - if ( $args{inline} ) { - $self->Inline->write; - } else { - $self->Makefile->write; - } - - # The Makefile write process adds a couple of dependencies, - # so write the META.yml files after the Makefile. - if ( $args{meta} ) { - $self->Meta->write; - } - - # Experimental support for MYMETA - if ( $ENV{X_MYMETA} ) { - if ( $ENV{X_MYMETA} eq 'JSON' ) { - $self->Meta->write_mymeta_json; - } else { - $self->Meta->write_mymeta_yaml; - } - } - - return 1; -} - -1; diff --git a/Web-Plugin-RANCID/lib/App/NetdiscoX/Web/Plugin/RANCID.pm b/Web-Plugin-RANCID/lib/App/NetdiscoX/Web/Plugin/RANCID.pm deleted file mode 100644 index 93ac09c1..00000000 --- a/Web-Plugin-RANCID/lib/App/NetdiscoX/Web/Plugin/RANCID.pm +++ /dev/null @@ -1,152 +0,0 @@ -package App::NetdiscoX::Web::Plugin::RANCID; - -our $VERSION = '2.004000'; - -use Dancer ':syntax'; - -use App::Netdisco::Web::Plugin; -use App::Netdisco::Util::Device 'get_device'; -use App::Netdisco::Util::Permission 'check_acl'; - -use File::ShareDir 'dist_dir'; -register_template_path( - dist_dir( 'App-NetdiscoX-Web-Plugin-RANCID' )); - -register_device_details({ - name => 'rancid', - label => 'RANCID', - default => 'on', -}); - -hook 'before_template' => sub { - return unless - index(request->path, uri_for('/ajax/content/device/details')->path) == 0; - - my $config = config; - my $tokens = shift; - my $device = $tokens->{d}; - my $domain_suffix = setting('domain_suffix') || ''; - - # defaults - $tokens->{rancidgroup} = ''; - $tokens->{ranciddevice} = ($device->{dns} || $device->{name} || $device->{ip}); - - return unless exists $config->{rancid}; - my $rancid = $config->{rancid}; - - $rancid->{groups} ||= {}; - $rancid->{by_ip} ||= []; - $rancid->{by_hostname} ||= []; - - foreach my $g (keys %{ $rancid->{groups} }) { - if (check_acl( get_device($device->{ip}), $rancid->{groups}->{$g} )) { - $tokens->{rancidgroup} = $g; - $tokens->{ranciddevice} = $device->{ip} - if 0 < scalar grep {$_ eq $g} @{ $rancid->{by_ip} }; - $tokens->{ranciddevice} =~ s/$domain_suffix$// - if 0 < scalar grep {$_ eq $g} @{ $rancid->{by_hostname} }; - last; - } - } -}; - -=head1 NAME - -App::NetdiscoX::Web::Plugin::RANCID - Link to device backups in RANCID/WebSVN - -=head1 SYNOPSIS - - # in your ~/environments/deployment.yml file - - extra_web_plugins: - - X::RANCID - - plugin_rancid: - location: 'https://websvn-server.example.com/rancid/%DEVICE%' - -=head1 Description - -This is a plugin for the L network management application. -It adds a row to the Device Details page named "RANCID" with a link to -your local RANCID/WebSVN installation hosting the device configuation -backups. - -=head1 Configuration - -Create an entry in your C<~/environments/deployment.yml> file named -"C", containing the following settings: - -=head2 location - -Value: String, Required. - -Name of the server hosting your local WebSVN installation. This should -also include the path under which backup files are stored for the devices. - -The text "C<%DEVICE%>" B be included, and it will be substituted with -the name or IP of the device. That is, this setting must be a complete link to -a RANCID web page, only with the device name or ip changed to be -"C<%DEVICE%>". - -The text "C<%GROUP%>" will be replaced with the group name for this device, if -known to Netdisco. This uses the same configuration as for -L, an example of which is below: - - rancid: - by_ip: [ other ] - by_hostname: [ other2 ] - groups: - switch: [ 'name:.*[Ss][Ww].*' ] - rtr: [ 'name:[rR]tr.*' ] - ap: [ 'name:[aA][pP].*' ] - -Briefly, each group value is a list of rules for matching devices similar to -those used by any C<*_only> configuration item. You can provide an IP, subnet -or prefix, regular expression to match a device name, or device attribute and -regular expression as in the above example. - -The device DNS name is used, or if missing the device SNMP sysName. Adding the -group to the list in C will make the link include the device IP -instead of the name. Adding the group to the list in C will -use the device FQDN minus the C config item (i.e. the hostname). - -=head2 open_in_same_window - -Value: Boolean. Default: false. - -If set to true, the hyperlink is configured to open the WebSVN page in the -same browser window or tab as Netdisco. - -=head1 AUTHOR - -Oliver Gorwits - -=head1 COPYRIGHT AND LICENSE - -This software is copyright (c) 2013 by The Netdisco Developer Team. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Netdisco Project nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE NETDISCO DEVELOPER TEAM BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -=cut - -true; diff --git a/Web-Plugin-RANCID/share/views/plugin/rancid/device_details.tt b/Web-Plugin-RANCID/share/views/plugin/rancid/device_details.tt deleted file mode 100644 index 70a428f7..00000000 --- a/Web-Plugin-RANCID/share/views/plugin/rancid/device_details.tt +++ /dev/null @@ -1,3 +0,0 @@ -View Configuration diff --git a/Netdisco/bin/nd-dbic-versions b/bin/nd-dbic-versions similarity index 100% rename from Netdisco/bin/nd-dbic-versions rename to bin/nd-dbic-versions diff --git a/Netdisco/bin/nd-import-topology b/bin/nd-import-topology similarity index 100% rename from Netdisco/bin/nd-import-topology rename to bin/nd-import-topology diff --git a/Netdisco/bin/netdisco-daemon b/bin/netdisco-daemon similarity index 100% rename from Netdisco/bin/netdisco-daemon rename to bin/netdisco-daemon diff --git a/Netdisco/bin/netdisco-daemon-fg b/bin/netdisco-daemon-fg similarity index 100% rename from Netdisco/bin/netdisco-daemon-fg rename to bin/netdisco-daemon-fg diff --git a/Netdisco/bin/netdisco-db-deploy b/bin/netdisco-db-deploy similarity index 100% rename from Netdisco/bin/netdisco-db-deploy rename to bin/netdisco-db-deploy diff --git a/Netdisco/bin/netdisco-deploy b/bin/netdisco-deploy similarity index 100% rename from Netdisco/bin/netdisco-deploy rename to bin/netdisco-deploy diff --git a/Netdisco/bin/netdisco-do b/bin/netdisco-do similarity index 100% rename from Netdisco/bin/netdisco-do rename to bin/netdisco-do diff --git a/Netdisco/bin/netdisco-rancid-export b/bin/netdisco-rancid-export similarity index 100% rename from Netdisco/bin/netdisco-rancid-export rename to bin/netdisco-rancid-export diff --git a/Netdisco/bin/netdisco-sshcollector b/bin/netdisco-sshcollector similarity index 100% rename from Netdisco/bin/netdisco-sshcollector rename to bin/netdisco-sshcollector diff --git a/Netdisco/bin/netdisco-web b/bin/netdisco-web similarity index 100% rename from Netdisco/bin/netdisco-web rename to bin/netdisco-web diff --git a/Netdisco/bin/netdisco-web-fg b/bin/netdisco-web-fg similarity index 100% rename from Netdisco/bin/netdisco-web-fg rename to bin/netdisco-web-fg diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm deleted file mode 100644 index 4ecf46b9..00000000 --- a/inc/Module/Install.pm +++ /dev/null @@ -1,470 +0,0 @@ -#line 1 -package Module::Install; - -# For any maintainers: -# The load order for Module::Install is a bit magic. -# It goes something like this... -# -# IF ( host has Module::Install installed, creating author mode ) { -# 1. Makefile.PL calls "use inc::Module::Install" -# 2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install -# 3. The installed version of inc::Module::Install loads -# 4. inc::Module::Install calls "require Module::Install" -# 5. The ./inc/ version of Module::Install loads -# } ELSE { -# 1. Makefile.PL calls "use inc::Module::Install" -# 2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install -# 3. The ./inc/ version of Module::Install loads -# } - -use 5.005; -use strict 'vars'; -use Cwd (); -use File::Find (); -use File::Path (); - -use vars qw{$VERSION $MAIN}; -BEGIN { - # All Module::Install core packages now require synchronised versions. - # This will be used to ensure we don't accidentally load old or - # different versions of modules. - # This is not enforced yet, but will be some time in the next few - # releases once we can make sure it won't clash with custom - # Module::Install extensions. - $VERSION = '1.06'; - - # Storage for the pseudo-singleton - $MAIN = undef; - - *inc::Module::Install::VERSION = *VERSION; - @inc::Module::Install::ISA = __PACKAGE__; - -} - -sub import { - my $class = shift; - my $self = $class->new(@_); - my $who = $self->_caller; - - #------------------------------------------------------------- - # all of the following checks should be included in import(), - # to allow "eval 'require Module::Install; 1' to test - # installation of Module::Install. (RT #51267) - #------------------------------------------------------------- - - # Whether or not inc::Module::Install is actually loaded, the - # $INC{inc/Module/Install.pm} is what will still get set as long as - # the caller loaded module this in the documented manner. - # If not set, the caller may NOT have loaded the bundled version, and thus - # they may not have a MI version that works with the Makefile.PL. This would - # result in false errors or unexpected behaviour. And we don't want that. - my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; - unless ( $INC{$file} ) { die <<"END_DIE" } - -Please invoke ${\__PACKAGE__} with: - - use inc::${\__PACKAGE__}; - -not: - - use ${\__PACKAGE__}; - -END_DIE - - # This reportedly fixes a rare Win32 UTC file time issue, but - # as this is a non-cross-platform XS module not in the core, - # we shouldn't really depend on it. See RT #24194 for detail. - # (Also, this module only supports Perl 5.6 and above). - eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006; - - # If the script that is loading Module::Install is from the future, - # then make will detect this and cause it to re-run over and over - # again. This is bad. Rather than taking action to touch it (which - # is unreliable on some platforms and requires write permissions) - # for now we should catch this and refuse to run. - if ( -f $0 ) { - my $s = (stat($0))[9]; - - # If the modification time is only slightly in the future, - # sleep briefly to remove the problem. - my $a = $s - time; - if ( $a > 0 and $a < 5 ) { sleep 5 } - - # Too far in the future, throw an error. - my $t = time; - if ( $s > $t ) { die <<"END_DIE" } - -Your installer $0 has a modification time in the future ($s > $t). - -This is known to create infinite loops in make. - -Please correct this, then run $0 again. - -END_DIE - } - - - # Build.PL was formerly supported, but no longer is due to excessive - # difficulty in implementing every single feature twice. - if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } - -Module::Install no longer supports Build.PL. - -It was impossible to maintain duel backends, and has been deprecated. - -Please remove all Build.PL files and only use the Makefile.PL installer. - -END_DIE - - #------------------------------------------------------------- - - # To save some more typing in Module::Install installers, every... - # use inc::Module::Install - # ...also acts as an implicit use strict. - $^H |= strict::bits(qw(refs subs vars)); - - #------------------------------------------------------------- - - unless ( -f $self->{file} ) { - foreach my $key (keys %INC) { - delete $INC{$key} if $key =~ /Module\/Install/; - } - - local $^W; - require "$self->{path}/$self->{dispatch}.pm"; - File::Path::mkpath("$self->{prefix}/$self->{author}"); - $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); - $self->{admin}->init; - @_ = ($class, _self => $self); - goto &{"$self->{name}::import"}; - } - - local $^W; - *{"${who}::AUTOLOAD"} = $self->autoload; - $self->preload; - - # Unregister loader and worker packages so subdirs can use them again - delete $INC{'inc/Module/Install.pm'}; - delete $INC{'Module/Install.pm'}; - - # Save to the singleton - $MAIN = $self; - - return 1; -} - -sub autoload { - my $self = shift; - my $who = $self->_caller; - my $cwd = Cwd::cwd(); - my $sym = "${who}::AUTOLOAD"; - $sym->{$cwd} = sub { - my $pwd = Cwd::cwd(); - if ( my $code = $sym->{$pwd} ) { - # Delegate back to parent dirs - goto &$code unless $cwd eq $pwd; - } - unless ($$sym =~ s/([^:]+)$//) { - # XXX: it looks like we can't retrieve the missing function - # via $$sym (usually $main::AUTOLOAD) in this case. - # I'm still wondering if we should slurp Makefile.PL to - # get some context or not ... - my ($package, $file, $line) = caller; - die <<"EOT"; -Unknown function is found at $file line $line. -Execution of $file aborted due to runtime errors. - -If you're a contributor to a project, you may need to install -some Module::Install extensions from CPAN (or other repository). -If you're a user of a module, please contact the author. -EOT - } - my $method = $1; - if ( uc($method) eq $method ) { - # Do nothing - return; - } elsif ( $method =~ /^_/ and $self->can($method) ) { - # Dispatch to the root M:I class - return $self->$method(@_); - } - - # Dispatch to the appropriate plugin - unshift @_, ( $self, $1 ); - goto &{$self->can('call')}; - }; -} - -sub preload { - my $self = shift; - unless ( $self->{extensions} ) { - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ); - } - - my @exts = @{$self->{extensions}}; - unless ( @exts ) { - @exts = $self->{admin}->load_all_extensions; - } - - my %seen; - foreach my $obj ( @exts ) { - while (my ($method, $glob) = each %{ref($obj) . '::'}) { - next unless $obj->can($method); - next if $method =~ /^_/; - next if $method eq uc($method); - $seen{$method}++; - } - } - - my $who = $self->_caller; - foreach my $name ( sort keys %seen ) { - local $^W; - *{"${who}::$name"} = sub { - ${"${who}::AUTOLOAD"} = "${who}::$name"; - goto &{"${who}::AUTOLOAD"}; - }; - } -} - -sub new { - my ($class, %args) = @_; - - delete $INC{'FindBin.pm'}; - { - # to suppress the redefine warning - local $SIG{__WARN__} = sub {}; - require FindBin; - } - - # ignore the prefix on extension modules built from top level. - my $base_path = Cwd::abs_path($FindBin::Bin); - unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) { - delete $args{prefix}; - } - return $args{_self} if $args{_self}; - - $args{dispatch} ||= 'Admin'; - $args{prefix} ||= 'inc'; - $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); - $args{bundle} ||= 'inc/BUNDLES'; - $args{base} ||= $base_path; - $class =~ s/^\Q$args{prefix}\E:://; - $args{name} ||= $class; - $args{version} ||= $class->VERSION; - unless ( $args{path} ) { - $args{path} = $args{name}; - $args{path} =~ s!::!/!g; - } - $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm"; - $args{wrote} = 0; - - bless( \%args, $class ); -} - -sub call { - my ($self, $method) = @_; - my $obj = $self->load($method) or return; - splice(@_, 0, 2, $obj); - goto &{$obj->can($method)}; -} - -sub load { - my ($self, $method) = @_; - - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ) unless $self->{extensions}; - - foreach my $obj (@{$self->{extensions}}) { - return $obj if $obj->can($method); - } - - my $admin = $self->{admin} or die <<"END_DIE"; -The '$method' method does not exist in the '$self->{prefix}' path! -Please remove the '$self->{prefix}' directory and run $0 again to load it. -END_DIE - - my $obj = $admin->load($method, 1); - push @{$self->{extensions}}, $obj; - - $obj; -} - -sub load_extensions { - my ($self, $path, $top) = @_; - - my $should_reload = 0; - unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) { - unshift @INC, $self->{prefix}; - $should_reload = 1; - } - - foreach my $rv ( $self->find_extensions($path) ) { - my ($file, $pkg) = @{$rv}; - next if $self->{pathnames}{$pkg}; - - local $@; - my $new = eval { local $^W; require $file; $pkg->can('new') }; - unless ( $new ) { - warn $@ if $@; - next; - } - $self->{pathnames}{$pkg} = - $should_reload ? delete $INC{$file} : $INC{$file}; - push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); - } - - $self->{extensions} ||= []; -} - -sub find_extensions { - my ($self, $path) = @_; - - my @found; - File::Find::find( sub { - my $file = $File::Find::name; - return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; - my $subpath = $1; - return if lc($subpath) eq lc($self->{dispatch}); - - $file = "$self->{path}/$subpath.pm"; - my $pkg = "$self->{name}::$subpath"; - $pkg =~ s!/!::!g; - - # If we have a mixed-case package name, assume case has been preserved - # correctly. Otherwise, root through the file to locate the case-preserved - # version of the package name. - if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { - my $content = Module::Install::_read($subpath . '.pm'); - my $in_pod = 0; - foreach ( split //, $content ) { - $in_pod = 1 if /^=\w/; - $in_pod = 0 if /^=cut/; - next if ($in_pod || /^=cut/); # skip pod text - next if /^\s*#/; # and comments - if ( m/^\s*package\s+($pkg)\s*;/i ) { - $pkg = $1; - last; - } - } - } - - push @found, [ $file, $pkg ]; - }, $path ) if -d $path; - - @found; -} - - - - - -##################################################################### -# Common Utility Functions - -sub _caller { - my $depth = 0; - my $call = caller($depth); - while ( $call eq __PACKAGE__ ) { - $depth++; - $call = caller($depth); - } - return $call; -} - -# Done in evals to avoid confusing Perl::MinimumVersion -eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; -sub _read { - local *FH; - open( FH, '<', $_[0] ) or die "open($_[0]): $!"; - my $string = do { local $/; }; - close FH or die "close($_[0]): $!"; - return $string; -} -END_NEW -sub _read { - local *FH; - open( FH, "< $_[0]" ) or die "open($_[0]): $!"; - my $string = do { local $/; }; - close FH or die "close($_[0]): $!"; - return $string; -} -END_OLD - -sub _readperl { - my $string = Module::Install::_read($_[0]); - $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; - $string =~ s/(\n)\n*__(?:DATA|END)__\b.*\z/$1/s; - $string =~ s/\n\n=\w+.+?\n\n=cut\b.+?\n+/\n\n/sg; - return $string; -} - -sub _readpod { - my $string = Module::Install::_read($_[0]); - $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; - return $string if $_[0] =~ /\.pod\z/; - $string =~ s/(^|\n=cut\b.+?\n+)[^=\s].+?\n(\n=\w+|\z)/$1$2/sg; - $string =~ s/\n*=pod\b[^\n]*\n+/\n\n/sg; - $string =~ s/\n*=cut\b[^\n]*\n+/\n\n/sg; - $string =~ s/^\n+//s; - return $string; -} - -# Done in evals to avoid confusing Perl::MinimumVersion -eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; -sub _write { - local *FH; - open( FH, '>', $_[0] ) or die "open($_[0]): $!"; - foreach ( 1 .. $#_ ) { - print FH $_[$_] or die "print($_[0]): $!"; - } - close FH or die "close($_[0]): $!"; -} -END_NEW -sub _write { - local *FH; - open( FH, "> $_[0]" ) or die "open($_[0]): $!"; - foreach ( 1 .. $#_ ) { - print FH $_[$_] or die "print($_[0]): $!"; - } - close FH or die "close($_[0]): $!"; -} -END_OLD - -# _version is for processing module versions (eg, 1.03_05) not -# Perl versions (eg, 5.8.1). -sub _version ($) { - my $s = shift || 0; - my $d =()= $s =~ /(\.)/g; - if ( $d >= 2 ) { - # Normalise multipart versions - $s =~ s/(\.)(\d{1,3})/sprintf("$1%03d",$2)/eg; - } - $s =~ s/^(\d+)\.?//; - my $l = $1 || 0; - my @v = map { - $_ . '0' x (3 - length $_) - } $s =~ /(\d{1,3})\D?/g; - $l = $l . '.' . join '', @v if @v; - return $l + 0; -} - -sub _cmp ($$) { - _version($_[1]) <=> _version($_[2]); -} - -# Cloned from Params::Util::_CLASS -sub _CLASS ($) { - ( - defined $_[0] - and - ! ref $_[0] - and - $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s - ) ? $_[0] : undef; -} - -1; - -# Copyright 2008 - 2012 Adam Kennedy. diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm deleted file mode 100644 index 802844aa..00000000 --- a/inc/Module/Install/Base.pm +++ /dev/null @@ -1,83 +0,0 @@ -#line 1 -package Module::Install::Base; - -use strict 'vars'; -use vars qw{$VERSION}; -BEGIN { - $VERSION = '1.06'; -} - -# Suspend handler for "redefined" warnings -BEGIN { - my $w = $SIG{__WARN__}; - $SIG{__WARN__} = sub { $w }; -} - -#line 42 - -sub new { - my $class = shift; - unless ( defined &{"${class}::call"} ) { - *{"${class}::call"} = sub { shift->_top->call(@_) }; - } - unless ( defined &{"${class}::load"} ) { - *{"${class}::load"} = sub { shift->_top->load(@_) }; - } - bless { @_ }, $class; -} - -#line 61 - -sub AUTOLOAD { - local $@; - my $func = eval { shift->_top->autoload } or return; - goto &$func; -} - -#line 75 - -sub _top { - $_[0]->{_top}; -} - -#line 90 - -sub admin { - $_[0]->_top->{admin} - or - Module::Install::Base::FakeAdmin->new; -} - -#line 106 - -sub is_admin { - ! $_[0]->admin->isa('Module::Install::Base::FakeAdmin'); -} - -sub DESTROY {} - -package Module::Install::Base::FakeAdmin; - -use vars qw{$VERSION}; -BEGIN { - $VERSION = $Module::Install::Base::VERSION; -} - -my $fake; - -sub new { - $fake ||= bless(\@_, $_[0]); -} - -sub AUTOLOAD {} - -sub DESTROY {} - -# Restore warning handler -BEGIN { - $SIG{__WARN__} = $SIG{__WARN__}->(); -} - -1; - -#line 159 diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm deleted file mode 100644 index 22167b8f..00000000 --- a/inc/Module/Install/Can.pm +++ /dev/null @@ -1,154 +0,0 @@ -#line 1 -package Module::Install::Can; - -use strict; -use Config (); -use ExtUtils::MakeMaker (); -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -# check if we can load some module -### Upgrade this to not have to load the module if possible -sub can_use { - my ($self, $mod, $ver) = @_; - $mod =~ s{::|\\}{/}g; - $mod .= '.pm' unless $mod =~ /\.pm$/i; - - my $pkg = $mod; - $pkg =~ s{/}{::}g; - $pkg =~ s{\.pm$}{}i; - - local $@; - eval { require $mod; $pkg->VERSION($ver || 0); 1 }; -} - -# Check if we can run some command -sub can_run { - my ($self, $cmd) = @_; - - my $_cmd = $cmd; - return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); - - for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { - next if $dir eq ''; - require File::Spec; - my $abs = File::Spec->catfile($dir, $cmd); - return $abs if (-x $abs or $abs = MM->maybe_command($abs)); - } - - return; -} - -# Can our C compiler environment build XS files -sub can_xs { - my $self = shift; - - # Ensure we have the CBuilder module - $self->configure_requires( 'ExtUtils::CBuilder' => 0.27 ); - - # Do we have the configure_requires checker? - local $@; - eval "require ExtUtils::CBuilder;"; - if ( $@ ) { - # They don't obey configure_requires, so it is - # someone old and delicate. Try to avoid hurting - # them by falling back to an older simpler test. - return $self->can_cc(); - } - - # Do we have a working C compiler - my $builder = ExtUtils::CBuilder->new( - quiet => 1, - ); - unless ( $builder->have_compiler ) { - # No working C compiler - return 0; - } - - # Write a C file representative of what XS becomes - require File::Temp; - my ( $FH, $tmpfile ) = File::Temp::tempfile( - "compilexs-XXXXX", - SUFFIX => '.c', - ); - binmode $FH; - print $FH <<'END_C'; -#include "EXTERN.h" -#include "perl.h" -#include "XSUB.h" - -int main(int argc, char **argv) { - return 0; -} - -int boot_sanexs() { - return 1; -} - -END_C - close $FH; - - # Can the C compiler access the same headers XS does - my @libs = (); - my $object = undef; - eval { - local $^W = 0; - $object = $builder->compile( - source => $tmpfile, - ); - @libs = $builder->link( - objects => $object, - module_name => 'sanexs', - ); - }; - my $result = $@ ? 0 : 1; - - # Clean up all the build files - foreach ( $tmpfile, $object, @libs ) { - next unless defined $_; - 1 while unlink; - } - - return $result; -} - -# Can we locate a (the) C compiler -sub can_cc { - my $self = shift; - my @chunks = split(/ /, $Config::Config{cc}) or return; - - # $Config{cc} may contain args; try to find out the program part - while (@chunks) { - return $self->can_run("@chunks") || (pop(@chunks), next); - } - - return; -} - -# Fix Cygwin bug on maybe_command(); -if ( $^O eq 'cygwin' ) { - require ExtUtils::MM_Cygwin; - require ExtUtils::MM_Win32; - if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) { - *ExtUtils::MM_Cygwin::maybe_command = sub { - my ($self, $file) = @_; - if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) { - ExtUtils::MM_Win32->maybe_command($file); - } else { - ExtUtils::MM_Unix->maybe_command($file); - } - } - } -} - -1; - -__END__ - -#line 236 diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm deleted file mode 100644 index bee0c4fb..00000000 --- a/inc/Module/Install/Fetch.pm +++ /dev/null @@ -1,93 +0,0 @@ -#line 1 -package Module::Install::Fetch; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub get_file { - my ($self, %args) = @_; - my ($scheme, $host, $path, $file) = - $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; - - if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) { - $args{url} = $args{ftp_url} - or (warn("LWP support unavailable!\n"), return); - ($scheme, $host, $path, $file) = - $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; - } - - $|++; - print "Fetching '$file' from $host... "; - - unless (eval { require Socket; Socket::inet_aton($host) }) { - warn "'$host' resolve failed!\n"; - return; - } - - return unless $scheme eq 'ftp' or $scheme eq 'http'; - - require Cwd; - my $dir = Cwd::getcwd(); - chdir $args{local_dir} or return if exists $args{local_dir}; - - if (eval { require LWP::Simple; 1 }) { - LWP::Simple::mirror($args{url}, $file); - } - elsif (eval { require Net::FTP; 1 }) { eval { - # use Net::FTP to get past firewall - my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600); - $ftp->login("anonymous", 'anonymous@example.com'); - $ftp->cwd($path); - $ftp->binary; - $ftp->get($file) or (warn("$!\n"), return); - $ftp->quit; - } } - elsif (my $ftp = $self->can_run('ftp')) { eval { - # no Net::FTP, fallback to ftp.exe - require FileHandle; - my $fh = FileHandle->new; - - local $SIG{CHLD} = 'IGNORE'; - unless ($fh->open("|$ftp -n")) { - warn "Couldn't open ftp: $!\n"; - chdir $dir; return; - } - - my @dialog = split(/\n/, <<"END_FTP"); -open $host -user anonymous anonymous\@example.com -cd $path -binary -get $file $file -quit -END_FTP - foreach (@dialog) { $fh->print("$_\n") } - $fh->close; - } } - else { - warn "No working 'ftp' program available!\n"; - chdir $dir; return; - } - - unless (-f $file) { - warn "Fetching failed: $@\n"; - chdir $dir; return; - } - - return if exists $args{size} and -s $file != $args{size}; - system($args{run}) if exists $args{run}; - unlink($file) if $args{remove}; - - print(((!exists $args{check_for} or -e $args{check_for}) - ? "done!" : "failed! ($!)"), "\n"); - chdir $dir; return !$?; -} - -1; diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm deleted file mode 100644 index 7052f365..00000000 --- a/inc/Module/Install/Makefile.pm +++ /dev/null @@ -1,418 +0,0 @@ -#line 1 -package Module::Install::Makefile; - -use strict 'vars'; -use ExtUtils::MakeMaker (); -use Module::Install::Base (); -use Fcntl qw/:flock :seek/; - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub Makefile { $_[0] } - -my %seen = (); - -sub prompt { - shift; - - # Infinite loop protection - my @c = caller(); - if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) { - die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; - } - - # In automated testing or non-interactive session, always use defaults - if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) { - local $ENV{PERL_MM_USE_DEFAULT} = 1; - goto &ExtUtils::MakeMaker::prompt; - } else { - goto &ExtUtils::MakeMaker::prompt; - } -} - -# Store a cleaned up version of the MakeMaker version, -# since we need to behave differently in a variety of -# ways based on the MM version. -my $makemaker = eval $ExtUtils::MakeMaker::VERSION; - -# If we are passed a param, do a "newer than" comparison. -# Otherwise, just return the MakeMaker version. -sub makemaker { - ( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0 -} - -# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified -# as we only need to know here whether the attribute is an array -# or a hash or something else (which may or may not be appendable). -my %makemaker_argtype = ( - C => 'ARRAY', - CONFIG => 'ARRAY', -# CONFIGURE => 'CODE', # ignore - DIR => 'ARRAY', - DL_FUNCS => 'HASH', - DL_VARS => 'ARRAY', - EXCLUDE_EXT => 'ARRAY', - EXE_FILES => 'ARRAY', - FUNCLIST => 'ARRAY', - H => 'ARRAY', - IMPORTS => 'HASH', - INCLUDE_EXT => 'ARRAY', - LIBS => 'ARRAY', # ignore '' - MAN1PODS => 'HASH', - MAN3PODS => 'HASH', - META_ADD => 'HASH', - META_MERGE => 'HASH', - PL_FILES => 'HASH', - PM => 'HASH', - PMLIBDIRS => 'ARRAY', - PMLIBPARENTDIRS => 'ARRAY', - PREREQ_PM => 'HASH', - CONFIGURE_REQUIRES => 'HASH', - SKIP => 'ARRAY', - TYPEMAPS => 'ARRAY', - XS => 'HASH', -# VERSION => ['version',''], # ignore -# _KEEP_AFTER_FLUSH => '', - - clean => 'HASH', - depend => 'HASH', - dist => 'HASH', - dynamic_lib=> 'HASH', - linkext => 'HASH', - macro => 'HASH', - postamble => 'HASH', - realclean => 'HASH', - test => 'HASH', - tool_autosplit => 'HASH', - - # special cases where you can use makemaker_append - CCFLAGS => 'APPENDABLE', - DEFINE => 'APPENDABLE', - INC => 'APPENDABLE', - LDDLFLAGS => 'APPENDABLE', - LDFROM => 'APPENDABLE', -); - -sub makemaker_args { - my ($self, %new_args) = @_; - my $args = ( $self->{makemaker_args} ||= {} ); - foreach my $key (keys %new_args) { - if ($makemaker_argtype{$key}) { - if ($makemaker_argtype{$key} eq 'ARRAY') { - $args->{$key} = [] unless defined $args->{$key}; - unless (ref $args->{$key} eq 'ARRAY') { - $args->{$key} = [$args->{$key}] - } - push @{$args->{$key}}, - ref $new_args{$key} eq 'ARRAY' - ? @{$new_args{$key}} - : $new_args{$key}; - } - elsif ($makemaker_argtype{$key} eq 'HASH') { - $args->{$key} = {} unless defined $args->{$key}; - foreach my $skey (keys %{ $new_args{$key} }) { - $args->{$key}{$skey} = $new_args{$key}{$skey}; - } - } - elsif ($makemaker_argtype{$key} eq 'APPENDABLE') { - $self->makemaker_append($key => $new_args{$key}); - } - } - else { - if (defined $args->{$key}) { - warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n}; - } - $args->{$key} = $new_args{$key}; - } - } - return $args; -} - -# For mm args that take multiple space-seperated args, -# append an argument to the current list. -sub makemaker_append { - my $self = shift; - my $name = shift; - my $args = $self->makemaker_args; - $args->{$name} = defined $args->{$name} - ? join( ' ', $args->{$name}, @_ ) - : join( ' ', @_ ); -} - -sub build_subdirs { - my $self = shift; - my $subdirs = $self->makemaker_args->{DIR} ||= []; - for my $subdir (@_) { - push @$subdirs, $subdir; - } -} - -sub clean_files { - my $self = shift; - my $clean = $self->makemaker_args->{clean} ||= {}; - %$clean = ( - %$clean, - FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_), - ); -} - -sub realclean_files { - my $self = shift; - my $realclean = $self->makemaker_args->{realclean} ||= {}; - %$realclean = ( - %$realclean, - FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_), - ); -} - -sub libs { - my $self = shift; - my $libs = ref $_[0] ? shift : [ shift ]; - $self->makemaker_args( LIBS => $libs ); -} - -sub inc { - my $self = shift; - $self->makemaker_args( INC => shift ); -} - -sub _wanted_t { -} - -sub tests_recursive { - my $self = shift; - my $dir = shift || 't'; - unless ( -d $dir ) { - die "tests_recursive dir '$dir' does not exist"; - } - my %tests = map { $_ => 1 } split / /, ($self->tests || ''); - require File::Find; - File::Find::find( - sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 }, - $dir - ); - $self->tests( join ' ', sort keys %tests ); -} - -sub write { - my $self = shift; - die "&Makefile->write() takes no arguments\n" if @_; - - # Check the current Perl version - my $perl_version = $self->perl_version; - if ( $perl_version ) { - eval "use $perl_version; 1" - or die "ERROR: perl: Version $] is installed, " - . "but we need version >= $perl_version"; - } - - # Make sure we have a new enough MakeMaker - require ExtUtils::MakeMaker; - - if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) { - # This previous attempted to inherit the version of - # ExtUtils::MakeMaker in use by the module author, but this - # was found to be untenable as some authors build releases - # using future dev versions of EU:MM that nobody else has. - # Instead, #toolchain suggests we use 6.59 which is the most - # stable version on CPAN at time of writing and is, to quote - # ribasushi, "not terminally fucked, > and tested enough". - # TODO: We will now need to maintain this over time to push - # the version up as new versions are released. - $self->build_requires( 'ExtUtils::MakeMaker' => 6.59 ); - $self->configure_requires( 'ExtUtils::MakeMaker' => 6.59 ); - } else { - # Allow legacy-compatibility with 5.005 by depending on the - # most recent EU:MM that supported 5.005. - $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 ); - $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 ); - } - - # Generate the MakeMaker params - my $args = $self->makemaker_args; - $args->{DISTNAME} = $self->name; - $args->{NAME} = $self->module_name || $self->name; - $args->{NAME} =~ s/-/::/g; - $args->{VERSION} = $self->version or die <<'EOT'; -ERROR: Can't determine distribution version. Please specify it -explicitly via 'version' in Makefile.PL, or set a valid $VERSION -in a module, and provide its file path via 'version_from' (or -'all_from' if you prefer) in Makefile.PL. -EOT - - if ( $self->tests ) { - my @tests = split ' ', $self->tests; - my %seen; - $args->{test} = { - TESTS => (join ' ', grep {!$seen{$_}++} @tests), - }; - } elsif ( $Module::Install::ExtraTests::use_extratests ) { - # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness. - # So, just ignore our xt tests here. - } elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) { - $args->{test} = { - TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ), - }; - } - if ( $] >= 5.005 ) { - $args->{ABSTRACT} = $self->abstract; - $args->{AUTHOR} = join ', ', @{$self->author || []}; - } - if ( $self->makemaker(6.10) ) { - $args->{NO_META} = 1; - #$args->{NO_MYMETA} = 1; - } - if ( $self->makemaker(6.17) and $self->sign ) { - $args->{SIGN} = 1; - } - unless ( $self->is_admin ) { - delete $args->{SIGN}; - } - if ( $self->makemaker(6.31) and $self->license ) { - $args->{LICENSE} = $self->license; - } - - my $prereq = ($args->{PREREQ_PM} ||= {}); - %$prereq = ( %$prereq, - map { @$_ } # flatten [module => version] - map { @$_ } - grep $_, - ($self->requires) - ); - - # Remove any reference to perl, PREREQ_PM doesn't support it - delete $args->{PREREQ_PM}->{perl}; - - # Merge both kinds of requires into BUILD_REQUIRES - my $build_prereq = ($args->{BUILD_REQUIRES} ||= {}); - %$build_prereq = ( %$build_prereq, - map { @$_ } # flatten [module => version] - map { @$_ } - grep $_, - ($self->configure_requires, $self->build_requires) - ); - - # Remove any reference to perl, BUILD_REQUIRES doesn't support it - delete $args->{BUILD_REQUIRES}->{perl}; - - # Delete bundled dists from prereq_pm, add it to Makefile DIR - my $subdirs = ($args->{DIR} || []); - if ($self->bundles) { - my %processed; - foreach my $bundle (@{ $self->bundles }) { - my ($mod_name, $dist_dir) = @$bundle; - delete $prereq->{$mod_name}; - $dist_dir = File::Basename::basename($dist_dir); # dir for building this module - if (not exists $processed{$dist_dir}) { - if (-d $dist_dir) { - # List as sub-directory to be processed by make - push @$subdirs, $dist_dir; - } - # Else do nothing: the module is already present on the system - $processed{$dist_dir} = undef; - } - } - } - - unless ( $self->makemaker('6.55_03') ) { - %$prereq = (%$prereq,%$build_prereq); - delete $args->{BUILD_REQUIRES}; - } - - if ( my $perl_version = $self->perl_version ) { - eval "use $perl_version; 1" - or die "ERROR: perl: Version $] is installed, " - . "but we need version >= $perl_version"; - - if ( $self->makemaker(6.48) ) { - $args->{MIN_PERL_VERSION} = $perl_version; - } - } - - if ($self->installdirs) { - warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS}; - $args->{INSTALLDIRS} = $self->installdirs; - } - - my %args = map { - ( $_ => $args->{$_} ) } grep {defined($args->{$_} ) - } keys %$args; - - my $user_preop = delete $args{dist}->{PREOP}; - if ( my $preop = $self->admin->preop($user_preop) ) { - foreach my $key ( keys %$preop ) { - $args{dist}->{$key} = $preop->{$key}; - } - } - - my $mm = ExtUtils::MakeMaker::WriteMakefile(%args); - $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile'); -} - -sub fix_up_makefile { - my $self = shift; - my $makefile_name = shift; - my $top_class = ref($self->_top) || ''; - my $top_version = $self->_top->VERSION || ''; - - my $preamble = $self->preamble - ? "# Preamble by $top_class $top_version\n" - . $self->preamble - : ''; - my $postamble = "# Postamble by $top_class $top_version\n" - . ($self->postamble || ''); - - local *MAKEFILE; - open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; - eval { flock MAKEFILE, LOCK_EX }; - my $makefile = do { local $/; }; - - $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; - $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; - $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g; - $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m; - $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m; - - # Module::Install will never be used to build the Core Perl - # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks - # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist - $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m; - #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m; - - # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well. - $makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g; - - # XXX - This is currently unused; not sure if it breaks other MM-users - # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg; - - seek MAKEFILE, 0, SEEK_SET; - truncate MAKEFILE, 0; - print MAKEFILE "$preamble$makefile$postamble" or die $!; - close MAKEFILE or die $!; - - 1; -} - -sub preamble { - my ($self, $text) = @_; - $self->{preamble} = $text . $self->{preamble} if defined $text; - $self->{preamble}; -} - -sub postamble { - my ($self, $text) = @_; - $self->{postamble} ||= $self->admin->postamble; - $self->{postamble} .= $text if defined $text; - $self->{postamble} -} - -1; - -__END__ - -#line 544 diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm deleted file mode 100644 index 58430f30..00000000 --- a/inc/Module/Install/Metadata.pm +++ /dev/null @@ -1,722 +0,0 @@ -#line 1 -package Module::Install::Metadata; - -use strict 'vars'; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -my @boolean_keys = qw{ - sign -}; - -my @scalar_keys = qw{ - name - module_name - abstract - version - distribution_type - tests - installdirs -}; - -my @tuple_keys = qw{ - configure_requires - build_requires - requires - recommends - bundles - resources -}; - -my @resource_keys = qw{ - homepage - bugtracker - repository -}; - -my @array_keys = qw{ - keywords - author -}; - -*authors = \&author; - -sub Meta { shift } -sub Meta_BooleanKeys { @boolean_keys } -sub Meta_ScalarKeys { @scalar_keys } -sub Meta_TupleKeys { @tuple_keys } -sub Meta_ResourceKeys { @resource_keys } -sub Meta_ArrayKeys { @array_keys } - -foreach my $key ( @boolean_keys ) { - *$key = sub { - my $self = shift; - if ( defined wantarray and not @_ ) { - return $self->{values}->{$key}; - } - $self->{values}->{$key} = ( @_ ? $_[0] : 1 ); - return $self; - }; -} - -foreach my $key ( @scalar_keys ) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} if defined wantarray and !@_; - $self->{values}->{$key} = shift; - return $self; - }; -} - -foreach my $key ( @array_keys ) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} if defined wantarray and !@_; - $self->{values}->{$key} ||= []; - push @{$self->{values}->{$key}}, @_; - return $self; - }; -} - -foreach my $key ( @resource_keys ) { - *$key = sub { - my $self = shift; - unless ( @_ ) { - return () unless $self->{values}->{resources}; - return map { $_->[1] } - grep { $_->[0] eq $key } - @{ $self->{values}->{resources} }; - } - return $self->{values}->{resources}->{$key} unless @_; - my $uri = shift or die( - "Did not provide a value to $key()" - ); - $self->resources( $key => $uri ); - return 1; - }; -} - -foreach my $key ( grep { $_ ne "resources" } @tuple_keys) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} unless @_; - my @added; - while ( @_ ) { - my $module = shift or last; - my $version = shift || 0; - push @added, [ $module, $version ]; - } - push @{ $self->{values}->{$key} }, @added; - return map {@$_} @added; - }; -} - -# Resource handling -my %lc_resource = map { $_ => 1 } qw{ - homepage - license - bugtracker - repository -}; - -sub resources { - my $self = shift; - while ( @_ ) { - my $name = shift or last; - my $value = shift or next; - if ( $name eq lc $name and ! $lc_resource{$name} ) { - die("Unsupported reserved lowercase resource '$name'"); - } - $self->{values}->{resources} ||= []; - push @{ $self->{values}->{resources} }, [ $name, $value ]; - } - $self->{values}->{resources}; -} - -# Aliases for build_requires that will have alternative -# meanings in some future version of META.yml. -sub test_requires { shift->build_requires(@_) } -sub install_requires { shift->build_requires(@_) } - -# Aliases for installdirs options -sub install_as_core { $_[0]->installdirs('perl') } -sub install_as_cpan { $_[0]->installdirs('site') } -sub install_as_site { $_[0]->installdirs('site') } -sub install_as_vendor { $_[0]->installdirs('vendor') } - -sub dynamic_config { - my $self = shift; - my $value = @_ ? shift : 1; - if ( $self->{values}->{dynamic_config} ) { - # Once dynamic we never change to static, for safety - return 0; - } - $self->{values}->{dynamic_config} = $value ? 1 : 0; - return 1; -} - -# Convenience command -sub static_config { - shift->dynamic_config(0); -} - -sub perl_version { - my $self = shift; - return $self->{values}->{perl_version} unless @_; - my $version = shift or die( - "Did not provide a value to perl_version()" - ); - - # Normalize the version - $version = $self->_perl_version($version); - - # We don't support the really old versions - unless ( $version >= 5.005 ) { - die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; - } - - $self->{values}->{perl_version} = $version; -} - -sub all_from { - my ( $self, $file ) = @_; - - unless ( defined($file) ) { - my $name = $self->name or die( - "all_from called with no args without setting name() first" - ); - $file = join('/', 'lib', split(/-/, $name)) . '.pm'; - $file =~ s{.*/}{} unless -e $file; - unless ( -e $file ) { - die("all_from cannot find $file from $name"); - } - } - unless ( -f $file ) { - die("The path '$file' does not exist, or is not a file"); - } - - $self->{values}{all_from} = $file; - - # Some methods pull from POD instead of code. - # If there is a matching .pod, use that instead - my $pod = $file; - $pod =~ s/\.pm$/.pod/i; - $pod = $file unless -e $pod; - - # Pull the different values - $self->name_from($file) unless $self->name; - $self->version_from($file) unless $self->version; - $self->perl_version_from($file) unless $self->perl_version; - $self->author_from($pod) unless @{$self->author || []}; - $self->license_from($pod) unless $self->license; - $self->abstract_from($pod) unless $self->abstract; - - return 1; -} - -sub provides { - my $self = shift; - my $provides = ( $self->{values}->{provides} ||= {} ); - %$provides = (%$provides, @_) if @_; - return $provides; -} - -sub auto_provides { - my $self = shift; - return $self unless $self->is_admin; - unless (-e 'MANIFEST') { - warn "Cannot deduce auto_provides without a MANIFEST, skipping\n"; - return $self; - } - # Avoid spurious warnings as we are not checking manifest here. - local $SIG{__WARN__} = sub {1}; - require ExtUtils::Manifest; - local *ExtUtils::Manifest::manicheck = sub { return }; - - require Module::Build; - my $build = Module::Build->new( - dist_name => $self->name, - dist_version => $self->version, - license => $self->license, - ); - $self->provides( %{ $build->find_dist_packages || {} } ); -} - -sub feature { - my $self = shift; - my $name = shift; - my $features = ( $self->{values}->{features} ||= [] ); - my $mods; - - if ( @_ == 1 and ref( $_[0] ) ) { - # The user used ->feature like ->features by passing in the second - # argument as a reference. Accomodate for that. - $mods = $_[0]; - } else { - $mods = \@_; - } - - my $count = 0; - push @$features, ( - $name => [ - map { - ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_ - } @$mods - ] - ); - - return @$features; -} - -sub features { - my $self = shift; - while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) { - $self->feature( $name, @$mods ); - } - return $self->{values}->{features} - ? @{ $self->{values}->{features} } - : (); -} - -sub no_index { - my $self = shift; - my $type = shift; - push @{ $self->{values}->{no_index}->{$type} }, @_ if $type; - return $self->{values}->{no_index}; -} - -sub read { - my $self = shift; - $self->include_deps( 'YAML::Tiny', 0 ); - - require YAML::Tiny; - my $data = YAML::Tiny::LoadFile('META.yml'); - - # Call methods explicitly in case user has already set some values. - while ( my ( $key, $value ) = each %$data ) { - next unless $self->can($key); - if ( ref $value eq 'HASH' ) { - while ( my ( $module, $version ) = each %$value ) { - $self->can($key)->($self, $module => $version ); - } - } else { - $self->can($key)->($self, $value); - } - } - return $self; -} - -sub write { - my $self = shift; - return $self unless $self->is_admin; - $self->admin->write_meta; - return $self; -} - -sub version_from { - require ExtUtils::MM_Unix; - my ( $self, $file ) = @_; - $self->version( ExtUtils::MM_Unix->parse_version($file) ); - - # for version integrity check - $self->makemaker_args( VERSION_FROM => $file ); -} - -sub abstract_from { - require ExtUtils::MM_Unix; - my ( $self, $file ) = @_; - $self->abstract( - bless( - { DISTNAME => $self->name }, - 'ExtUtils::MM_Unix' - )->parse_abstract($file) - ); -} - -# Add both distribution and module name -sub name_from { - my ($self, $file) = @_; - if ( - Module::Install::_read($file) =~ m/ - ^ \s* - package \s* - ([\w:]+) - \s* ; - /ixms - ) { - my ($name, $module_name) = ($1, $1); - $name =~ s{::}{-}g; - $self->name($name); - unless ( $self->module_name ) { - $self->module_name($module_name); - } - } else { - die("Cannot determine name from $file\n"); - } -} - -sub _extract_perl_version { - if ( - $_[0] =~ m/ - ^\s* - (?:use|require) \s* - v? - ([\d_\.]+) - \s* ; - /ixms - ) { - my $perl_version = $1; - $perl_version =~ s{_}{}g; - return $perl_version; - } else { - return; - } -} - -sub perl_version_from { - my $self = shift; - my $perl_version=_extract_perl_version(Module::Install::_read($_[0])); - if ($perl_version) { - $self->perl_version($perl_version); - } else { - warn "Cannot determine perl version info from $_[0]\n"; - return; - } -} - -sub author_from { - my $self = shift; - my $content = Module::Install::_read($_[0]); - if ($content =~ m/ - =head \d \s+ (?:authors?)\b \s* - ([^\n]*) - | - =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s* - .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s* - ([^\n]*) - /ixms) { - my $author = $1 || $2; - - # XXX: ugly but should work anyway... - if (eval "require Pod::Escapes; 1") { - # Pod::Escapes has a mapping table. - # It's in core of perl >= 5.9.3, and should be installed - # as one of the Pod::Simple's prereqs, which is a prereq - # of Pod::Text 3.x (see also below). - $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } - { - defined $2 - ? chr($2) - : defined $Pod::Escapes::Name2character_number{$1} - ? chr($Pod::Escapes::Name2character_number{$1}) - : do { - warn "Unknown escape: E<$1>"; - "E<$1>"; - }; - }gex; - } - elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) { - # Pod::Text < 3.0 has yet another mapping table, - # though the table name of 2.x and 1.x are different. - # (1.x is in core of Perl < 5.6, 2.x is in core of - # Perl < 5.9.3) - my $mapping = ($Pod::Text::VERSION < 2) - ? \%Pod::Text::HTML_Escapes - : \%Pod::Text::ESCAPES; - $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } - { - defined $2 - ? chr($2) - : defined $mapping->{$1} - ? $mapping->{$1} - : do { - warn "Unknown escape: E<$1>"; - "E<$1>"; - }; - }gex; - } - else { - $author =~ s{E}{<}g; - $author =~ s{E}{>}g; - } - $self->author($author); - } else { - warn "Cannot determine author info from $_[0]\n"; - } -} - -#Stolen from M::B -my %license_urls = ( - perl => 'http://dev.perl.org/licenses/', - apache => 'http://apache.org/licenses/LICENSE-2.0', - apache_1_1 => 'http://apache.org/licenses/LICENSE-1.1', - artistic => 'http://opensource.org/licenses/artistic-license.php', - artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php', - lgpl => 'http://opensource.org/licenses/lgpl-license.php', - lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php', - lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html', - bsd => 'http://opensource.org/licenses/bsd-license.php', - gpl => 'http://opensource.org/licenses/gpl-license.php', - gpl2 => 'http://opensource.org/licenses/gpl-2.0.php', - gpl3 => 'http://opensource.org/licenses/gpl-3.0.html', - mit => 'http://opensource.org/licenses/mit-license.php', - mozilla => 'http://opensource.org/licenses/mozilla1.1.php', - open_source => undef, - unrestricted => undef, - restrictive => undef, - unknown => undef, -); - -sub license { - my $self = shift; - return $self->{values}->{license} unless @_; - my $license = shift or die( - 'Did not provide a value to license()' - ); - $license = __extract_license($license) || lc $license; - $self->{values}->{license} = $license; - - # Automatically fill in license URLs - if ( $license_urls{$license} ) { - $self->resources( license => $license_urls{$license} ); - } - - return 1; -} - -sub _extract_license { - my $pod = shift; - my $matched; - return __extract_license( - ($matched) = $pod =~ m/ - (=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?) - (=head \d.*|=cut.*|)\z - /xms - ) || __extract_license( - ($matched) = $pod =~ m/ - (=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?) - (=head \d.*|=cut.*|)\z - /xms - ); -} - -sub __extract_license { - my $license_text = shift or return; - my @phrases = ( - '(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1, - '(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1, - 'Artistic and GPL' => 'perl', 1, - 'GNU general public license' => 'gpl', 1, - 'GNU public license' => 'gpl', 1, - 'GNU lesser general public license' => 'lgpl', 1, - 'GNU lesser public license' => 'lgpl', 1, - 'GNU library general public license' => 'lgpl', 1, - 'GNU library public license' => 'lgpl', 1, - 'GNU Free Documentation license' => 'unrestricted', 1, - 'GNU Affero General Public License' => 'open_source', 1, - '(?:Free)?BSD license' => 'bsd', 1, - 'Artistic license 2\.0' => 'artistic_2', 1, - 'Artistic license' => 'artistic', 1, - 'Apache (?:Software )?license' => 'apache', 1, - 'GPL' => 'gpl', 1, - 'LGPL' => 'lgpl', 1, - 'BSD' => 'bsd', 1, - 'Artistic' => 'artistic', 1, - 'MIT' => 'mit', 1, - 'Mozilla Public License' => 'mozilla', 1, - 'Q Public License' => 'open_source', 1, - 'OpenSSL License' => 'unrestricted', 1, - 'SSLeay License' => 'unrestricted', 1, - 'zlib License' => 'open_source', 1, - 'proprietary' => 'proprietary', 0, - ); - while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { - $pattern =~ s#\s+#\\s+#gs; - if ( $license_text =~ /\b$pattern\b/i ) { - return $license; - } - } - return ''; -} - -sub license_from { - my $self = shift; - if (my $license=_extract_license(Module::Install::_read($_[0]))) { - $self->license($license); - } else { - warn "Cannot determine license info from $_[0]\n"; - return 'unknown'; - } -} - -sub _extract_bugtracker { - my @links = $_[0] =~ m#L<( - https?\Q://rt.cpan.org/\E[^>]+| - https?\Q://github.com/\E[\w_]+/[\w_]+/issues| - https?\Q://code.google.com/p/\E[\w_\-]+/issues/list - )>#gx; - my %links; - @links{@links}=(); - @links=keys %links; - return @links; -} - -sub bugtracker_from { - my $self = shift; - my $content = Module::Install::_read($_[0]); - my @links = _extract_bugtracker($content); - unless ( @links ) { - warn "Cannot determine bugtracker info from $_[0]\n"; - return 0; - } - if ( @links > 1 ) { - warn "Found more than one bugtracker link in $_[0]\n"; - return 0; - } - - # Set the bugtracker - bugtracker( $links[0] ); - return 1; -} - -sub requires_from { - my $self = shift; - my $content = Module::Install::_readperl($_[0]); - my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg; - while ( @requires ) { - my $module = shift @requires; - my $version = shift @requires; - $self->requires( $module => $version ); - } -} - -sub test_requires_from { - my $self = shift; - my $content = Module::Install::_readperl($_[0]); - my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; - while ( @requires ) { - my $module = shift @requires; - my $version = shift @requires; - $self->test_requires( $module => $version ); - } -} - -# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to -# numbers (eg, 5.006001 or 5.008009). -# Also, convert double-part versions (eg, 5.8) -sub _perl_version { - my $v = $_[-1]; - $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e; - $v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e; - $v =~ s/(\.\d\d\d)000$/$1/; - $v =~ s/_.+$//; - if ( ref($v) ) { - # Numify - $v = $v + 0; - } - return $v; -} - -sub add_metadata { - my $self = shift; - my %hash = @_; - for my $key (keys %hash) { - warn "add_metadata: $key is not prefixed with 'x_'.\n" . - "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/; - $self->{values}->{$key} = $hash{$key}; - } -} - - -###################################################################### -# MYMETA Support - -sub WriteMyMeta { - die "WriteMyMeta has been deprecated"; -} - -sub write_mymeta_yaml { - my $self = shift; - - # We need YAML::Tiny to write the MYMETA.yml file - unless ( eval { require YAML::Tiny; 1; } ) { - return 1; - } - - # Generate the data - my $meta = $self->_write_mymeta_data or return 1; - - # Save as the MYMETA.yml file - print "Writing MYMETA.yml\n"; - YAML::Tiny::DumpFile('MYMETA.yml', $meta); -} - -sub write_mymeta_json { - my $self = shift; - - # We need JSON to write the MYMETA.json file - unless ( eval { require JSON; 1; } ) { - return 1; - } - - # Generate the data - my $meta = $self->_write_mymeta_data or return 1; - - # Save as the MYMETA.yml file - print "Writing MYMETA.json\n"; - Module::Install::_write( - 'MYMETA.json', - JSON->new->pretty(1)->canonical->encode($meta), - ); -} - -sub _write_mymeta_data { - my $self = shift; - - # If there's no existing META.yml there is nothing we can do - return undef unless -f 'META.yml'; - - # We need Parse::CPAN::Meta to load the file - unless ( eval { require Parse::CPAN::Meta; 1; } ) { - return undef; - } - - # Merge the perl version into the dependencies - my $val = $self->Meta->{values}; - my $perl = delete $val->{perl_version}; - if ( $perl ) { - $val->{requires} ||= []; - my $requires = $val->{requires}; - - # Canonize to three-dot version after Perl 5.6 - if ( $perl >= 5.006 ) { - $perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e - } - unshift @$requires, [ perl => $perl ]; - } - - # Load the advisory META.yml file - my @yaml = Parse::CPAN::Meta::LoadFile('META.yml'); - my $meta = $yaml[0]; - - # Overwrite the non-configure dependency hashs - delete $meta->{requires}; - delete $meta->{build_requires}; - delete $meta->{recommends}; - if ( exists $val->{requires} ) { - $meta->{requires} = { map { @$_ } @{ $val->{requires} } }; - } - if ( exists $val->{build_requires} ) { - $meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } }; - } - - return $meta; -} - -1; diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm deleted file mode 100644 index eeaa3fed..00000000 --- a/inc/Module/Install/Win32.pm +++ /dev/null @@ -1,64 +0,0 @@ -#line 1 -package Module::Install::Win32; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -# determine if the user needs nmake, and download it if needed -sub check_nmake { - my $self = shift; - $self->load('can_run'); - $self->load('get_file'); - - require Config; - return unless ( - $^O eq 'MSWin32' and - $Config::Config{make} and - $Config::Config{make} =~ /^nmake\b/i and - ! $self->can_run('nmake') - ); - - print "The required 'nmake' executable not found, fetching it...\n"; - - require File::Basename; - my $rv = $self->get_file( - url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe', - ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe', - local_dir => File::Basename::dirname($^X), - size => 51928, - run => 'Nmake15.exe /o > nul', - check_for => 'Nmake.exe', - remove => 1, - ); - - die <<'END_MESSAGE' unless $rv; - -------------------------------------------------------------------------------- - -Since you are using Microsoft Windows, you will need the 'nmake' utility -before installation. It's available at: - - http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe - or - ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe - -Please download the file manually, save it to a directory in %PATH% (e.g. -C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to -that directory, and run "Nmake15.exe" from there; that will create the -'nmake.exe' file needed by this module. - -You may then resume the installation process described in README. - -------------------------------------------------------------------------------- -END_MESSAGE - -} - -1; diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm deleted file mode 100644 index 85d8018c..00000000 --- a/inc/Module/Install/WriteAll.pm +++ /dev/null @@ -1,63 +0,0 @@ -#line 1 -package Module::Install::WriteAll; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = qw{Module::Install::Base}; - $ISCORE = 1; -} - -sub WriteAll { - my $self = shift; - my %args = ( - meta => 1, - sign => 0, - inline => 0, - check_nmake => 1, - @_, - ); - - $self->sign(1) if $args{sign}; - $self->admin->WriteAll(%args) if $self->is_admin; - - $self->check_nmake if $args{check_nmake}; - unless ( $self->makemaker_args->{PL_FILES} ) { - # XXX: This still may be a bit over-defensive... - unless ($self->makemaker(6.25)) { - $self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL'; - } - } - - # Until ExtUtils::MakeMaker support MYMETA.yml, make sure - # we clean it up properly ourself. - $self->realclean_files('MYMETA.yml'); - - if ( $args{inline} ) { - $self->Inline->write; - } else { - $self->Makefile->write; - } - - # The Makefile write process adds a couple of dependencies, - # so write the META.yml files after the Makefile. - if ( $args{meta} ) { - $self->Meta->write; - } - - # Experimental support for MYMETA - if ( $ENV{X_MYMETA} ) { - if ( $ENV{X_MYMETA} eq 'JSON' ) { - $self->Meta->write_mymeta_json; - } else { - $self->Meta->write_mymeta_yaml; - } - } - - return 1; -} - -1; diff --git a/Netdisco/lib/App/Netdisco.pm b/lib/App/Netdisco.pm similarity index 100% rename from Netdisco/lib/App/Netdisco.pm rename to lib/App/Netdisco.pm diff --git a/Netdisco/lib/App/Netdisco/AnyEvent/Nbtstat.pm b/lib/App/Netdisco/AnyEvent/Nbtstat.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/AnyEvent/Nbtstat.pm rename to lib/App/Netdisco/AnyEvent/Nbtstat.pm diff --git a/Netdisco/lib/App/Netdisco/Configuration.pm b/lib/App/Netdisco/Configuration.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Configuration.pm rename to lib/App/Netdisco/Configuration.pm diff --git a/Netdisco/lib/App/Netdisco/Core/Arpnip.pm b/lib/App/Netdisco/Core/Arpnip.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Core/Arpnip.pm rename to lib/App/Netdisco/Core/Arpnip.pm diff --git a/Netdisco/lib/App/Netdisco/Core/Discover.pm b/lib/App/Netdisco/Core/Discover.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Core/Discover.pm rename to lib/App/Netdisco/Core/Discover.pm diff --git a/Netdisco/lib/App/Netdisco/Core/Macsuck.pm b/lib/App/Netdisco/Core/Macsuck.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Core/Macsuck.pm rename to lib/App/Netdisco/Core/Macsuck.pm diff --git a/Netdisco/lib/App/Netdisco/Core/Nbtstat.pm b/lib/App/Netdisco/Core/Nbtstat.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Core/Nbtstat.pm rename to lib/App/Netdisco/Core/Nbtstat.pm diff --git a/Netdisco/lib/App/Netdisco/DB.pm b/lib/App/Netdisco/DB.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB.pm rename to lib/App/Netdisco/DB.pm diff --git a/Netdisco/lib/App/Netdisco/DB/ExplicitLocking.pm b/lib/App/Netdisco/DB/ExplicitLocking.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/ExplicitLocking.pm rename to lib/App/Netdisco/DB/ExplicitLocking.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Admin.pm b/lib/App/Netdisco/DB/Result/Admin.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Admin.pm rename to lib/App/Netdisco/DB/Result/Admin.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Community.pm b/lib/App/Netdisco/DB/Result/Community.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Community.pm rename to lib/App/Netdisco/DB/Result/Community.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Device.pm b/lib/App/Netdisco/DB/Result/Device.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Device.pm rename to lib/App/Netdisco/DB/Result/Device.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/DeviceIp.pm b/lib/App/Netdisco/DB/Result/DeviceIp.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/DeviceIp.pm rename to lib/App/Netdisco/DB/Result/DeviceIp.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/DeviceModule.pm b/lib/App/Netdisco/DB/Result/DeviceModule.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/DeviceModule.pm rename to lib/App/Netdisco/DB/Result/DeviceModule.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/DevicePort.pm b/lib/App/Netdisco/DB/Result/DevicePort.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/DevicePort.pm rename to lib/App/Netdisco/DB/Result/DevicePort.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/DevicePortLog.pm b/lib/App/Netdisco/DB/Result/DevicePortLog.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/DevicePortLog.pm rename to lib/App/Netdisco/DB/Result/DevicePortLog.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/DevicePortPower.pm b/lib/App/Netdisco/DB/Result/DevicePortPower.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/DevicePortPower.pm rename to lib/App/Netdisco/DB/Result/DevicePortPower.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/DevicePortSsid.pm b/lib/App/Netdisco/DB/Result/DevicePortSsid.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/DevicePortSsid.pm rename to lib/App/Netdisco/DB/Result/DevicePortSsid.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/DevicePortVlan.pm b/lib/App/Netdisco/DB/Result/DevicePortVlan.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/DevicePortVlan.pm rename to lib/App/Netdisco/DB/Result/DevicePortVlan.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/DevicePortWireless.pm b/lib/App/Netdisco/DB/Result/DevicePortWireless.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/DevicePortWireless.pm rename to lib/App/Netdisco/DB/Result/DevicePortWireless.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/DevicePower.pm b/lib/App/Netdisco/DB/Result/DevicePower.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/DevicePower.pm rename to lib/App/Netdisco/DB/Result/DevicePower.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/DeviceRoute.pm b/lib/App/Netdisco/DB/Result/DeviceRoute.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/DeviceRoute.pm rename to lib/App/Netdisco/DB/Result/DeviceRoute.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/DeviceVlan.pm b/lib/App/Netdisco/DB/Result/DeviceVlan.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/DeviceVlan.pm rename to lib/App/Netdisco/DB/Result/DeviceVlan.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Log.pm b/lib/App/Netdisco/DB/Result/Log.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Log.pm rename to lib/App/Netdisco/DB/Result/Log.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Node.pm b/lib/App/Netdisco/DB/Result/Node.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Node.pm rename to lib/App/Netdisco/DB/Result/Node.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/NodeIp.pm b/lib/App/Netdisco/DB/Result/NodeIp.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/NodeIp.pm rename to lib/App/Netdisco/DB/Result/NodeIp.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/NodeMonitor.pm b/lib/App/Netdisco/DB/Result/NodeMonitor.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/NodeMonitor.pm rename to lib/App/Netdisco/DB/Result/NodeMonitor.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/NodeNbt.pm b/lib/App/Netdisco/DB/Result/NodeNbt.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/NodeNbt.pm rename to lib/App/Netdisco/DB/Result/NodeNbt.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/NodeWireless.pm b/lib/App/Netdisco/DB/Result/NodeWireless.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/NodeWireless.pm rename to lib/App/Netdisco/DB/Result/NodeWireless.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Oui.pm b/lib/App/Netdisco/DB/Result/Oui.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Oui.pm rename to lib/App/Netdisco/DB/Result/Oui.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Process.pm b/lib/App/Netdisco/DB/Result/Process.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Process.pm rename to lib/App/Netdisco/DB/Result/Process.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Session.pm b/lib/App/Netdisco/DB/Result/Session.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Session.pm rename to lib/App/Netdisco/DB/Result/Session.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Subnet.pm b/lib/App/Netdisco/DB/Result/Subnet.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Subnet.pm rename to lib/App/Netdisco/DB/Result/Subnet.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Topology.pm b/lib/App/Netdisco/DB/Result/Topology.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Topology.pm rename to lib/App/Netdisco/DB/Result/Topology.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/User.pm b/lib/App/Netdisco/DB/Result/User.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/User.pm rename to lib/App/Netdisco/DB/Result/User.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/UserLog.pm b/lib/App/Netdisco/DB/Result/UserLog.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/UserLog.pm rename to lib/App/Netdisco/DB/Result/UserLog.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/ActiveNode.pm b/lib/App/Netdisco/DB/Result/Virtual/ActiveNode.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/ActiveNode.pm rename to lib/App/Netdisco/DB/Result/Virtual/ActiveNode.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm b/lib/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm rename to lib/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/ApRadioChannelPower.pm b/lib/App/Netdisco/DB/Result/Virtual/ApRadioChannelPower.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/ApRadioChannelPower.pm rename to lib/App/Netdisco/DB/Result/Virtual/ApRadioChannelPower.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm b/lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm rename to lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DeviceDnsMismatch.pm b/lib/App/Netdisco/DB/Result/Virtual/DeviceDnsMismatch.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/DeviceDnsMismatch.pm rename to lib/App/Netdisco/DB/Result/Virtual/DeviceDnsMismatch.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm rename to lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DevicePoeStatus.pm b/lib/App/Netdisco/DB/Result/Virtual/DevicePoeStatus.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/DevicePoeStatus.pm rename to lib/App/Netdisco/DB/Result/Virtual/DevicePoeStatus.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DuplexMismatch.pm b/lib/App/Netdisco/DB/Result/Virtual/DuplexMismatch.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/DuplexMismatch.pm rename to lib/App/Netdisco/DB/Result/Virtual/DuplexMismatch.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/GenericReport.pm b/lib/App/Netdisco/DB/Result/Virtual/GenericReport.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/GenericReport.pm rename to lib/App/Netdisco/DB/Result/Virtual/GenericReport.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodeIp4.pm b/lib/App/Netdisco/DB/Result/Virtual/NodeIp4.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodeIp4.pm rename to lib/App/Netdisco/DB/Result/Virtual/NodeIp4.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodeIp6.pm b/lib/App/Netdisco/DB/Result/Virtual/NodeIp6.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodeIp6.pm rename to lib/App/Netdisco/DB/Result/Virtual/NodeIp6.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodeMonitor.pm b/lib/App/Netdisco/DB/Result/Virtual/NodeMonitor.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodeMonitor.pm rename to lib/App/Netdisco/DB/Result/Virtual/NodeMonitor.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm b/lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm rename to lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodesDiscovered.pm b/lib/App/Netdisco/DB/Result/Virtual/NodesDiscovered.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/NodesDiscovered.pm rename to lib/App/Netdisco/DB/Result/Virtual/NodesDiscovered.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/OrphanedDevices.pm b/lib/App/Netdisco/DB/Result/Virtual/OrphanedDevices.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/OrphanedDevices.pm rename to lib/App/Netdisco/DB/Result/Virtual/OrphanedDevices.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/PollerPerformance.pm b/lib/App/Netdisco/DB/Result/Virtual/PollerPerformance.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/PollerPerformance.pm rename to lib/App/Netdisco/DB/Result/Virtual/PollerPerformance.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm b/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm rename to lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/SlowDevices.pm b/lib/App/Netdisco/DB/Result/Virtual/SlowDevices.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/SlowDevices.pm rename to lib/App/Netdisco/DB/Result/Virtual/SlowDevices.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/SubnetUtilization.pm b/lib/App/Netdisco/DB/Result/Virtual/SubnetUtilization.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/SubnetUtilization.pm rename to lib/App/Netdisco/DB/Result/Virtual/SubnetUtilization.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/UnDirEdgesAgg.pm b/lib/App/Netdisco/DB/Result/Virtual/UnDirEdgesAgg.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/UnDirEdgesAgg.pm rename to lib/App/Netdisco/DB/Result/Virtual/UnDirEdgesAgg.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/UndiscoveredNeighbors.pm b/lib/App/Netdisco/DB/Result/Virtual/UndiscoveredNeighbors.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/UndiscoveredNeighbors.pm rename to lib/App/Netdisco/DB/Result/Virtual/UndiscoveredNeighbors.pm diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/UserRole.pm b/lib/App/Netdisco/DB/Result/Virtual/UserRole.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/Result/Virtual/UserRole.pm rename to lib/App/Netdisco/DB/Result/Virtual/UserRole.pm diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet.pm b/lib/App/Netdisco/DB/ResultSet.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/ResultSet.pm rename to lib/App/Netdisco/DB/ResultSet.pm diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/Admin.pm b/lib/App/Netdisco/DB/ResultSet/Admin.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/ResultSet/Admin.pm rename to lib/App/Netdisco/DB/ResultSet/Admin.pm diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm b/lib/App/Netdisco/DB/ResultSet/Device.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm rename to lib/App/Netdisco/DB/ResultSet/Device.pm diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/DeviceModule.pm b/lib/App/Netdisco/DB/ResultSet/DeviceModule.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/ResultSet/DeviceModule.pm rename to lib/App/Netdisco/DB/ResultSet/DeviceModule.pm diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePort.pm b/lib/App/Netdisco/DB/ResultSet/DevicePort.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePort.pm rename to lib/App/Netdisco/DB/ResultSet/DevicePort.pm diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePortLog.pm b/lib/App/Netdisco/DB/ResultSet/DevicePortLog.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePortLog.pm rename to lib/App/Netdisco/DB/ResultSet/DevicePortLog.pm diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePortSsid.pm b/lib/App/Netdisco/DB/ResultSet/DevicePortSsid.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePortSsid.pm rename to lib/App/Netdisco/DB/ResultSet/DevicePortSsid.pm diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePower.pm b/lib/App/Netdisco/DB/ResultSet/DevicePower.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePower.pm rename to lib/App/Netdisco/DB/ResultSet/DevicePower.pm diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/Node.pm b/lib/App/Netdisco/DB/ResultSet/Node.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/ResultSet/Node.pm rename to lib/App/Netdisco/DB/ResultSet/Node.pm diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeIp.pm b/lib/App/Netdisco/DB/ResultSet/NodeIp.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/ResultSet/NodeIp.pm rename to lib/App/Netdisco/DB/ResultSet/NodeIp.pm diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeNbt.pm b/lib/App/Netdisco/DB/ResultSet/NodeNbt.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/ResultSet/NodeNbt.pm rename to lib/App/Netdisco/DB/ResultSet/NodeNbt.pm diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeWireless.pm b/lib/App/Netdisco/DB/ResultSet/NodeWireless.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/ResultSet/NodeWireless.pm rename to lib/App/Netdisco/DB/ResultSet/NodeWireless.pm diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/Subnet.pm b/lib/App/Netdisco/DB/ResultSet/Subnet.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/ResultSet/Subnet.pm rename to lib/App/Netdisco/DB/ResultSet/Subnet.pm diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-1-2-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-1-2-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-1-2-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-1-2-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-10-11-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-10-11-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-10-11-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-10-11-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-11-12-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-11-12-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-11-12-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-11-12-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-12-13-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-12-13-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-12-13-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-12-13-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-13-14-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-13-14-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-13-14-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-13-14-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-14-15-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-14-15-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-14-15-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-14-15-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-15-16-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-15-16-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-15-16-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-15-16-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-16-17-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-16-17-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-16-17-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-16-17-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-17-18-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-17-18-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-17-18-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-17-18-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-18-19-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-18-19-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-18-19-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-18-19-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-19-20-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-19-20-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-19-20-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-19-20-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-2-3-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-2-3-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-2-3-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-2-3-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-20-21-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-20-21-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-20-21-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-20-21-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-21-22-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-21-22-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-21-22-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-21-22-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-22-23-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-22-23-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-22-23-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-22-23-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-23-24-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-23-24-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-23-24-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-23-24-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-24-25-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-24-25-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-24-25-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-24-25-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-25-26-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-25-26-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-25-26-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-25-26-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-26-27-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-26-27-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-26-27-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-26-27-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-27-28-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-27-28-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-27-28-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-27-28-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-28-29-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-28-29-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-28-29-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-28-29-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-29-30-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-29-30-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-29-30-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-29-30-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-4-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-4-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-4-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-4-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-30-31-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-30-31-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-30-31-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-30-31-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-31-32-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-31-32-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-31-32-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-31-32-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-32-33-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-32-33-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-32-33-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-32-33-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-33-34-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-33-34-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-33-34-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-33-34-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-34-35-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-34-35-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-34-35-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-34-35-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-35-36-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-35-36-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-35-36-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-35-36-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-36-37-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-36-37-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-36-37-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-36-37-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-37-38-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-37-38-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-37-38-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-37-38-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-38-39-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-38-39-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-38-39-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-38-39-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-39-40-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-39-40-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-39-40-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-39-40-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-5-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-5-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-5-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-5-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-40-41-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-40-41-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-40-41-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-40-41-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-5-6-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-5-6-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-5-6-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-5-6-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-6-7-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-6-7-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-6-7-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-6-7-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-7-8-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-7-8-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-7-8-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-7-8-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-9-10-PostgreSQL.sql b/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-9-10-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-9-10-PostgreSQL.sql rename to lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-9-10-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/Daemon/Job.pm b/lib/App/Netdisco/Daemon/Job.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Daemon/Job.pm rename to lib/App/Netdisco/Daemon/Job.pm diff --git a/Netdisco/lib/App/Netdisco/Daemon/Util.pm b/lib/App/Netdisco/Daemon/Util.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Daemon/Util.pm rename to lib/App/Netdisco/Daemon/Util.pm diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm b/lib/App/Netdisco/Daemon/Worker/Common.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm rename to lib/App/Netdisco/Daemon/Worker/Common.pm diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm b/lib/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm rename to lib/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm b/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm rename to lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm b/lib/App/Netdisco/Daemon/Worker/Manager.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm rename to lib/App/Netdisco/Daemon/Worker/Manager.pm diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller.pm b/lib/App/Netdisco/Daemon/Worker/Poller.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Daemon/Worker/Poller.pm rename to lib/App/Netdisco/Daemon/Worker/Poller.pm diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Arpnip.pm b/lib/App/Netdisco/Daemon/Worker/Poller/Arpnip.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Arpnip.pm rename to lib/App/Netdisco/Daemon/Worker/Poller/Arpnip.pm diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Common.pm b/lib/App/Netdisco/Daemon/Worker/Poller/Common.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Common.pm rename to lib/App/Netdisco/Daemon/Worker/Poller/Common.pm diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm b/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm rename to lib/App/Netdisco/Daemon/Worker/Poller/Device.pm diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Expiry.pm b/lib/App/Netdisco/Daemon/Worker/Poller/Expiry.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Expiry.pm rename to lib/App/Netdisco/Daemon/Worker/Poller/Expiry.pm diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Macsuck.pm b/lib/App/Netdisco/Daemon/Worker/Poller/Macsuck.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Macsuck.pm rename to lib/App/Netdisco/Daemon/Worker/Poller/Macsuck.pm diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Nbtstat.pm b/lib/App/Netdisco/Daemon/Worker/Poller/Nbtstat.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Nbtstat.pm rename to lib/App/Netdisco/Daemon/Worker/Poller/Nbtstat.pm diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Scheduler.pm b/lib/App/Netdisco/Daemon/Worker/Scheduler.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Daemon/Worker/Scheduler.pm rename to lib/App/Netdisco/Daemon/Worker/Scheduler.pm diff --git a/Netdisco/lib/App/Netdisco/Environment.pm b/lib/App/Netdisco/Environment.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Environment.pm rename to lib/App/Netdisco/Environment.pm diff --git a/Netdisco/lib/App/Netdisco/GenericDB.pm b/lib/App/Netdisco/GenericDB.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/GenericDB.pm rename to lib/App/Netdisco/GenericDB.pm diff --git a/Netdisco/lib/App/Netdisco/GenericDB/Result/Virtual/GenericReport.pm b/lib/App/Netdisco/GenericDB/Result/Virtual/GenericReport.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/GenericDB/Result/Virtual/GenericReport.pm rename to lib/App/Netdisco/GenericDB/Result/Virtual/GenericReport.pm diff --git a/Netdisco/lib/App/Netdisco/JobQueue.pm b/lib/App/Netdisco/JobQueue.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/JobQueue.pm rename to lib/App/Netdisco/JobQueue.pm diff --git a/Netdisco/lib/App/Netdisco/JobQueue/PostgreSQL.pm b/lib/App/Netdisco/JobQueue/PostgreSQL.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/JobQueue/PostgreSQL.pm rename to lib/App/Netdisco/JobQueue/PostgreSQL.pm diff --git a/Netdisco/lib/App/Netdisco/Manual/BSDInstall.pod b/lib/App/Netdisco/Manual/BSDInstall.pod similarity index 100% rename from Netdisco/lib/App/Netdisco/Manual/BSDInstall.pod rename to lib/App/Netdisco/Manual/BSDInstall.pod diff --git a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod b/lib/App/Netdisco/Manual/Configuration.pod similarity index 100% rename from Netdisco/lib/App/Netdisco/Manual/Configuration.pod rename to lib/App/Netdisco/Manual/Configuration.pod diff --git a/Netdisco/lib/App/Netdisco/Manual/Deployment.pod b/lib/App/Netdisco/Manual/Deployment.pod similarity index 100% rename from Netdisco/lib/App/Netdisco/Manual/Deployment.pod rename to lib/App/Netdisco/Manual/Deployment.pod diff --git a/Netdisco/lib/App/Netdisco/Manual/Developing.pod b/lib/App/Netdisco/Manual/Developing.pod similarity index 100% rename from Netdisco/lib/App/Netdisco/Manual/Developing.pod rename to lib/App/Netdisco/Manual/Developing.pod diff --git a/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod b/lib/App/Netdisco/Manual/ReleaseNotes.pod similarity index 100% rename from Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod rename to lib/App/Netdisco/Manual/ReleaseNotes.pod diff --git a/Netdisco/lib/App/Netdisco/Manual/Systemd.pod b/lib/App/Netdisco/Manual/Systemd.pod similarity index 100% rename from Netdisco/lib/App/Netdisco/Manual/Systemd.pod rename to lib/App/Netdisco/Manual/Systemd.pod diff --git a/Netdisco/lib/App/Netdisco/Manual/Troubleshooting.pod b/lib/App/Netdisco/Manual/Troubleshooting.pod similarity index 100% rename from Netdisco/lib/App/Netdisco/Manual/Troubleshooting.pod rename to lib/App/Netdisco/Manual/Troubleshooting.pod diff --git a/Netdisco/lib/App/Netdisco/Manual/Vendors.pod b/lib/App/Netdisco/Manual/Vendors.pod similarity index 100% rename from Netdisco/lib/App/Netdisco/Manual/Vendors.pod rename to lib/App/Netdisco/Manual/Vendors.pod diff --git a/Netdisco/lib/App/Netdisco/Manual/WritingPlugins.pod b/lib/App/Netdisco/Manual/WritingPlugins.pod similarity index 100% rename from Netdisco/lib/App/Netdisco/Manual/WritingPlugins.pod rename to lib/App/Netdisco/Manual/WritingPlugins.pod diff --git a/Netdisco/lib/App/Netdisco/SSHCollector/Platform/ACE.pm b/lib/App/Netdisco/SSHCollector/Platform/ACE.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/SSHCollector/Platform/ACE.pm rename to lib/App/Netdisco/SSHCollector/Platform/ACE.pm diff --git a/Netdisco/lib/App/Netdisco/SSHCollector/Platform/ASA.pm b/lib/App/Netdisco/SSHCollector/Platform/ASA.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/SSHCollector/Platform/ASA.pm rename to lib/App/Netdisco/SSHCollector/Platform/ASA.pm diff --git a/Netdisco/lib/App/Netdisco/SSHCollector/Platform/BigIP.pm b/lib/App/Netdisco/SSHCollector/Platform/BigIP.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/SSHCollector/Platform/BigIP.pm rename to lib/App/Netdisco/SSHCollector/Platform/BigIP.pm diff --git a/Netdisco/lib/App/Netdisco/SSHCollector/Platform/CPVSX.pm b/lib/App/Netdisco/SSHCollector/Platform/CPVSX.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/SSHCollector/Platform/CPVSX.pm rename to lib/App/Netdisco/SSHCollector/Platform/CPVSX.pm diff --git a/Netdisco/lib/App/Netdisco/SSHCollector/Platform/FreeBSD.pm b/lib/App/Netdisco/SSHCollector/Platform/FreeBSD.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/SSHCollector/Platform/FreeBSD.pm rename to lib/App/Netdisco/SSHCollector/Platform/FreeBSD.pm diff --git a/Netdisco/lib/App/Netdisco/SSHCollector/Platform/GAIAEmbedded.pm b/lib/App/Netdisco/SSHCollector/Platform/GAIAEmbedded.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/SSHCollector/Platform/GAIAEmbedded.pm rename to lib/App/Netdisco/SSHCollector/Platform/GAIAEmbedded.pm diff --git a/Netdisco/lib/App/Netdisco/SSHCollector/Platform/IOS.pm b/lib/App/Netdisco/SSHCollector/Platform/IOS.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/SSHCollector/Platform/IOS.pm rename to lib/App/Netdisco/SSHCollector/Platform/IOS.pm diff --git a/Netdisco/lib/App/Netdisco/SSHCollector/Platform/IOSXR.pm b/lib/App/Netdisco/SSHCollector/Platform/IOSXR.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/SSHCollector/Platform/IOSXR.pm rename to lib/App/Netdisco/SSHCollector/Platform/IOSXR.pm diff --git a/Netdisco/lib/App/Netdisco/SSHCollector/Platform/Linux.pm b/lib/App/Netdisco/SSHCollector/Platform/Linux.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/SSHCollector/Platform/Linux.pm rename to lib/App/Netdisco/SSHCollector/Platform/Linux.pm diff --git a/Netdisco/lib/App/Netdisco/SSHCollector/Platform/PaloAlto.pm b/lib/App/Netdisco/SSHCollector/Platform/PaloAlto.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/SSHCollector/Platform/PaloAlto.pm rename to lib/App/Netdisco/SSHCollector/Platform/PaloAlto.pm diff --git a/Netdisco/lib/App/Netdisco/Util/DNS.pm b/lib/App/Netdisco/Util/DNS.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Util/DNS.pm rename to lib/App/Netdisco/Util/DNS.pm diff --git a/Netdisco/lib/App/Netdisco/Util/Daemon.pm b/lib/App/Netdisco/Util/Daemon.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Util/Daemon.pm rename to lib/App/Netdisco/Util/Daemon.pm diff --git a/Netdisco/lib/App/Netdisco/Util/Device.pm b/lib/App/Netdisco/Util/Device.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Util/Device.pm rename to lib/App/Netdisco/Util/Device.pm diff --git a/Netdisco/lib/App/Netdisco/Util/ExpandParams.pm b/lib/App/Netdisco/Util/ExpandParams.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Util/ExpandParams.pm rename to lib/App/Netdisco/Util/ExpandParams.pm diff --git a/Netdisco/lib/App/Netdisco/Util/Graph.pm b/lib/App/Netdisco/Util/Graph.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Util/Graph.pm rename to lib/App/Netdisco/Util/Graph.pm diff --git a/Netdisco/lib/App/Netdisco/Util/Node.pm b/lib/App/Netdisco/Util/Node.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Util/Node.pm rename to lib/App/Netdisco/Util/Node.pm diff --git a/Netdisco/lib/App/Netdisco/Util/NodeMonitor.pm b/lib/App/Netdisco/Util/NodeMonitor.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Util/NodeMonitor.pm rename to lib/App/Netdisco/Util/NodeMonitor.pm diff --git a/Netdisco/lib/App/Netdisco/Util/Noop.pm b/lib/App/Netdisco/Util/Noop.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Util/Noop.pm rename to lib/App/Netdisco/Util/Noop.pm diff --git a/Netdisco/lib/App/Netdisco/Util/Permission.pm b/lib/App/Netdisco/Util/Permission.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Util/Permission.pm rename to lib/App/Netdisco/Util/Permission.pm diff --git a/Netdisco/lib/App/Netdisco/Util/Port.pm b/lib/App/Netdisco/Util/Port.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Util/Port.pm rename to lib/App/Netdisco/Util/Port.pm diff --git a/Netdisco/lib/App/Netdisco/Util/PortMAC.pm b/lib/App/Netdisco/Util/PortMAC.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Util/PortMAC.pm rename to lib/App/Netdisco/Util/PortMAC.pm diff --git a/Netdisco/lib/App/Netdisco/Util/SNMP.pm b/lib/App/Netdisco/Util/SNMP.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Util/SNMP.pm rename to lib/App/Netdisco/Util/SNMP.pm diff --git a/Netdisco/lib/App/Netdisco/Util/Web.pm b/lib/App/Netdisco/Util/Web.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Util/Web.pm rename to lib/App/Netdisco/Util/Web.pm diff --git a/Netdisco/lib/App/Netdisco/Web.pm b/lib/App/Netdisco/Web.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web.pm rename to lib/App/Netdisco/Web.pm diff --git a/Netdisco/lib/App/Netdisco/Web/AdminTask.pm b/lib/App/Netdisco/Web/AdminTask.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/AdminTask.pm rename to lib/App/Netdisco/Web/AdminTask.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm b/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm rename to lib/App/Netdisco/Web/Auth/Provider/DBIC.pm diff --git a/Netdisco/lib/App/Netdisco/Web/AuthN.pm b/lib/App/Netdisco/Web/AuthN.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/AuthN.pm rename to lib/App/Netdisco/Web/AuthN.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Device.pm b/lib/App/Netdisco/Web/Device.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Device.pm rename to lib/App/Netdisco/Web/Device.pm diff --git a/Netdisco/lib/App/Netdisco/Web/GenericReport.pm b/lib/App/Netdisco/Web/GenericReport.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/GenericReport.pm rename to lib/App/Netdisco/Web/GenericReport.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Password.pm b/lib/App/Netdisco/Web/Password.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Password.pm rename to lib/App/Netdisco/Web/Password.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin.pm b/lib/App/Netdisco/Web/Plugin.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin.pm rename to lib/App/Netdisco/Web/Plugin.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/JobQueue.pm b/lib/App/Netdisco/Web/Plugin/AdminTask/JobQueue.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/JobQueue.pm rename to lib/App/Netdisco/Web/Plugin/AdminTask/JobQueue.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/NodeMonitor.pm b/lib/App/Netdisco/Web/Plugin/AdminTask/NodeMonitor.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/NodeMonitor.pm rename to lib/App/Netdisco/Web/Plugin/AdminTask/NodeMonitor.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/OrphanedDevices.pm b/lib/App/Netdisco/Web/Plugin/AdminTask/OrphanedDevices.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/OrphanedDevices.pm rename to lib/App/Netdisco/Web/Plugin/AdminTask/OrphanedDevices.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/PollerPerformance.pm b/lib/App/Netdisco/Web/Plugin/AdminTask/PollerPerformance.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/PollerPerformance.pm rename to lib/App/Netdisco/Web/Plugin/AdminTask/PollerPerformance.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm b/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm rename to lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/SlowDevices.pm b/lib/App/Netdisco/Web/Plugin/AdminTask/SlowDevices.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/SlowDevices.pm rename to lib/App/Netdisco/Web/Plugin/AdminTask/SlowDevices.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/Topology.pm b/lib/App/Netdisco/Web/Plugin/AdminTask/Topology.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/Topology.pm rename to lib/App/Netdisco/Web/Plugin/AdminTask/Topology.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/UndiscoveredNeighbors.pm b/lib/App/Netdisco/Web/Plugin/AdminTask/UndiscoveredNeighbors.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/UndiscoveredNeighbors.pm rename to lib/App/Netdisco/Web/Plugin/AdminTask/UndiscoveredNeighbors.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/UserLog.pm b/lib/App/Netdisco/Web/Plugin/AdminTask/UserLog.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/UserLog.pm rename to lib/App/Netdisco/Web/Plugin/AdminTask/UserLog.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/Users.pm b/lib/App/Netdisco/Web/Plugin/AdminTask/Users.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/Users.pm rename to lib/App/Netdisco/Web/Plugin/AdminTask/Users.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Device/Addresses.pm b/lib/App/Netdisco/Web/Plugin/Device/Addresses.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Device/Addresses.pm rename to lib/App/Netdisco/Web/Plugin/Device/Addresses.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Device/Details.pm b/lib/App/Netdisco/Web/Plugin/Device/Details.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Device/Details.pm rename to lib/App/Netdisco/Web/Plugin/Device/Details.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Device/Modules.pm b/lib/App/Netdisco/Web/Plugin/Device/Modules.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Device/Modules.pm rename to lib/App/Netdisco/Web/Plugin/Device/Modules.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm b/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm rename to lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Device/Ports.pm b/lib/App/Netdisco/Web/Plugin/Device/Ports.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Device/Ports.pm rename to lib/App/Netdisco/Web/Plugin/Device/Ports.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Inventory.pm b/lib/App/Netdisco/Web/Plugin/Inventory.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Inventory.pm rename to lib/App/Netdisco/Web/Plugin/Inventory.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/ApChannelDist.pm b/lib/App/Netdisco/Web/Plugin/Report/ApChannelDist.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/ApChannelDist.pm rename to lib/App/Netdisco/Web/Plugin/Report/ApChannelDist.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm b/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm rename to lib/App/Netdisco/Web/Plugin/Report/ApClients.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/ApRadioChannelPower.pm b/lib/App/Netdisco/Web/Plugin/Report/ApRadioChannelPower.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/ApRadioChannelPower.pm rename to lib/App/Netdisco/Web/Plugin/Report/ApRadioChannelPower.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceAddrNoDNS.pm b/lib/App/Netdisco/Web/Plugin/Report/DeviceAddrNoDNS.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceAddrNoDNS.pm rename to lib/App/Netdisco/Web/Plugin/Report/DeviceAddrNoDNS.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceByLocation.pm b/lib/App/Netdisco/Web/Plugin/Report/DeviceByLocation.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceByLocation.pm rename to lib/App/Netdisco/Web/Plugin/Report/DeviceByLocation.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceDnsMismatch.pm b/lib/App/Netdisco/Web/Plugin/Report/DeviceDnsMismatch.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceDnsMismatch.pm rename to lib/App/Netdisco/Web/Plugin/Report/DeviceDnsMismatch.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DevicePoeStatus.pm b/lib/App/Netdisco/Web/Plugin/Report/DevicePoeStatus.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/DevicePoeStatus.pm rename to lib/App/Netdisco/Web/Plugin/Report/DevicePoeStatus.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DuplexMismatch.pm b/lib/App/Netdisco/Web/Plugin/Report/DuplexMismatch.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/DuplexMismatch.pm rename to lib/App/Netdisco/Web/Plugin/Report/DuplexMismatch.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/HalfDuplex.pm b/lib/App/Netdisco/Web/Plugin/Report/HalfDuplex.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/HalfDuplex.pm rename to lib/App/Netdisco/Web/Plugin/Report/HalfDuplex.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/InventoryByModelByOS.pm b/lib/App/Netdisco/Web/Plugin/Report/InventoryByModelByOS.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/InventoryByModelByOS.pm rename to lib/App/Netdisco/Web/Plugin/Report/InventoryByModelByOS.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm b/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm rename to lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm b/lib/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm rename to lib/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/Netbios.pm b/lib/App/Netdisco/Web/Plugin/Report/Netbios.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/Netbios.pm rename to lib/App/Netdisco/Web/Plugin/Report/Netbios.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/NodeMultiIPs.pm b/lib/App/Netdisco/Web/Plugin/Report/NodeMultiIPs.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/NodeMultiIPs.pm rename to lib/App/Netdisco/Web/Plugin/Report/NodeMultiIPs.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/NodeVendor.pm b/lib/App/Netdisco/Web/Plugin/Report/NodeVendor.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/NodeVendor.pm rename to lib/App/Netdisco/Web/Plugin/Report/NodeVendor.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/NodesDiscovered.pm b/lib/App/Netdisco/Web/Plugin/Report/NodesDiscovered.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/NodesDiscovered.pm rename to lib/App/Netdisco/Web/Plugin/Report/NodesDiscovered.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm b/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm rename to lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortBlocking.pm b/lib/App/Netdisco/Web/Plugin/Report/PortBlocking.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortBlocking.pm rename to lib/App/Netdisco/Web/Plugin/Report/PortBlocking.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortLog.pm b/lib/App/Netdisco/Web/Plugin/Report/PortLog.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortLog.pm rename to lib/App/Netdisco/Web/Plugin/Report/PortLog.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm b/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm rename to lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortSsid.pm b/lib/App/Netdisco/Web/Plugin/Report/PortSsid.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortSsid.pm rename to lib/App/Netdisco/Web/Plugin/Report/PortSsid.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm b/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm rename to lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/SsidInventory.pm b/lib/App/Netdisco/Web/Plugin/Report/SsidInventory.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/SsidInventory.pm rename to lib/App/Netdisco/Web/Plugin/Report/SsidInventory.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm b/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm rename to lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/VlanInventory.pm b/lib/App/Netdisco/Web/Plugin/Report/VlanInventory.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Report/VlanInventory.pm rename to lib/App/Netdisco/Web/Plugin/Report/VlanInventory.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Device.pm b/lib/App/Netdisco/Web/Plugin/Search/Device.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Search/Device.pm rename to lib/App/Netdisco/Web/Plugin/Search/Device.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm b/lib/App/Netdisco/Web/Plugin/Search/Node.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm rename to lib/App/Netdisco/Web/Plugin/Search/Node.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Port.pm b/lib/App/Netdisco/Web/Plugin/Search/Port.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Search/Port.pm rename to lib/App/Netdisco/Web/Plugin/Search/Port.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Search/VLAN.pm b/lib/App/Netdisco/Web/Plugin/Search/VLAN.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Plugin/Search/VLAN.pm rename to lib/App/Netdisco/Web/Plugin/Search/VLAN.pm diff --git a/Netdisco/lib/App/Netdisco/Web/PortControl.pm b/lib/App/Netdisco/Web/PortControl.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/PortControl.pm rename to lib/App/Netdisco/Web/PortControl.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Report.pm b/lib/App/Netdisco/Web/Report.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Report.pm rename to lib/App/Netdisco/Web/Report.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Search.pm b/lib/App/Netdisco/Web/Search.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Search.pm rename to lib/App/Netdisco/Web/Search.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Static.pm b/lib/App/Netdisco/Web/Static.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Static.pm rename to lib/App/Netdisco/Web/Static.pm diff --git a/Netdisco/lib/App/Netdisco/Web/Statistics.pm b/lib/App/Netdisco/Web/Statistics.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/Statistics.pm rename to lib/App/Netdisco/Web/Statistics.pm diff --git a/Netdisco/lib/App/Netdisco/Web/TypeAhead.pm b/lib/App/Netdisco/Web/TypeAhead.pm similarity index 100% rename from Netdisco/lib/App/Netdisco/Web/TypeAhead.pm rename to lib/App/Netdisco/Web/TypeAhead.pm diff --git a/Netdisco/lib/Dancer/Template/NetdiscoTemplateToolkit.pm b/lib/Dancer/Template/NetdiscoTemplateToolkit.pm similarity index 100% rename from Netdisco/lib/Dancer/Template/NetdiscoTemplateToolkit.pm rename to lib/Dancer/Template/NetdiscoTemplateToolkit.pm diff --git a/Netdisco/lib/auto/App/Netdisco b/lib/auto/App/Netdisco similarity index 100% rename from Netdisco/lib/auto/App/Netdisco rename to lib/auto/App/Netdisco diff --git a/Netdisco/share/config.yml b/share/config.yml similarity index 100% rename from Netdisco/share/config.yml rename to share/config.yml diff --git a/Netdisco/share/environments/deployment.yml b/share/environments/deployment.yml similarity index 100% rename from Netdisco/share/environments/deployment.yml rename to share/environments/deployment.yml diff --git a/Netdisco/share/public/500.html b/share/public/500.html similarity index 100% rename from Netdisco/share/public/500.html rename to share/public/500.html diff --git a/Netdisco/share/public/css/bootstrap-tree.css b/share/public/css/bootstrap-tree.css similarity index 100% rename from Netdisco/share/public/css/bootstrap-tree.css rename to share/public/css/bootstrap-tree.css diff --git a/Netdisco/share/public/css/bootstrap.min.css b/share/public/css/bootstrap.min.css similarity index 100% rename from Netdisco/share/public/css/bootstrap.min.css rename to share/public/css/bootstrap.min.css diff --git a/Netdisco/share/public/css/dataTables.bootstrap.css b/share/public/css/dataTables.bootstrap.css similarity index 100% rename from Netdisco/share/public/css/dataTables.bootstrap.css rename to share/public/css/dataTables.bootstrap.css diff --git a/Netdisco/share/public/css/daterangepicker-bs2.css b/share/public/css/daterangepicker-bs2.css similarity index 100% rename from Netdisco/share/public/css/daterangepicker-bs2.css rename to share/public/css/daterangepicker-bs2.css diff --git a/Netdisco/share/public/css/font-awesome.min.css b/share/public/css/font-awesome.min.css similarity index 100% rename from Netdisco/share/public/css/font-awesome.min.css rename to share/public/css/font-awesome.min.css diff --git a/Netdisco/share/public/css/jquery.qtip.min.css b/share/public/css/jquery.qtip.min.css similarity index 100% rename from Netdisco/share/public/css/jquery.qtip.min.css rename to share/public/css/jquery.qtip.min.css diff --git a/Netdisco/share/public/css/nd_print.css b/share/public/css/nd_print.css similarity index 100% rename from Netdisco/share/public/css/nd_print.css rename to share/public/css/nd_print.css diff --git a/Netdisco/share/public/css/netdisco.css b/share/public/css/netdisco.css similarity index 100% rename from Netdisco/share/public/css/netdisco.css rename to share/public/css/netdisco.css diff --git a/Netdisco/share/public/css/smoothness/images/animated-overlay.gif b/share/public/css/smoothness/images/animated-overlay.gif similarity index 100% rename from Netdisco/share/public/css/smoothness/images/animated-overlay.gif rename to share/public/css/smoothness/images/animated-overlay.gif diff --git a/Netdisco/share/public/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/share/public/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from Netdisco/share/public/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png rename to share/public/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/Netdisco/share/public/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/share/public/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from Netdisco/share/public/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png rename to share/public/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/Netdisco/share/public/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/share/public/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from Netdisco/share/public/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png rename to share/public/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/Netdisco/share/public/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/share/public/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from Netdisco/share/public/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png rename to share/public/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/Netdisco/share/public/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/share/public/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from Netdisco/share/public/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png rename to share/public/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png diff --git a/Netdisco/share/public/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/share/public/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from Netdisco/share/public/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png rename to share/public/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/Netdisco/share/public/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/share/public/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from Netdisco/share/public/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png rename to share/public/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/Netdisco/share/public/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/share/public/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from Netdisco/share/public/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to share/public/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/Netdisco/share/public/css/smoothness/images/ui-icons_222222_256x240.png b/share/public/css/smoothness/images/ui-icons_222222_256x240.png similarity index 100% rename from Netdisco/share/public/css/smoothness/images/ui-icons_222222_256x240.png rename to share/public/css/smoothness/images/ui-icons_222222_256x240.png diff --git a/Netdisco/share/public/css/smoothness/images/ui-icons_2e83ff_256x240.png b/share/public/css/smoothness/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from Netdisco/share/public/css/smoothness/images/ui-icons_2e83ff_256x240.png rename to share/public/css/smoothness/images/ui-icons_2e83ff_256x240.png diff --git a/Netdisco/share/public/css/smoothness/images/ui-icons_454545_256x240.png b/share/public/css/smoothness/images/ui-icons_454545_256x240.png similarity index 100% rename from Netdisco/share/public/css/smoothness/images/ui-icons_454545_256x240.png rename to share/public/css/smoothness/images/ui-icons_454545_256x240.png diff --git a/Netdisco/share/public/css/smoothness/images/ui-icons_888888_256x240.png b/share/public/css/smoothness/images/ui-icons_888888_256x240.png similarity index 100% rename from Netdisco/share/public/css/smoothness/images/ui-icons_888888_256x240.png rename to share/public/css/smoothness/images/ui-icons_888888_256x240.png diff --git a/Netdisco/share/public/css/smoothness/images/ui-icons_cd0a0a_256x240.png b/share/public/css/smoothness/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from Netdisco/share/public/css/smoothness/images/ui-icons_cd0a0a_256x240.png rename to share/public/css/smoothness/images/ui-icons_cd0a0a_256x240.png diff --git a/Netdisco/share/public/css/smoothness/jquery-ui.custom.min.css b/share/public/css/smoothness/jquery-ui.custom.min.css similarity index 100% rename from Netdisco/share/public/css/smoothness/jquery-ui.custom.min.css rename to share/public/css/smoothness/jquery-ui.custom.min.css diff --git a/Netdisco/share/public/css/toastr.css b/share/public/css/toastr.css similarity index 100% rename from Netdisco/share/public/css/toastr.css rename to share/public/css/toastr.css diff --git a/Netdisco/share/public/dispatch.cgi b/share/public/dispatch.cgi similarity index 100% rename from Netdisco/share/public/dispatch.cgi rename to share/public/dispatch.cgi diff --git a/Netdisco/share/public/dispatch.fcgi b/share/public/dispatch.fcgi similarity index 100% rename from Netdisco/share/public/dispatch.fcgi rename to share/public/dispatch.fcgi diff --git a/Netdisco/share/public/font/FontAwesome.otf b/share/public/font/FontAwesome.otf similarity index 100% rename from Netdisco/share/public/font/FontAwesome.otf rename to share/public/font/FontAwesome.otf diff --git a/Netdisco/share/public/font/fontawesome-webfont.eot b/share/public/font/fontawesome-webfont.eot similarity index 100% rename from Netdisco/share/public/font/fontawesome-webfont.eot rename to share/public/font/fontawesome-webfont.eot diff --git a/Netdisco/share/public/font/fontawesome-webfont.svg b/share/public/font/fontawesome-webfont.svg similarity index 100% rename from Netdisco/share/public/font/fontawesome-webfont.svg rename to share/public/font/fontawesome-webfont.svg diff --git a/Netdisco/share/public/font/fontawesome-webfont.ttf b/share/public/font/fontawesome-webfont.ttf similarity index 100% rename from Netdisco/share/public/font/fontawesome-webfont.ttf rename to share/public/font/fontawesome-webfont.ttf diff --git a/Netdisco/share/public/font/fontawesome-webfont.woff b/share/public/font/fontawesome-webfont.woff similarity index 100% rename from Netdisco/share/public/font/fontawesome-webfont.woff rename to share/public/font/fontawesome-webfont.woff diff --git a/Netdisco/share/public/images/crystalclear_mag.png b/share/public/images/crystalclear_mag.png similarity index 100% rename from Netdisco/share/public/images/crystalclear_mag.png rename to share/public/images/crystalclear_mag.png diff --git a/Netdisco/share/public/images/diagona_settings.png b/share/public/images/diagona_settings.png similarity index 100% rename from Netdisco/share/public/images/diagona_settings.png rename to share/public/images/diagona_settings.png diff --git a/Netdisco/share/public/images/dusseldorf_settings.png b/share/public/images/dusseldorf_settings.png similarity index 100% rename from Netdisco/share/public/images/dusseldorf_settings.png rename to share/public/images/dusseldorf_settings.png diff --git a/Netdisco/share/public/images/glyphicons_072_bookmark.png b/share/public/images/glyphicons_072_bookmark.png similarity index 100% rename from Netdisco/share/public/images/glyphicons_072_bookmark.png rename to share/public/images/glyphicons_072_bookmark.png diff --git a/Netdisco/share/public/images/matte_basic_pin.png b/share/public/images/matte_basic_pin.png similarity index 100% rename from Netdisco/share/public/images/matte_basic_pin.png rename to share/public/images/matte_basic_pin.png diff --git a/Netdisco/share/public/images/navbar_disco.png b/share/public/images/navbar_disco.png similarity index 100% rename from Netdisco/share/public/images/navbar_disco.png rename to share/public/images/navbar_disco.png diff --git a/Netdisco/share/public/images/sort_asc.png b/share/public/images/sort_asc.png similarity index 100% rename from Netdisco/share/public/images/sort_asc.png rename to share/public/images/sort_asc.png diff --git a/Netdisco/share/public/images/sort_asc_disabled.png b/share/public/images/sort_asc_disabled.png similarity index 100% rename from Netdisco/share/public/images/sort_asc_disabled.png rename to share/public/images/sort_asc_disabled.png diff --git a/Netdisco/share/public/images/sort_both.png b/share/public/images/sort_both.png similarity index 100% rename from Netdisco/share/public/images/sort_both.png rename to share/public/images/sort_both.png diff --git a/Netdisco/share/public/images/sort_desc.png b/share/public/images/sort_desc.png similarity index 100% rename from Netdisco/share/public/images/sort_desc.png rename to share/public/images/sort_desc.png diff --git a/Netdisco/share/public/images/sort_desc_disabled.png b/share/public/images/sort_desc_disabled.png similarity index 100% rename from Netdisco/share/public/images/sort_desc_disabled.png rename to share/public/images/sort_desc_disabled.png diff --git a/Netdisco/share/public/images/splashyfish_left.png b/share/public/images/splashyfish_left.png similarity index 100% rename from Netdisco/share/public/images/splashyfish_left.png rename to share/public/images/splashyfish_left.png diff --git a/Netdisco/share/public/images/splashyfish_right.png b/share/public/images/splashyfish_right.png similarity index 100% rename from Netdisco/share/public/images/splashyfish_right.png rename to share/public/images/splashyfish_right.png diff --git a/Netdisco/share/public/images/tango_sweep.png b/share/public/images/tango_sweep.png similarity index 100% rename from Netdisco/share/public/images/tango_sweep.png rename to share/public/images/tango_sweep.png diff --git a/Netdisco/share/public/images/vaga_copy.png b/share/public/images/vaga_copy.png similarity index 100% rename from Netdisco/share/public/images/vaga_copy.png rename to share/public/images/vaga_copy.png diff --git a/Netdisco/share/public/javascripts/bootstrap.min.js b/share/public/javascripts/bootstrap.min.js similarity index 100% rename from Netdisco/share/public/javascripts/bootstrap.min.js rename to share/public/javascripts/bootstrap.min.js diff --git a/Netdisco/share/public/javascripts/d3.min.js b/share/public/javascripts/d3.min.js similarity index 100% rename from Netdisco/share/public/javascripts/d3.min.js rename to share/public/javascripts/d3.min.js diff --git a/Netdisco/share/public/javascripts/dataTables.bootstrap.js b/share/public/javascripts/dataTables.bootstrap.js similarity index 100% rename from Netdisco/share/public/javascripts/dataTables.bootstrap.js rename to share/public/javascripts/dataTables.bootstrap.js diff --git a/Netdisco/share/public/javascripts/dataTables.ip-address-detect.js b/share/public/javascripts/dataTables.ip-address-detect.js similarity index 100% rename from Netdisco/share/public/javascripts/dataTables.ip-address-detect.js rename to share/public/javascripts/dataTables.ip-address-detect.js diff --git a/Netdisco/share/public/javascripts/dataTables.ip-address-sort.js b/share/public/javascripts/dataTables.ip-address-sort.js similarity index 100% rename from Netdisco/share/public/javascripts/dataTables.ip-address-sort.js rename to share/public/javascripts/dataTables.ip-address-sort.js diff --git a/Netdisco/share/public/javascripts/daterangepicker.js b/share/public/javascripts/daterangepicker.js similarity index 100% rename from Netdisco/share/public/javascripts/daterangepicker.js rename to share/public/javascripts/daterangepicker.js diff --git a/Netdisco/share/public/javascripts/he.js b/share/public/javascripts/he.js similarity index 100% rename from Netdisco/share/public/javascripts/he.js rename to share/public/javascripts/he.js diff --git a/Netdisco/share/public/javascripts/jquery-deserialize.js b/share/public/javascripts/jquery-deserialize.js similarity index 100% rename from Netdisco/share/public/javascripts/jquery-deserialize.js rename to share/public/javascripts/jquery-deserialize.js diff --git a/Netdisco/share/public/javascripts/jquery-history.js b/share/public/javascripts/jquery-history.js similarity index 100% rename from Netdisco/share/public/javascripts/jquery-history.js rename to share/public/javascripts/jquery-history.js diff --git a/Netdisco/share/public/javascripts/jquery-latest.min.js b/share/public/javascripts/jquery-latest.min.js similarity index 100% rename from Netdisco/share/public/javascripts/jquery-latest.min.js rename to share/public/javascripts/jquery-latest.min.js diff --git a/Netdisco/share/public/javascripts/jquery-ui.custom.min.js b/share/public/javascripts/jquery-ui.custom.min.js similarity index 100% rename from Netdisco/share/public/javascripts/jquery-ui.custom.min.js rename to share/public/javascripts/jquery-ui.custom.min.js diff --git a/Netdisco/share/public/javascripts/jquery.cookie.js b/share/public/javascripts/jquery.cookie.js similarity index 100% rename from Netdisco/share/public/javascripts/jquery.cookie.js rename to share/public/javascripts/jquery.cookie.js diff --git a/Netdisco/share/public/javascripts/jquery.dataTables.min.js b/share/public/javascripts/jquery.dataTables.min.js similarity index 100% rename from Netdisco/share/public/javascripts/jquery.dataTables.min.js rename to share/public/javascripts/jquery.dataTables.min.js diff --git a/Netdisco/share/public/javascripts/jquery.floatThead.js b/share/public/javascripts/jquery.floatThead.js similarity index 100% rename from Netdisco/share/public/javascripts/jquery.floatThead.js rename to share/public/javascripts/jquery.floatThead.js diff --git a/Netdisco/share/public/javascripts/jquery.qtip.min.js b/share/public/javascripts/jquery.qtip.min.js similarity index 100% rename from Netdisco/share/public/javascripts/jquery.qtip.min.js rename to share/public/javascripts/jquery.qtip.min.js diff --git a/Netdisco/share/public/javascripts/moment.min.js b/share/public/javascripts/moment.min.js similarity index 100% rename from Netdisco/share/public/javascripts/moment.min.js rename to share/public/javascripts/moment.min.js diff --git a/Netdisco/share/public/javascripts/natural.js b/share/public/javascripts/natural.js similarity index 100% rename from Netdisco/share/public/javascripts/natural.js rename to share/public/javascripts/natural.js diff --git a/Netdisco/share/public/javascripts/netdisco.js b/share/public/javascripts/netdisco.js similarity index 100% rename from Netdisco/share/public/javascripts/netdisco.js rename to share/public/javascripts/netdisco.js diff --git a/Netdisco/share/public/javascripts/netdisco_portcontrol.js b/share/public/javascripts/netdisco_portcontrol.js similarity index 100% rename from Netdisco/share/public/javascripts/netdisco_portcontrol.js rename to share/public/javascripts/netdisco_portcontrol.js diff --git a/Netdisco/share/public/javascripts/portsort.js b/share/public/javascripts/portsort.js similarity index 100% rename from Netdisco/share/public/javascripts/portsort.js rename to share/public/javascripts/portsort.js diff --git a/Netdisco/share/public/javascripts/toastr.js b/share/public/javascripts/toastr.js similarity index 100% rename from Netdisco/share/public/javascripts/toastr.js rename to share/public/javascripts/toastr.js diff --git a/Netdisco/share/public/javascripts/underscore.min.js b/share/public/javascripts/underscore.min.js similarity index 100% rename from Netdisco/share/public/javascripts/underscore.min.js rename to share/public/javascripts/underscore.min.js diff --git a/Netdisco/share/views/admintask.tt b/share/views/admintask.tt similarity index 100% rename from Netdisco/share/views/admintask.tt rename to share/views/admintask.tt diff --git a/Netdisco/share/views/ajax/admintask/jobqueue.tt b/share/views/ajax/admintask/jobqueue.tt similarity index 100% rename from Netdisco/share/views/ajax/admintask/jobqueue.tt rename to share/views/ajax/admintask/jobqueue.tt diff --git a/Netdisco/share/views/ajax/admintask/nodemonitor.tt b/share/views/ajax/admintask/nodemonitor.tt similarity index 100% rename from Netdisco/share/views/ajax/admintask/nodemonitor.tt rename to share/views/ajax/admintask/nodemonitor.tt diff --git a/Netdisco/share/views/ajax/admintask/orphaned.tt b/share/views/ajax/admintask/orphaned.tt similarity index 100% rename from Netdisco/share/views/ajax/admintask/orphaned.tt rename to share/views/ajax/admintask/orphaned.tt diff --git a/Netdisco/share/views/ajax/admintask/orphaned_csv.tt b/share/views/ajax/admintask/orphaned_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/admintask/orphaned_csv.tt rename to share/views/ajax/admintask/orphaned_csv.tt diff --git a/Netdisco/share/views/ajax/admintask/performance.tt b/share/views/ajax/admintask/performance.tt similarity index 100% rename from Netdisco/share/views/ajax/admintask/performance.tt rename to share/views/ajax/admintask/performance.tt diff --git a/Netdisco/share/views/ajax/admintask/pseudodevice.tt b/share/views/ajax/admintask/pseudodevice.tt similarity index 100% rename from Netdisco/share/views/ajax/admintask/pseudodevice.tt rename to share/views/ajax/admintask/pseudodevice.tt diff --git a/Netdisco/share/views/ajax/admintask/slowdevices.tt b/share/views/ajax/admintask/slowdevices.tt similarity index 100% rename from Netdisco/share/views/ajax/admintask/slowdevices.tt rename to share/views/ajax/admintask/slowdevices.tt diff --git a/Netdisco/share/views/ajax/admintask/topology.tt b/share/views/ajax/admintask/topology.tt similarity index 100% rename from Netdisco/share/views/ajax/admintask/topology.tt rename to share/views/ajax/admintask/topology.tt diff --git a/Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt b/share/views/ajax/admintask/undiscoveredneighbors.tt similarity index 100% rename from Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt rename to share/views/ajax/admintask/undiscoveredneighbors.tt diff --git a/Netdisco/share/views/ajax/admintask/undiscoveredneighbors_csv.tt b/share/views/ajax/admintask/undiscoveredneighbors_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/admintask/undiscoveredneighbors_csv.tt rename to share/views/ajax/admintask/undiscoveredneighbors_csv.tt diff --git a/Netdisco/share/views/ajax/admintask/userlog.tt b/share/views/ajax/admintask/userlog.tt similarity index 100% rename from Netdisco/share/views/ajax/admintask/userlog.tt rename to share/views/ajax/admintask/userlog.tt diff --git a/Netdisco/share/views/ajax/admintask/users.tt b/share/views/ajax/admintask/users.tt similarity index 100% rename from Netdisco/share/views/ajax/admintask/users.tt rename to share/views/ajax/admintask/users.tt diff --git a/Netdisco/share/views/ajax/admintask/users_csv.tt b/share/views/ajax/admintask/users_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/admintask/users_csv.tt rename to share/views/ajax/admintask/users_csv.tt diff --git a/Netdisco/share/views/ajax/datatabledefaults.tt b/share/views/ajax/datatabledefaults.tt similarity index 100% rename from Netdisco/share/views/ajax/datatabledefaults.tt rename to share/views/ajax/datatabledefaults.tt diff --git a/Netdisco/share/views/ajax/device/addresses.tt b/share/views/ajax/device/addresses.tt similarity index 100% rename from Netdisco/share/views/ajax/device/addresses.tt rename to share/views/ajax/device/addresses.tt diff --git a/Netdisco/share/views/ajax/device/addresses_csv.tt b/share/views/ajax/device/addresses_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/device/addresses_csv.tt rename to share/views/ajax/device/addresses_csv.tt diff --git a/Netdisco/share/views/ajax/device/details.tt b/share/views/ajax/device/details.tt similarity index 100% rename from Netdisco/share/views/ajax/device/details.tt rename to share/views/ajax/device/details.tt diff --git a/Netdisco/share/views/ajax/device/modules.tt b/share/views/ajax/device/modules.tt similarity index 100% rename from Netdisco/share/views/ajax/device/modules.tt rename to share/views/ajax/device/modules.tt diff --git a/Netdisco/share/views/ajax/device/netmap.tt b/share/views/ajax/device/netmap.tt similarity index 100% rename from Netdisco/share/views/ajax/device/netmap.tt rename to share/views/ajax/device/netmap.tt diff --git a/Netdisco/share/views/ajax/device/ports.tt b/share/views/ajax/device/ports.tt similarity index 100% rename from Netdisco/share/views/ajax/device/ports.tt rename to share/views/ajax/device/ports.tt diff --git a/Netdisco/share/views/ajax/device/ports_csv.tt b/share/views/ajax/device/ports_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/device/ports_csv.tt rename to share/views/ajax/device/ports_csv.tt diff --git a/Netdisco/share/views/ajax/report/apchanneldist.tt b/share/views/ajax/report/apchanneldist.tt similarity index 100% rename from Netdisco/share/views/ajax/report/apchanneldist.tt rename to share/views/ajax/report/apchanneldist.tt diff --git a/Netdisco/share/views/ajax/report/apchanneldist_csv.tt b/share/views/ajax/report/apchanneldist_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/apchanneldist_csv.tt rename to share/views/ajax/report/apchanneldist_csv.tt diff --git a/Netdisco/share/views/ajax/report/apclients.tt b/share/views/ajax/report/apclients.tt similarity index 100% rename from Netdisco/share/views/ajax/report/apclients.tt rename to share/views/ajax/report/apclients.tt diff --git a/Netdisco/share/views/ajax/report/apclients_csv.tt b/share/views/ajax/report/apclients_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/apclients_csv.tt rename to share/views/ajax/report/apclients_csv.tt diff --git a/Netdisco/share/views/ajax/report/apradiochannelpower.tt b/share/views/ajax/report/apradiochannelpower.tt similarity index 100% rename from Netdisco/share/views/ajax/report/apradiochannelpower.tt rename to share/views/ajax/report/apradiochannelpower.tt diff --git a/Netdisco/share/views/ajax/report/apradiochannelpower_csv.tt b/share/views/ajax/report/apradiochannelpower_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/apradiochannelpower_csv.tt rename to share/views/ajax/report/apradiochannelpower_csv.tt diff --git a/Netdisco/share/views/ajax/report/deviceaddrnodns.tt b/share/views/ajax/report/deviceaddrnodns.tt similarity index 100% rename from Netdisco/share/views/ajax/report/deviceaddrnodns.tt rename to share/views/ajax/report/deviceaddrnodns.tt diff --git a/Netdisco/share/views/ajax/report/deviceaddrnodns_csv.tt b/share/views/ajax/report/deviceaddrnodns_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/deviceaddrnodns_csv.tt rename to share/views/ajax/report/deviceaddrnodns_csv.tt diff --git a/Netdisco/share/views/ajax/report/devicebylocation.tt b/share/views/ajax/report/devicebylocation.tt similarity index 100% rename from Netdisco/share/views/ajax/report/devicebylocation.tt rename to share/views/ajax/report/devicebylocation.tt diff --git a/Netdisco/share/views/ajax/report/devicebylocation_csv.tt b/share/views/ajax/report/devicebylocation_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/devicebylocation_csv.tt rename to share/views/ajax/report/devicebylocation_csv.tt diff --git a/Netdisco/share/views/ajax/report/devicednsmismatch.tt b/share/views/ajax/report/devicednsmismatch.tt similarity index 100% rename from Netdisco/share/views/ajax/report/devicednsmismatch.tt rename to share/views/ajax/report/devicednsmismatch.tt diff --git a/Netdisco/share/views/ajax/report/devicednsmismatch_csv.tt b/share/views/ajax/report/devicednsmismatch_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/devicednsmismatch_csv.tt rename to share/views/ajax/report/devicednsmismatch_csv.tt diff --git a/Netdisco/share/views/ajax/report/devicepoestatus.tt b/share/views/ajax/report/devicepoestatus.tt similarity index 100% rename from Netdisco/share/views/ajax/report/devicepoestatus.tt rename to share/views/ajax/report/devicepoestatus.tt diff --git a/Netdisco/share/views/ajax/report/devicepoestatus_csv.tt b/share/views/ajax/report/devicepoestatus_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/devicepoestatus_csv.tt rename to share/views/ajax/report/devicepoestatus_csv.tt diff --git a/Netdisco/share/views/ajax/report/duplexmismatch.tt b/share/views/ajax/report/duplexmismatch.tt similarity index 100% rename from Netdisco/share/views/ajax/report/duplexmismatch.tt rename to share/views/ajax/report/duplexmismatch.tt diff --git a/Netdisco/share/views/ajax/report/duplexmismatch_csv.tt b/share/views/ajax/report/duplexmismatch_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/duplexmismatch_csv.tt rename to share/views/ajax/report/duplexmismatch_csv.tt diff --git a/Netdisco/share/views/ajax/report/generic_report.tt b/share/views/ajax/report/generic_report.tt similarity index 100% rename from Netdisco/share/views/ajax/report/generic_report.tt rename to share/views/ajax/report/generic_report.tt diff --git a/Netdisco/share/views/ajax/report/generic_report_csv.tt b/share/views/ajax/report/generic_report_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/generic_report_csv.tt rename to share/views/ajax/report/generic_report_csv.tt diff --git a/Netdisco/share/views/ajax/report/halfduplex.tt b/share/views/ajax/report/halfduplex.tt similarity index 100% rename from Netdisco/share/views/ajax/report/halfduplex.tt rename to share/views/ajax/report/halfduplex.tt diff --git a/Netdisco/share/views/ajax/report/halfduplex_csv.tt b/share/views/ajax/report/halfduplex_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/halfduplex_csv.tt rename to share/views/ajax/report/halfduplex_csv.tt diff --git a/Netdisco/share/views/ajax/report/inventorybymodelbyos.tt b/share/views/ajax/report/inventorybymodelbyos.tt similarity index 100% rename from Netdisco/share/views/ajax/report/inventorybymodelbyos.tt rename to share/views/ajax/report/inventorybymodelbyos.tt diff --git a/Netdisco/share/views/ajax/report/ipinventory.tt b/share/views/ajax/report/ipinventory.tt similarity index 100% rename from Netdisco/share/views/ajax/report/ipinventory.tt rename to share/views/ajax/report/ipinventory.tt diff --git a/Netdisco/share/views/ajax/report/ipinventory_csv.tt b/share/views/ajax/report/ipinventory_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/ipinventory_csv.tt rename to share/views/ajax/report/ipinventory_csv.tt diff --git a/Netdisco/share/views/ajax/report/moduleinventory.tt b/share/views/ajax/report/moduleinventory.tt similarity index 100% rename from Netdisco/share/views/ajax/report/moduleinventory.tt rename to share/views/ajax/report/moduleinventory.tt diff --git a/Netdisco/share/views/ajax/report/moduleinventory_csv.tt b/share/views/ajax/report/moduleinventory_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/moduleinventory_csv.tt rename to share/views/ajax/report/moduleinventory_csv.tt diff --git a/Netdisco/share/views/ajax/report/netbios.tt b/share/views/ajax/report/netbios.tt similarity index 100% rename from Netdisco/share/views/ajax/report/netbios.tt rename to share/views/ajax/report/netbios.tt diff --git a/Netdisco/share/views/ajax/report/netbios_csv.tt b/share/views/ajax/report/netbios_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/netbios_csv.tt rename to share/views/ajax/report/netbios_csv.tt diff --git a/Netdisco/share/views/ajax/report/nodemultiips.tt b/share/views/ajax/report/nodemultiips.tt similarity index 100% rename from Netdisco/share/views/ajax/report/nodemultiips.tt rename to share/views/ajax/report/nodemultiips.tt diff --git a/Netdisco/share/views/ajax/report/nodemultiips_csv.tt b/share/views/ajax/report/nodemultiips_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/nodemultiips_csv.tt rename to share/views/ajax/report/nodemultiips_csv.tt diff --git a/Netdisco/share/views/ajax/report/nodesdiscovered.tt b/share/views/ajax/report/nodesdiscovered.tt similarity index 100% rename from Netdisco/share/views/ajax/report/nodesdiscovered.tt rename to share/views/ajax/report/nodesdiscovered.tt diff --git a/Netdisco/share/views/ajax/report/nodesdiscovered_csv.tt b/share/views/ajax/report/nodesdiscovered_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/nodesdiscovered_csv.tt rename to share/views/ajax/report/nodesdiscovered_csv.tt diff --git a/Netdisco/share/views/ajax/report/nodevendor.tt b/share/views/ajax/report/nodevendor.tt similarity index 100% rename from Netdisco/share/views/ajax/report/nodevendor.tt rename to share/views/ajax/report/nodevendor.tt diff --git a/Netdisco/share/views/ajax/report/nodevendor_csv.tt b/share/views/ajax/report/nodevendor_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/nodevendor_csv.tt rename to share/views/ajax/report/nodevendor_csv.tt diff --git a/Netdisco/share/views/ajax/report/portadmindown.tt b/share/views/ajax/report/portadmindown.tt similarity index 100% rename from Netdisco/share/views/ajax/report/portadmindown.tt rename to share/views/ajax/report/portadmindown.tt diff --git a/Netdisco/share/views/ajax/report/portadmindown_csv.tt b/share/views/ajax/report/portadmindown_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/portadmindown_csv.tt rename to share/views/ajax/report/portadmindown_csv.tt diff --git a/Netdisco/share/views/ajax/report/portblocking.tt b/share/views/ajax/report/portblocking.tt similarity index 100% rename from Netdisco/share/views/ajax/report/portblocking.tt rename to share/views/ajax/report/portblocking.tt diff --git a/Netdisco/share/views/ajax/report/portblocking_csv.tt b/share/views/ajax/report/portblocking_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/portblocking_csv.tt rename to share/views/ajax/report/portblocking_csv.tt diff --git a/Netdisco/share/views/ajax/report/portlog.tt b/share/views/ajax/report/portlog.tt similarity index 100% rename from Netdisco/share/views/ajax/report/portlog.tt rename to share/views/ajax/report/portlog.tt diff --git a/Netdisco/share/views/ajax/report/portmultinodes.tt b/share/views/ajax/report/portmultinodes.tt similarity index 100% rename from Netdisco/share/views/ajax/report/portmultinodes.tt rename to share/views/ajax/report/portmultinodes.tt diff --git a/Netdisco/share/views/ajax/report/portmultinodes_csv.tt b/share/views/ajax/report/portmultinodes_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/portmultinodes_csv.tt rename to share/views/ajax/report/portmultinodes_csv.tt diff --git a/Netdisco/share/views/ajax/report/portssid.tt b/share/views/ajax/report/portssid.tt similarity index 100% rename from Netdisco/share/views/ajax/report/portssid.tt rename to share/views/ajax/report/portssid.tt diff --git a/Netdisco/share/views/ajax/report/portssid_csv.tt b/share/views/ajax/report/portssid_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/portssid_csv.tt rename to share/views/ajax/report/portssid_csv.tt diff --git a/Netdisco/share/views/ajax/report/portutilization.tt b/share/views/ajax/report/portutilization.tt similarity index 100% rename from Netdisco/share/views/ajax/report/portutilization.tt rename to share/views/ajax/report/portutilization.tt diff --git a/Netdisco/share/views/ajax/report/portutilization_csv.tt b/share/views/ajax/report/portutilization_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/portutilization_csv.tt rename to share/views/ajax/report/portutilization_csv.tt diff --git a/Netdisco/share/views/ajax/report/subnets.tt b/share/views/ajax/report/subnets.tt similarity index 100% rename from Netdisco/share/views/ajax/report/subnets.tt rename to share/views/ajax/report/subnets.tt diff --git a/Netdisco/share/views/ajax/report/subnets_csv.tt b/share/views/ajax/report/subnets_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/subnets_csv.tt rename to share/views/ajax/report/subnets_csv.tt diff --git a/Netdisco/share/views/ajax/report/vlaninventory.tt b/share/views/ajax/report/vlaninventory.tt similarity index 100% rename from Netdisco/share/views/ajax/report/vlaninventory.tt rename to share/views/ajax/report/vlaninventory.tt diff --git a/Netdisco/share/views/ajax/report/vlaninventory_csv.tt b/share/views/ajax/report/vlaninventory_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/report/vlaninventory_csv.tt rename to share/views/ajax/report/vlaninventory_csv.tt diff --git a/Netdisco/share/views/ajax/search/device.tt b/share/views/ajax/search/device.tt similarity index 100% rename from Netdisco/share/views/ajax/search/device.tt rename to share/views/ajax/search/device.tt diff --git a/Netdisco/share/views/ajax/search/device_csv.tt b/share/views/ajax/search/device_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/search/device_csv.tt rename to share/views/ajax/search/device_csv.tt diff --git a/Netdisco/share/views/ajax/search/node_by_ip.tt b/share/views/ajax/search/node_by_ip.tt similarity index 100% rename from Netdisco/share/views/ajax/search/node_by_ip.tt rename to share/views/ajax/search/node_by_ip.tt diff --git a/Netdisco/share/views/ajax/search/node_by_mac.tt b/share/views/ajax/search/node_by_mac.tt similarity index 100% rename from Netdisco/share/views/ajax/search/node_by_mac.tt rename to share/views/ajax/search/node_by_mac.tt diff --git a/Netdisco/share/views/ajax/search/port.tt b/share/views/ajax/search/port.tt similarity index 100% rename from Netdisco/share/views/ajax/search/port.tt rename to share/views/ajax/search/port.tt diff --git a/Netdisco/share/views/ajax/search/port_csv.tt b/share/views/ajax/search/port_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/search/port_csv.tt rename to share/views/ajax/search/port_csv.tt diff --git a/Netdisco/share/views/ajax/search/vlan.tt b/share/views/ajax/search/vlan.tt similarity index 100% rename from Netdisco/share/views/ajax/search/vlan.tt rename to share/views/ajax/search/vlan.tt diff --git a/Netdisco/share/views/ajax/search/vlan_csv.tt b/share/views/ajax/search/vlan_csv.tt similarity index 100% rename from Netdisco/share/views/ajax/search/vlan_csv.tt rename to share/views/ajax/search/vlan_csv.tt diff --git a/Netdisco/share/views/ajax/statistics.tt b/share/views/ajax/statistics.tt similarity index 100% rename from Netdisco/share/views/ajax/statistics.tt rename to share/views/ajax/statistics.tt diff --git a/Netdisco/share/views/device.tt b/share/views/device.tt similarity index 100% rename from Netdisco/share/views/device.tt rename to share/views/device.tt diff --git a/Netdisco/share/views/index.tt b/share/views/index.tt similarity index 100% rename from Netdisco/share/views/index.tt rename to share/views/index.tt diff --git a/Netdisco/share/views/inventory.tt b/share/views/inventory.tt similarity index 100% rename from Netdisco/share/views/inventory.tt rename to share/views/inventory.tt diff --git a/Netdisco/share/views/js/admintask.js b/share/views/js/admintask.js similarity index 100% rename from Netdisco/share/views/js/admintask.js rename to share/views/js/admintask.js diff --git a/Netdisco/share/views/js/bootstrap-tree.js b/share/views/js/bootstrap-tree.js similarity index 100% rename from Netdisco/share/views/js/bootstrap-tree.js rename to share/views/js/bootstrap-tree.js diff --git a/Netdisco/share/views/js/common.js b/share/views/js/common.js similarity index 100% rename from Netdisco/share/views/js/common.js rename to share/views/js/common.js diff --git a/Netdisco/share/views/js/device.js b/share/views/js/device.js similarity index 100% rename from Netdisco/share/views/js/device.js rename to share/views/js/device.js diff --git a/Netdisco/share/views/js/report.js b/share/views/js/report.js similarity index 100% rename from Netdisco/share/views/js/report.js rename to share/views/js/report.js diff --git a/Netdisco/share/views/js/search.js b/share/views/js/search.js similarity index 100% rename from Netdisco/share/views/js/search.js rename to share/views/js/search.js diff --git a/Netdisco/share/views/layouts/main.tt b/share/views/layouts/main.tt similarity index 100% rename from Netdisco/share/views/layouts/main.tt rename to share/views/layouts/main.tt diff --git a/Netdisco/share/views/password.tt b/share/views/password.tt similarity index 100% rename from Netdisco/share/views/password.tt rename to share/views/password.tt diff --git a/Netdisco/share/views/plugin.tt b/share/views/plugin.tt similarity index 100% rename from Netdisco/share/views/plugin.tt rename to share/views/plugin.tt diff --git a/Netdisco/share/views/report.tt b/share/views/report.tt similarity index 100% rename from Netdisco/share/views/report.tt rename to share/views/report.tt diff --git a/Netdisco/share/views/search.tt b/share/views/search.tt similarity index 100% rename from Netdisco/share/views/search.tt rename to share/views/search.tt diff --git a/Netdisco/share/views/sidebar/device/netmap.tt b/share/views/sidebar/device/netmap.tt similarity index 100% rename from Netdisco/share/views/sidebar/device/netmap.tt rename to share/views/sidebar/device/netmap.tt diff --git a/Netdisco/share/views/sidebar/device/ports.tt b/share/views/sidebar/device/ports.tt similarity index 100% rename from Netdisco/share/views/sidebar/device/ports.tt rename to share/views/sidebar/device/ports.tt diff --git a/Netdisco/share/views/sidebar/report/generic_report.tt b/share/views/sidebar/report/generic_report.tt similarity index 100% rename from Netdisco/share/views/sidebar/report/generic_report.tt rename to share/views/sidebar/report/generic_report.tt diff --git a/Netdisco/share/views/sidebar/report/ipinventory.tt b/share/views/sidebar/report/ipinventory.tt similarity index 100% rename from Netdisco/share/views/sidebar/report/ipinventory.tt rename to share/views/sidebar/report/ipinventory.tt diff --git a/Netdisco/share/views/sidebar/report/moduleinventory.tt b/share/views/sidebar/report/moduleinventory.tt similarity index 100% rename from Netdisco/share/views/sidebar/report/moduleinventory.tt rename to share/views/sidebar/report/moduleinventory.tt diff --git a/Netdisco/share/views/sidebar/report/netbios.tt b/share/views/sidebar/report/netbios.tt similarity index 100% rename from Netdisco/share/views/sidebar/report/netbios.tt rename to share/views/sidebar/report/netbios.tt diff --git a/Netdisco/share/views/sidebar/report/nodesdiscovered.tt b/share/views/sidebar/report/nodesdiscovered.tt similarity index 100% rename from Netdisco/share/views/sidebar/report/nodesdiscovered.tt rename to share/views/sidebar/report/nodesdiscovered.tt diff --git a/Netdisco/share/views/sidebar/report/nodevendor.tt b/share/views/sidebar/report/nodevendor.tt similarity index 100% rename from Netdisco/share/views/sidebar/report/nodevendor.tt rename to share/views/sidebar/report/nodevendor.tt diff --git a/Netdisco/share/views/sidebar/report/portlog.tt b/share/views/sidebar/report/portlog.tt similarity index 100% rename from Netdisco/share/views/sidebar/report/portlog.tt rename to share/views/sidebar/report/portlog.tt diff --git a/Netdisco/share/views/sidebar/report/portmultinodes.tt b/share/views/sidebar/report/portmultinodes.tt similarity index 100% rename from Netdisco/share/views/sidebar/report/portmultinodes.tt rename to share/views/sidebar/report/portmultinodes.tt diff --git a/Netdisco/share/views/sidebar/report/portssid.tt b/share/views/sidebar/report/portssid.tt similarity index 100% rename from Netdisco/share/views/sidebar/report/portssid.tt rename to share/views/sidebar/report/portssid.tt diff --git a/Netdisco/share/views/sidebar/report/subnets.tt b/share/views/sidebar/report/subnets.tt similarity index 100% rename from Netdisco/share/views/sidebar/report/subnets.tt rename to share/views/sidebar/report/subnets.tt diff --git a/Netdisco/share/views/sidebar/search/device.tt b/share/views/sidebar/search/device.tt similarity index 100% rename from Netdisco/share/views/sidebar/search/device.tt rename to share/views/sidebar/search/device.tt diff --git a/Netdisco/share/views/sidebar/search/node.tt b/share/views/sidebar/search/node.tt similarity index 100% rename from Netdisco/share/views/sidebar/search/node.tt rename to share/views/sidebar/search/node.tt diff --git a/Netdisco/share/views/sidebar/search/port.tt b/share/views/sidebar/search/port.tt similarity index 100% rename from Netdisco/share/views/sidebar/search/port.tt rename to share/views/sidebar/search/port.tt diff --git a/Netdisco/t/10-sort_port.t b/t/10-sort_port.t similarity index 100% rename from Netdisco/t/10-sort_port.t rename to t/10-sort_port.t diff --git a/Netdisco/t/11-portsort.t b/t/11-portsort.t similarity index 100% rename from Netdisco/t/11-portsort.t rename to t/11-portsort.t diff --git a/Netdisco/t/html/portsort.html b/t/html/portsort.html similarity index 100% rename from Netdisco/t/html/portsort.html rename to t/html/portsort.html diff --git a/Netdisco/t/js/qunit-tap.js b/t/js/qunit-tap.js similarity index 100% rename from Netdisco/t/js/qunit-tap.js rename to t/js/qunit-tap.js diff --git a/Netdisco/t/js/run_qunit.js b/t/js/run_qunit.js similarity index 100% rename from Netdisco/t/js/run_qunit.js rename to t/js/run_qunit.js