From d2816827727e338dea7ccdef988edd54f3c41030 Mon Sep 17 00:00:00 2001 From: ahrenholz Date: Wed, 4 Dec 2013 21:45:42 +0000 Subject: [PATCH] globally replace old NRL URL with new http://www.nrl.navy.mil/itd/ncs/products/core (Boeing r1803) --- README | 2 +- daemon/core/__init__.py | 2 +- daemon/core/services/nrl.py | 2 +- daemon/ns3/corens3/__init__.py | 2 +- daemon/ns3/setup.py | 2 +- daemon/setup.py | 2 +- daemon/src/setup.py | 2 +- gui/initgui.tcl | 4 ++-- packaging/bsd/core.pkgdesclong | 2 +- packaging/deb/control | 2 +- packaging/deb/copyright | 2 +- packaging/rpm/core.spec.in | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README b/README index 5f08b620..c3004eb0 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ project site (1) is a good source of introductory information, with a manual, screenshots, and demos about this software. Also a supplemental Google Code page (2) hosts a wiki, blog, bug tracker, and quickstart guide. - 1. http://cs.itd.nrl.navy.mil/work/core/ + 1. http://www.nrl.navy.mil/itd/ncs/products/core 2. http://code.google.com/p/coreemu/ diff --git a/daemon/core/__init__.py b/daemon/core/__init__.py index 58b68b5e..fc9a2033 100644 --- a/daemon/core/__init__.py +++ b/daemon/core/__init__.py @@ -5,7 +5,7 @@ Top-level Python package containing CORE components. -See http://cs.itd.nrl.navy.mil/work/core/ and +See http://www.nrl.navy.mil/itd/ncs/products/core and http://code.google.com/p/coreemu/ for more information on CORE. Pieces can be imported individually, for example diff --git a/daemon/core/services/nrl.py b/daemon/core/services/nrl.py index d0412c33..d0275662 100644 --- a/daemon/core/services/nrl.py +++ b/daemon/core/services/nrl.py @@ -7,7 +7,7 @@ # ''' nrl.py: defines services provided by NRL protolib tools hosted here: -http://cs.itd.nrl.navy.mil/products/ + http://www.nrl.navy.mil/itd/ncs/products ''' from core.service import CoreService, addservice diff --git a/daemon/ns3/corens3/__init__.py b/daemon/ns3/corens3/__init__.py index dd1c1fd0..689b00d3 100644 --- a/daemon/ns3/corens3/__init__.py +++ b/daemon/ns3/corens3/__init__.py @@ -6,7 +6,7 @@ Python package containing CORE components for use with the ns-3 simulator. -See http://cs.itd.nrl.navy.mil/work/core/ and +See http://www.nrl.navy.mil/itd/ncs/products/core and http://code.google.com/p/coreemu/ for more information on CORE. Pieces can be imported individually, for example diff --git a/daemon/ns3/setup.py b/daemon/ns3/setup.py index 44582d13..31586534 100644 --- a/daemon/ns3/setup.py +++ b/daemon/ns3/setup.py @@ -20,7 +20,7 @@ setup(name = "corens3-python", glob.glob("examples/*.py")), ], description = "Python ns-3 components of CORE", - url = "http://cs.itd.nrl.navy.mil/work/core/", + url = "http://www.nrl.navy.mil/itd/ncs/products/core", author = "Boeing Research & Technology", author_email = "core-dev@pf.itd.nrl.navy.mil", license = "GPLv2", diff --git a/daemon/setup.py b/daemon/setup.py index 71ddc341..3cfc4d2a 100644 --- a/daemon/setup.py +++ b/daemon/setup.py @@ -38,7 +38,7 @@ setup(name = "core-python", glob.glob("examples/myservices/*")), ], description = "Python components of CORE", - url = "http://cs.itd.nrl.navy.mil/work/core/", + url = "http://www.nrl.navy.mil/itd/ncs/products/core", author = "Boeing Research & Technology", author_email = "core-dev@pf.itd.nrl.navy.mil", license = "BSD", diff --git a/daemon/src/setup.py b/daemon/src/setup.py index 7a2bfe15..b432155b 100644 --- a/daemon/src/setup.py +++ b/daemon/src/setup.py @@ -22,7 +22,7 @@ setup(name = "core-python-netns", "Linux network namespaces", data_files = [("sbin", ('vcmd', 'vnoded', 'netns')), ], ext_modules = [netns, vcmd], - url = "http://cs.itd.nrl.navy.mil/work/core/", + url = "http://www.nrl.navy.mil/itd/ncs/products/core", author = "Boeing Research & Technology", author_email = "core-dev@pf.itd.nrl.navy.mil", license = "BSD", diff --git a/gui/initgui.tcl b/gui/initgui.tcl index 1121523c..60f73b47 100755 --- a/gui/initgui.tcl +++ b/gui/initgui.tcl @@ -596,9 +596,9 @@ menu .menubar.session -tearoff 1 # menu .menubar.help -tearoff 0 .menubar.help add command -label "Online manual (www)" -command \ - "_launchBrowser http://pf.itd.nrl.navy.mil/core/core-html/" + "_launchBrowser http://downloads.pf.itd.nrl.navy.mil/docs/core/core-html/" .menubar.help add command -label "CORE website (www)" -command \ - "_launchBrowser http://cs.itd.nrl.navy.mil/work/core/index.php" + "_launchBrowser http://www.nrl.navy.mil/itd/ncs/products/core" .menubar.help add command -label "Mailing list (www)" -command \ "_launchBrowser http://pf.itd.nrl.navy.mil/mailman/listinfo/core-users" .menubar.help add command -label "About" -command popupAbout diff --git a/packaging/bsd/core.pkgdesclong b/packaging/bsd/core.pkgdesclong index 79f4f825..e8158147 100644 --- a/packaging/bsd/core.pkgdesclong +++ b/packaging/bsd/core.pkgdesclong @@ -1,3 +1,3 @@ The Common Open Research Emulator (CORE) is a tool that allows you to emulate entire networks on a FreeBSD or Linux machine. You can connect these emulated networks to live networks (or to additional emulated networks) via the machine's physical interfaces. This package contains CORE userspace components for easily drawing topologies that drive lightweight virutalized network stacks. -WWW: http://cs.itd.nrl.navy.mil/work/core/index.php +WWW: http://www.nrl.navy.mil/itd/ncs/products/core diff --git a/packaging/deb/control b/packaging/deb/control index 2427ecb6..0717cdbc 100644 --- a/packaging/deb/control +++ b/packaging/deb/control @@ -5,7 +5,7 @@ Maintainer: Jeff Ahrenholz Standards-Version: 3.8.4 Build-Depends: debhelper (>= 9), cdbs, autoconf, automake, gcc, libev-dev, make, python-dev, libreadline-dev, bridge-utils, ebtables, iproute, imagemagick, pkg-config, help2man # python-sphinx -Homepage: http://cs.itd.nrl.navy.mil/work/core/index.php +Homepage: http://www.nrl.navy.mil/itd/ncs/products/core Package: core-daemon Architecture: any diff --git a/packaging/deb/copyright b/packaging/deb/copyright index abab355f..04f2a7bd 100644 --- a/packaging/deb/copyright +++ b/packaging/deb/copyright @@ -1,7 +1,7 @@ This package was debianized by Jeff Ahrenholz 4/3/13 -It was downloaded from: http://cs.itd.nrl.navy.mil/work/core/index.php +It was downloaded from: http://www.nrl.navy.mil/itd/ncs/products/core Upstream Author(s): Jeff Ahrenholz diff --git a/packaging/rpm/core.spec.in b/packaging/rpm/core.spec.in index b8c9bedb..451019ac 100644 --- a/packaging/rpm/core.spec.in +++ b/packaging/rpm/core.spec.in @@ -13,7 +13,7 @@ License: BSD Prefix: /usr Release: 1 Source: core-%{version}.tar.gz -URL: http://cs.itd.nrl.navy.mil/work/core/ +URL: http://www.nrl.navy.mil/itd/ncs/products/core Version: %{version} %description The Common Open Research Emulator provides Python modules and a GUI for