From 6df609a9f0a776b56b435d336dbb8eebec138b0b Mon Sep 17 00:00:00 2001
From: Eric Eide <eeide@cs.utah.edu>
Date: Mon, 24 Sep 2012 07:57:36 -0600
Subject: [PATCH] Replace license symbols with {{{ }}}-enclosed license blocks.
This commit is intended to makes the license status of Emulab and
ProtoGENI source files more clear. It replaces license symbols like
"EMULAB-COPYRIGHT" and "GENIPUBLIC-COPYRIGHT" with {{{ }}}-delimited
blocks that contain actual license statements.
This change was driven by the fact that today, most people acquire and
track Emulab and ProtoGENI sources via git.
Before the Emulab source code was kept in git, the Flux Research Group
at the University of Utah would roll distributions by making tar
files. As part of that process, the Flux Group would replace the
license symbols in the source files with actual license statements.
When the Flux Group moved to git, people outside of the group started
to see the source files with the "unexpanded" symbols. This meant
that people acquired source files without actual license statements in
them. All the relevant files had Utah *copyright* statements in them,
but without the expanded *license* statements, the licensing status of
the source files was unclear.
This commit is intended to clear up that confusion.
Most Utah-copyrighted files in the Emulab source tree are distributed
under the terms of the Affero GNU General Public License, version 3
(AGPLv3).
Most Utah-copyrighted files related to ProtoGENI are distributed under
the terms of the GENI Public License, which is a BSD-like open-source
license.
Some Utah-copyrighted files in the Emulab source tree are distributed
under the terms of the GNU Lesser General Public License, version 2.1
(LGPL).
---
GNUmakefile.in | 21 ++++++++-
GNUmakerules | 21 ++++++++-
Makeconf.in | 21 ++++++++-
WEBtemplate.in | 21 ++++++++-
account/GNUmakefile.in | 21 ++++++++-
account/addpubkey.in | 21 ++++++++-
account/addsfskey.in | 21 ++++++++-
account/adduserhook.in | 21 ++++++++-
account/dumpproject.in | 21 ++++++++-
account/dumpuser.in | 21 ++++++++-
account/genpubkeys.in | 21 ++++++++-
account/manageremote.in | 27 +++++++++++-
account/mksyscert.in | 21 ++++++++-
account/mkusercert.in | 21 ++++++++-
account/newproj.in | 21 ++++++++-
account/newuser.in | 21 ++++++++-
account/quotamail.in | 21 ++++++++-
account/spewcert.in | 21 ++++++++-
account/tbacct.in | 21 ++++++++-
apache/GNUmakefile.in | 21 ++++++++-
assign/GNUmakefile.in | 21 ++++++++-
assign/about.txt | 21 ++++++++-
assign/anneal.cc | 21 ++++++++-
assign/anneal.h | 21 ++++++++-
assign/annotate.cc | 21 ++++++++-
assign/annotate.h | 21 ++++++++-
assign/annotate_rspec.cc | 21 ++++++++-
assign/annotate_rspec.h | 21 ++++++++-
assign/annotate_rspec_v2.cc | 21 ++++++++-
assign/annotate_rspec_v2.h | 21 ++++++++-
assign/annotate_vtop.cc | 21 ++++++++-
assign/annotate_vtop.h | 21 ++++++++-
assign/assign.cc | 21 ++++++++-
assign/assign_internals.txt | 21 ++++++++-
assign/assign_todo.txt | 21 ++++++++-
assign/comet/toy-assign.co | 21 ++++++++-
assign/common.h | 21 ++++++++-
assign/compile-options.txt | 21 ++++++++-
assign/config.cc | 21 ++++++++-
assign/config.h | 21 ++++++++-
assign/delay.h | 21 ++++++++-
assign/emulab_extensions_parser.cc | 21 ++++++++-
assign/emulab_extensions_parser.h | 21 ++++++++-
assign/featuredesire.cc | 21 ++++++++-
assign/featuredesire.h | 21 ++++++++-
assign/file_formats.txt | 21 ++++++++-
assign/forwarding.cc | 21 ++++++++-
assign/forwarding.h | 21 ++++++++-
assign/fstring.cc | 21 ++++++++-
assign/fstring.h | 21 ++++++++-
assign/fstringtest.cc | 21 ++++++++-
assign/maps.h | 21 ++++++++-
assign/neighborhood.cc | 21 ++++++++-
assign/neighborhood.h | 21 ++++++++-
assign/parse_advertisement_rspec.cc | 21 ++++++++-
assign/parse_advertisement_rspec.h | 21 ++++++++-
assign/parse_error_handler.cc | 21 ++++++++-
assign/parse_error_handler.h | 21 ++++++++-
assign/parse_policy_xml.cc | 21 ++++++++-
assign/parse_policy_xml.h | 21 ++++++++-
assign/parse_ptop.cc | 21 ++++++++-
assign/parse_ptop_xml.cc | 21 ++++++++-
assign/parse_ptop_xml.h | 21 ++++++++-
assign/parse_request_rspec.cc | 21 ++++++++-
assign/parse_request_rspec.h | 21 ++++++++-
assign/parse_top.cc | 21 ++++++++-
assign/parse_vtop_xml.cc | 21 ++++++++-
assign/parse_vtop_xml.h | 21 ++++++++-
assign/parser.cc | 21 ++++++++-
assign/parser.h | 21 ++++++++-
assign/pclass.cc | 21 ++++++++-
assign/pclass.h | 21 ++++++++-
assign/pclass_vclass_fixed.txt | 21 ++++++++-
assign/physical.h | 21 ++++++++-
assign/policy.rnc | 21 ++++++++-
assign/port.h | 21 ++++++++-
assign/ptop-top.xsd | 21 ++++++++-
assign/ptop.rnc | 21 ++++++++-
assign/ptop.rng | 21 ++++++++-
assign/rspec_parser.cc | 21 ++++++++-
assign/rspec_parser.h | 21 ++++++++-
assign/rspec_parser_helper.cc | 21 ++++++++-
assign/rspec_parser_helper.h | 21 ++++++++-
assign/rspec_parser_v1.cc | 21 ++++++++-
assign/rspec_parser_v1.h | 21 ++++++++-
assign/rspec_parser_v2.cc | 21 ++++++++-
assign/rspec_parser_v2.h | 21 ++++++++-
assign/score.cc | 21 ++++++++-
assign/score.h | 21 ++++++++-
assign/solution.cc | 21 ++++++++-
assign/solution.h | 21 ++++++++-
assign/test-ptop.xml | 21 ++++++++-
assign/test-top.xml | 21 ++++++++-
assign/top.rnc | 21 ++++++++-
assign/top.rng | 21 ++++++++-
assign/toptools/anonymize-expinfo | 21 ++++++++-
assign/toptools/check-top | 21 ++++++++-
assign/toptools/rename-files | 21 ++++++++-
assign/vclass.cc | 21 ++++++++-
assign/vclass.h | 21 ++++++++-
assign/virtual.h | 21 ++++++++-
assign/vtop-top.xsd | 21 ++++++++-
assign/vtop.rnc | 21 ++++++++-
assign/vtop.rng | 21 ++++++++-
assign/xmlhelpers.cc | 21 ++++++++-
assign/xmlhelpers.h | 21 ++++++++-
assign/xsdgen | 21 ++++++++-
assign/xstr.h | 21 ++++++++-
backend/GNUmakefile.in | 21 ++++++++-
backend/editexp.in | 21 ++++++++-
backend/editgroup.in | 21 ++++++++-
backend/editimageid.in | 21 ++++++++-
backend/editnodetype.in | 21 ++++++++-
backend/editsitevars.in | 21 ++++++++-
backend/joinproject.in | 21 ++++++++-
backend/moduserinfo.in | 21 ++++++++-
backend/newgroup.in | 21 ++++++++-
backend/newimageid.in | 21 ++++++++-
backend/newimageid_ez.in | 21 ++++++++-
backend/newmmlist.in | 21 ++++++++-
backend/newosid.in | 21 ++++++++-
backend/newscript.in | 21 ++++++++-
bugdb/GNUmakefile.in | 21 ++++++++-
bugdb/addbugdbproj.in | 21 ++++++++-
bugdb/addbugdbuser.in | 21 ++++++++-
bugdb/bugdbgateway.in | 21 ++++++++-
bugdb/bugdbproxy.in | 21 ++++++++-
bugdb/bugdbsetup.in | 21 ++++++++-
bugdb/bugdbxlogin.in | 21 ++++++++-
bugdb/exporttickets.in | 21 ++++++++-
bugdb/setbugdbgroups.in | 21 ++++++++-
capture/GNUmakefile.in | 21 ++++++++-
capture/capdecls.h | 21 ++++++++-
capture/caplog.c | 21 ++++++++-
capture/caplog.in | 21 ++++++++-
capture/caplogserver.c | 21 ++++++++-
capture/capquery.c | 21 ++++++++-
capture/capserver.c | 21 ++++++++-
capture/capture.1 | 21 ++++++++-
capture/capture.c | 21 ++++++++-
cdrom/GNUmakefile.in | 21 ++++++++-
cdrom/frisboot/rc.d/frisbee | 21 ++++++++-
cdrom/frisboot/waipconfig.pl | 21 ++++++++-
cdrom/groklilo/GNUmakefile.in | 21 ++++++++-
cdrom/groklilo/Makefile | 21 ++++++++-
cdrom/groklilo/groklilo.c | 21 ++++++++-
cdrom/tbbootconfig/GNUmakefile.in | 21 ++++++++-
cdrom/tbbootconfig/Makefile | 21 ++++++++-
cdrom/tbbootconfig/tbbootconfig.c | 21 ++++++++-
cdrom/tbbootconfig/testbed_boot.h | 21 ++++++++-
cdrom/waboot/emulabboot.sh | 21 ++++++++-
cdrom/waboot/netbed-setup.pl | 21 ++++++++-
cdrom/waboot/rc.emulab | 21 ++++++++-
cdrom/waboot/register.pl | 21 ++++++++-
cdrom/waboot/register.sh | 21 ++++++++-
cdrom/waboot/waipconfig.pl | 21 ++++++++-
clientside/GNUmakefile.in | 21 ++++++++-
clientside/GNUmakerules | 21 ++++++++-
clientside/Makeconf.in | 21 ++++++++-
clientside/configure.in | 21 ++++++++-
clientside/event/GNUmakefile.in | 21 ++++++++-
clientside/event/delay-agent/GNUmakefile.in | 21 ++++++++-
clientside/event/delay-agent/callback.c | 21 ++++++++-
clientside/event/delay-agent/delay.ns | 21 ++++++++-
clientside/event/delay-agent/delay_test.ns | 21 ++++++++-
clientside/event/delay-agent/main.c | 21 ++++++++-
clientside/event/delay-agent/main.h | 21 ++++++++-
clientside/event/disk-agent/GNUmakefile.in | 21 ++++++++-
clientside/event/disk-agent/compile.sh | 21 ++++++++-
clientside/event/disk-agent/disk-agent.cc | 21 ++++++++-
clientside/event/disk-agent/mkextrafs | 21 ++++++++-
clientside/event/link-agent/GNUmakefile.in | 21 ++++++++-
clientside/event/link-agent/link-agent.c | 21 ++++++++-
clientside/event/linktest/GNUmakefile.in | 21 ++++++++-
clientside/event/linktest/elab_linktest.pl.in | 21 ++++++++-
.../event/linktest/iperf/GNUmakefile.in | 21 ++++++++-
.../event/linktest/iperf/iperf-fetch.sh | 21 ++++++++-
clientside/event/linktest/linktest.c | 21 ++++++++-
clientside/event/linktest/linktest.pl | 21 ++++++++-
clientside/event/linktest/linktest.proxy.in | 21 ++++++++-
clientside/event/linktest/linktest_control.in | 21 ++++++++-
clientside/event/linktest/ltevent.c | 21 ++++++++-
clientside/event/linktest/rude/GNUmakefile.in | 21 ++++++++-
clientside/event/linktest/rude/rude-fetch.sh | 21 ++++++++-
clientside/event/linktest/run_linktest.pl.in | 21 ++++++++-
clientside/event/linktest/switchtest.pl | 21 ++++++++-
clientside/event/linktest/weblinktest.in | 21 ++++++++-
clientside/event/program-agent/GNUmakefile.in | 21 ++++++++-
.../event/program-agent/program-agent.8 | 21 ++++++++-
.../event/program-agent/program-agent.c | 21 ++++++++-
clientside/event/proxy/GNUmakefile.in | 21 ++++++++-
clientside/event/proxy/evproxy.c | 21 ++++++++-
clientside/event/proxy/evproxyplab.cc | 21 ++++++++-
clientside/event/proxy/proxytest.c | 21 ++++++++-
clientside/event/tevc/GNUmakefile.in | 21 ++++++++-
clientside/event/tevc/tevc.c | 21 ++++++++-
clientside/event/trafgen/GNUmakefile.in | 21 ++++++++-
clientside/event/trafgen/event.c | 21 ++++++++-
clientside/event/trafgen/tg-install | 21 ++++++++-
clientside/lib/GNUmakefile.in | 21 ++++++++-
clientside/lib/event/GNUmakefile.in | 21 ++++++++-
clientside/lib/event/event.c | 21 ++++++++-
clientside/lib/event/event.h | 21 ++++++++-
clientside/lib/event/event.i | 21 ++++++++-
clientside/lib/event/event.pm | 21 ++++++++-
clientside/lib/event/event.pm.tail | 21 ++++++++-
clientside/lib/event/perlvers.pl | 21 ++++++++-
clientside/lib/event/tbevent.py | 21 ++++++++-
clientside/lib/event/tbevent.py.tail | 21 ++++++++-
clientside/lib/event/util.c | 21 ++++++++-
clientside/lib/libtb/GNUmakefile.in | 21 ++++++++-
clientside/lib/libtb/be_user.c | 21 ++++++++-
clientside/lib/libtb/be_user.h | 21 ++++++++-
clientside/lib/libtb/log.c | 21 ++++++++-
clientside/lib/libtb/log.h | 21 ++++++++-
clientside/lib/libtb/popenf.c | 21 ++++++++-
clientside/lib/libtb/popenf.h | 21 ++++++++-
clientside/lib/libtb/systemf.c | 21 ++++++++-
clientside/lib/libtb/systemf.h | 21 ++++++++-
clientside/lib/libtb/tbdb.c | 21 ++++++++-
clientside/lib/libtb/tbdb.h | 21 ++++++++-
clientside/lib/libtb/tbdefs.c | 21 ++++++++-
clientside/lib/libtb/tbdefs.h | 21 ++++++++-
clientside/lib/libtb/tmcc.c | 21 ++++++++-
clientside/lib/libtb/tmcc.h | 21 ++++++++-
clientside/lib/tmcd/GNUmakefile.in | 21 ++++++++-
clientside/lib/tmcd/ssl.c | 21 ++++++++-
clientside/lib/tmcd/ssl.h | 21 ++++++++-
clientside/lib/tmcd/tmcd.h | 21 ++++++++-
clientside/lib/tmcd/tpm.c | 21 ++++++++-
clientside/lib/tmcd/tpm.h | 21 ++++++++-
clientside/os/GNUmakefile.in | 21 ++++++++-
clientside/os/dijkstra/Compressor.cc | 21 ++++++++-
clientside/os/dijkstra/Compressor.h | 21 ++++++++-
clientside/os/dijkstra/Exception.h | 21 ++++++++-
clientside/os/dijkstra/GNUmakefile.in | 21 ++++++++-
clientside/os/dijkstra/IpTree.h | 21 ++++++++-
clientside/os/dijkstra/NoneCompressor.cc | 21 ++++++++-
clientside/os/dijkstra/NoneCompressor.h | 21 ++++++++-
clientside/os/dijkstra/OptimalIpTree.cc | 21 ++++++++-
clientside/os/dijkstra/OptimalIpTree.h | 21 ++++++++-
clientside/os/dijkstra/SetIterator.h | 21 ++++++++-
clientside/os/dijkstra/SingleSource.cc | 21 ++++++++-
clientside/os/dijkstra/SingleSource.h | 21 ++++++++-
clientside/os/dijkstra/TreeCompressor.cc | 21 ++++++++-
clientside/os/dijkstra/TreeCompressor.h | 21 ++++++++-
clientside/os/dijkstra/VoteIpTree.cc | 21 ++++++++-
clientside/os/dijkstra/VoteIpTree.h | 21 ++++++++-
clientside/os/dijkstra/apsp.cc | 21 ++++++++-
clientside/os/dijkstra/bitmath.cc | 29 +++++++++----
clientside/os/dijkstra/bitmath.h | 21 ++++++++-
clientside/os/dijkstra/check-dijkstra.cc | 21 ++++++++-
clientside/os/dijkstra/dijkstra.cc | 21 ++++++++-
clientside/os/dijkstra/dijkstra.h | 21 ++++++++-
clientside/os/dijkstra/drecal.cc | 21 ++++++++-
clientside/os/dijkstra/lib.h | 21 ++++++++-
clientside/os/dijkstra/route-histogram.cc | 21 ++++++++-
clientside/os/frisbee.redux/GNUmakefile.in | 21 ++++++++-
clientside/os/frisbee.redux/Makefile-linux.sa | 21 ++++++++-
clientside/os/frisbee.redux/Makefile.sa | 21 ++++++++-
clientside/os/frisbee.redux/client.c | 21 ++++++++-
clientside/os/frisbee.redux/config.c | 21 ++++++++-
clientside/os/frisbee.redux/config_emulab.c | 21 ++++++++-
clientside/os/frisbee.redux/config_null.c | 21 ++++++++-
clientside/os/frisbee.redux/decls.h | 21 ++++++++-
clientside/os/frisbee.redux/event.c | 21 ++++++++-
clientside/os/frisbee.redux/event.h | 21 ++++++++-
.../os/frisbee.redux/frisuploadd_emulab.in | 21 ++++++++-
clientside/os/frisbee.redux/frisuploader.c | 21 ++++++++-
clientside/os/frisbee.redux/log.c | 21 ++++++++-
clientside/os/frisbee.redux/log.h | 21 ++++++++-
clientside/os/frisbee.redux/mserver.c | 21 ++++++++-
clientside/os/frisbee.redux/network.c | 21 ++++++++-
clientside/os/frisbee.redux/server.c | 21 ++++++++-
clientside/os/frisbee.redux/trace-parse.pl | 21 ++++++++-
clientside/os/frisbee.redux/trace.c | 21 ++++++++-
clientside/os/frisbee.redux/trace.h | 21 ++++++++-
clientside/os/frisbee.redux/upload.c | 21 ++++++++-
clientside/os/frisbee.redux/uploadio.c | 21 ++++++++-
clientside/os/frisbee.redux/uploadio.h | 21 ++++++++-
clientside/os/frisbee.redux/utils.c | 21 ++++++++-
clientside/os/frisbee.redux/utils.h | 21 ++++++++-
clientside/os/genhostsfile/GNUmakefile.in | 21 ++++++++-
clientside/os/genhostsfile/genfromdb.in | 21 ++++++++-
clientside/os/genhostsfile/genfromtopo.in | 21 ++++++++-
clientside/os/genhostsfile/genhostsfile.c | 21 ++++++++-
clientside/os/growdisk/GNUmakefile.in | 21 ++++++++-
clientside/os/growdisk/growdisk.c | 21 ++++++++-
clientside/os/imagezip/GNUmakefile.in | 21 ++++++++-
clientside/os/imagezip/Makefile-linux.sa | 21 ++++++++-
clientside/os/imagezip/Makefile.sa | 21 ++++++++-
clientside/os/imagezip/checksum.c | 21 ++++++++-
clientside/os/imagezip/disksize.c | 21 ++++++++-
clientside/os/imagezip/extfs/GNUmakefile.in | 21 ++++++++-
clientside/os/imagezip/extfs/extfs.c | 21 ++++++++-
clientside/os/imagezip/extfs/lilo.h | 21 ++++++++-
clientside/os/imagezip/extfs/reloc_lilo.c | 21 ++++++++-
clientside/os/imagezip/fat/GNUmakefile.in | 21 ++++++++-
clientside/os/imagezip/fat/fat_glue.c | 21 ++++++++-
clientside/os/imagezip/fat/fat_glue.h | 21 ++++++++-
clientside/os/imagezip/ffs/GNUmakefile.in | 21 ++++++++-
clientside/os/imagezip/ffs/ffs.c | 21 ++++++++-
clientside/os/imagezip/ffs/ffs.h | 21 ++++++++-
clientside/os/imagezip/global.h | 21 ++++++++-
clientside/os/imagezip/hashmap/GNUmakefile.in | 21 ++++++++-
clientside/os/imagezip/hashmap/hashmap.c | 21 ++++++++-
clientside/os/imagezip/hashmap/hashmap.h | 21 ++++++++-
clientside/os/imagezip/imagedump.8 | 21 ++++++++-
clientside/os/imagezip/imagedump.c | 21 ++++++++-
clientside/os/imagezip/imagehash.c | 21 ++++++++-
clientside/os/imagezip/imagehash.h | 21 ++++++++-
clientside/os/imagezip/imagehdr.h | 21 ++++++++-
clientside/os/imagezip/imageunzip.8 | 21 ++++++++-
clientside/os/imagezip/imageunzip.c | 21 ++++++++-
clientside/os/imagezip/imagezip.8 | 21 ++++++++-
clientside/os/imagezip/imagezip.c | 21 ++++++++-
clientside/os/imagezip/ntfs/GNUmakefile.in | 21 ++++++++-
.../os/imagezip/ntfs/liblocale/GNUmakefile.in | 21 ++++++++-
.../os/imagezip/ntfs/libntfs/GNUmakefile.in | 21 ++++++++-
.../imagezip/ntfs/libntfs/Makefile-linux.sa | 21 ++++++++-
clientside/os/imagezip/ntfs/ntfs_glue.c | 21 ++++++++-
clientside/os/imagezip/sliceinfo.h | 21 ++++++++-
clientside/os/install-rpm | 21 ++++++++-
clientside/os/install-tarfile | 21 ++++++++-
clientside/os/install-tarfile.1 | 21 ++++++++-
clientside/os/syncd/GNUmakefile.in | 21 ++++++++-
clientside/os/syncd/decls.h | 21 ++++++++-
clientside/os/syncd/emulab-sync.1 | 21 ++++++++-
clientside/os/syncd/emulab-sync.c | 21 ++++++++-
clientside/os/syncd/emulab-syncd.1 | 21 ++++++++-
clientside/os/syncd/emulab-syncd.c | 21 ++++++++-
clientside/os/syncd/syncd_test.sh | 21 ++++++++-
clientside/os/zapdisk/GNUmakefile.in | 21 ++++++++-
clientside/os/zapdisk/diskzap | 21 ++++++++-
clientside/os/zapdisk/zapdisk.c | 21 ++++++++-
clientside/sensors/GNUmakefile.in | 21 ++++++++-
clientside/sensors/canaryd/GNUmakefile.in | 21 ++++++++-
clientside/sensors/canaryd/alertlistener.c | 21 ++++++++-
clientside/sensors/canaryd/auxfuncs.h | 21 ++++++++-
clientside/sensors/canaryd/canaryd.c | 21 ++++++++-
clientside/sensors/canaryd/canaryd.h | 21 ++++++++-
clientside/sensors/canaryd/canarydEvents.c | 21 ++++++++-
clientside/sensors/canaryd/canarydEvents.h | 21 ++++++++-
clientside/sensors/canaryd/childProcess.c | 21 ++++++++-
clientside/sensors/canaryd/childProcess.h | 21 ++++++++-
clientside/sensors/canaryd/feedbacklogs.in | 21 ++++++++-
clientside/sensors/canaryd/networkInterface.c | 21 ++++++++-
clientside/sensors/canaryd/networkInterface.h | 21 ++++++++-
clientside/sensors/slothd/GNUmakefile.in | 21 ++++++++-
clientside/sensors/slothd/clean_tables | 21 ++++++++-
clientside/sensors/slothd/digest-slothd | 21 ++++++++-
clientside/sensors/slothd/iddata_clean | 21 ++++++++-
clientside/sensors/slothd/idlemon.c | 21 ++++++++-
clientside/sensors/slothd/idloadup.pl | 21 ++++++++-
clientside/sensors/slothd/sdcollectd.c | 21 ++++++++-
clientside/sensors/slothd/sdcollectd.h | 21 ++++++++-
clientside/sensors/slothd/sddeploy.in | 21 ++++++++-
clientside/sensors/slothd/sdhalt.pl | 21 ++++++++-
clientside/sensors/slothd/sdisrunning.in | 21 ++++++++-
clientside/sensors/slothd/slothd.c | 21 ++++++++-
clientside/sensors/slothd/slothd.h | 21 ++++++++-
clientside/sensors/slothd/utmptest.c | 21 ++++++++-
clientside/sensors/slothd/webfeedback.in | 21 ++++++++-
clientside/tmcc/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/common/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/common/bootsubnodes | 21 ++++++++-
clientside/tmcc/common/bootvnodes | 21 ++++++++-
clientside/tmcc/common/config/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/common/config/librc.pm | 21 ++++++++-
clientside/tmcc/common/config/rc.accounts | 21 ++++++++-
clientside/tmcc/common/config/rc.blobs | 21 ++++++++-
clientside/tmcc/common/config/rc.config | 21 ++++++++-
clientside/tmcc/common/config/rc.delays | 21 ++++++++-
clientside/tmcc/common/config/rc.diskagent | 21 ++++++++-
clientside/tmcc/common/config/rc.fakejail | 21 ++++++++-
clientside/tmcc/common/config/rc.firewall | 21 ++++++++-
clientside/tmcc/common/config/rc.hostnames | 21 ++++++++-
clientside/tmcc/common/config/rc.ifconfig | 21 ++++++++-
clientside/tmcc/common/config/rc.keys | 21 ++++++++-
clientside/tmcc/common/config/rc.linkagent | 21 ++++++++-
clientside/tmcc/common/config/rc.localize | 21 ++++++++-
clientside/tmcc/common/config/rc.misc | 21 ++++++++-
clientside/tmcc/common/config/rc.mkelab | 21 ++++++++-
clientside/tmcc/common/config/rc.mksubboss | 21 ++++++++-
clientside/tmcc/common/config/rc.motelog | 21 ++++++++-
clientside/tmcc/common/config/rc.mounts | 21 ++++++++-
clientside/tmcc/common/config/rc.progagent | 21 ++++++++-
clientside/tmcc/common/config/rc.route | 21 ++++++++-
clientside/tmcc/common/config/rc.rpms | 21 ++++++++-
clientside/tmcc/common/config/rc.simulator | 21 ++++++++-
clientside/tmcc/common/config/rc.startcmd | 21 ++++++++-
clientside/tmcc/common/config/rc.syncserver | 21 ++++++++-
clientside/tmcc/common/config/rc.tarfiles | 21 ++++++++-
clientside/tmcc/common/config/rc.template | 21 ++++++++-
clientside/tmcc/common/config/rc.tiptunnels | 21 ++++++++-
clientside/tmcc/common/config/rc.topomap | 21 ++++++++-
clientside/tmcc/common/config/rc.tpmsetup | 21 ++++++++-
clientside/tmcc/common/config/rc.trace | 21 ++++++++-
clientside/tmcc/common/config/rc.trafgen | 21 ++++++++-
clientside/tmcc/common/config/rc.tunnels | 21 ++++++++-
clientside/tmcc/common/ctrlnode.sh | 21 ++++++++-
clientside/tmcc/common/getblob | 21 ++++++++-
clientside/tmcc/common/ifdynconfig | 21 ++++++++-
clientside/tmcc/common/ifsetup | 21 ++++++++-
clientside/tmcc/common/libsetup.pm | 21 ++++++++-
clientside/tmcc/common/libtestbed.pm | 21 ++++++++-
clientside/tmcc/common/libtmcc.pm | 21 ++++++++-
clientside/tmcc/common/logboot | 21 ++++++++-
clientside/tmcc/common/ntpstart | 21 ++++++++-
clientside/tmcc/common/osconfig | 21 ++++++++-
clientside/tmcc/common/paths.pm | 21 ++++++++-
clientside/tmcc/common/paths.sh | 21 ++++++++-
clientside/tmcc/common/rc.bootsetup | 21 ++++++++-
clientside/tmcc/common/rc.canaryd | 21 ++++++++-
clientside/tmcc/common/rc.ctrlnode | 21 ++++++++-
clientside/tmcc/common/rc.inelab | 21 ++++++++-
clientside/tmcc/common/rc.linktest | 21 ++++++++-
clientside/tmcc/common/rc.pgeni | 21 ++++++++-
clientside/tmcc/common/rc.slothd | 21 ++++++++-
clientside/tmcc/common/rc.testbed | 21 ++++++++-
clientside/tmcc/common/runcvsup.sh | 21 ++++++++-
clientside/tmcc/common/runstartup | 21 ++++++++-
clientside/tmcc/common/sendevent | 21 ++++++++-
clientside/tmcc/common/startcmddone | 21 ++++++++-
clientside/tmcc/common/tmcc.pl | 21 ++++++++-
clientside/tmcc/common/update | 21 ++++++++-
clientside/tmcc/common/vnodesetup | 21 ++++++++-
clientside/tmcc/common/watchdog | 21 ++++++++-
clientside/tmcc/cygwinseven/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/cygwinseven/liblocsetup.pm | 21 ++++++++-
clientside/tmcc/cygwinseven/netbt | 21 ++++++++-
clientside/tmcc/cygwinseven/prepare | 21 ++++++++-
clientside/tmcc/cygwinseven/rc.cygwinseven | 21 ++++++++-
clientside/tmcc/cygwinseven/rc.lmhosts | 21 ++++++++-
clientside/tmcc/cygwinseven/rc.reboot | 21 ++++++++-
clientside/tmcc/cygwinseven/tbshutdown | 21 ++++++++-
clientside/tmcc/cygwinxp/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/cygwinxp/clean_logonui | 21 ++++++++-
clientside/tmcc/cygwinxp/liblocsetup.pm | 21 ++++++++-
clientside/tmcc/cygwinxp/netbt | 21 ++++++++-
clientside/tmcc/cygwinxp/prepare | 21 ++++++++-
clientside/tmcc/cygwinxp/rc.cygwinxp | 21 ++++++++-
clientside/tmcc/cygwinxp/rc.firstboot | 21 ++++++++-
clientside/tmcc/cygwinxp/rc.lmhosts | 21 ++++++++-
clientside/tmcc/cygwinxp/rc.reboot | 21 ++++++++-
clientside/tmcc/cygwinxp/reboot | 21 ++++++++-
clientside/tmcc/cygwinxp/tbshutdown | 21 ++++++++-
clientside/tmcc/dostype.c | 21 ++++++++-
clientside/tmcc/dp/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/dp/emulab.sh | 21 ++++++++-
clientside/tmcc/dp/emulabctl | 21 ++++++++-
clientside/tmcc/dp/mkemuman.sh | 21 ++++++++-
clientside/tmcc/fedora/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/fedora/delaysetup | 21 ++++++++-
clientside/tmcc/fedora/ifcfg-eth99 | 21 ++++++++-
clientside/tmcc/fedora/mkifcfgs | 21 ++++++++-
clientside/tmcc/fedora15/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/fedora15/delaysetup | 21 ++++++++-
clientside/tmcc/fedora15/emulab-systemd-swaps | 21 ++++++++-
clientside/tmcc/fedora15/ifcfg-eth99 | 21 ++++++++-
clientside/tmcc/fedora15/ifup-emulabcnet | 21 ++++++++-
clientside/tmcc/fedora15/mkifcfgs | 21 ++++++++-
clientside/tmcc/fedora15/rc.local | 21 ++++++++-
clientside/tmcc/fedora15/testbed | 21 ++++++++-
clientside/tmcc/findif.c | 21 ++++++++-
clientside/tmcc/freebsd/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/freebsd/camwce | 21 ++++++++-
clientside/tmcc/freebsd/cdboot/rc.cdboot | 21 ++++++++-
clientside/tmcc/freebsd/chipset.awk | 21 ++++++++-
clientside/tmcc/freebsd/control_interface | 21 ++++++++-
clientside/tmcc/freebsd/cpuspeed.awk | 21 ++++++++-
clientside/tmcc/freebsd/delaysetup | 21 ++++++++-
clientside/tmcc/freebsd/dhclient | 21 ++++++++-
clientside/tmcc/freebsd/dhclient-enter-hooks | 21 ++++++++-
clientside/tmcc/freebsd/dhclient-exit-hooks | 21 ++++++++-
clientside/tmcc/freebsd/frisbee/prepare | 21 ++++++++-
clientside/tmcc/freebsd/init/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/freebsd/jail/injail.c | 21 ++++++++-
clientside/tmcc/freebsd/jail/mkjail.pl | 21 ++++++++-
clientside/tmcc/freebsd/jail/rc.injail | 21 ++++++++-
clientside/tmcc/freebsd/liblocsetup.pm | 21 ++++++++-
clientside/tmcc/freebsd/mkextrafs.pl | 21 ++++++++-
clientside/tmcc/freebsd/newnode-testbed.sh | 21 ++++++++-
clientside/tmcc/freebsd/nodetype | 21 ++++++++-
clientside/tmcc/freebsd/prepare | 21 ++++++++-
clientside/tmcc/freebsd/rc.bridges | 21 ++++++++-
clientside/tmcc/freebsd/rc.delayagent | 21 ++++++++-
clientside/tmcc/freebsd/rc.frisbee | 21 ++++++++-
clientside/tmcc/freebsd/rc.healthd | 21 ++++++++-
clientside/tmcc/freebsd/rc.ipod | 21 ++++++++-
clientside/tmcc/freebsd/rc.kname | 21 ++++++++-
clientside/tmcc/freebsd/rc.mfs | 21 ++++++++-
clientside/tmcc/freebsd/rc.nfshack | 21 ++++++++-
clientside/tmcc/freebsd/sethostname.in | 21 ++++++++-
clientside/tmcc/freebsd/slicefix | 21 ++++++++-
clientside/tmcc/freebsd/tbshutdown | 21 ++++++++-
clientside/tmcc/freebsd/testbed.sh | 21 ++++++++-
clientside/tmcc/freebsd10/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/freebsd10/rc.freebsd | 21 ++++++++-
clientside/tmcc/freebsd5/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/freebsd5/cdboot/rc.dhclient | 21 ++++++++-
clientside/tmcc/freebsd5/rc.dhclient | 21 ++++++++-
clientside/tmcc/freebsd6/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/freebsd7/GNUmakefile.in | 21 ++++++++-
.../tmcc/freebsd7/mfs-newnode-testbed.sh | 21 ++++++++-
clientside/tmcc/freebsd7/rc.freebsd | 21 ++++++++-
clientside/tmcc/freebsd9/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/freebsd9/rc.freebsd | 21 ++++++++-
clientside/tmcc/linux-sg/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/linux-sg/dhcpcd.exe | 21 ++++++++-
clientside/tmcc/linux-sg/rc.stargate | 21 ++++++++-
clientside/tmcc/linux-sg/testbed | 21 ++++++++-
clientside/tmcc/linux/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/linux/cdboot/rc.cdboot | 21 ++++++++-
clientside/tmcc/linux/chipset.awk | 21 ++++++++-
clientside/tmcc/linux/control_interface | 21 ++++++++-
clientside/tmcc/linux/cpuspeed.awk | 21 ++++++++-
clientside/tmcc/linux/delaysetup | 21 ++++++++-
clientside/tmcc/linux/dhclient-enter-hooks | 21 ++++++++-
clientside/tmcc/linux/dhclient-exit-hooks | 21 ++++++++-
clientside/tmcc/linux/fixup-fstab-swaps | 21 ++++++++-
clientside/tmcc/linux/ifcfg-eth99 | 21 ++++++++-
clientside/tmcc/linux/ifforce | 21 ++++++++-
clientside/tmcc/linux/ixpboot | 21 ++++++++-
clientside/tmcc/linux/liblocsetup.pm | 21 ++++++++-
clientside/tmcc/linux/libvnode.pm | 21 ++++++++-
clientside/tmcc/linux/mkextrafs.pl | 21 ++++++++-
clientside/tmcc/linux/mkifcfgs | 21 ++++++++-
clientside/tmcc/linux/mkvnode.pl | 21 ++++++++-
clientside/tmcc/linux/mkvserver.pl | 21 ++++++++-
clientside/tmcc/linux/netfpgactl | 21 ++++++++-
clientside/tmcc/linux/nodetype | 21 ++++++++-
clientside/tmcc/linux/openvz/create-image | 21 ++++++++-
.../tmcc/linux/openvz/libvnode_openvz.pm | 21 ++++++++-
clientside/tmcc/linux/prepare | 21 ++++++++-
clientside/tmcc/linux/rc.frisbee | 21 ++++++++-
clientside/tmcc/linux/rc.healthd | 21 ++++++++-
clientside/tmcc/linux/rc.ipod | 21 ++++++++-
clientside/tmcc/linux/rc.ixp | 21 ++++++++-
clientside/tmcc/linux/rc.kname | 21 ++++++++-
clientside/tmcc/linux/rc.linux | 21 ++++++++-
clientside/tmcc/linux/rc.local | 21 ++++++++-
clientside/tmcc/linux/rc.mfs | 21 ++++++++-
clientside/tmcc/linux/sethostname.dhclient.in | 21 ++++++++-
clientside/tmcc/linux/slicefix | 21 ++++++++-
clientside/tmcc/linux/tbprepare | 21 ++++++++-
clientside/tmcc/linux/testbed | 21 ++++++++-
clientside/tmcc/linux/vnodectl | 21 ++++++++-
clientside/tmcc/linux/vserver/rc.invserver | 21 ++++++++-
clientside/tmcc/linux/xen/capturevm.pl | 21 ++++++++-
clientside/tmcc/linux/xen/libvnode_xen.pm | 21 ++++++++-
clientside/tmcc/linux/xen/restorevm.pl | 21 ++++++++-
clientside/tmcc/linux/xen/xenbridge-setup | 21 ++++++++-
clientside/tmcc/linux9/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/linux9/ifcfg-eth99 | 21 ++++++++-
clientside/tmcc/linux9/mkifcfgs | 21 ++++++++-
clientside/tmcc/openbsd/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/openbsd/chipset.awk | 21 ++++++++-
clientside/tmcc/openbsd/control_interface | 21 ++++++++-
clientside/tmcc/openbsd/cpuspeed.awk | 21 ++++++++-
clientside/tmcc/openbsd/dhclient | 21 ++++++++-
clientside/tmcc/openbsd/dhclient-exit-hooks | 21 ++++++++-
clientside/tmcc/openbsd/nodetype | 21 ++++++++-
clientside/tmcc/osstuff.sh | 21 ++++++++-
clientside/tmcc/plab/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/plab/fixsudo.sh | 21 ++++++++-
clientside/tmcc/plab/mkrootball | 21 ++++++++-
clientside/tmcc/plab/plabrusage | 21 ++++++++-
clientside/tmcc/plab/rc.inplab | 21 ++++++++-
clientside/tmcc/plab/rc.vinit | 21 ++++++++-
clientside/tmcc/plab/runevents | 21 ++++++++-
clientside/tmcc/ron/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/ron/cvsup.sh | 21 ++++++++-
clientside/tmcc/ron/emulab.sh | 21 ++++++++-
clientside/tmcc/ron/emulabctl | 21 ++++++++-
clientside/tmcc/ron/mkemuman.sh | 21 ++++++++-
clientside/tmcc/ron/prepare | 21 ++++++++-
clientside/tmcc/ron/webserver.pl | 21 ++++++++-
clientside/tmcc/tmcc.c | 21 ++++++++-
clientside/tmcc/ubuntu10/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/ubuntu10/dhclient-enter-hooks | 21 ++++++++-
clientside/tmcc/ubuntu10/dhclient-exit-hooks | 21 ++++++++-
clientside/tmcc/ubuntu10/rc.local | 21 ++++++++-
clientside/tmcc/ubuntu11/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/ubuntu11/dhclient-enter-hooks | 21 ++++++++-
clientside/tmcc/ubuntu11/dhclient-exit-hooks | 21 ++++++++-
clientside/tmcc/ubuntu11/rc.local | 21 ++++++++-
clientside/tmcc/ubuntu7/GNUmakefile.in | 21 ++++++++-
clientside/tmcc/ubuntu7/dhclient-enter-hooks | 21 ++++++++-
clientside/tmcc/ubuntu7/dhclient-exit-hooks | 21 ++++++++-
clientside/tmcc/ubuntu7/rc.local | 21 ++++++++-
clientside/tmcc/widearea/cpwa.sh | 21 ++++++++-
clientside/tmcc/widearea/rc.frisbee | 21 ++++++++-
clientside/tools/GNUmakefile.in | 21 ++++++++-
clientside/tools/pcapper/GNUmakefile.in | 21 ++++++++-
clientside/tools/pcapper/pcapper.c | 21 ++++++++-
collab/GNUmakefile.in | 21 ++++++++-
collab/cvstools/GNUmakefile.in | 21 ++++++++-
collab/cvstools/cvs.proxy.in | 21 ++++++++-
collab/cvstools/cvs_ctrl.in | 21 ++++++++-
collab/cvstools/cvsrepo_ctrl.in | 21 ++++++++-
collab/cvstools/cvsrepo_ctrl.proxy.in | 21 ++++++++-
collab/cvstools/webcvsrepo_ctrl.in | 21 ++++++++-
collab/exp-vis/GNUmakefile.in | 21 ++++++++-
collab/exp-vis/fetch-vis.in | 21 ++++++++-
collab/exp-vis/write-vis-auth.in | 21 ++++++++-
collab/exp-vis/write-vis-auth.proxy.in | 21 ++++++++-
collab/jabber/GNUmakefile.in | 21 ++++++++-
collab/jabber/addjabberchat.in | 21 ++++++++-
collab/jabber/addjabberuser.in | 21 ++++++++-
collab/jabber/deljabberchat.in | 21 ++++++++-
collab/jabber/deljabberuser.in | 21 ++++++++-
collab/jabber/jabberproxy.in | 21 ++++++++-
collab/jabber/jabbersetup.in | 21 ++++++++-
collab/jabber/modjabberbuddies.in | 21 ++++++++-
collab/jabber/setchatmembers.in | 21 ++++++++-
collab/mailman/GNUmakefile.in | 21 ++++++++-
collab/mailman/addmmlist.in | 21 ++++++++-
collab/mailman/addmmuser.in | 21 ++++++++-
collab/mailman/addprojadminlist.in | 21 ++++++++-
collab/mailman/closeprojadminlist.in | 21 ++++++++-
collab/mailman/delmmlist.in | 21 ++++++++-
collab/mailman/delmmuser.in | 21 ++++++++-
collab/mailman/genaliases.in | 21 ++++++++-
collab/mailman/mailmanproxy.in | 21 ++++++++-
collab/mailman/mmlistmembership.in | 21 ++++++++-
collab/mailman/mmmodifymember.in | 21 ++++++++-
collab/mailman/mmscript.py | 21 ++++++++-
collab/mailman/mmsetup.in | 21 ++++++++-
collab/mailman/mmxlogin.in | 21 ++++++++-
collab/mailman/setmmlistmembers.in | 21 ++++++++-
collab/mailman/setmmpasswd.in | 21 ++++++++-
collab/mailman/webaddmmlist.in | 21 ++++++++-
collab/mailman/webdelmmlist.in | 21 ++++++++-
collab/mailman/webmmlistmembership.in | 21 ++++++++-
collab/mailman/websetmmpasswd.in | 21 ++++++++-
collab/trac/GNUmakefile.in | 21 ++++++++-
collab/trac/email2trac.in | 21 ++++++++-
collab/trac/emulab_auth.py | 21 ++++++++-
collab/trac/tracproxy.in | 21 ++++++++-
collab/trac/tracsetup.in | 21 ++++++++-
collab/trac/tracuser.in | 21 ++++++++-
collab/trac/tracxlogin.in | 21 ++++++++-
configure.in | 21 ++++++++-
daikon/GNUmakefile.in | 21 ++++++++-
db/Archive.pm.in | 21 ++++++++-
db/EmulabConstants.pm.in | 21 ++++++++-
db/EmulabFeatures.pm.in | 21 ++++++++-
db/Experiment.pm.in | 21 ++++++++-
db/Firewall.pm.in | 21 ++++++++-
db/GNUmakefile.in | 21 ++++++++-
db/Group.pm.in | 21 ++++++++-
db/Image.pm.in | 21 ++++++++-
db/Interface.pm.in | 21 ++++++++-
db/Lan.pm.in | 21 ++++++++-
db/Logfile.pm.in | 21 ++++++++-
db/Node.pm.in | 21 ++++++++-
db/NodeType.pm.in | 21 ++++++++-
db/OSinfo.pm.in | 21 ++++++++-
db/Port.pm | 21 ++++++++-
db/Project.pm.in | 21 ++++++++-
db/User.pm.in | 21 ++++++++-
db/VirtExperiment.pm.in | 21 ++++++++-
db/audit.in | 21 ++++++++-
db/avail.in | 21 ++++++++-
db/backup.in | 21 ++++++++-
db/changecreator.in | 21 ++++++++-
db/changeleader.in | 21 ++++++++-
db/changepid.in | 21 ++++++++-
db/changeuid.in | 21 ++++++++-
db/checkstats.in | 21 ++++++++-
db/dbboot.in | 21 ++++++++-
db/dbcheck.in | 21 ++++++++-
db/dbfillcheck.in | 21 ++++++++-
db/dbupdate.in | 21 ++++++++-
db/dhcpd_makeconf.in | 21 ++++++++-
db/dumperrorlog.in | 21 ++++++++-
db/dumperrorlog.proxy.in | 21 ++++++++-
db/elabinelab_bossinit.in | 21 ++++++++-
db/emdb.pm.in | 21 ++++++++-
db/emdbi.pm.in | 21 ++++++++-
db/emutil.pm.in | 21 ++++++++-
db/genelists.in | 21 ++++++++-
db/genelists.proxy.in | 21 ++++++++-
db/geni_control.in | 21 ++++++++-
db/grabron.in | 21 ++++++++-
db/idlemail.in | 21 ++++++++-
db/idletimes.in | 21 ++++++++-
db/if2port.in | 21 ++++++++-
db/interswitch.in | 21 ++++++++-
db/inuse.in | 21 ++++++++-
db/libEmulab.pm.in | 21 ++++++++-
db/libGeni.pm.in | 21 ++++++++-
db/libadminctrl.pm.in | 21 ++++++++-
db/libdb.pm.in | 21 ++++++++-
db/libdb.py.in | 21 ++++++++-
db/libtbdb.pm.in | 21 ++++++++-
db/mysqld_watchdog.in | 21 ++++++++-
db/nalloc.in | 21 ++++++++-
db/newwanode.in | 21 ++++++++-
db/nfree.in | 21 ++++++++-
db/node_status.in | 21 ++++++++-
db/nodeip.in | 21 ++++++++-
db/nodelog.in | 21 ++++++++-
db/readycount.in | 21 ++++++++-
db/schemacheck.in | 21 ++++++++-
db/setsitevar.in | 21 ++++++++-
db/showgraph.in | 21 ++++++++-
db/sitevarscheck.in | 21 ++++++++-
db/stategraph.in | 21 ++++++++-
db/subboss_dhcpd_makeconf.in | 21 ++++++++-
db/subboss_sync.in | 21 ++++++++-
db/unixgroups.in | 21 ++++++++-
db/update_permissions.in | 21 ++++++++-
db/webcontrol.in | 21 ++++++++-
db/xmlconvert.in | 21 ++++++++-
dhcpd/GNUmakefile.in | 21 ++++++++-
discvr/GNUmakefile.in | 21 ++++++++-
discvr/cli.c | 21 ++++++++-
discvr/discvr.c | 21 ++++++++-
discvr/discvr.h | 21 ++++++++-
discvr/forw_requests.c | 21 ++++++++-
discvr/generate_namfile.c | 21 ++++++++-
discvr/generate_namfile.h | 21 ++++++++-
discvr/get_ifi_info.c | 21 ++++++++-
discvr/get_rtaddrs.c | 21 ++++++++-
discvr/if_indextoname.c | 21 ++++++++-
discvr/net_rt_iflist.c | 21 ++++++++-
discvr/packet.h | 21 ++++++++-
discvr/recvfromflags.c | 21 ++++++++-
discvr/reply.c | 21 ++++++++-
discvr/serv.c | 21 ++++++++-
discvr/serv_listen.c | 21 ++++++++-
discvr/sock_ntop.c | 21 ++++++++-
discvr/util.c | 21 ++++++++-
discvr/util.h | 21 ++++++++-
doc/setup-archive/README | 21 ++++++++-
doc/setup-archive/customize-image.txt | 21 ++++++++-
doc/setup-archive/setup-cisco.txt | 21 ++++++++-
doc/setup-archive/setup-db.txt | 21 ++++++++-
doc/setup-archive/setup-fs.txt | 21 ++++++++-
doc/setup-archive/setup-network.txt | 21 ++++++++-
doc/setup-archive/setup-nodes.txt | 21 ++++++++-
doc/setup-archive/setup-ops.txt | 21 ++++++++-
doc/setup-archive/setup-power.txt | 21 ++++++++-
doc/setup-archive/setup.txt | 21 ++++++++-
doc/setup-archive/update-testbed.txt | 21 ++++++++-
event/API | 21 ++++++++-
event/API.PERL | 21 ++++++++-
event/API.PYTHON | 21 ++++++++-
event/GNUmakefile.in | 21 ++++++++-
event/etc/GNUmakefile.in | 21 ++++++++-
event/example/GNUmakefile.in | 21 ++++++++-
event/example/dumpevsubs.c | 21 ++++++++-
event/example/eventdebug.pl.in | 21 ++++++++-
event/example/tbrecv.c | 21 ++++++++-
event/example/tbrecv.pl.in | 21 ++++++++-
event/example/tbrecv.py.in | 21 ++++++++-
event/example/tbsend-short.pl.in | 21 ++++++++-
event/example/tbsend.c | 21 ++++++++-
event/example/tbsend.pl.in | 21 ++++++++-
event/example/tbsend.py.in | 21 ++++++++-
event/new_sched/GNUmakefile.in | 21 ++++++++-
event/new_sched/Makefile | 21 ++++++++-
event/new_sched/console-agent.cc | 21 ++++++++-
event/new_sched/console-agent.h | 21 ++++++++-
event/new_sched/elog2xplot | 21 ++++++++-
event/new_sched/error-record.c | 21 ++++++++-
event/new_sched/error-record.h | 21 ++++++++-
event/new_sched/event-sched.8 | 21 ++++++++-
event/new_sched/event-sched.c | 21 ++++++++-
event/new_sched/event-sched.h | 21 ++++++++-
event/new_sched/group-agent.c | 21 ++++++++-
event/new_sched/group-agent.h | 21 ++++++++-
event/new_sched/listNode.c | 21 ++++++++-
event/new_sched/listNode.h | 21 ++++++++-
event/new_sched/local-agent.c | 21 ++++++++-
event/new_sched/local-agent.h | 21 ++++++++-
event/new_sched/node-agent.cc | 21 ++++++++-
event/new_sched/node-agent.h | 21 ++++++++-
event/new_sched/queue.c | 21 ++++++++-
event/new_sched/rpc.cc | 21 ++++++++-
event/new_sched/rpc.h | 21 ++++++++-
event/new_sched/simulator-agent.cc | 21 ++++++++-
event/new_sched/simulator-agent.h | 21 ++++++++-
event/new_sched/timeline-agent.c | 21 ++++++++-
event/new_sched/timeline-agent.h | 21 ++++++++-
event/nsetrafgen/GNUmakefile.in | 21 ++++++++-
event/nsetrafgen/nseinput.tcl.in | 21 ++++++++-
event/nsetrafgen/startnse | 21 ++++++++-
event/nsetrafgen/tbevent.cc | 21 ++++++++-
event/nsetrafgen/tbevent.h | 21 ++++++++-
event/nsetrafgen/tbnexthop.cc | 21 ++++++++-
event/nsetrafgen/tbnexthop.h | 21 ++++++++-
event/proxy/GNUmakefile.in | 21 ++++++++-
event/proxy/eventping.c | 21 ++++++++-
event/proxy/proxyclient.c | 21 ++++++++-
event/proxy/proxyserver.c | 21 ++++++++-
event/proxy/version0_gateway.c | 21 ++++++++-
event/sched/GNUmakefile.in | 21 ++++++++-
event/sched/Makefile | 21 ++++++++-
event/sched/console-agent.cc | 21 ++++++++-
event/sched/console-agent.h | 21 ++++++++-
event/sched/elog2xplot | 21 ++++++++-
event/sched/error-record.c | 21 ++++++++-
event/sched/error-record.h | 21 ++++++++-
event/sched/event-sched.8 | 21 ++++++++-
event/sched/event-sched.c | 21 ++++++++-
event/sched/event-sched.h | 21 ++++++++-
event/sched/group-agent.c | 21 ++++++++-
event/sched/group-agent.h | 21 ++++++++-
event/sched/listNode.c | 21 ++++++++-
event/sched/listNode.h | 21 ++++++++-
event/sched/local-agent.c | 21 ++++++++-
event/sched/local-agent.h | 21 ++++++++-
event/sched/node-agent.cc | 21 ++++++++-
event/sched/node-agent.h | 21 ++++++++-
event/sched/queue.c | 21 ++++++++-
event/sched/rpc.cc | 21 ++++++++-
event/sched/rpc.h | 21 ++++++++-
event/sched/simulator-agent.cc | 21 ++++++++-
event/sched/simulator-agent.h | 21 ++++++++-
event/sched/timeline-agent.c | 21 ++++++++-
event/sched/timeline-agent.h | 21 ++++++++-
event/simple-agent/compile.sh | 21 ++++++++-
event/simple-agent/disk-agent.cc | 21 ++++++++-
event/simple-agent/main.cc | 21 ++++++++-
event/simple-agent/mkextrafs | 21 ++++++++-
event/simple-agent/tbdefs.h | 21 ++++++++-
event/stated/GNUmakefile.in | 21 ++++++++-
event/stated/StateWait.pm | 21 ++++++++-
event/stated/TimeoutQueue.pm | 21 ++++++++-
event/stated/stated.in | 21 ++++++++-
event/stated/waitForState.in | 21 ++++++++-
firewall/GNUmakefile.in | 21 ++++++++-
firewall/fw-rules | 21 ++++++++-
firewall/genconfig-iptables.pl | 21 ++++++++-
firewall/genconfig.pl | 21 ++++++++-
firewall/initfwvars.pl.in | 21 ++++++++-
firewall/iptables-fw-rules | 21 ++++++++-
flash/GNUmakefile.in | 21 ++++++++-
hyperviewer/GNUMakefile | 21 ++++++++-
hyperviewer/README | 30 ++++++++-----
hyperviewer/_hv.cpp | 30 ++++++++-----
hyperviewer/emulabclient.py | 21 ++++++++-
hyperviewer/exptToHv.py | 21 ++++++++-
hyperviewer/hv.i | 30 ++++++++-----
hyperviewer/hv.mod | 30 ++++++++-----
hyperviewer/hvFrameUI.py | 30 ++++++++-----
hyperviewer/hvmain.cpp | 30 ++++++++-----
hyperviewer/hypview | 30 ++++++++-----
hyperviewer/hypview.py | 30 ++++++++-----
hyperviewer/sshxmlrpc.py | 30 ++++++++-----
hyperviewer/win32/_hv.cpp | 30 ++++++++-----
image-test/ImageTest.pm | 21 ++++++++-
image-test/image-test | 21 ++++++++-
image-test/tests/lan/nsfile.ns | 21 ++++++++-
image-test/tests/linkdelay/nsfile.ns | 21 ++++++++-
image-test/tests/linktest-hilat/nsfile.ns | 21 ++++++++-
image-test/tests/linktest-lobw/nsfile.ns | 21 ++++++++-
image-test/tests/linktest-nse/nsfile.ns | 21 ++++++++-
image-test/tests/pair/nsfile.ns | 21 ++++++++-
image-test/tests/router-manual/nsfile.ns | 21 ++++++++-
image-test/tests/router-manual/tests.pl | 21 ++++++++-
image-test/tests/router/nsfile.ns | 21 ++++++++-
image-test/tests/router/tests.pl | 21 ++++++++-
image-test/tests/single/nsfile.ns | 21 ++++++++-
image-test/tests/single/tests.pl | 21 ++++++++-
image-test/tests/sync/nsfile.ns | 21 ++++++++-
image-test/tests/sync/tests.pl | 21 ++++++++-
image-test/tests/traffic-gen/nsfile.ns | 21 ++++++++-
image-test/tests/traffic-gen/tests.pl | 21 ++++++++-
install/GNUmakefile.in | 21 ++++++++-
install/boss-install.in | 21 ++++++++-
install/clrhouse-install.in | 21 ++++++++-
install/dump-descriptors.in | 21 ++++++++-
install/emulab-install.in | 21 ++++++++-
install/fs-install.in | 21 ++++++++-
install/genirack/GNUmakefile.in | 21 ++++++++-
install/genirack/initnodes.pl.in | 21 ++++++++-
install/images/README | 21 ++++++++-
install/installvars.pm.in | 21 ++++++++-
install/libinstall.pm.in | 21 ++++++++-
install/load-descriptors.in | 21 ++++++++-
install/newclient | 21 ++++++++-
install/newnode_sshkeys/GNUmakefile.in | 21 ++++++++-
install/old-install/boss-install.in | 21 ++++++++-
install/old-install/fs-install.in | 21 ++++++++-
install/old-install/ops-install.in | 21 ++++++++-
install/ops-install.in | 21 ++++++++-
install/testbed-version.in | 21 ++++++++-
install/update-install.in | 21 ++++++++-
install/update-mfs.in | 21 ++++++++-
install/update-testbed.in | 21 ++++++++-
ipod/GNUmakefile.in | 21 ++++++++-
ipod/apod.in | 21 ++++++++-
ipod/ipod.c | 21 ++++++++-
mote/GNUmakefile.in | 21 ++++++++-
mote/motelog/ElabACL.java | 21 ++++++++-
mote/motelog/ElabTrustManager.java | 21 ++++++++-
mote/motelog/FieldInfo.java | 21 ++++++++-
mote/motelog/LogPacket.java | 21 ++++++++-
mote/motelog/MoteLogger.java | 21 ++++++++-
mote/motelog/NCCSpecParser.java | 21 ++++++++-
mote/motelog/PacketReader.java | 21 ++++++++-
mote/motelog/SQLGenerator.java | 21 ++++++++-
mote/motelog/SpecData.java | 21 ++++++++-
mote/motelog/SynchQueue.java | 21 ++++++++-
mote/newmote.in | 21 ++++++++-
mote/powermon/powerMeasure/Makefile | 21 ++++++++-
mote/powermon/powerMeasure/exceptions.cpp | 21 ++++++++-
mote/powermon/powerMeasure/exceptions.h | 21 ++++++++-
mote/powermon/powerMeasure/main.cpp | 21 ++++++++-
mote/powermon/powerMeasure/powerMeasure.cpp | 21 ++++++++-
mote/powermon/powerMeasure/powerMeasure.h | 21 ++++++++-
mote/sgtools/GNUmakefile | 21 ++++++++-
mote/sgtools/GNUmakefile.in | 21 ++++++++-
mote/sgtools/SGGPIO.C | 21 ++++++++-
mote/sgtools/SGGPIO.h | 21 ++++++++-
mote/sgtools/moteleds.C | 21 ++++++++-
mote/sgtools/motepower.C | 21 ++++++++-
mote/sgtools/wagthedog.C | 21 ++++++++-
mote/tbsgmotepower.in | 21 ++++++++-
mote/tbuisp.in | 21 ++++++++-
named/GNUmakefile.in | 21 ++++++++-
named/named_makeconf.in | 21 ++++++++-
named/named_makeforw.in | 21 ++++++++-
named/named_makerev.in | 21 ++++++++-
node_usage/GNUmakefile.in | 21 ++++++++-
node_usage/analy.in | 21 ++++++++-
node_usage/analy2.in | 21 ++++++++-
node_usage/from_ptop.in | 21 ++++++++-
node_usage/gather.in | 21 ++++++++-
node_usage/get-start-date.in | 21 ++++++++-
node_usage/mk-php-pages.in | 42 ++++++++++++++++--
node_usage/mk-plots.in | 21 ++++++++-
node_usage/publish.in | 21 ++++++++-
node_usage/refresh.in | 21 ++++++++-
node_usage/sanity.in | 21 ++++++++-
os/GNUmakefile.in | 21 ++++++++-
os/create-image | 21 ++++++++-
os/create-swapimage | 21 ++++++++-
os/split-image.sh.in | 21 ++++++++-
os/template_record | 21 ++++++++-
patches/wireshark-1.8.0-emulab.patch | 21 ++++++++-
pelab/CorrelationR.sh | 21 ++++++++-
pelab/GNUmakefile | 21 ++++++++-
pelab/GNUmakefile.in | 21 ++++++++-
pelab/SanityCheck.py | 21 ++++++++-
pelab/UdpSanityCheck.py | 21 ++++++++-
pelab/auto-compile.sh | 21 ++++++++-
pelab/auto-pelab.ns | 21 ++++++++-
pelab/auto-pelab.tm | 21 ++++++++-
pelab/bgmon/Cmdqueue.pm | 21 ++++++++-
pelab/bgmon/GNUmakefile.in | 21 ++++++++-
pelab/bgmon/automanage.pl | 21 ++++++++-
pelab/bgmon/automanagerclient.pl | 21 ++++++++-
pelab/bgmon/bgmon.pl | 21 ++++++++-
pelab/bgmon/find-asymmetric | 21 ++++++++-
.../flexlab-canonicalization-misc-notes.txt | 21 ++++++++-
pelab/bgmon/fpingwrapper.pl | 21 ++++++++-
pelab/bgmon/getstats.pl | 21 ++++++++-
pelab/bgmon/iperfwrapper.pl | 21 ++++++++-
pelab/bgmon/libpelabdb.pm | 21 ++++++++-
pelab/bgmon/libwanetmon.pm | 21 ++++++++-
pelab/bgmon/manager.pl | 21 ++++++++-
pelab/bgmon/managerclient.pl | 21 ++++++++-
pelab/bgmon/opsrecv.pl | 21 ++++++++-
pelab/bgmon/packbgmon | 21 ++++++++-
pelab/bgmon/pair-data-stats.pl | 21 ++++++++-
pelab/bgmon/parsenodenames.pl | 21 ++++++++-
pelab/bgmon/pelab.sh | 21 ++++++++-
pelab/bgmon/runbgmon | 21 ++++++++-
pelab/bgmon/runopswanetmon.csh | 21 ++++++++-
pelab/bgmon/stopOpsWanetmon.pl | 21 ++++++++-
pelab/bgmon/testsend.pl | 21 ++++++++-
pelab/bgmon/wanetmon_meeting_7-6.txt | 21 ++++++++-
pelab/bgmon/wanetmon_overview.txt | 21 ++++++++-
.../backfill_dummynet/delayagent_callback.c | 21 ++++++++-
.../fbsd410/delay-agent/callback.c | 21 ++++++++-
.../fbsd410/delay-agent/main.h | 21 ++++++++-
pelab/bw-bottleneck/createClusters.pl | 21 ++++++++-
pelab/bw-bottleneck/multiplex-monitor.py | 21 ++++++++-
pelab/bw-bottleneck/sharedBottle.pl | 21 ++++++++-
pelab/bw-bottleneck/wavelet/WaveletR.sh | 21 ++++++++-
pelab/bw-bottleneck/wavelet/client.py | 21 ++++++++-
pelab/bw-bottleneck/wavelet/processDelay.py | 21 ++++++++-
pelab/bw-bottleneck/wavelet/server.py | 21 ++++++++-
pelab/cloudinfo-set | 21 ++++++++-
pelab/cloudinfo.in | 21 ++++++++-
pelab/common-env.sh | 21 ++++++++-
pelab/db/GNUmakefile.in | 21 ++++++++-
pelab/db/pelab_dbpush.in | 21 ++++++++-
pelab/db/pelab_opspush.in | 21 ++++++++-
pelab/db/pelab_opspush.proxy.in | 21 ++++++++-
pelab/db/pelab_sql_dbpush.in | 21 ++++++++-
pelab/dbmonitor/auto-dbmonitor.sh | 21 ++++++++-
pelab/dbmonitor/dbmonitor.pl | 21 ++++++++-
pelab/dbmonitor/libtbdb.pm | 21 ++++++++-
pelab/dbmonitor/run-dbmonitor.sh | 21 ++++++++-
pelab/flexdataclient.in | 21 ++++++++-
pelab/flexdatasrv.in | 21 ++++++++-
pelab/goodnodes.pl | 21 ++++++++-
pelab/init-by-file.pl | 21 ++++++++-
pelab/init-elabnodes.pl | 21 ++++++++-
pelab/install-tarball | 21 ++++++++-
pelab/iperfd/GNUmakefile | 21 ++++++++-
pelab/iperfd/iperfd.c | 21 ++++++++-
pelab/iplane/init-iplane.pl | 21 ++++++++-
pelab/iplane/iplane_pairwise.rb | 21 ++++++++-
pelab/libnetmon/GNUmakefile | 21 ++++++++-
pelab/libnetmon/instrument-simple.sh | 21 ++++++++-
pelab/libnetmon/instrument-standalone.sh | 21 ++++++++-
pelab/libnetmon/libnetmon-format3.txt | 21 ++++++++-
pelab/libnetmon/libnetmon.c | 20 ++++++++-
pelab/libnetmon/libnetmon.h | 20 ++++++++-
pelab/libnetmon/netmon.h | 20 ++++++++-
pelab/libnetmon/netmond.c | 20 ++++++++-
pelab/libnetmon/netmonup.c | 20 ++++++++-
pelab/libwanetmondb.pm | 21 ++++++++-
pelab/magent/CircularTraffic.cc | 21 ++++++++-
pelab/magent/CircularTraffic.h | 21 ++++++++-
pelab/magent/Command.cc | 21 ++++++++-
pelab/magent/Command.h | 21 ++++++++-
pelab/magent/CommandInput.h | 21 ++++++++-
pelab/magent/CommandOutput.h | 21 ++++++++-
pelab/magent/Connection.cc | 21 ++++++++-
pelab/magent/Connection.h | 21 ++++++++-
pelab/magent/ConnectionModel.h | 21 ++++++++-
pelab/magent/Decayer.cc | 21 ++++++++-
pelab/magent/Decayer.h | 21 ++++++++-
pelab/magent/DelaySensor.cc | 21 ++++++++-
pelab/magent/DelaySensor.h | 21 ++++++++-
pelab/magent/DirectInput.cc | 21 ++++++++-
pelab/magent/DirectInput.h | 21 ++++++++-
pelab/magent/EwmaThroughputSensor.cc | 21 ++++++++-
pelab/magent/EwmaThroughputSensor.h | 21 ++++++++-
pelab/magent/GNUmakefile | 21 ++++++++-
pelab/magent/KernelTcp.cc | 21 ++++++++-
pelab/magent/KernelTcp.h | 21 ++++++++-
pelab/magent/LeastSquaresThroughput.cc | 21 ++++++++-
pelab/magent/LeastSquaresThroughput.h | 21 ++++++++-
pelab/magent/Makefile | 21 ++++++++-
pelab/magent/MaxDelaySensor.cc | 21 ++++++++-
pelab/magent/MaxDelaySensor.h | 21 ++++++++-
pelab/magent/MinDelaySensor.cc | 21 ++++++++-
pelab/magent/MinDelaySensor.h | 21 ++++++++-
pelab/magent/PacketSensor.cc | 21 ++++++++-
pelab/magent/PacketSensor.h | 21 ++++++++-
pelab/magent/Sensor.cc | 21 ++++++++-
pelab/magent/Sensor.h | 21 ++++++++-
pelab/magent/SensorList.cc | 21 ++++++++-
pelab/magent/SensorList.h | 21 ++++++++-
pelab/magent/StateSensor.cc | 21 ++++++++-
pelab/magent/StateSensor.h | 21 ++++++++-
pelab/magent/TSThroughputSensor.cc | 21 ++++++++-
pelab/magent/TSThroughputSensor.h | 21 ++++++++-
pelab/magent/ThroughputSensor.cc | 21 ++++++++-
pelab/magent/ThroughputSensor.h | 21 ++++++++-
pelab/magent/Time.cc | 21 ++++++++-
pelab/magent/Time.h | 21 ++++++++-
pelab/magent/TrafficModel.h | 21 ++++++++-
pelab/magent/TrivialCommandOutput.cc | 21 ++++++++-
pelab/magent/TrivialCommandOutput.h | 21 ++++++++-
pelab/magent/UDP/DESIGN_RFC.txt | 21 ++++++++-
pelab/magent/UDP/README_UDP.txt | 21 ++++++++-
pelab/magent/UDP/UdpClientDir/Makefile.Client | 21 ++++++++-
.../UdpClientDir/UdpAvgThroughputSensor.cc | 21 ++++++++-
.../UDP/UdpClientDir/UdpAvgThroughputSensor.h | 21 ++++++++-
pelab/magent/UDP/UdpClientDir/UdpClient.cc | 21 ++++++++-
pelab/magent/UDP/UdpClientDir/UdpLibs.h | 21 ++++++++-
.../magent/UDP/UdpClientDir/UdpLossSensor.cc | 21 ++++++++-
pelab/magent/UDP/UdpClientDir/UdpLossSensor.h | 21 ++++++++-
.../UDP/UdpClientDir/UdpMaxDelaySensor.cc | 21 ++++++++-
.../UDP/UdpClientDir/UdpMaxDelaySensor.h | 21 ++++++++-
.../UDP/UdpClientDir/UdpMinDelaySensor.cc | 21 ++++++++-
.../UDP/UdpClientDir/UdpMinDelaySensor.h | 21 ++++++++-
.../magent/UDP/UdpClientDir/UdpPacketInfo.cc | 21 ++++++++-
pelab/magent/UDP/UdpClientDir/UdpPacketInfo.h | 21 ++++++++-
.../UDP/UdpClientDir/UdpPacketSensor.cc | 21 ++++++++-
.../magent/UDP/UdpClientDir/UdpPacketSensor.h | 21 ++++++++-
pelab/magent/UDP/UdpClientDir/UdpRttSensor.cc | 21 ++++++++-
pelab/magent/UDP/UdpClientDir/UdpRttSensor.h | 21 ++++++++-
pelab/magent/UDP/UdpClientDir/UdpSensor.cc | 21 ++++++++-
pelab/magent/UDP/UdpClientDir/UdpSensor.h | 21 ++++++++-
.../magent/UDP/UdpClientDir/UdpSensorList.cc | 21 ++++++++-
pelab/magent/UDP/UdpClientDir/UdpSensorList.h | 21 ++++++++-
pelab/magent/UDP/UdpClientDir/UdpState.h | 21 ++++++++-
.../UDP/UdpClientDir/UdpThroughputSensor.cc | 21 ++++++++-
.../UDP/UdpClientDir/UdpThroughputSensor.h | 21 ++++++++-
pelab/magent/UDP/UdpClientDir/makeGnuPlot.py | 21 ++++++++-
pelab/magent/UDP/UdpClientDir/plot.gp | 21 ++++++++-
pelab/magent/UDP/UdpClientDir/runClient.sh | 21 ++++++++-
.../magent/UDP/UdpClientDir/showTputGraph.sh | 21 ++++++++-
pelab/magent/UDP/UdpServerDir/GNUmakefile | 21 ++++++++-
pelab/magent/UDP/UdpServerDir/UdpServer.cc | 21 ++++++++-
pelab/magent/UDP/UdpServerDir/UdpServer.h | 21 ++++++++-
.../magent/UDP/UdpServerDir/makeServerPlot.py | 21 ++++++++-
pelab/magent/UDP/UdpServerDir/plot.gp | 21 ++++++++-
pelab/magent/UDP/UdpServerDir/runServer.sh | 21 ++++++++-
pelab/magent/UdpAvgThroughputSensor.cc | 21 ++++++++-
pelab/magent/UdpAvgThroughputSensor.h | 21 ++++++++-
pelab/magent/UdpLossSensor.cc | 21 ++++++++-
pelab/magent/UdpLossSensor.h | 21 ++++++++-
pelab/magent/UdpMaxDelaySensor.cc | 21 ++++++++-
pelab/magent/UdpMaxDelaySensor.h | 21 ++++++++-
pelab/magent/UdpMinDelaySensor.cc | 21 ++++++++-
pelab/magent/UdpMinDelaySensor.h | 21 ++++++++-
pelab/magent/UdpPacketSensor.cc | 21 ++++++++-
pelab/magent/UdpPacketSensor.h | 21 ++++++++-
pelab/magent/UdpRttSensor.cc | 21 ++++++++-
pelab/magent/UdpRttSensor.h | 21 ++++++++-
pelab/magent/UdpThroughputSensor.cc | 21 ++++++++-
pelab/magent/UdpThroughputSensor.h | 21 ++++++++-
pelab/magent/auto-magent.sh | 21 ++++++++-
pelab/magent/lib.cc | 21 ++++++++-
pelab/magent/lib.h | 21 ++++++++-
pelab/magent/libreplay.c | 20 ++++++++-
pelab/magent/libreplay.h | 20 ++++++++-
pelab/magent/log.cc | 21 ++++++++-
pelab/magent/log.h | 21 ++++++++-
pelab/magent/main.cc | 21 ++++++++-
pelab/magent/makeUdpPlots.py | 21 ++++++++-
pelab/magent/mock-monitor/compile.sh | 21 ++++++++-
pelab/magent/mock-monitor/udpmon.cc | 21 ++++++++-
pelab/magent/run-magent.sh | 21 ++++++++-
pelab/magent/saveload.cc | 21 ++++++++-
pelab/magent/saveload.h | 21 ++++++++-
pelab/make-tarball | 21 ++++++++-
pelab/manual-magent.sh | 21 ++++++++-
pelab/monitor/auto-monitor.sh | 21 ++++++++-
pelab/monitor/gen-ip-mapping.pl | 21 ++++++++-
pelab/monitor/instrument-env.sh | 21 ++++++++-
pelab/monitor/instrument.sh | 21 ++++++++-
pelab/monitor/monitor.py | 21 ++++++++-
pelab/monitor/run-fake.sh | 21 ++++++++-
pelab/monitor/run-iperf.sh | 21 ++++++++-
pelab/monitor/run-monitor-libnetmon.sh | 21 ++++++++-
pelab/monitor/run-monitor.sh | 21 ++++++++-
pelab/monitor/timediff.pl | 21 ++++++++-
pelab/netmond2tput.pl | 21 ++++++++-
pelab/opsdbcheck.pl | 21 ++++++++-
pelab/parastream/GNUmakefile | 21 ++++++++-
pelab/parastream/parastream.c | 21 ++++++++-
pelab/parastream/parastreamd.c | 21 ++++++++-
pelab/reset-elabc.pl | 21 ++++++++-
pelab/reset-plab.sh | 21 ++++++++-
pelab/resetlinks.py | 21 ++++++++-
pelab/run-sanity.sh | 21 ++++++++-
pelab/run-tcpdump.sh | 21 ++++++++-
pelab/schedmon/GNUmakefile | 21 ++++++++-
pelab/schedmon/mktar.sh | 21 ++++++++-
pelab/schedmon/schedmon-run.sh | 21 ++++++++-
pelab/schedmon/schedmon.c | 21 ++++++++-
pelab/showsamples.pl | 21 ++++++++-
pelab/start-experiment | 21 ++++++++-
pelab/start-run | 21 ++++++++-
pelab/stop-experiment | 21 ++++++++-
pelab/stop-run | 21 ++++++++-
pelab/stub/Makefile | 21 ++++++++-
pelab/stub/auto-stub.sh | 21 ++++++++-
pelab/stub/dumb-client.c | 21 ++++++++-
pelab/stub/dumb-server.c | 21 ++++++++-
pelab/stub/log.c | 21 ++++++++-
pelab/stub/log.h | 21 ++++++++-
pelab/stub/lookup.cc | 21 ++++++++-
pelab/stub/run-stub.sh | 21 ++++++++-
pelab/stub/stub-monitor.c | 21 ++++++++-
pelab/stub/stub-pcap.c | 21 ++++++++-
pelab/stub/stub.h | 21 ++++++++-
pelab/stub/stubd.c | 21 ++++++++-
pelab/stub/stubm.c | 21 ++++++++-
pelab/stub/which-iface.sh | 21 ++++++++-
pelab/supafly/GNUmakefile | 21 ++++++++-
pelab/supafly/cryptic-driver.pl | 21 ++++++++-
pelab/supafly/cryptic.c | 21 ++++++++-
pelab/supafly/crypto.c | 21 ++++++++-
pelab/supafly/crypto.h | 21 ++++++++-
pelab/supafly/defs.h | 21 ++++++++-
pelab/supafly/logparse.pl | 21 ++++++++-
pelab/supafly/scripts/log_analyzer.pl | 21 ++++++++-
pelab/supafly/scripts/plot.sh | 21 ++++++++-
pelab/supafly/sfmiddleman.c | 21 ++++++++-
pelab/supafly/sfreceiver.c | 21 ++++++++-
pelab/supafly/sfsender.c | 21 ++++++++-
pelab/supafly/util.c | 21 ++++++++-
pelab/supafly/util.h | 21 ++++++++-
protogeni/GNUmakefile.in | 27 +++++++++++-
protogeni/etc/GNUmakefile.in | 21 ++++++++-
protogeni/flack/LICENSES | 29 ++++++++++++-
.../flack/src/com/flack/emulab/EmulabMain.as | 41 ++++++++++++------
.../com/flack/emulab/display/DisplayUtil.as | 41 ++++++++++++------
.../flack/emulab/display/NameValueVgroup.mxml | 32 ++++++++++----
.../emulab/display/NumberValueVgroup.mxml | 32 ++++++++++----
.../display/PhysicalNodeItemRenderer.mxml | 32 ++++++++++----
.../emulab/display/PhysicalNodeList.mxml | 32 ++++++++++----
.../flack/emulab/display/VirtualLinkList.mxml | 32 ++++++++++----
.../display/VirtualNodeItemRenderer.mxml | 32 ++++++++++----
.../flack/emulab/display/VirtualNodeList.mxml | 32 ++++++++++----
.../display/areas/CreateExperimentArea.mxml | 32 ++++++++++----
.../emulab/display/areas/EmulabUserArea.mxml | 32 ++++++++++----
.../emulab/display/areas/ExperimentArea.mxml | 32 ++++++++++----
.../emulab/display/areas/ManagerArea.mxml | 32 ++++++++++----
.../emulab/display/areas/VirtualLinkArea.mxml | 32 ++++++++++----
.../areas/VirtualLinkCollectionArea.mxml | 32 ++++++++++----
.../emulab/display/areas/VirtualNodeArea.mxml | 32 ++++++++++----
.../areas/VirtualNodeCollectionArea.mxml | 32 ++++++++++----
.../emulab/display/areas/WelcomeArea.mxml | 32 ++++++++++----
.../experimenter/ExecuteServiceComponent.mxml | 32 ++++++++++----
.../display/experimenter/IComponentsArea.as | 41 ++++++++++++------
.../experimenter/InstallServiceComponent.mxml | 32 ++++++++++----
.../experimenter/elabview/ElabinelabView.mxml | 32 ++++++++++----
.../graphview/CanvasBranchLabel.mxml | 32 ++++++++++----
.../experimenter/graphview/CanvasLink.as | 41 ++++++++++++------
.../graphview/CanvasLinkCollection.as | 41 ++++++++++++------
.../graphview/CanvasLinkLabel.mxml | 32 ++++++++++----
.../experimenter/graphview/CanvasNode.mxml | 32 ++++++++++----
.../graphview/CanvasNodeCollection.as | 41 ++++++++++++------
.../graphview/ExperimentCanvas.mxml | 32 ++++++++++----
.../experimenter/nsview/ExperimentNsView.mxml | 32 ++++++++++----
.../display/panes/EmulabSearchPane.mxml | 32 ++++++++++----
.../emulab/display/panes/EmulabUserPane.mxml | 32 ++++++++++----
.../emulab/display/panes/ExperimentItem.mxml | 32 ++++++++++----
.../emulab/display/windows/LoginWindow.mxml | 32 ++++++++++----
.../display/windows/TextInputWindow.mxml | 32 ++++++++++----
.../com/flack/emulab/resources/EmulabUser.as | 41 ++++++++++++------
.../com/flack/emulab/resources/NamedObject.as | 41 ++++++++++++------
.../flack/emulab/resources/physical/Osid.as | 41 ++++++++++++------
.../resources/physical/OsidCollection.as | 41 ++++++++++++------
.../emulab/resources/physical/PhysicalNode.as | 41 ++++++++++++------
.../physical/PhysicalNodeCollection.as | 41 ++++++++++++------
.../emulab/resources/sites/EmulabManager.as | 41 ++++++++++++------
.../flack/emulab/resources/sites/Project.as | 41 ++++++++++++------
.../resources/sites/ProjectCollection.as | 41 ++++++++++++------
.../flack/emulab/resources/sites/Subgroup.as | 41 ++++++++++++------
.../resources/sites/SubgroupCollection.as | 41 ++++++++++++------
.../emulab/resources/virtual/ElabInElab.as | 41 ++++++++++++------
.../emulab/resources/virtual/Experiment.as | 41 ++++++++++++------
.../resources/virtual/ExperimentCollection.as | 41 ++++++++++++------
.../emulab/resources/virtual/Firewall.as | 41 ++++++++++++------
.../emulab/resources/virtual/NameValuePair.as | 41 ++++++++++++------
.../resources/virtual/NumberValuePair.as | 41 ++++++++++++------
.../emulab/resources/virtual/ProgramAgent.as | 41 ++++++++++++------
.../flack/emulab/resources/virtual/Queue.as | 41 ++++++++++++------
.../flack/emulab/resources/virtual/TarFile.as | 41 ++++++++++++------
.../emulab/resources/virtual/TrafficFlow.as | 41 ++++++++++++------
.../resources/virtual/TrafficGenerator.as | 41 ++++++++++++------
.../virtual/TrafficGeneratorCollection.as | 41 ++++++++++++------
.../resources/virtual/VirtualInterface.as | 41 ++++++++++++------
.../virtual/VirtualInterfaceCollection.as | 41 ++++++++++++------
.../emulab/resources/virtual/VirtualLink.as | 41 ++++++++++++------
.../virtual/VirtualLinkCollection.as | 41 ++++++++++++------
.../emulab/resources/virtual/VirtualNode.as | 41 ++++++++++++------
.../virtual/VirtualNodeCollection.as | 41 ++++++++++++------
.../emulab/resources/virtual/VirtualType.as | 41 ++++++++++++------
.../tasks/groups/GetExperimentTaskGroup.as | 41 ++++++++++++------
.../tasks/groups/GetManagerTaskGroup.as | 41 ++++++++++++------
.../emulab/tasks/groups/GetUserTaskGroup.as | 41 ++++++++++++------
.../tasks/groups/ResolveUserTaskGroup.as | 41 ++++++++++++------
.../emulab/tasks/http/GetUserCertTask.as | 41 ++++++++++++------
.../emulab/tasks/process/GenerateNsTask.as | 41 ++++++++++++------
.../emulab/tasks/xmlrpc/EmulabXmlrpcTask.as | 41 ++++++++++++------
.../EmulabExperimentConstraintsTask.as | 41 ++++++++++++------
.../experiment/EmulabExperimentEndExpTask.as | 41 ++++++++++++------
.../EmulabExperimentEventSysControlTask.as | 41 ++++++++++++------
.../experiment/EmulabExperimentExpInfoTask.as | 41 ++++++++++++------
.../experiment/EmulabExperimentGetListTask.as | 41 ++++++++++++------
.../experiment/EmulabExperimentGetVizTask.as | 41 ++++++++++++------
.../experiment/EmulabExperimentInfoTask.as | 41 ++++++++++++------
.../EmulabExperimentMetadataTask.as | 41 ++++++++++++------
.../experiment/EmulabExperimentModifyTask.as | 41 ++++++++++++------
.../experiment/EmulabExperimentNsCheckTask.as | 41 ++++++++++++------
.../experiment/EmulabExperimentNsFileTask.as | 41 ++++++++++++------
.../EmulabExperimentPortStatsTask.as | 41 ++++++++++++------
.../experiment/EmulabExperimentRebootTask.as | 41 ++++++++++++------
.../experiment/EmulabExperimentReloadTask.as | 41 ++++++++++++------
.../EmulabExperimentSaveLogsTask.as | 41 ++++++++++++------
.../EmulabExperimentStartExpTask.as | 41 ++++++++++++------
.../experiment/EmulabExperimentStateTask.as | 41 ++++++++++++------
.../experiment/EmulabExperimentSwapExpTask.as | 41 ++++++++++++------
.../EmulabExperimentVirtualTopologyTask.as | 41 ++++++++++++------
.../xmlrpc/node/EmulabNodeAdminModeTask.as | 41 ++++++++++++------
.../xmlrpc/node/EmulabNodeConsoleTask.as | 41 ++++++++++++------
.../xmlrpc/node/EmulabNodeCreateImageTask.as | 41 ++++++++++++------
.../xmlrpc/node/EmulabNodeGetListTask.as | 41 ++++++++++++------
.../xmlrpc/node/EmulabNodeHostKeysTask.as | 41 ++++++++++++------
.../tasks/xmlrpc/node/EmulabNodeRebootTask.as | 41 ++++++++++++------
.../tasks/xmlrpc/node/EmulabNodeReloadTask.as | 41 ++++++++++++------
.../node/EmulabNodeSshDescriptionTask.as | 41 ++++++++++++------
.../xmlrpc/osid/EmulabOsidGetListTask.as | 41 ++++++++++++------
.../xmlrpc/user/EmulabUserMembershipTask.as | 41 ++++++++++++------
.../flack/src/com/flack/geni/GeniCache.as | 41 ++++++++++++------
.../flack/src/com/flack/geni/GeniMain.as | 41 ++++++++++++------
.../flack/src/com/flack/geni/GeniUniverse.as | 41 ++++++++++++------
.../flack/src/com/flack/geni/RspecUtil.as | 41 ++++++++++++------
.../geni/display/AddAuthorityWindow.mxml | 32 ++++++++++----
.../geni/display/ChooseManagerWindow.mxml | 32 ++++++++++----
.../display/ChooseManagersToWatchWindow.mxml | 32 ++++++++++----
.../geni/display/CreateSliceControl.mxml | 32 ++++++++++----
.../src/com/flack/geni/display/DisplayUtil.as | 41 ++++++++++++------
.../geni/display/GeniDataGridRenderer.mxml | 34 ++++++++++-----
.../com/flack/geni/display/InterfaceList.mxml | 32 ++++++++++----
.../geni/display/LogMessageItemRenderer.mxml | 32 ++++++++++----
.../flack/geni/display/PhysicalLinkList.mxml | 32 ++++++++++----
.../display/PhysicalNodeItemRenderer.mxml | 32 ++++++++++----
.../flack/geni/display/PhysicalNodeList.mxml | 32 ++++++++++----
.../geni/display/SliverTypesControl.mxml | 32 ++++++++++----
.../flack/geni/display/VirtualLinkList.mxml | 32 ++++++++++----
.../geni/display/VirtualNodeItemRenderer.mxml | 32 ++++++++++----
.../flack/geni/display/VirtualNodeList.mxml | 32 ++++++++++----
.../geni/display/areas/AddManagerArea.mxml | 32 ++++++++++----
.../geni/display/areas/ExampleSlicesArea.mxml | 32 ++++++++++----
.../geni/display/areas/GeniUserArea.mxml | 32 ++++++++++----
.../flack/geni/display/areas/ManagerArea.mxml | 32 ++++++++++----
.../display/areas/PhysicalInterfaceArea.mxml | 32 ++++++++++----
.../PhysicalInterfaceCollectionArea.mxml | 32 ++++++++++----
.../geni/display/areas/PhysicalLinkArea.mxml | 32 ++++++++++----
.../areas/PhysicalLinkCollectionArea.mxml | 32 ++++++++++----
.../geni/display/areas/PhysicalNodeArea.mxml | 32 ++++++++++----
.../areas/PhysicalNodeCollectionArea.mxml | 32 ++++++++++----
.../flack/geni/display/areas/SliceArea.mxml | 32 ++++++++++----
.../geni/display/areas/SliceLoginsArea.mxml | 32 ++++++++++----
.../geni/display/areas/VirtualLinkArea.mxml | 32 ++++++++++----
.../areas/VirtualLinkCollectionArea.mxml | 32 ++++++++++----
.../geni/display/areas/VirtualNodeArea.mxml | 32 ++++++++++----
.../areas/VirtualNodeCollectionArea.mxml | 32 ++++++++++----
.../com/flack/geni/display/mapping/GeniMap.as | 41 ++++++++++++------
.../geni/display/mapping/GeniMapHandler.as | 41 ++++++++++++------
.../flack/geni/display/mapping/GeniMapLink.as | 41 ++++++++++++------
.../geni/display/mapping/GeniMapNodeMarker.as | 41 ++++++++++++------
.../geni/display/mapping/LatitudeLongitude.as | 41 ++++++++++++------
.../mapping/LatitudeLongitudeBounds.as | 41 ++++++++++++------
.../mapproviders/esriprovider/EsriMap.mxml | 32 ++++++++++----
.../mapproviders/esriprovider/EsriMapLink.as | 41 ++++++++++++------
.../esriprovider/EsriMapLinkMarker.as | 41 ++++++++++++------
.../esriprovider/EsriMapLinkMarkerSymbol.as | 41 ++++++++++++------
.../esriprovider/EsriMapNodeMarker.as | 41 ++++++++++++------
.../esriprovider/EsriMapNodeMarkerInfo.mxml | 32 ++++++++++----
.../esriprovider/EsriMapNodeMarkerSymbol.as | 41 ++++++++++++------
.../googlemapsprovider/GoogleMap.mxml | 32 ++++++++++----
.../googlemapsprovider/GoogleMapLink.as | 41 ++++++++++++------
.../GoogleMapLocationMarker.as | 41 ++++++++++++------
.../GoogleMapLocationMarkerIcon.as | 41 ++++++++++++------
.../GoogleMapLocationMarkerInfo.mxml | 34 ++++++++++-----
.../GoogleZoomToAllControl.as | 41 ++++++++++++------
.../mapquestprovider/MapquestMapLink.as | 41 ++++++++++++------
.../mapquestprovider/MapquestMapNodeMarker.as | 41 ++++++++++++------
.../mapquestprovider/MapquestTilemap.mxml | 32 ++++++++++----
.../geni/display/panes/GeniResourcesPane.mxml | 32 ++++++++++----
.../geni/display/panes/GeniSearchPane.mxml | 32 ++++++++++----
.../flack/geni/display/panes/ManagerItem.mxml | 32 ++++++++++----
.../geni/display/panes/ManagersPane.mxml | 32 ++++++++++----
.../flack/geni/display/panes/SliceItem.mxml | 32 ++++++++++----
.../flack/geni/display/panes/UserPane.mxml | 32 ++++++++++----
.../slicer/ExecuteServiceComponent.mxml | 32 ++++++++++----
.../geni/display/slicer/IComponentsArea.as | 41 ++++++++++++------
.../display/slicer/ImportSliceWindow.mxml | 32 ++++++++++----
.../slicer/InstallServiceComponent.mxml | 32 ++++++++++----
.../display/slicer/ManagerVirtualArea.mxml | 32 ++++++++++----
.../display/slicer/ManagersVirtualPane.mxml | 32 ++++++++++----
.../geni/display/slicer/SliverInfoArea.mxml | 32 ++++++++++----
.../geni/display/slicer/SliversPane.mxml | 32 ++++++++++----
.../display/slicer/graphview/CanvasLink.as | 41 ++++++++++++------
.../slicer/graphview/CanvasLinkBranch.mxml | 32 ++++++++++----
.../slicer/graphview/CanvasLinkCollection.as | 41 ++++++++++++------
.../slicer/graphview/CanvasLinkMain.mxml | 32 ++++++++++----
.../display/slicer/graphview/CanvasNode.mxml | 32 ++++++++++----
.../slicer/graphview/CanvasNodeCollection.as | 41 ++++++++++++------
.../display/slicer/graphview/SliceCanvas.mxml | 32 ++++++++++----
.../display/slicer/listview/ListLink.mxml | 32 ++++++++++----
.../display/slicer/listview/ListNode.mxml | 32 ++++++++++----
.../display/slicer/listview/SliceList.mxml | 32 ++++++++++----
.../geni/display/windows/LoginWindow.mxml | 32 ++++++++++----
.../geni/display/windows/StartWindow.mxml | 32 ++++++++++----
.../src/com/flack/geni/plugins/Plugin.as | 41 ++++++++++++------
.../com/flack/geni/plugins/PluginArea.mxml | 32 ++++++++++----
.../geni/plugins/RspecProcessInterface.as | 41 ++++++++++++------
.../flack/geni/plugins/SliverTypeInterface.as | 41 ++++++++++++------
.../flack/geni/plugins/SliverTypePart.mxml | 32 ++++++++++----
.../flack/geni/plugins/emulab/DelayGrid.mxml | 32 ++++++++++----
.../geni/plugins/emulab/DelaySliverType.as | 41 ++++++++++++------
.../com/flack/geni/plugins/emulab/Emulab.as | 41 ++++++++++++------
.../flack/geni/plugins/emulab/EmulabArea.mxml | 32 ++++++++++----
.../plugins/emulab/EmulabBbgSliverType.as | 41 ++++++++++++------
.../plugins/emulab/EmulabOpenVzSliverType.as | 41 ++++++++++++------
.../plugins/emulab/EmulabSppSliverType.as | 41 ++++++++++++------
.../geni/plugins/emulab/FirewallSliverType.as | 41 ++++++++++++------
.../geni/plugins/emulab/FirewallVgroup.mxml | 32 ++++++++++----
.../geni/plugins/emulab/Netfpga2SliverType.as | 41 ++++++++++++------
.../src/com/flack/geni/plugins/emulab/Pipe.as | 41 ++++++++++++------
.../geni/plugins/emulab/PipeCollection.as | 41 ++++++++++++------
.../geni/plugins/emulab/RawPcSliverType.as | 41 ++++++++++++------
.../flack/geni/plugins/instools/Instools.as | 43 +++++++++++++------
.../geni/plugins/instools/InstoolsArea.mxml | 36 +++++++++++-----
.../plugins/instools/SliceInstoolsDetails.as | 43 +++++++++++++------
.../instools/instasks/AddMCNodeTask.as | 43 +++++++++++++------
.../instools/instasks/AddMCNodesTaskGroup.as | 43 +++++++++++++------
.../instasks/CreateMCNodesTaskGroup.as | 43 +++++++++++++------
.../instools/instasks/InstoolsVersionTask.as | 43 +++++++++++++------
.../instasks/InstoolsVersionsTaskGroup.as | 43 +++++++++++++------
.../instasks/InstrumentizeSliceGroupTask.as | 43 +++++++++++++------
.../instools/instasks/InstrumentizeTask.as | 43 +++++++++++++------
.../instasks/PollInstoolsStatusTask.as | 43 +++++++++++++------
.../instasks/PollInstoolsStatusTaskGroup.as | 43 +++++++++++++------
.../instools/instasks/SaveManifestTask.as | 43 +++++++++++++------
.../instasks/SaveManifestTaskGroup.as | 43 +++++++++++++------
.../flack/geni/plugins/openflow/Openflow.as | 41 ++++++++++++------
.../openflow/OpenflowRspecProcessor.as | 41 ++++++++++++------
.../flack/geni/plugins/planetlab/FwRule.as | 41 ++++++++++++------
.../plugins/planetlab/FwRuleComponent.mxml | 32 ++++++++++----
.../plugins/planetlab/M1LargeSliverType.as | 41 ++++++++++++------
.../plugins/planetlab/M1MediumSliverType.as | 41 ++++++++++++------
.../plugins/planetlab/M1SmallSliverType.as | 41 ++++++++++++------
.../plugins/planetlab/M1TinySliverType.as | 41 ++++++++++++------
.../plugins/planetlab/M1WorkerSliverType.as | 41 ++++++++++++------
.../plugins/planetlab/M1XLargeSliverType.as | 41 ++++++++++++------
.../plugins/planetlab/OpenStackSliverType.as | 41 ++++++++++++------
.../plugins/planetlab/OpenStackVgroup.mxml | 32 ++++++++++----
.../flack/geni/plugins/planetlab/Planetlab.as | 41 ++++++++++++------
.../geni/plugins/planetlab/PlanetlabArea.mxml | 32 ++++++++++----
.../plugins/planetlab/PlanetlabSliverType.as | 41 ++++++++++++------
.../plugins/planetlab/PlanetlabVgroup.mxml | 32 ++++++++++----
.../shadownet/JuniperRouterSliverType.as | 41 ++++++++++++------
.../flack/geni/plugins/shadownet/Shadownet.as | 41 ++++++++++++------
.../src/com/flack/geni/resources/DiskImage.as | 41 ++++++++++++------
.../geni/resources/ExtensionAttribute.as | 41 ++++++++++++------
.../flack/geni/resources/ExtensionSpace.as | 41 ++++++++++++------
.../resources/ExtensionSpaceCollection.as | 41 ++++++++++++------
.../com/flack/geni/resources/Extensions.as | 41 ++++++++++++------
.../src/com/flack/geni/resources/GeniUser.as | 41 ++++++++++++------
.../src/com/flack/geni/resources/Property.as | 41 ++++++++++++------
.../geni/resources/PropertyCollection.as | 41 ++++++++++++------
.../com/flack/geni/resources/SliverType.as | 41 ++++++++++++------
.../geni/resources/SliverTypeCollection.as | 41 ++++++++++++------
.../com/flack/geni/resources/SliverTypes.as | 41 ++++++++++++------
.../geni/resources/docs/GeniCredential.as | 41 ++++++++++++------
.../resources/physical/DiskImageCollection.as | 41 ++++++++++++------
.../geni/resources/physical/HardwareType.as | 41 ++++++++++++------
.../physical/HardwareTypeCollection.as | 41 ++++++++++++------
.../geni/resources/physical/MapLocation.as | 41 ++++++++++++------
.../resources/physical/PhysicalInterface.as | 41 ++++++++++++------
.../physical/PhysicalInterfaceCollection.as | 41 ++++++++++++------
.../geni/resources/physical/PhysicalLink.as | 41 ++++++++++++------
.../physical/PhysicalLinkCollection.as | 41 ++++++++++++------
.../resources/physical/PhysicalLocation.as | 41 ++++++++++++------
.../physical/PhysicalLocationCollection.as | 41 ++++++++++++------
.../geni/resources/physical/PhysicalNode.as | 41 ++++++++++++------
.../physical/PhysicalNodeCollection.as | 41 ++++++++++++------
.../geni/resources/sites/GeniAuthority.as | 41 ++++++++++++------
.../sites/GeniAuthorityCollection.as | 41 ++++++++++++------
.../flack/geni/resources/sites/GeniManager.as | 41 ++++++++++++------
.../resources/sites/GeniManagerCollection.as | 41 ++++++++++++------
.../geni/resources/sites/SupportedLinkType.as | 41 ++++++++++++------
.../sites/SupportedLinkTypeCollection.as | 41 ++++++++++++------
.../resources/sites/SupportedSliverType.as | 41 ++++++++++++------
.../sites/SupportedSliverTypeCollection.as | 41 ++++++++++++------
.../authorities/ProtogeniSliceAuthority.as | 41 ++++++++++++------
.../clearinghouses/ProtogeniClearinghouse.as | 41 ++++++++++++------
.../managers/OpenflowAggregateManager.as | 41 ++++++++++++------
.../managers/PlanetlabAggregateManager.as | 41 ++++++++++++------
.../managers/ProtogeniComponentManager.as | 41 ++++++++++++------
.../geni/resources/virtual/ComponentHop.as | 41 ++++++++++++------
.../geni/resources/virtual/ExecuteService.as | 41 ++++++++++++------
.../resources/virtual/GeniManagerReference.as | 41 ++++++++++++------
.../virtual/GeniManagerReferenceCollection.as | 41 ++++++++++++------
.../com/flack/geni/resources/virtual/Host.as | 41 ++++++++++++------
.../geni/resources/virtual/InstallService.as | 41 ++++++++++++------
.../com/flack/geni/resources/virtual/Ip.as | 41 ++++++++++++------
.../flack/geni/resources/virtual/LinkType.as | 41 ++++++++++++------
.../geni/resources/virtual/LoginService.as | 41 ++++++++++++------
.../flack/geni/resources/virtual/Services.as | 41 ++++++++++++------
.../com/flack/geni/resources/virtual/Slice.as | 41 ++++++++++++------
.../geni/resources/virtual/SliceCollection.as | 41 ++++++++++++------
.../flack/geni/resources/virtual/Sliver.as | 41 ++++++++++++------
.../resources/virtual/SliverCollection.as | 41 ++++++++++++------
.../virtual/SliverCollectionCollection.as | 41 ++++++++++++------
.../resources/virtual/VirtualComponent.as | 41 ++++++++++++------
.../resources/virtual/VirtualInterface.as | 41 ++++++++++++------
.../virtual/VirtualInterfaceCollection.as | 41 ++++++++++++------
.../virtual/VirtualInterfaceReference.as | 41 ++++++++++++------
.../VirtualInterfaceReferenceCollection.as | 41 ++++++++++++------
.../geni/resources/virtual/VirtualLink.as | 41 ++++++++++++------
.../virtual/VirtualLinkCollection.as | 41 ++++++++++++------
.../geni/resources/virtual/VirtualNode.as | 41 ++++++++++++------
.../virtual/VirtualNodeCollection.as | 41 ++++++++++++------
.../virtual/extensions/ClientInfo.as | 41 ++++++++++++------
.../virtual/extensions/LinkFlackInfo.as | 41 ++++++++++++------
.../resources/virtual/extensions/MCInfo.as | 41 ++++++++++++------
.../virtual/extensions/NodeFlackInfo.as | 41 ++++++++++++------
.../virtual/extensions/SliceFlackInfo.as | 41 ++++++++++++------
.../extensions/slicehistory/SliceHistory.as | 41 ++++++++++++------
.../slicehistory/SliceHistoryItem.as | 41 ++++++++++++------
.../tasks/groups/GetCertBundlesTaskGroup.as | 41 ++++++++++++------
.../geni/tasks/groups/GetManagerTaskGroup.as | 41 ++++++++++++------
.../groups/GetPublicResourcesTaskGroup.as | 41 ++++++++++++------
.../tasks/groups/GetResourcesTaskGroup.as | 41 ++++++++++++------
.../geni/tasks/groups/GetUserTaskGroup.as | 41 ++++++++++++------
.../tasks/groups/InitializeUserTaskGroup.as | 41 ++++++++++++------
.../geni/tasks/groups/ResolveUserTaskGroup.as | 41 ++++++++++++------
.../groups/slice/CreateSliceTaskGroup.as | 41 ++++++++++++------
.../groups/slice/CreateSliversTaskGroup.as | 41 ++++++++++++------
.../groups/slice/DeleteSliversTaskGroup.as | 41 ++++++++++++------
.../tasks/groups/slice/GetSliceTaskGroup.as | 41 ++++++++++++------
.../groups/slice/ImportSliceTaskGroup.as | 41 ++++++++++++------
.../slice/RefreshSliceStatusTaskGroup.as | 41 ++++++++++++------
.../tasks/groups/slice/RenewSliceTaskGroup.as | 41 ++++++++++++------
.../groups/slice/RestartSliceTaskGroup.as | 41 ++++++++++++------
.../slice/RevertToManifestsTaskGroup.as | 41 ++++++++++++------
.../tasks/groups/slice/StartSliceTaskGroup.as | 41 ++++++++++++------
.../tasks/groups/slice/StopSliceTaskGroup.as | 41 ++++++++++++------
.../groups/slice/SubmitSliceTaskGroup.as | 41 ++++++++++++------
.../groups/slice/UpdateSliversTaskGroup.as | 41 ++++++++++++------
.../tasks/http/PublicListAuthoritiesTask.as | 41 ++++++++++++------
.../geni/tasks/http/PublicListManagersTask.as | 41 ++++++++++++------
.../tasks/http/PublicListResourcesTask.as | 41 ++++++++++++------
.../geni/tasks/process/GenerateNsTask.as | 41 ++++++++++++------
.../process/GenerateRequestManifestTask.as | 41 ++++++++++++------
.../tasks/process/ParseAdvertisementTask.as | 41 ++++++++++++------
.../tasks/process/ParseRequestManifestTask.as | 41 ++++++++++++------
.../tasks/process/StartImportSliceTask.as | 41 ++++++++++++------
.../geni/tasks/tests/AuthorityTestGroup.as | 41 ++++++++++++------
.../tasks/tests/ClearinghouseTestGroup.as | 41 ++++++++++++------
.../tests/ManagerAdvertisementsTestGroup.as | 41 ++++++++++++------
.../tasks/tests/ManagerAllocationTestGroup.as | 41 ++++++++++++------
.../geni/tasks/tests/TestCcrTaskGroup.as | 41 ++++++++++++------
.../tests/TestCombineMultipleTaskGroup.as | 41 ++++++++++++------
.../tests/TestSliceFailureModesTaskGroup.as | 41 ++++++++++++------
.../tasks/tests/TestSliceHistoryTaskGroup.as | 41 ++++++++++++------
.../tests/TestSliceSuccessModesTaskGroup.as | 41 ++++++++++++------
.../flack/geni/tasks/tests/TestTaskGroup.as | 41 ++++++++++++------
.../flack/geni/tasks/tests/TestsliceRspec.as | 41 ++++++++++++------
.../geni/tasks/tests/TestsliceRspecLeft.as | 41 ++++++++++++------
.../geni/tasks/tests/TestsliceRspecRight.as | 41 ++++++++++++------
.../geni/tasks/xmlrpc/am/AllocateTask.as | 41 ++++++++++++------
.../geni/tasks/xmlrpc/am/AmXmlrpcTask.as | 41 ++++++++++++------
.../geni/tasks/xmlrpc/am/CreateSliverTask.as | 41 ++++++++++++------
.../flack/geni/tasks/xmlrpc/am/DeleteTask.as | 41 ++++++++++++------
.../geni/tasks/xmlrpc/am/GetVersionTask.as | 41 ++++++++++++------
.../xmlrpc/am/ListManagerResourcesTask.as | 41 ++++++++++++------
.../xmlrpc/am/ListSliverResourcesTask.as | 41 ++++++++++++------
.../geni/tasks/xmlrpc/am/ProvisionTask.as | 41 ++++++++++++------
.../flack/geni/tasks/xmlrpc/am/RenewTask.as | 41 ++++++++++++------
.../flack/geni/tasks/xmlrpc/am/StatusTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/ProtogeniXmlrpcTask.as | 41 ++++++++++++------
.../protogeni/ch/ListComponentsChTask.as | 41 ++++++++++++------
.../tasks/xmlrpc/protogeni/ch/WhoAmIChTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/cm/CreateImageCmTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/cm/CreateSliverCmTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/cm/DeleteSliverCmTask.as | 41 ++++++++++++------
.../protogeni/cm/DiscoverResourcesCmTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/cm/GetSliverCmTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/cm/GetTicketCmTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/cm/GetVersionCmTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/cm/RedeemTicketCmTask.as | 41 ++++++++++++------
.../protogeni/cm/ReleaseTicketCmTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/cm/RenewSliverCmTask.as | 41 ++++++++++++------
.../protogeni/cm/ResolveSliverCmTask.as | 41 ++++++++++++------
.../protogeni/cm/RestartSliverCmTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/cm/SliverStatusCmTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/cm/StartSliverCmTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/cm/StopSliverCmTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/cm/UpdateSliverCmTask.as | 41 ++++++++++++------
.../protogeni/sa/GetSliceCredentialSaTask.as | 41 ++++++++++++------
.../protogeni/sa/GetUserCredentialSaTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/sa/GetUserKeysSaTask.as | 41 ++++++++++++------
.../protogeni/sa/RegisterSliceSaTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/sa/RemoveSliceSaTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/sa/RenewSliceSaTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/sa/ResolveSliceSaTask.as | 41 ++++++++++++------
.../xmlrpc/protogeni/sa/ResolveUserSaTask.as | 41 ++++++++++++------
.../src/com/flack/shared/FlackDispatcher.as | 41 ++++++++++++------
.../flack/src/com/flack/shared/FlackEvent.as | 41 ++++++++++++------
.../flack/src/com/flack/shared/SharedCache.as | 41 ++++++++++++------
.../flack/src/com/flack/shared/SharedMain.as | 41 ++++++++++++------
.../flack/shared/display/TaskGroupPeek.mxml | 32 ++++++++++----
.../flack/shared/display/TaskGroupView.mxml | 32 ++++++++++----
.../com/flack/shared/display/TaskPeek.mxml | 32 ++++++++++----
.../com/flack/shared/display/TaskView.mxml | 32 ++++++++++----
.../flack/shared/display/areas/AboutArea.mxml | 32 ++++++++++----
.../com/flack/shared/display/areas/Area.mxml | 32 ++++++++++----
.../shared/display/areas/AreaContent.mxml | 32 ++++++++++----
.../shared/display/areas/AreaHistoryItem.mxml | 32 ++++++++++----
.../shared/display/areas/DocumentArea.mxml | 32 ++++++++++----
.../shared/display/areas/DocumentsArea.mxml | 32 ++++++++++----
.../shared/display/areas/LogMessageArea.mxml | 32 ++++++++++----
.../areas/LogMessagesRelatedToArea.mxml | 32 ++++++++++----
.../shared/display/areas/MapContent.mxml | 32 ++++++++++----
.../flack/shared/display/areas/TaskArea.mxml | 32 ++++++++++----
.../shared/display/areas/TaskGroupArea.mxml | 32 ++++++++++----
.../shared/display/areas/TaskerArea.mxml | 32 ++++++++++----
.../display/components/AdvancedTextArea.mxml | 32 ++++++++++----
.../shared/display/components/DataButton.as | 41 ++++++++++++------
.../display/components/DefaultLine.mxml | 32 ++++++++++----
.../display/components/DefaultWindow.mxml | 32 ++++++++++----
.../display/components/DocumentWindow.mxml | 32 ++++++++++----
.../shared/display/components/ImageButton.as | 41 ++++++++++++------
.../shared/display/components/MenuButton.mxml | 32 ++++++++++----
.../components/MultiDocumentWindow.mxml | 32 ++++++++++----
.../display/components/NumericEditor.mxml | 32 ++++++++++----
.../components/NumericGridRenderer.mxml | 34 ++++++++++-----
.../display/components/PopupTitleWindow.as | 41 ++++++++++++------
.../display/components/TextInputWindow.mxml | 32 ++++++++++----
.../flack/shared/display/panes/TaskPane.mxml | 32 ++++++++++----
.../com/flack/shared/logging/LogMessage.as | 41 ++++++++++++------
.../shared/logging/LogMessageCollection.as | 41 ++++++++++++------
.../src/com/flack/shared/logging/Logger.as | 41 ++++++++++++------
.../com/flack/shared/resources/FlackUser.as | 41 ++++++++++++------
.../shared/resources/IdentifiableObject.as | 41 ++++++++++++------
.../src/com/flack/shared/resources/IdnUrn.as | 41 ++++++++++++------
.../com/flack/shared/resources/docs/Rspec.as | 41 ++++++++++++------
.../shared/resources/docs/RspecVersion.as | 41 ++++++++++++------
.../resources/docs/RspecVersionCollection.as | 41 ++++++++++++------
.../resources/physical/PhysicalComponent.as | 41 ++++++++++++------
.../shared/resources/sites/ApiDetails.as | 41 ++++++++++++------
.../shared/resources/sites/FlackManager.as | 41 ++++++++++++------
.../flack/shared/tasks/ParallelTaskGroup.as | 41 ++++++++++++------
.../com/flack/shared/tasks/SerialTaskGroup.as | 41 ++++++++++++------
.../flack/src/com/flack/shared/tasks/Task.as | 41 ++++++++++++------
.../com/flack/shared/tasks/TaskCollection.as | 41 ++++++++++++------
.../src/com/flack/shared/tasks/TaskError.as | 41 ++++++++++++------
.../src/com/flack/shared/tasks/TaskEvent.as | 41 ++++++++++++------
.../src/com/flack/shared/tasks/TaskGroup.as | 41 ++++++++++++------
.../src/com/flack/shared/tasks/Tasker.as | 41 ++++++++++++------
.../com/flack/shared/tasks/file/FileTask.as | 41 ++++++++++++------
.../com/flack/shared/tasks/http/HttpTask.as | 41 ++++++++++++------
.../com/flack/shared/tasks/http/JsHttpTask.as | 41 ++++++++++++------
.../flack/shared/tasks/xmlrpc/XmlrpcTask.as | 41 ++++++++++++------
.../flack/shared/tasks/xmlrpc/XmlrpcUtil.as | 41 ++++++++++++------
.../src/com/flack/shared/utils/ArrayUtil.as | 41 ++++++++++++------
.../src/com/flack/shared/utils/ColorUtil.as | 37 +++++++++++-----
.../com/flack/shared/utils/CompressUtil.as | 41 ++++++++++++------
.../src/com/flack/shared/utils/ImageUtil.as | 37 +++++++++++-----
.../src/com/flack/shared/utils/MathUtil.as | 41 ++++++++++++------
.../src/com/flack/shared/utils/NetUtil.as | 41 ++++++++++++------
.../src/com/flack/shared/utils/StringUtil.as | 41 ++++++++++++------
.../src/com/flack/shared/utils/ViewUtil.as | 37 +++++++++++-----
protogeni/flack/src/com/mstrum/Asn1Classes.as | 41 ++++++++++++------
protogeni/flack/src/com/mstrum/Asn1Field.as | 41 ++++++++++++------
protogeni/flack/src/com/mstrum/Asn1Tags.as | 41 ++++++++++++------
protogeni/flack/src/com/mstrum/DER.as | 41 ++++++++++++------
protogeni/flack/src/com/mstrum/Oids.as | 41 ++++++++++++------
protogeni/flack/src/flack.mxml | 32 ++++++++++----
protogeni/install/configure.in | 21 ++++++++-
protogeni/lib/GNUmakefile.in | 27 +++++++++++-
protogeni/lib/GeniAM.pm.in | 27 +++++++++++-
protogeni/lib/GeniAggregate.pm.in | 27 +++++++++++-
protogeni/lib/GeniAuthority.pm.in | 27 +++++++++++-
protogeni/lib/GeniCH.pm.in | 27 +++++++++++-
protogeni/lib/GeniCM.pm.in | 27 +++++++++++-
protogeni/lib/GeniCMV2.pm.in | 27 +++++++++++-
protogeni/lib/GeniCertificate.pm.in | 27 +++++++++++-
protogeni/lib/GeniComponent.pm.in | 27 +++++++++++-
protogeni/lib/GeniCredential.pm.in | 27 +++++++++++-
protogeni/lib/GeniDB.pm.in | 27 +++++++++++-
protogeni/lib/GeniEmulab.pm.in | 27 +++++++++++-
protogeni/lib/GeniEmulabUtil.pm.in | 27 +++++++++++-
protogeni/lib/GeniFoam.pm.in | 27 +++++++++++-
protogeni/lib/GeniHRN.pm.in | 27 +++++++++++-
protogeni/lib/GeniRegistry.pm.in | 27 +++++++++++-
protogeni/lib/GeniResource.pm.in | 27 +++++++++++-
protogeni/lib/GeniSA.pm.in | 27 +++++++++++-
protogeni/lib/GeniSES.pm.in | 27 +++++++++++-
protogeni/lib/GeniSlice.pm.in | 27 +++++++++++-
protogeni/lib/GeniSliver.pm.in | 27 +++++++++++-
protogeni/lib/GeniTicket.pm.in | 27 +++++++++++-
protogeni/lib/GeniUsage.pm.in | 27 +++++++++++-
protogeni/lib/GeniUser.pm.in | 27 +++++++++++-
protogeni/lib/GeniUtil.pm.in | 27 +++++++++++-
protogeni/lib/GeniXML.pm.in | 27 +++++++++++-
protogeni/lib/genischemacheck.pl.in | 27 +++++++++++-
protogeni/lib/plabnodewrapper.in | 27 +++++++++++-
protogeni/lib/plabslicewrapper.in | 27 +++++++++++-
protogeni/protogeniflash/src/Main.as | 37 +++++++++++-----
.../src/protogeni/ProtogeniHandler.as | 37 +++++++++++-----
.../protogeniflash/src/protogeni/Util.as | 37 +++++++++++-----
.../communication/CommunicationUtil.as | 37 +++++++++++-----
.../src/protogeni/communication/Operation.as | 37 +++++++++++-----
.../communication/ProtogeniRpcHandler.as | 37 +++++++++++-----
.../src/protogeni/communication/Request.as | 37 +++++++++++-----
.../communication/RequestDiscoverResources.as | 37 +++++++++++-----
.../communication/RequestGetCredential.as | 37 +++++++++++-----
.../protogeni/communication/RequestGetKeys.as | 41 ++++++++++++------
.../communication/RequestListComponents.as | 37 +++++++++++-----
.../protogeni/communication/RequestQueue.as | 37 +++++++++++-----
.../communication/RequestQueueNode.as | 37 +++++++++++-----
.../communication/RequestReleaseTicket.as | 37 +++++++++++-----
.../communication/RequestSliceCredential.as | 37 +++++++++++-----
.../communication/RequestSliceDelete.as | 37 +++++++++++-----
.../communication/RequestSliceEmbedding.as | 37 +++++++++++-----
.../communication/RequestSliceRegister.as | 37 +++++++++++-----
.../communication/RequestSliceRemove.as | 37 +++++++++++-----
.../communication/RequestSliceResolve.as | 37 +++++++++++-----
.../communication/RequestSliverCreate.as | 37 +++++++++++-----
.../communication/RequestSliverDelete.as | 37 +++++++++++-----
.../communication/RequestSliverGet.as | 37 +++++++++++-----
.../communication/RequestSliverResolve.as | 37 +++++++++++-----
.../communication/RequestSliverRestart.as | 37 +++++++++++-----
.../communication/RequestSliverStart.as | 37 +++++++++++-----
.../communication/RequestSliverStatus.as | 37 +++++++++++-----
.../communication/RequestSliverStop.as | 37 +++++++++++-----
.../communication/RequestSliverUpdate.as | 37 +++++++++++-----
.../communication/RequestTicketGet.as | 37 +++++++++++-----
.../communication/RequestTicketRedeem.as | 37 +++++++++++-----
.../communication/RequestTicketRelease.as | 37 +++++++++++-----
.../communication/RequestTicketUpdate.as | 37 +++++++++++-----
.../communication/RequestUserResolve.as | 37 +++++++++++-----
.../communication/RequestWaitForStatus.as | 37 +++++++++++-----
.../src/protogeni/display/DisplayUtil.as | 37 +++++++++++-----
.../protogeni/resources/ComponentManager.as | 37 +++++++++++-----
.../src/protogeni/resources/NodeType.as | 37 +++++++++++-----
.../src/protogeni/resources/PhysicalLink.as | 37 +++++++++++-----
.../protogeni/resources/PhysicalLinkGroup.as | 37 +++++++++++-----
.../resources/PhysicalLinkGroupCollection.as | 37 +++++++++++-----
.../src/protogeni/resources/PhysicalNode.as | 37 +++++++++++-----
.../protogeni/resources/PhysicalNodeGroup.as | 37 +++++++++++-----
.../resources/PhysicalNodeGroupCollection.as | 37 +++++++++++-----
.../resources/PhysicalNodeInterface.as | 37 +++++++++++-----
.../PhysicalNodeInterfaceCollection.as | 37 +++++++++++-----
.../src/protogeni/resources/Slice.as | 37 +++++++++++-----
.../src/protogeni/resources/Sliver.as | 37 +++++++++++-----
.../src/protogeni/resources/User.as | 37 +++++++++++-----
.../protogeni/resources/VirtualInterface.as | 37 +++++++++++-----
.../resources/VirtualInterfaceCollection.as | 37 +++++++++++-----
.../src/protogeni/resources/VirtualLink.as | 37 +++++++++++-----
.../src/protogeni/resources/VirtualNode.as | 37 +++++++++++-----
protogeni/rspec-emulab/0.1/GNUmakefile.in | 21 ++++++++-
protogeni/rspec-emulab/0.2/GNUmakefile.in | 21 ++++++++-
protogeni/rspec-emulab/2/GNUmakefile.in | 21 ++++++++-
protogeni/rspec-emulab/GNUmakefile.in | 21 ++++++++-
protogeni/scripts/GNUmakefile.in | 27 +++++++++++-
protogeni/scripts/addauthority.in | 27 +++++++++++-
protogeni/scripts/advt-merge.py.in | 21 ++++++++-
protogeni/scripts/cacontrol.in | 27 +++++++++++-
protogeni/scripts/ch_daemon.in | 27 +++++++++++-
protogeni/scripts/cleanupslice.in | 27 +++++++++++-
protogeni/scripts/cleanupticket.in | 27 +++++++++++-
protogeni/scripts/delegatecredential.in | 27 +++++++++++-
protogeni/scripts/delgeniuser.in | 27 +++++++++++-
protogeni/scripts/expire_daemon.in | 27 +++++++++++-
protogeni/scripts/fixcerts.in | 27 +++++++++++-
protogeni/scripts/genadmincredential.in | 27 +++++++++++-
protogeni/scripts/genallow_extcred.in | 27 +++++++++++-
protogeni/scripts/gencabundle.in | 27 +++++++++++-
protogeni/scripts/gencrl.in | 27 +++++++++++-
protogeni/scripts/gencrlbundle.in | 27 +++++++++++-
protogeni/scripts/genextend_lifetime.in | 27 +++++++++++-
protogeni/scripts/getcacerts.in | 27 +++++++++++-
protogeni/scripts/getchcredential.in | 27 +++++++++++-
protogeni/scripts/initcerts.in | 27 +++++++++++-
protogeni/scripts/initclrhouse.in | 27 +++++++++++-
protogeni/scripts/initsite.in | 27 +++++++++++-
protogeni/scripts/listhistory.in | 27 +++++++++++-
protogeni/scripts/listusage.in | 27 +++++++++++-
protogeni/scripts/planetlab-initscript.pl | 27 +++++++++++-
protogeni/scripts/postcrl.in | 27 +++++++++++-
protogeni/scripts/register_resources.in | 27 +++++++++++-
protogeni/scripts/register_sliver.in | 27 +++++++++++-
protogeni/scripts/remauthority.in | 27 +++++++++++-
protogeni/scripts/reregister.in | 27 +++++++++++-
protogeni/scripts/reservevlans.in | 27 +++++++++++-
protogeni/scripts/resolve-ch.in | 27 +++++++++++-
protogeni/scripts/resolve.in | 27 +++++++++++-
protogeni/scripts/resolvenode.in | 27 +++++++++++-
protogeni/scripts/sa_daemon.in | 27 +++++++++++-
protogeni/scripts/shutdownslice.in | 27 +++++++++++-
protogeni/scripts/testclrhouse.in | 27 +++++++++++-
protogeni/scripts/update.in | 27 +++++++++++-
protogeni/scripts/updatecert.in | 27 +++++++++++-
protogeni/scripts/webcacontrol.in | 21 ++++++++-
protogeni/security/GNUmakefile.in | 27 +++++++++++-
protogeni/security/credential.rnc | 27 +++++++++++-
protogeni/security/credential.xsd | 27 +++++++++++-
protogeni/security/peers.rnc | 27 +++++++++++-
protogeni/security/protogeni-rspec-common.xsd | 21 ++++++++-
protogeni/security/signgenicred.in | 27 +++++++++++-
protogeni/security/top.xsd | 21 ++++++++-
protogeni/security/verifygenicred.in | 27 +++++++++++-
protogeni/test/GNUmakefile.in | 27 +++++++++++-
protogeni/test/am/createsliver.py | 34 ++++++++++-----
protogeni/test/am/deletesliver.py | 34 ++++++++++-----
protogeni/test/am/getversion.py | 34 ++++++++++-----
protogeni/test/am/listresources.py | 34 ++++++++++-----
protogeni/test/am/renewsliver.py | 34 ++++++++++-----
protogeni/test/am/sliverstatus.py | 34 ++++++++++-----
protogeni/test/binduser.py | 34 ++++++++++-----
protogeni/test/createimage.py | 34 ++++++++++-----
protogeni/test/createsliver.py | 34 ++++++++++-----
protogeni/test/delegate.py | 33 ++++++++++----
protogeni/test/deleteslice.py | 34 ++++++++++-----
protogeni/test/deletesliver.py | 34 ++++++++++-----
protogeni/test/discover.py | 34 ++++++++++-----
protogeni/test/getcredential.py | 34 ++++++++++-----
protogeni/test/getmanifest.py | 34 ++++++++++-----
protogeni/test/getslicecredential.py | 34 ++++++++++-----
protogeni/test/getsshkeys.py | 34 ++++++++++-----
protogeni/test/getticket.py | 34 ++++++++++-----
protogeni/test/getversion.py | 34 ++++++++++-----
protogeni/test/injectevent.py | 34 ++++++++++-----
protogeni/test/list-ch.py | 34 ++++++++++-----
protogeni/test/listcomponents.py | 34 ++++++++++-----
protogeni/test/listusage.py | 34 ++++++++++-----
protogeni/test/lookupuser.py | 34 ++++++++++-----
protogeni/test/map.py | 34 ++++++++++-----
protogeni/test/redeemticket.py | 34 ++++++++++-----
protogeni/test/registerslice.py | 34 ++++++++++-----
protogeni/test/releaseticket.py | 34 ++++++++++-----
protogeni/test/renewslice.py | 34 ++++++++++-----
protogeni/test/renewsliver.py | 34 ++++++++++-----
protogeni/test/resolve.py | 34 ++++++++++-----
protogeni/test/showcredential.py | 33 ++++++++++----
protogeni/test/shutdownslice.py | 34 ++++++++++-----
protogeni/test/slice.py | 34 ++++++++++-----
protogeni/test/sliveraction.py | 34 ++++++++++-----
protogeni/test/sliverstatus.py | 34 ++++++++++-----
protogeni/test/stitch.py | 34 ++++++++++-----
protogeni/test/test-common.py | 33 ++++++++++----
protogeni/test/tuntest-new.py | 34 ++++++++++-----
protogeni/test/tuntest.py | 34 ++++++++++-----
protogeni/test/unregisterslice.py | 34 ++++++++++-----
protogeni/test/updatesliver.py | 34 ++++++++++-----
protogeni/test/version1/binduser.py | 34 ++++++++++-----
protogeni/test/version1/createsliver.py | 34 ++++++++++-----
protogeni/test/version1/deletesliver.py | 34 ++++++++++-----
protogeni/test/version1/discover.py | 34 ++++++++++-----
protogeni/test/version1/getticket.py | 34 ++++++++++-----
protogeni/test/version1/jailtest.py | 34 ++++++++++-----
protogeni/test/version1/linktest.py | 34 ++++++++++-----
protogeni/test/version1/loctuntest.py | 34 ++++++++++-----
protogeni/test/version1/renewsliver.py | 34 ++++++++++-----
protogeni/test/version1/slicestatus.py | 34 ++++++++++-----
protogeni/test/version1/sliverstatus.py | 34 ++++++++++-----
protogeni/test/version1/startsliver.py | 34 ++++++++++-----
protogeni/test/version1/tuntest.py | 34 ++++++++++-----
protogeni/test/waitforsliver.py | 34 ++++++++++-----
protogeni/test/whoami.py | 34 ++++++++++-----
protogeni/tutorial/allocatenodes.py | 34 ++++++++++-----
protogeni/tutorial/binduser.py | 34 ++++++++++-----
protogeni/tutorial/clrhouselist.py | 34 ++++++++++-----
protogeni/tutorial/createsliver.py | 34 ++++++++++-----
protogeni/tutorial/delegate.py | 33 ++++++++++----
protogeni/tutorial/deleteslice.py | 34 ++++++++++-----
protogeni/tutorial/deletesliver.py | 34 ++++++++++-----
protogeni/tutorial/discover.py | 34 ++++++++++-----
protogeni/tutorial/forgetpassphrase.py | 34 ++++++++++-----
protogeni/tutorial/getcredential.py | 34 ++++++++++-----
protogeni/tutorial/getslicecredential.py | 34 ++++++++++-----
protogeni/tutorial/getticket.py | 34 ++++++++++-----
protogeni/tutorial/getversion.py | 34 ++++++++++-----
protogeni/tutorial/jailtest.py | 34 ++++++++++-----
protogeni/tutorial/linktest.py | 34 ++++++++++-----
protogeni/tutorial/list-ch.py | 34 ++++++++++-----
protogeni/tutorial/listcomponents.py | 34 ++++++++++-----
protogeni/tutorial/listusage.py | 34 ++++++++++-----
protogeni/tutorial/loctuntest.py | 34 ++++++++++-----
protogeni/tutorial/lookupuser.py | 34 ++++++++++-----
protogeni/tutorial/map.py | 34 ++++++++++-----
protogeni/tutorial/redeemticket.py | 34 ++++++++++-----
protogeni/tutorial/registerslice.py | 34 ++++++++++-----
protogeni/tutorial/releaseticket.py | 34 ++++++++++-----
protogeni/tutorial/rememberpassphrase.py | 34 ++++++++++-----
protogeni/tutorial/renewsliver.py | 34 ++++++++++-----
protogeni/tutorial/resolve-ch.py | 34 ++++++++++-----
protogeni/tutorial/resolve.py | 34 ++++++++++-----
protogeni/tutorial/showcredential.py | 33 ++++++++++----
protogeni/tutorial/showuser.py | 34 ++++++++++-----
protogeni/tutorial/shutdownslice.py | 34 ++++++++++-----
protogeni/tutorial/slice.py | 34 ++++++++++-----
protogeni/tutorial/slicestatus.py | 34 ++++++++++-----
protogeni/tutorial/sliveraction.py | 34 ++++++++++-----
protogeni/tutorial/sliverstatus.py | 34 ++++++++++-----
protogeni/tutorial/startsliver.py | 34 ++++++++++-----
protogeni/tutorial/test-common.py | 33 ++++++++++----
protogeni/tutorial/tuntest.py | 34 ++++++++++-----
protogeni/tutorial/unregisterslice.py | 34 ++++++++++-----
protogeni/tutorial/updatesliver.py | 34 ++++++++++-----
protogeni/tutorial/waitforsliver.py | 34 ++++++++++-----
protogeni/xmlrpc/GNUmakefile.in | 27 +++++++++++-
protogeni/xmlrpc/GeniResponse.pm | 27 +++++++++++-
protogeni/xmlrpc/Genixmlrpc.pm.in | 27 +++++++++++-
protogeni/xmlrpc/geni-am.pm.in | 27 +++++++++++-
protogeni/xmlrpc/protogeni-ch.pm.in | 27 +++++++++++-
protogeni/xmlrpc/protogeni-client.pl.in | 27 +++++++++++-
protogeni/xmlrpc/protogeni-client.py.in | 34 ++++++++++-----
protogeni/xmlrpc/protogeni-cm.pm.in | 27 +++++++++++-
protogeni/xmlrpc/protogeni-emulab.pm.in | 27 +++++++++++-
protogeni/xmlrpc/protogeni-sa.pm.in | 27 +++++++++++-
protogeni/xmlrpc/protogeni-ses.pm.in | 27 +++++++++++-
protogeni/xmlrpc/protogeni-sfa.pl.in | 27 +++++++++++-
protogeni/xmlrpc/protogeni-wrapper.pl.in | 27 +++++++++++-
protogeni/xmlrpc/protogeni.py.in | 27 +++++++++++-
pxe/GNUmakefile.in | 21 ++++++++-
pxe/bootinfo.c | 21 ++++++++-
pxe/bootinfo.conf | 21 ++++++++-
pxe/bootinfo.h | 21 ++++++++-
pxe/bootinfo.restart.in | 21 ++++++++-
pxe/bootinfo_cfile.c | 21 ++++++++-
pxe/bootinfo_mysql.c | 21 ++++++++-
pxe/bootinfo_null.c | 21 ++++++++-
pxe/bootinfoclient.c | 21 ++++++++-
pxe/bootinfosend.c | 21 ++++++++-
pxe/bootwhat.h | 21 ++++++++-
pxe/event-support.c | 21 ++++++++-
pxe/freebsd/sysboot.diffs | 42 ++++++++++++++++--
pxe/main.c | 21 ++++++++-
rc.d/GNUmakefile.in | 21 ++++++++-
robots/GNUmakefile.in | 21 ++++++++-
robots/emc/GNUmakefile.in | 21 ++++++++-
robots/emc/emcd.c | 21 ++++++++-
robots/emc/emcd.h | 21 ++++++++-
robots/emc/loclistener.in | 21 ++++++++-
robots/emc/locpiper.in | 21 ++++++++-
robots/emc/robot_list.c | 21 ++++++++-
robots/emc/robot_list.h | 21 ++++++++-
robots/emc/test_emcd.sh.in | 21 ++++++++-
robots/mezzanine/GNUmakefile.in | 21 ++++++++-
robots/mezzanine/libmezz/blend_tris.c | 21 ++++++++-
robots/mezzanine/libmezz/blend_tris.h | 21 ++++++++-
robots/mezzanine/libmezz/fauxmezz.c | 21 ++++++++-
robots/mezzanine/libmezz/geom.c | 21 ++++++++-
robots/mezzanine/libmezz/geom.h | 21 ++++++++-
robots/mezzanine/libmezz/mezzdump.c | 21 ++++++++-
robots/mezzanine/libmezz/test_blend_tris.c | 21 ++++++++-
robots/mezzanine/libmezz/test_geom.c | 21 ++++++++-
robots/mtp/GNUmakefile | 21 ++++++++-
robots/mtp/GNUmakefile.in | 21 ++++++++-
robots/mtp/listNode.c | 21 ++++++++-
robots/mtp/listNode.h | 21 ++++++++-
robots/mtp/mtp.c | 21 ++++++++-
robots/mtp/mtp.h | 21 ++++++++-
robots/mtp/mtp.x | 21 ++++++++-
robots/mtp/mtp_dump.c | 21 ++++++++-
robots/mtp/mtp_recv.c | 21 ++++++++-
robots/mtp/mtp_send.c | 21 ++++++++-
robots/mtp/mtp_test.c | 21 ++++++++-
robots/mtp/test_mtp.sh | 21 ++++++++-
robots/primotion/GNUmakefile.in | 21 ++++++++-
robots/primotion/Makefile | 21 ++++++++-
robots/primotion/brainstem-reset.cc | 21 ++++++++-
robots/primotion/buttonManager.cc | 21 ++++++++-
robots/primotion/buttonManager.hh | 21 ++++++++-
robots/primotion/circle.cc | 21 ++++++++-
robots/primotion/commotion.cc | 21 ++++++++-
robots/primotion/dashboard.cc | 21 ++++++++-
robots/primotion/dashboard.hh | 21 ++++++++-
robots/primotion/dgrobot/GNUmakefile.in | 21 ++++++++-
robots/primotion/dgrobot/commotion.h | 21 ++++++++-
robots/primotion/dgrobot/cubicpath.h | 21 ++++++++-
robots/primotion/dgrobot/gbehaviors.cc | 21 ++++++++-
robots/primotion/dgrobot/gbehaviors.h | 21 ++++++++-
robots/primotion/dgrobot/gcallbacks.cc | 21 ++++++++-
robots/primotion/dgrobot/gcallbacks.h | 21 ++++++++-
robots/primotion/dgrobot/grobot.cc | 21 ++++++++-
robots/primotion/dgrobot/grobot.h | 21 ++++++++-
robots/primotion/dgrobot/grobot_sim.cc | 21 ++++++++-
robots/primotion/dgrobot/simplepath.cc | 21 ++++++++-
robots/primotion/dgrobot/simplepath.h | 21 ++++++++-
robots/primotion/faultDetection.cc | 21 ++++++++-
robots/primotion/faultDetection.hh | 21 ++++++++-
robots/primotion/flash-user-led.cc | 21 ++++++++-
robots/primotion/garcia-pilot.cc | 21 ++++++++-
robots/primotion/garcia-pilot.hh | 21 ++++++++-
robots/primotion/garciaUtil.cc | 21 ++++++++-
robots/primotion/garciaUtil.hh | 21 ++++++++-
robots/primotion/gorobot.cc | 21 ++++++++-
robots/primotion/gorobotc.cc | 21 ++++++++-
robots/primotion/ledManager.cc | 21 ++++++++-
robots/primotion/ledManager.hh | 21 ++++++++-
robots/primotion/pathmotion.cc | 21 ++++++++-
robots/primotion/pilot-wrapper.sh | 21 ++++++++-
robots/primotion/pilotButtonCallback.cc | 21 ++++++++-
robots/primotion/pilotButtonCallback.hh | 21 ++++++++-
robots/primotion/pilotClient.cc | 21 ++++++++-
robots/primotion/pilotClient.hh | 21 ++++++++-
robots/primotion/run | 21 ++++++++-
robots/primotion/test_gorobot.sh.in | 21 ++++++++-
robots/primotion/watch-user-button.cc | 21 ++++++++-
robots/primotion/wheelManager.cc | 21 ++++++++-
robots/primotion/wheelManager.hh | 21 ++++++++-
robots/rmcd/GNUmakefile.in | 21 ++++++++-
robots/rmcd/masterController.c | 21 ++++++++-
robots/rmcd/masterController.h | 21 ++++++++-
robots/rmcd/multi_path.c | 21 ++++++++-
robots/rmcd/obstacles.c | 21 ++++++++-
robots/rmcd/obstacles.h | 21 ++++++++-
robots/rmcd/pathPlanning.c | 21 ++++++++-
robots/rmcd/pathPlanning.h | 21 ++++++++-
robots/rmcd/pilotConnection.c | 21 ++++++++-
robots/rmcd/pilotConnection.h | 21 ++++++++-
robots/rmcd/rclip.c | 21 ++++++++-
robots/rmcd/rclip.h | 21 ++++++++-
robots/rmcd/rcoord.c | 21 ++++++++-
robots/rmcd/rcoord.h | 21 ++++++++-
robots/rmcd/rmcd.c | 21 ++++++++-
robots/rmcd/rmcd.h | 21 ++++++++-
robots/rmcd/simple_path.c | 21 ++++++++-
robots/rmcd/slaveController.c | 21 ++++++++-
robots/rmcd/slaveController.h | 21 ++++++++-
robots/rmcd/test_multi_path.sh | 21 ++++++++-
robots/rmcd/test_path.c | 21 ++++++++-
robots/rmcd/test_rmcd.sh.in | 21 ++++++++-
robots/rmcd/test_simple_path.sh | 21 ++++++++-
robots/robomonitord.in | 21 ++++++++-
robots/tbsetdest/GNUmakefile.in | 21 ++++++++-
robots/tbsetdest/tbsetdest.cc | 21 ++++++++-
robots/tbsetdest/tbsetdest.h | 21 ++++++++-
robots/tracker/BSpline.java | 21 ++++++++-
robots/tracker/DrawPanel.java | 21 ++++++++-
robots/tracker/Editor.java | 21 ++++++++-
robots/tracker/GNUmakefile.in | 21 ++++++++-
robots/tracker/NodeSelect.java | 21 ++++++++-
robots/tracker/RoboTrack.java | 21 ++++++++-
robots/vmcd/GNUmakefile.in | 21 ++++++++-
robots/vmcd/analysis_w_plot.awk | 21 ++++++++-
robots/vmcd/cam-sim.awk | 21 ++++++++-
robots/vmcd/camera_checker.c | 21 ++++++++-
robots/vmcd/camera_checker.initd | 21 ++++++++-
robots/vmcd/camera_data/Makefile | 21 ++++++++-
robots/vmcd/camera_data/blend_tris.py | 21 ++++++++-
robots/vmcd/camera_data/cal_pts.py | 21 ++++++++-
robots/vmcd/camera_data/geom.py | 21 ++++++++-
robots/vmcd/camera_data/output_config.awk | 21 ++++++++-
robots/vmcd/camera_data/read_analysis.py | 21 ++++++++-
robots/vmcd/camera_data/subset_fd_output.awk | 21 ++++++++-
robots/vmcd/camera_data/test_lin_blend.py | 21 ++++++++-
robots/vmcd/camera_data/test_lin_blend2.py | 21 ++++++++-
robots/vmcd/camera_data/test_lin_blend3.py | 21 ++++++++-
robots/vmcd/dump_analyzer.py | 21 ++++++++-
robots/vmcd/file_dumper.c | 21 ++++++++-
robots/vmcd/robotObject.c | 21 ++++++++-
robots/vmcd/robotObject.h | 21 ++++++++-
robots/vmcd/test_vmc-client.sh.in | 21 ++++++++-
robots/vmcd/test_vmcd.sh.in | 21 ++++++++-
robots/vmcd/test_vmcd2.sh | 21 ++++++++-
robots/vmcd/test_vmcd3.sh | 21 ++++++++-
robots/vmcd/test_vmcd4.sh | 21 ++++++++-
robots/vmcd/visionTrack.c | 21 ++++++++-
robots/vmcd/visionTrack.h | 21 ++++++++-
robots/vmcd/vmc-client.c | 21 ++++++++-
robots/vmcd/vmc-client.initd | 21 ++++++++-
robots/vmcd/vmcd.c | 21 ++++++++-
robots/vmcd/vmcd.h | 21 ++++++++-
robots/vmcd/worldTransform.py | 21 ++++++++-
security/GNUmakefile.in | 21 ++++++++-
security/checkenv.pl | 21 ++++++++-
security/genlastlog.c | 21 ++++++++-
security/lastlog_daemon.in | 21 ++++++++-
security/runsuid.c | 21 ++++++++-
security/sudoers.in | 21 ++++++++-
security/suexec.c | 21 ++++++++-
security/suexec.h | 21 ++++++++-
sensors/GNUmakefile.in | 21 ++++++++-
sensors/and/GNUmakefile.in | 21 ++++++++-
sensors/hmcd/Makefile | 21 ++++++++-
sensors/hmcd/hmcd.c | 21 ++++++++-
sensors/hmcd/hmcd.h | 21 ++++++++-
sensors/hmcd/hmcdgrab.c | 21 ++++++++-
sensors/nfstrace/GNUmakefile | 21 ++++++++-
sensors/nfstrace/GNUmakefile.in | 21 ++++++++-
sensors/nfstrace/nfsdump2/GNUmakefile.in | 21 ++++++++-
sensors/nfstrace/nfsdump2/files/listNode.c | 21 ++++++++-
sensors/nfstrace/nfsdump2/files/listNode.h | 21 ++++++++-
sensors/nfstrace/nfsdump2/files/mypcap.c | 21 ++++++++-
sensors/nfstrace/nfsdump2/files/mypcap.h | 21 ++++++++-
sensors/nfstrace/nfsdump2/files/packetTable.c | 21 ++++++++-
sensors/nfstrace/nfsdump2/files/packetTable.h | 21 ++++++++-
sensors/nfstrace/nfsdump2/nfsdump2-install | 21 ++++++++-
sensors/nfstrace/nfsdump2db | 21 ++++++++-
sensors/nfstrace/nfsdump2db.8 | 21 ++++++++-
sensors/nfstrace/nfstrace.7 | 21 ++++++++-
sensors/nfstrace/nfstrace.init.in | 21 ++++++++-
sensors/nfstrace/nfstrace.proxy | 21 ++++++++-
sensors/nfstrace/nfstrace.proxy.8 | 21 ++++++++-
sensors/powermon/GNUmakefile.in | 21 ++++++++-
sensors/powermon/powermon.in | 21 ++++++++-
sql/GNUmakefile | 21 ++++++++-
sql/bios_move.pl | 21 ++++++++-
sql/close-projadminlists.pl | 21 ++++++++-
sql/create-projadminlists.pl | 21 ++++++++-
sql/database-migrate.txt | 21 ++++++++-
sql/delvnodes.pl | 21 ++++++++-
sql/errors-migrate.pl | 21 ++++++++-
sql/fixstats-swapin.pl | 21 ++++++++-
sql/fixstats_swapmod.pl | 21 ++++++++-
sql/gentopmaps.pl | 21 ++++++++-
sql/init_newids.pl | 21 ++++++++-
sql/init_nodeattrs.pl | 21 ++++++++-
sql/initcerts.pl | 21 ++++++++-
sql/initkey.pl | 21 ++++++++-
sql/initstats.pl | 21 ++++++++-
sql/initvinterfaces.pl | 21 ++++++++-
sql/ipmember.pl | 21 ++++++++-
sql/logfiles.pl | 21 ++++++++-
sql/mod-userstats.pl | 21 ++++++++-
sql/mustdelay.pl | 21 ++++++++-
sql/newlans.pl | 21 ++++++++-
sql/newstates.pl | 21 ++++++++-
sql/nodeutil.pl | 21 ++++++++-
sql/nsfiles.pl | 21 ++++++++-
sql/resources.pl | 21 ++++++++-
sql/step2_newids.pl | 21 ++++++++-
sql/step3_newids.pl | 21 ++++++++-
sql/step4_newids.pl | 21 ++++++++-
sql/step5_newids.pl | 21 ++++++++-
ssl/GNUmakefile.in | 21 ++++++++-
ssl/mkclient.sh | 21 ++++++++-
ssl/mkserial.in | 21 ++++++++-
ssl/mksig.in | 21 ++++++++-
ssl/updatecert.in | 27 +++++++++++-
sysadmin/apachelogroll.sh | 21 ++++++++-
sysadmin/mailphperrors | 21 ++++++++-
tbsetup/GNUmakefile.in | 21 ++++++++-
tbsetup/Template.pm.in | 21 ++++++++-
tbsetup/archive_control.in | 21 ++++++++-
tbsetup/assign_prepass.in | 21 ++++++++-
tbsetup/assign_wrapper.in | 21 ++++++++-
tbsetup/assign_wrapper2.in | 21 ++++++++-
tbsetup/batch_daemon.in | 21 ++++++++-
tbsetup/batchexp.in | 21 ++++++++-
tbsetup/bwconfig.in | 21 ++++++++-
tbsetup/checknodes_daemon.in | 21 ++++++++-
tbsetup/checkpass/GNUmakefile.in | 21 ++++++++-
tbsetup/checkports.in | 21 ++++++++-
tbsetup/checkup/GNUmakefile.in | 21 ++++++++-
tbsetup/checkup/checkup_daemon.8 | 21 ++++++++-
tbsetup/checkup/checkup_daemon.in | 21 ++++++++-
tbsetup/checkup/example_checkup | 21 ++++++++-
tbsetup/checkup/linktest.ns | 21 ++++++++-
tbsetup/console_reset.in | 21 ++++++++-
tbsetup/console_setup.in | 21 ++++++++-
tbsetup/console_setup.proxy.in | 21 ++++++++-
tbsetup/db2ns.in | 21 ++++++++-
tbsetup/elabinelab.in | 21 ++++++++-
tbsetup/endexp.in | 21 ++++++++-
tbsetup/eventsys.proxy.in | 21 ++++++++-
tbsetup/eventsys_control.in | 21 ++++++++-
tbsetup/eventsys_start.in | 21 ++++++++-
tbsetup/exitonwarn.pm | 21 ++++++++-
tbsetup/exports_setup.in | 21 ++++++++-
tbsetup/exports_setup.proxy.in | 21 ++++++++-
tbsetup/fetchtar.proxy.in | 21 ++++++++-
tbsetup/frisbeehelper.in | 21 ++++++++-
tbsetup/gentopofile.in | 21 ++++++++-
tbsetup/idlepower.in | 21 ++++++++-
tbsetup/idleswap.in | 21 ++++++++-
tbsetup/image_setup.in | 21 ++++++++-
tbsetup/ipassign/GNUmakefile.in | 21 ++++++++-
tbsetup/ipassign/dre/GNUmakefile | 21 ++++++++-
tbsetup/ipassign/dre/dijkstra.ml | 21 ++++++++-
tbsetup/ipassign/dre/dre-histogram.ml | 21 ++++++++-
tbsetup/ipassign/dre/dre.ml | 21 ++++++++-
tbsetup/ipassign/dre/ga.ml | 21 ++++++++-
tbsetup/ipassign/dre/graph-to-tree.ml | 21 ++++++++-
tbsetup/ipassign/dre/graph.ml | 21 ++++++++-
tbsetup/ipassign/dre/graph2dot.ml | 21 ++++++++-
tbsetup/ipassign/dre/heap.ml | 21 ++++++++-
tbsetup/ipassign/dre/heap.mli | 21 ++++++++-
tbsetup/ipassign/dre/help.ml | 21 ++++++++-
tbsetup/ipassign/dre/histogram.ml | 21 ++++++++-
tbsetup/ipassign/dre/ipassign.ml | 21 ++++++++-
tbsetup/ipassign/dre/linklist.ml | 21 ++++++++-
tbsetup/ipassign/dre/mintree.ml | 21 ++++++++-
tbsetup/ipassign/dre/name-ga.ml | 21 ++++++++-
tbsetup/ipassign/dre/naming.ml | 21 ++++++++-
tbsetup/ipassign/dre/ordering-to-tree.ml | 21 ++++++++-
tbsetup/ipassign/dre/ortc.ml | 21 ++++++++-
tbsetup/ipassign/dre/prepass/Partition.cc | 21 ++++++++-
tbsetup/ipassign/dre/prepass/Partition.h | 21 ++++++++-
tbsetup/ipassign/dre/prepass/coprocess.cc | 21 ++++++++-
tbsetup/ipassign/dre/prepass/coprocess.h | 21 ++++++++-
tbsetup/ipassign/dre/prepass/fail-assign.cc | 21 ++++++++-
tbsetup/ipassign/dre/prepass/prepass.cc | 21 ++++++++-
tbsetup/ipassign/dre/prepass/prepass.h | 21 ++++++++-
.../ipassign/dre/prepass/trivial-assign.cc | 21 ++++++++-
tbsetup/ipassign/dre/test-dijk.ml | 21 ++++++++-
tbsetup/ipassign/dre/test-dre.ml | 21 ++++++++-
tbsetup/ipassign/dre/test-heap.ml | 21 ++++++++-
tbsetup/ipassign/dre/tree-assign.ml | 21 ++++++++-
tbsetup/ipassign/ipassign_wrapper.in | 21 ++++++++-
tbsetup/ipassign/src/Assigner.h | 21 ++++++++-
tbsetup/ipassign/src/ConservativeAssigner.cc | 21 ++++++++-
tbsetup/ipassign/src/ConservativeAssigner.h | 21 ++++++++-
tbsetup/ipassign/src/CutSearchPartition.h | 21 ++++++++-
tbsetup/ipassign/src/Exception.h | 21 ++++++++-
tbsetup/ipassign/src/FixedPartition.h | 21 ++++++++-
tbsetup/ipassign/src/Framework.cc | 21 ++++++++-
tbsetup/ipassign/src/Framework.h | 21 ++++++++-
tbsetup/ipassign/src/GNUmakefile.in | 21 ++++++++-
tbsetup/ipassign/src/GraphConverter.h | 21 ++++++++-
tbsetup/ipassign/src/HierarchicalAssigner.cc | 21 ++++++++-
tbsetup/ipassign/src/HierarchicalAssigner.h | 21 ++++++++-
tbsetup/ipassign/src/PTree.h | 21 ++++++++-
tbsetup/ipassign/src/Partition.h | 21 ++++++++-
tbsetup/ipassign/src/RatioCutPartition.h | 21 ++++++++-
tbsetup/ipassign/src/SearchPartition.h | 21 ++++++++-
tbsetup/ipassign/src/SquareRootPartition.h | 21 ++++++++-
tbsetup/ipassign/src/add-x.cc | 21 ++++++++-
tbsetup/ipassign/src/bitmath.cc | 21 ++++++++-
tbsetup/ipassign/src/bitmath.h | 21 ++++++++-
tbsetup/ipassign/src/brite2graph.cc | 21 ++++++++-
tbsetup/ipassign/src/coprocess.cc | 21 ++++++++-
tbsetup/ipassign/src/coprocess.h | 21 ++++++++-
tbsetup/ipassign/src/difference.cc | 21 ++++++++-
tbsetup/ipassign/src/graph2lan.cc | 21 ++++++++-
tbsetup/ipassign/src/graph2single-source.cc | 21 ++++++++-
tbsetup/ipassign/src/inet2graph.cc | 21 ++++++++-
tbsetup/ipassign/src/ipassign.cc | 21 ++++++++-
tbsetup/ipassign/src/lib.h | 21 ++++++++-
tbsetup/ipassign/src/route2dist.cc | 21 ++++++++-
tbsetup/ipassign/src/route2lan.cc | 21 ++++++++-
tbsetup/ipassign/src/single-source.cc | 21 ++++++++-
tbsetup/ipassign/src/top2graph.cc | 21 ++++++++-
tbsetup/libArchive.pm.in | 21 ++++++++-
tbsetup/libadminmfs.pm.in | 21 ++++++++-
tbsetup/libaudit.pm.in | 21 ++++++++-
tbsetup/libosload.pm.in | 21 ++++++++-
tbsetup/libosload_new.pm.in | 21 ++++++++-
tbsetup/libossetup.pm.in | 21 ++++++++-
tbsetup/libossetup_switch.pm.in | 21 ++++++++-
tbsetup/libptop.pm.in | 21 ++++++++-
tbsetup/libptop_new.pm.in | 21 ++++++++-
tbsetup/libreboot.pm.in | 21 ++++++++-
tbsetup/libtblog.pm.in | 21 ++++++++-
tbsetup/libtblog_simple.pm | 21 ++++++++-
tbsetup/libtbsetup.pm | 21 ++++++++-
tbsetup/libtestbed.pm.in | 21 ++++++++-
tbsetup/libtestbed.py.in | 21 ++++++++-
tbsetup/libvtop.pm.in | 21 ++++++++-
tbsetup/libvtop_stable.pm.in | 21 ++++++++-
tbsetup/libvtop_test.pm.in | 21 ++++++++-
tbsetup/mapper.in | 21 ++++++++-
tbsetup/mkexpdir.in | 21 ++++++++-
tbsetup/mkgroup.in | 21 ++++++++-
tbsetup/mkproj.in | 21 ++++++++-
tbsetup/modgroups.in | 21 ++++++++-
tbsetup/named_setup.in | 21 ++++++++-
tbsetup/newnode_reboot.in | 21 ++++++++-
tbsetup/nfstrace.in | 21 ++++++++-
tbsetup/node_attributes.in | 21 ++++++++-
tbsetup/node_control.in | 21 ++++++++-
tbsetup/node_history.in | 21 ++++++++-
tbsetup/node_reboot.in | 21 ++++++++-
tbsetup/node_update.in | 21 ++++++++-
tbsetup/ns2ir/GNUmakefile.in | 21 ++++++++-
tbsetup/ns2ir/console.tcl | 21 ++++++++-
tbsetup/ns2ir/custom.tcl | 21 ++++++++-
tbsetup/ns2ir/disk.tcl | 21 ++++++++-
tbsetup/ns2ir/elabinelab-opsvm.ns | 21 ++++++++-
tbsetup/ns2ir/elabinelab-withfsnode.ns | 21 ++++++++-
tbsetup/ns2ir/elabinelab-xen.ns | 21 ++++++++-
tbsetup/ns2ir/elabinelab.ns | 21 ++++++++-
tbsetup/ns2ir/event.tcl | 21 ++++++++-
tbsetup/ns2ir/firewall.tcl | 21 ++++++++-
tbsetup/ns2ir/fw.ns | 21 ++++++++-
tbsetup/ns2ir/lanlink.tcl | 21 ++++++++-
tbsetup/ns2ir/node.tcl | 21 ++++++++-
tbsetup/ns2ir/nsenode.tcl | 21 ++++++++-
tbsetup/ns2ir/nsobject.tcl | 21 ++++++++-
tbsetup/ns2ir/nstb_compat.tcl | 21 ++++++++-
tbsetup/ns2ir/null.tcl | 21 ++++++++-
tbsetup/ns2ir/parse-ns.in | 21 ++++++++-
tbsetup/ns2ir/parse.proxy.in | 21 ++++++++-
tbsetup/ns2ir/parse.tcl.in | 21 ++++++++-
tbsetup/ns2ir/path.tcl | 21 ++++++++-
tbsetup/ns2ir/program.tcl | 21 ++++++++-
tbsetup/ns2ir/sequence.tcl | 21 ++++++++-
tbsetup/ns2ir/sim.tcl.in | 21 ++++++++-
tbsetup/ns2ir/tb_compat.tcl.in | 21 ++++++++-
tbsetup/ns2ir/timeline.tcl | 21 ++++++++-
tbsetup/ns2ir/topography.tcl | 21 ++++++++-
tbsetup/ns2ir/traffic.tcl | 21 ++++++++-
tbsetup/ns2ir/vtype.tcl | 21 ++++++++-
tbsetup/nscheck.in | 21 ++++++++-
tbsetup/nseparse/GNUmakefile.in | 21 ++++++++-
tbsetup/nseparse/nse.agent.tcl | 21 ++++++++-
tbsetup/nseparse/nse.node.tcl | 21 ++++++++-
tbsetup/nseparse/nse.null.tcl | 21 ++++++++-
tbsetup/nseparse/nse.parse.proxy.in | 21 ++++++++-
tbsetup/nseparse/nse.parse.tcl.in | 21 ++++++++-
tbsetup/nseparse/nse.sim.tcl | 21 ++++++++-
tbsetup/nseparse/parse-nse.in | 21 ++++++++-
tbsetup/nseparse/tb_compat.tcl | 21 ++++++++-
tbsetup/nseswap.in | 21 ++++++++-
tbsetup/nsverify/GNUmakefile.in | 21 ++++++++-
tbsetup/nsverify/nstbparse.in | 21 ++++++++-
tbsetup/nsverify/tb_compat.tcl | 21 ++++++++-
tbsetup/nsverify/verify-ns.in | 21 ++++++++-
tbsetup/os_load.in | 21 ++++++++-
tbsetup/os_select.in | 21 ++++++++-
tbsetup/os_setup.in | 21 ++++++++-
tbsetup/os_setup_old.in | 21 ++++++++-
tbsetup/panic.in | 21 ++++++++-
tbsetup/plab/GNUmakefile.in | 21 ++++++++-
tbsetup/plab/etc/GNUmakefile.in | 21 ++++++++-
tbsetup/plab/etc/fixsudo.sh | 21 ++++++++-
tbsetup/plab/etc/netbed_files/GNUmakefile.in | 21 ++++++++-
tbsetup/plab/libdslice/GNUmakefile.in | 21 ++++++++-
tbsetup/plab/libplab.py.in | 21 ++++++++-
tbsetup/plab/libplabmon.pm.in | 21 ++++++++-
tbsetup/plab/libplabnodehist.pm.in | 21 ++++++++-
tbsetup/plab/mod_PLC.py.in | 21 ++++++++-
tbsetup/plab/mod_PLC4.py.in | 21 ++++++++-
tbsetup/plab/mod_PLCNM.py.in | 21 ++++++++-
tbsetup/plab/mod_dslice.py.in | 21 ++++++++-
tbsetup/plab/plabdiscover.in | 21 ++++++++-
tbsetup/plab/plabdist.in | 21 ++++++++-
tbsetup/plab/plabfed.in | 21 ++++++++-
tbsetup/plab/plabhttpd.in | 21 ++++++++-
tbsetup/plab/plablinkdata.in | 21 ++++++++-
tbsetup/plab/plabmetrics.in | 21 ++++++++-
tbsetup/plab/plabmon_badpool.pm.in | 21 ++++++++-
tbsetup/plab/plabmon_goodpool.pm.in | 21 ++++++++-
tbsetup/plab/plabmonitord.in | 21 ++++++++-
tbsetup/plab/plabnode.in | 21 ++++++++-
tbsetup/plab/plabnodehistclean.in | 21 ++++++++-
tbsetup/plab/plabnodehistmetrics.in | 21 ++++++++-
tbsetup/plab/plabrenewd.in | 21 ++++++++-
tbsetup/plab/plabrenewonce.in | 21 ++++++++-
tbsetup/plab/plabslice.in | 21 ++++++++-
tbsetup/plab/plabstats.in | 21 ++++++++-
tbsetup/plab/procmail.plab | 21 ++++++++-
tbsetup/plab/sshhttp.py.in | 21 ++++++++-
tbsetup/plab/timer_advisories.py | 21 ++++++++-
tbsetup/plab/webplabstats.in | 21 ++++++++-
tbsetup/plabinelab.in | 21 ++++++++-
tbsetup/pool_daemon.in | 21 ++++++++-
tbsetup/portal_daemon.in | 21 ++++++++-
tbsetup/portstats.in | 21 ++++++++-
tbsetup/power.in | 21 ++++++++-
tbsetup/power_apc.pm | 21 ++++++++-
tbsetup/power_icebox.pm | 21 ++++++++-
tbsetup/power_ilo.pm.in | 21 ++++++++-
tbsetup/power_ipmi.pm | 21 ++++++++-
tbsetup/power_mail.pm.in | 21 ++++++++-
tbsetup/power_rmcp.pm.in | 21 ++++++++-
tbsetup/power_rpc27.pm.in | 21 ++++++++-
tbsetup/power_sgmote.pm.in | 21 ++++++++-
tbsetup/power_whol.pm.in | 21 ++++++++-
tbsetup/ptopgen.in | 21 ++++++++-
tbsetup/ptopgen_new.in | 21 ++++++++-
tbsetup/pxe_select.in | 21 ++++++++-
tbsetup/regression.in | 21 ++++++++-
tbsetup/reload_daemon.in | 21 ++++++++-
tbsetup/repos_daemon.in | 21 ++++++++-
tbsetup/resetvlans.in | 21 ++++++++-
tbsetup/rmgroup.in | 21 ++++++++-
tbsetup/rmproj.in | 21 ++++++++-
tbsetup/rmuser.in | 21 ++++++++-
tbsetup/routecalc.cc | 21 ++++++++-
tbsetup/savelogs.in | 21 ++++++++-
tbsetup/savelogs.proxy.in | 21 ++++++++-
tbsetup/sched_reload.in | 21 ++++++++-
tbsetup/sched_reserve.in | 21 ++++++++-
tbsetup/setgroups.in | 21 ++++++++-
tbsetup/sfskey_update.in | 21 ++++++++-
tbsetup/sfskey_update.proxy.in | 21 ++++++++-
tbsetup/smbpasswd_setup.in | 21 ++++++++-
tbsetup/smbpasswd_setup.proxy.in | 21 ++++++++-
tbsetup/snmpit.in | 21 ++++++++-
tbsetup/snmpit.proxy.in | 21 ++++++++-
tbsetup/snmpit.proxynew.in | 21 ++++++++-
tbsetup/snmpit.proxyv2.in | 21 ++++++++-
tbsetup/snmpit.proxyv3.in | 21 ++++++++-
tbsetup/snmpit_old/GNUmakefile.in | 21 ++++++++-
tbsetup/snmpit_old/portstats.in | 21 ++++++++-
tbsetup/snmpit_old/snmpit_ancient.in | 21 ++++++++-
tbsetup/snmpit_old/snmpit_apcon.pm | 21 ++++++++-
tbsetup/snmpit_old/snmpit_cisco.pm | 21 ++++++++-
tbsetup/snmpit_old/snmpit_cisco_stack.pm | 21 ++++++++-
tbsetup/snmpit_old/snmpit_foundry.pm | 20 ++++++++-
tbsetup/snmpit_old/snmpit_hp.pm | 21 ++++++++-
tbsetup/snmpit_old/snmpit_intel.pm | 21 ++++++++-
tbsetup/snmpit_old/snmpit_intel_stack.pm | 21 ++++++++-
tbsetup/snmpit_old/snmpit_lib.pm | 21 ++++++++-
tbsetup/snmpit_old/snmpit_nortel.pm | 21 ++++++++-
tbsetup/snmpit_old/snmpit_old.in | 21 ++++++++-
tbsetup/snmpit_old/snmpit_remote.pm.in | 21 ++++++++-
tbsetup/snmpit_old/snmpit_stack.pm | 21 ++++++++-
tbsetup/snmpit_test/GNUmakefile.in | 21 ++++++++-
tbsetup/snmpit_test/portstats.in | 21 ++++++++-
tbsetup/snmpit_test/snmpit_apcon.pm | 21 ++++++++-
tbsetup/snmpit_test/snmpit_arista.pm.in | 21 ++++++++-
.../snmpit_arista_switch_daemon.py.in | 21 ++++++++-
tbsetup/snmpit_test/snmpit_cisco.pm | 21 ++++++++-
tbsetup/snmpit_test/snmpit_cisco_stack.pm | 21 ++++++++-
tbsetup/snmpit_test/snmpit_foundry.pm | 20 ++++++++-
tbsetup/snmpit_test/snmpit_hp.pm | 21 ++++++++-
tbsetup/snmpit_test/snmpit_intel.pm | 21 ++++++++-
tbsetup/snmpit_test/snmpit_intel_stack.pm | 21 ++++++++-
tbsetup/snmpit_test/snmpit_lib.pm | 21 ++++++++-
tbsetup/snmpit_test/snmpit_nortel.pm | 21 ++++++++-
tbsetup/snmpit_test/snmpit_remote.pm.in | 21 ++++++++-
tbsetup/snmpit_test/snmpit_stack.pm | 21 ++++++++-
tbsetup/snmpit_test/snmpit_test.in | 21 ++++++++-
tbsetup/spewlogfile.in | 21 ++++++++-
tbsetup/spewrpmtar.in | 21 ++++++++-
tbsetup/staticroutes.in | 21 ++++++++-
tbsetup/swapexp.in | 21 ++++++++-
tbsetup/switchmac.in | 21 ++++++++-
tbsetup/tarfiles_setup.in | 21 ++++++++-
tbsetup/tbend.in | 21 ++++++++-
tbsetup/tbprerun.in | 21 ++++++++-
tbsetup/tbreport.in | 21 ++++++++-
tbsetup/tbrestart.in | 21 ++++++++-
tbsetup/tbrsync.in | 21 ++++++++-
tbsetup/tbswap.in | 21 ++++++++-
tbsetup/template_analyze.in | 21 ++++++++-
tbsetup/template_checkout.in | 21 ++++++++-
tbsetup/template_commit.in | 21 ++++++++-
tbsetup/template_control.in | 21 ++++++++-
tbsetup/template_create.in | 21 ++++++++-
tbsetup/template_cvsroot/GNUmakefile.in | 21 ++++++++-
tbsetup/template_cvsroot/commit_finish.in | 21 ++++++++-
tbsetup/template_cvsroot/commit_logmsg.in | 21 ++++++++-
tbsetup/template_cvsroot/commit_prep.in | 21 ++++++++-
tbsetup/template_cvsroot/logtag.in | 21 ++++++++-
tbsetup/template_cvsroot/rtag_commit.in | 21 ++++++++-
tbsetup/template_delete.in | 21 ++++++++-
tbsetup/template_export.in | 21 ++++++++-
tbsetup/template_exprun.in | 21 ++++++++-
tbsetup/template_graph.in | 21 ++++++++-
tbsetup/template_instantiate.in | 21 ++++++++-
tbsetup/template_linkgraph.in | 21 ++++++++-
tbsetup/template_metadata.in | 21 ++++++++-
tbsetup/template_revise.in | 21 ++++++++-
tbsetup/template_swapin.in | 21 ++++++++-
tbsetup/template_swapout.in | 21 ++++++++-
tbsetup/vnode_setup.in | 21 ++++++++-
tbsetup/vtopgen.in | 21 ++++++++-
tbsetup/wanassign.in | 21 ++++++++-
tbsetup/wanlinkinfo.in | 21 ++++++++-
tbsetup/wanlinksolve.cc | 21 ++++++++-
tbsetup/webfrisbeekiller.in | 21 ++++++++-
testsuite/assign/common.pm | 21 ++++++++-
testsuite/assign/gatherstats | 23 ++++++++--
testsuite/assign/mklantop | 23 ++++++++--
testsuite/assign/mkptop | 23 ++++++++--
testsuite/assign/runtests | 23 ++++++++--
testsuite/assign/testfiles/plan-scale.pl | 23 ++++++++--
.../assign/testfiles/plan-small-scale.pl | 23 ++++++++--
testsuite/dumpdb | 21 ++++++++-
testsuite/mktest | 21 ++++++++-
testsuite/tbstub | 21 ++++++++-
testsuite/tbtest | 21 ++++++++-
testsuite/test-defs | 21 ++++++++-
testsuite/testswap/Makefile.PL | 21 ++++++++-
testsuite/testswap/TBConfig.pm.in | 21 ++++++++-
testsuite/testswap/devtools/podfailure.pl | 21 ++++++++-
testsuite/testswap/install_deps_from_cpan | 21 ++++++++-
testsuite/testswap/lib/SemiModern/Perl.pm | 21 ++++++++-
testsuite/testswap/lib/TestBed/Daemonize.pm | 21 ++++++++-
.../testswap/lib/TestBed/ForkFramework.pm | 21 ++++++++-
testsuite/testswap/lib/TestBed/Harness.pm | 21 ++++++++-
.../testswap/lib/TestBed/ParallelRunner.pm | 21 ++++++++-
.../TestBed/ParallelRunner/ErrorStrategy.pm | 21 ++++++++-
.../lib/TestBed/ParallelRunner/Executor.pm | 21 ++++++++-
.../lib/TestBed/TestBuilderWrapper.pm | 21 ++++++++-
testsuite/testswap/lib/TestBed/TestSuite.pm | 21 ++++++++-
.../lib/TestBed/TestSuite/Experiment.pm | 21 ++++++++-
.../testswap/lib/TestBed/TestSuite/Link.pm | 21 ++++++++-
.../testswap/lib/TestBed/TestSuite/Node.pm | 21 ++++++++-
.../testswap/lib/TestBed/Wrap/linktest.pm | 21 ++++++++-
.../testswap/lib/TestBed/Wrap/loghole.pm | 21 ++++++++-
testsuite/testswap/lib/TestBed/Wrap/tevc.pm | 21 ++++++++-
.../testswap/lib/TestBed/XMLRPC/Client.pm | 21 ++++++++-
.../lib/TestBed/XMLRPC/Client/Emulab.pm | 21 ++++++++-
.../lib/TestBed/XMLRPC/Client/Experiment.pm | 21 ++++++++-
.../lib/TestBed/XMLRPC/Client/Node.pm | 21 ++++++++-
.../lib/TestBed/XMLRPC/Client/NodeInfo.pm | 21 ++++++++-
.../lib/TestBed/XMLRPC/Client/OSID.pm | 21 ++++++++-
.../lib/TestBed/XMLRPC/Client/Pretty.pm | 21 ++++++++-
testsuite/testswap/lib/Tools.pm | 21 ++++++++-
testsuite/testswap/lib/Tools/Network.pm | 21 ++++++++-
testsuite/testswap/lib/Tools/PerlSSH.pm | 21 ++++++++-
testsuite/testswap/lib/Tools/TBSSH.pm | 21 ++++++++-
testsuite/testswap/lib/Tools/WrappedSSH.pm | 21 ++++++++-
testsuite/testswap/run_single_test_with_args | 21 ++++++++-
testsuite/testswap/sc | 21 ++++++++-
testsuite/testswap/t/coding/pod_coverage.t | 21 ++++++++-
testsuite/testswap/t/eine/elab_in_elab.t | 21 ++++++++-
.../testswap/t/lib/testbed/forkframework.t | 21 ++++++++-
testsuite/testswap/t/lib/testbed/testsuite.t | 21 ++++++++-
testsuite/testswap/t/lib/tools.t | 21 ++++++++-
testsuite/testswap/t/lib/tools/network.t | 21 ++++++++-
testsuite/testswap/t/lib/tools/ssh.t | 21 ++++++++-
.../testswap/t/livetests/ensure_active.t | 21 ++++++++-
.../testswap/t/noautorun/tbts_cmdlineargs.t | 21 ++++++++-
testsuite/testswap/t/tbts/cmdlineargs.t | 21 ++++++++-
testsuite/testswap/t/xmlrpc/emulab.t | 21 ++++++++-
testsuite/testswap/t/xmlrpc/experiment.t | 21 ++++++++-
testsuite/testswap/t/xmlrpc/node.t | 21 ++++++++-
testsuite/testswap/t/xmlrpc/osid.t | 21 ++++++++-
testsuite/testswap/tbts | 21 ++++++++-
testsuite/testswap/tests/BasicNSs.pm | 21 ++++++++-
testsuite/testswap/tests/BasicTopologies.pm | 21 ++++++++-
testsuite/testswap/tests/ImageTests.pm | 21 ++++++++-
testsuite/testswap/tests/OldTestSuite.pm | 21 ++++++++-
testsuite/testswap/tests/OldTestSuiteTests.pm | 21 ++++++++-
.../tests/RateLimitParallelExample.pm | 21 ++++++++-
testsuite/testswap/tests/SyncTests.pm | 21 ++++++++-
testsuite/testswap/tests/TooManyLans.pm | 21 ++++++++-
testsuite/testswap/tests/Trafficgen.pm | 21 ++++++++-
testsuite/testswap/tests/VNodeTest.pm | 21 ++++++++-
testsuite/testswap/tests/features/features.pm | 21 ++++++++-
.../tests/topologies/link_up_link_down.pm | 21 ++++++++-
.../topologies/simple_two_node_linktest.pm | 21 ++++++++-
.../testswap/tests/topologies/single_node.pm | 21 ++++++++-
.../testswap/tests/topologies/two_node_lan.pm | 21 ++++++++-
testsuite/testswap/tests/xen/xen.pm | 21 ++++++++-
testsuite/virt/ops/bw-run.pl | 21 ++++++++-
testsuite/virt/ops/client.pl | 21 ++++++++-
testsuite/virt/ops/command.pl | 21 ++++++++-
testsuite/virt/ops/copy-delay.pl | 21 ++++++++-
testsuite/virt/ops/copy-single-delay.pl | 21 ++++++++-
testsuite/virt/ops/kill.pl | 21 ++++++++-
testsuite/virt/ops/monitor.pl | 21 ++++++++-
testsuite/virt/ops/network.pl | 21 ++++++++-
testsuite/virt/ops/parallel-run.pl | 21 ++++++++-
testsuite/virt/ops/process.pl | 21 ++++++++-
testsuite/virt/ops/reset-syncd.pl | 21 ++++++++-
testsuite/virt/ops/run-sync.pl | 21 ++++++++-
testsuite/virt/ops/run.pl | 21 ++++++++-
testsuite/virt/ops/server.pl | 21 ++++++++-
testsuite/virt/testswap/master-virt.pl | 21 ++++++++-
testsuite/virt/testswap/run-virt.t | 21 ++++++++-
tip/GNUmakefile.in | 21 ++++++++-
tip/console.boss.in | 21 ++++++++-
tip/console.in | 21 ++++++++-
tip/tiptunnel.c | 21 ++++++++-
tmcd/GNUmakefile.in | 21 ++++++++-
tmcd/libtmcd.c | 21 ++++++++-
tmcd/libtmcd.h | 21 ++++++++-
tmcd/mod_tmcd.c | 21 ++++++++-
tmcd/newtmcd.c | 21 ++++++++-
tmcd/newtmcd/GNUmakefile.in | 21 ++++++++-
tmcd/newtmcd/bootsubnodes | 21 ++++++++-
tmcd/newtmcd/bootvnodes | 21 ++++++++-
tmcd/newtmcd/config/foo | 21 ++++++++-
tmcd/newtmcd/config/rc.accounts | 21 ++++++++-
tmcd/newtmcd/config/rc.fakejail | 21 ++++++++-
tmcd/newtmcd/config/rc.firewall | 21 ++++++++-
tmcd/newtmcd/config/rc.hostnames | 21 ++++++++-
tmcd/newtmcd/config/rc.keys | 21 ++++++++-
tmcd/newtmcd/config/rc.localize | 21 ++++++++-
tmcd/newtmcd/config/rc.misc | 21 ++++++++-
tmcd/newtmcd/config/rc.mkelab | 21 ++++++++-
tmcd/newtmcd/config/rc.mounts | 21 ++++++++-
tmcd/newtmcd/config/rc.progagent | 21 ++++++++-
tmcd/newtmcd/config/rc.rpms | 21 ++++++++-
tmcd/newtmcd/config/rc.simulator | 21 ++++++++-
tmcd/newtmcd/config/rc.startcmd | 21 ++++++++-
tmcd/newtmcd/config/rc.syncserver | 21 ++++++++-
tmcd/newtmcd/config/rc.tarfiles | 21 ++++++++-
tmcd/newtmcd/libsetup.pm | 21 ++++++++-
tmcd/newtmcd/libtmcc.pm | 21 ++++++++-
tmcd/newtmcd/logboot | 21 ++++++++-
tmcd/newtmcd/ntpstart | 21 ++++++++-
tmcd/newtmcd/rc.bootsetup | 21 ++++++++-
tmcd/newtmcd/rc.ctrlnode | 21 ++++++++-
tmcd/newtmcd/rc.inelab | 21 ++++++++-
tmcd/newtmcd/tmcc.pl | 21 ++++++++-
tmcd/newtmcd/vnodesetup | 21 ++++++++-
tmcd/newtmcd/watchdog | 21 ++++++++-
tmcd/tmcd.c | 21 ++++++++-
tmcd/tmcd.restart.in | 21 ++++++++-
tools/GNUmakefile.in | 21 ++++++++-
tools/binoffset/GNUmakefile.in | 21 ++++++++-
tools/git/git-checkout-push | 21 ++++++++-
tools/git/git-multihook | 21 ++++++++-
tools/git/gitcodefreeze | 21 ++++++++-
tools/git/gitmail | 21 ++++++++-
tools/git/rewritegitmoves | 21 ++++++++-
tools/hg/hgmail | 21 ++++++++-
tools/rmanage/GNUmakefile.in | 21 ++++++++-
tools/rmanage/rmanage.c | 21 ++++++++-
tools/rmanage/rmcp.c | 21 ++++++++-
tools/rmanage/rmcp.h | 21 ++++++++-
tools/rmanage/rmcp.i | 21 ++++++++-
tools/selectapplet/GNUmakefile.in | 21 ++++++++-
tools/selectapplet/NodeSelect.java | 21 ++++++++-
tools/svn/GNUmakefile.in | 21 ++++++++-
tools/teachswitch/GNUmakefile.in | 21 ++++++++-
tools/teachswitch/teachswitch.c | 20 ++++++++-
tools/tspitests/doquote.c | 21 ++++++++-
tools/tspitests/fail.c | 21 ++++++++-
tools/tspitests/getpub.c | 21 ++++++++-
tools/tspitests/idkey.c | 21 ++++++++-
tools/tspitests/keygen.c | 21 ++++++++-
tools/tspitests/loadkey.c | 21 ++++++++-
tools/tspitests/ltpmloadkey.c | 21 ++++++++-
tools/tspitests/pcrcomposite.c | 21 ++++++++-
tools/tspitests/script1.sh | 21 ++++++++-
tools/tspitests/script2.sh | 21 ++++++++-
tools/tspitests/tpm-signoff.c | 21 ++++++++-
tools/webcamapplet/GNUmakefile.in | 21 ++++++++-
tools/webcamapplet/WebCamApplet.java | 21 ++++++++-
tools/whol/GNUmakefile.in | 21 ++++++++-
tools/whol/whol.c | 20 ++++++++-
utils/GNUmakefile.in | 21 ++++++++-
utils/addblob.in | 21 ++++++++-
utils/addspecialdevice.in | 21 ++++++++-
utils/addspecialiface.in | 21 ++++++++-
utils/addvpubaddr.in | 21 ++++++++-
utils/anonsendmail.in | 21 ++++++++-
utils/archive_list.in | 21 ++++++++-
utils/backupswitches.in | 21 ++++++++-
utils/biosgrabber.pl | 21 ++++++++-
utils/check-shared-bw.in | 27 +++++++++++-
utils/checkquota.in | 21 ++++++++-
utils/clone_image.in | 21 ++++++++-
utils/create_image.in | 21 ++++++++-
utils/ctrladdr.in | 21 ++++++++-
utils/cvsinit.in | 21 ++++++++-
utils/cvsupd.pl.in | 21 ++++++++-
utils/daemon_wrapper.in | 21 ++++++++-
utils/delay_config.in | 21 ++++++++-
utils/deletenode.in | 21 ++++++++-
utils/dumpdescriptor.in | 21 ++++++++-
utils/elabplab_dongleconfig.py | 21 ++++++++-
utils/emulabfeature.in | 21 ++++++++-
utils/epmodeset.in | 21 ++++++++-
utils/eventping.in | 21 ++++++++-
utils/export_tables.in | 21 ++++++++-
utils/fillwires.pl | 21 ++++++++-
utils/firstuser.in | 21 ++++++++-
utils/fixexpinfo.in | 21 ++++++++-
utils/getimages.in | 21 ++++++++-
utils/gettimezone.pl | 21 ++++++++-
utils/grabswitchconfig.in | 21 ++++++++-
utils/grabwebcams.in | 21 ++++++++-
utils/grantfeature.in | 21 ++++++++-
utils/grantimage.in | 21 ++++++++-
utils/grantnodetype.in | 21 ++++++++-
utils/image_import.in | 21 ++++++++-
utils/imagehash.in | 21 ++++++++-
utils/imageinfo.in | 21 ++++++++-
utils/import_commitlog.in | 21 ++++++++-
utils/link_config.in | 21 ++++++++-
utils/linkmon_ctl.in | 21 ++++++++-
utils/localize_mfs.in | 21 ++++++++-
utils/loghole.1 | 21 ++++++++-
utils/loghole.in | 21 ++++++++-
utils/logparse/checkrecords.pl | 21 ++++++++-
utils/logparse/extractmail.pl | 21 ++++++++-
utils/logparse/parsemail.pl | 21 ++++++++-
utils/logparse/regen | 21 ++++++++-
utils/logparse/summarize.pl | 21 ++++++++-
utils/logparse/tbmail.pm | 21 ++++++++-
utils/macgrabber.pl | 21 ++++++++-
utils/management_iface.in | 21 ++++++++-
utils/mkblob.in | 21 ++++++++-
utils/newnode.in | 21 ++++++++-
utils/node_admin.in | 21 ++++++++-
utils/node_statewait.in | 21 ++++++++-
utils/node_testsuite | 21 ++++++++-
utils/node_traffic.in | 21 ++++++++-
utils/nsgen/GNUmakefile.in | 21 ++++++++-
utils/nsgen/nsgen | 21 ++++++++-
utils/nsgen/nstemplate.dtd | 21 ++++++++-
utils/nsgen/webnsgen.in | 21 ++++++++-
utils/opsdb_control.in | 21 ++++++++-
utils/opsdb_control.proxy.in | 21 ++++++++-
utils/opsreboot.in | 21 ++++++++-
utils/osstuff.sh | 21 ++++++++-
utils/plabmsrenew.pl.in | 21 ++++++++-
utils/prereserve.in | 21 ++++++++-
utils/prereserve_check.in | 21 ++++++++-
utils/process-acl | 21 ++++++++-
utils/readblob.in | 21 ++++++++-
utils/remove_old_www.in | 21 ++++++++-
utils/rmblob.in | 21 ++++++++-
utils/rpcgrab.sh | 21 ++++++++-
utils/schemadiff | 21 ++++++++-
utils/setbuildinfo.in | 21 ++++++++-
utils/setdest.in | 21 ++++++++-
utils/sharevlan.in | 21 ++++++++-
utils/sitevarsdiff | 21 ++++++++-
utils/snmp-if-deref.sh | 21 ++++++++-
utils/spewconlog.in | 21 ++++++++-
utils/spewevents.in | 21 ++++++++-
utils/spewimage.in | 21 ++++++++-
utils/spewleds.in | 21 ++++++++-
utils/spewsource.in | 21 ++++++++-
utils/sshtb.in | 21 ++++++++-
utils/subboss_tftpboot_sync.in | 21 ++++++++-
utils/suchown.in | 21 ++++++++-
utils/tbbuildkernels | 21 ++++++++-
utils/template_record.in | 21 ++++++++-
utils/testbed-control.in | 21 ++++++++-
utils/unelvin.pl | 21 ++++++++-
utils/vlandiff.in | 21 ++++++++-
utils/vlansync.in | 21 ++++++++-
utils/wanodecheckin.in | 21 ++++++++-
utils/wanodecreate.in | 21 ++++++++-
utils/wbts_dump.in | 21 ++++++++-
utils/webcopy.in | 21 ++++++++-
utils/webcvsweb.in | 21 ++++++++-
utils/withadminprivs | 21 ++++++++-
utils/xlogin.in | 21 ++++++++-
vis/GNUmakefile.in | 21 ++++++++-
vis/dbvistopology.in | 21 ++++++++-
vis/floormap.in | 21 ++++++++-
vis/prerender.in | 21 ++++++++-
vis/prerender_all.in | 21 ++++++++-
vis/render.in | 21 ++++++++-
vis/webfloormap.in | 21 ++++++++-
vis/webvistopology.in | 21 ++++++++-
wiki/GNUmakefile.in | 21 ++++++++-
wiki/addwikiproj.in | 21 ++++++++-
wiki/addwikiuser.in | 21 ++++++++-
wiki/delwikiuser.in | 21 ++++++++-
wiki/setwikigroups.in | 21 ++++++++-
wiki/wikiproxy.in | 21 ++++++++-
wiki/wikisetup.in | 21 ++++++++-
wiki/wikixlogin.in | 21 ++++++++-
www/BlinkenLichten.java | 21 ++++++++-
www/GNUmakefile.in | 21 ++++++++-
www/adminlogin.php | 21 ++++++++-
www/approveproject.php3 | 21 ++++++++-
www/approveproject_form.php3 | 21 ++++++++-
www/approveproject_list.php3 | 21 ++++++++-
www/approveuser.php3 | 21 ++++++++-
www/approveuser_form.php3 | 21 ++++++++-
www/archive_control.php3 | 21 ++++++++-
www/archive_list.php | 21 ++++++++-
www/archive_missing.php3 | 21 ++++++++-
www/archive_tag.php3 | 21 ++++++++-
www/archive_tags.php3 | 21 ++++++++-
www/archive_view.php3 | 21 ++++++++-
www/beginexp.php | 21 ++++++++-
www/beginexp_form.php3 | 21 ++++++++-
www/boot.php3 | 21 ++++++++-
www/bootlog.php3 | 21 ++++++++-
www/buildui/Expando.java | 21 ++++++++-
www/buildui/FlatButton.java | 21 ++++++++-
www/buildui/IFacePropertiesArea.java | 21 ++++++++-
www/buildui/IFaceThingee.java | 21 ++++++++-
www/buildui/IconThingee.java | 21 ++++++++-
www/buildui/LanLinkPropertiesArea.java | 21 ++++++++-
www/buildui/LanLinkThingee.java | 21 ++++++++-
www/buildui/LanPropertiesArea.java | 21 ++++++++-
www/buildui/LanThingee.java | 21 ++++++++-
www/buildui/LinkPropertiesArea.java | 21 ++++++++-
www/buildui/LinkThingee.java | 21 ++++++++-
www/buildui/MagicTextField.java | 21 ++++++++-
www/buildui/Netbuild.java | 21 ++++++++-
www/buildui/NodePropertiesArea.java | 21 ++++++++-
www/buildui/NodeThingee.java | 21 ++++++++-
www/buildui/Palette.java | 21 ++++++++-
www/buildui/PropertiesArea.java | 21 ++++++++-
www/buildui/Thingee.java | 21 ++++++++-
www/buildui/TrashThingee.java | 21 ++++++++-
www/buildui/WorkArea.java | 21 ++++++++-
www/buildui/bui.php3 | 21 ++++++++-
www/buildui/netbuild.html | 21 ++++++++-
www/buildui/nssave.php3 | 21 ++++++++-
www/cdromcheckin.php3 | 21 ++++++++-
www/changeuid.php | 21 ++++++++-
www/chpasswd.php3 | 21 ++++++++-
www/clientui.php3 | 21 ++++++++-
www/common-style.css | 21 ++++++++-
www/copyright-local.txt | 21 ++++++++-
www/copyright-standard.html | 21 ++++++++-
www/copyright.html | 21 ++++++++-
www/copyright.php | 21 ++++++++-
www/currentusage.php3 | 21 ++++++++-
www/cvsweb/cvsweb.php3 | 21 ++++++++-
www/cvsweb/cvswebwrap.php3 | 21 ++++++++-
www/dbcheck.php3 | 21 ++++++++-
www/dbdefs.php3.in | 21 ++++++++-
www/defs.php3.in | 21 ++++++++-
www/delaycontrol.php3 | 21 ++++++++-
www/deleted_pubs.php | 21 ++++++++-
www/deletegroup.php3 | 21 ++++++++-
www/deleteimageid.php3 | 21 ++++++++-
www/deletenodelog.php3 | 21 ++++++++-
www/deleteosid.php3 | 21 ++++++++-
www/deleteproject.php3 | 21 ++++++++-
www/deletepubkey.php3 | 21 ++++++++-
www/deleteuser.php3 | 21 ++++++++-
www/delmmlist.php3 | 21 ++++++++-
www/doc.php3 | 21 ++++++++-
www/doc/arch-small.html | 21 ++++++++-
www/doc/arch.html | 21 ++++++++-
www/doc/changelog.php3 | 21 ++++++++-
www/doc/docwrapper.php3 | 21 ++++++++-
www/doc/expubs.html | 21 ++++++++-
www/doc/internals.html | 21 ++++++++-
www/doc/mobilewireless.html | 21 ++++++++-
www/doc/sfs.html | 21 ++++++++-
www/doc/stargatenotes.html | 21 ++++++++-
www/doc/states.html | 21 ++++++++-
www/doc/tmcd.html | 21 ++++++++-
www/doc/topo.html | 21 ++++++++-
www/doc/users.html | 21 ++++++++-
www/docwrapper.php3 | 21 ++++++++-
www/dynselect.js | 21 ++++++++-
www/editexp.php3 | 21 ++++++++-
www/editgroup.php3 | 21 ++++++++-
www/editimageid.php3 | 21 ++++++++-
www/editnodetype.php3 | 21 ++++++++-
www/editsitevars.php3 | 21 ++++++++-
www/emailus.php3 | 21 ++++++++-
www/emulab_sup.js | 21 ++++++++-
www/endexp.php3 | 21 ++++++++-
www/error.php3 | 21 ++++++++-
www/error.shtml | 21 ++++++++-
www/experiment_defs.php | 21 ++++++++-
www/experimentrun_show.php | 21 ++++++++-
www/explist.php3 | 21 ++++++++-
www/expubs.php | 21 ++++++++-
www/faq.html | 21 ++++++++-
www/faq.php3 | 21 ++++++++-
www/feedback.php3 | 21 ++++++++-
www/floormap.php3 | 21 ++++++++-
www/floormap_aux.php3 | 21 ++++++++-
www/form_defs.php | 21 ++++++++-
www/form_example.php | 21 ++++++++-
www/freenode.php3 | 21 ++++++++-
www/freezeuser.php3 | 21 ++++++++-
www/garcia-telemetry/GNUmakefile.in | 21 ++++++++-
www/garcia-telemetry/GarciaTelemetry.java | 21 ++++++++-
www/garcia-telemetry/UpdateThread.java | 21 ++++++++-
www/garcia-telemetry/main.xml | 21 ++++++++-
www/geni_defs.php | 21 ++++++++-
www/genihistory.php | 21 ++++++++-
www/genislices.php | 21 ++++++++-
www/gensslcert.php3 | 21 ++++++++-
www/getsslcert.php3 | 21 ++++++++-
www/gotobugdb.php3 | 21 ++++++++-
www/gotochat.php3 | 21 ++++++++-
www/gotommlist.php3 | 21 ++++++++-
www/gotopeer.php | 21 ++++++++-
www/gototrac.php3 | 21 ++++++++-
www/gotowiki.php3 | 21 ++++++++-
www/group_defs.php | 21 ++++++++-
www/hardware-cmuemlab.html | 21 ++++++++-
www/hardware.php | 21 ++++++++-
www/htmlinstall.in | 21 ++++++++-
www/hyperviewer/docwrapper.php3 | 21 ++++++++-
www/hyperviewer/hyperviewer.php3 | 21 ++++++++-
www/image_metadata.php | 21 ++++++++-
www/imageid_defs.php | 21 ++++++++-
www/index-cmuemulab.html | 21 ++++++++-
www/index-mainsite.html | 21 ++++++++-
www/index-nonmain.html | 21 ++++++++-
www/index.html | 21 ++++++++-
www/index.php3 | 21 ++++++++-
www/installwikidocs.in | 21 ++++++++-
www/instance_show.php | 21 ++++++++-
www/jabber/jeti.php | 21 ++++++++-
www/java.html | 21 ++++++++-
www/jay.php | 21 ++++++++-
www/joinproject.php3 | 21 ++++++++-
www/kb-browse.php3 | 21 ++++++++-
www/kb-faq.php3 | 21 ++++++++-
www/kb-show.php3 | 21 ++++++++-
www/ledpipe.php3 | 21 ++++++++-
www/linkgraph_image.php | 21 ++++++++-
www/linkmon_ctl.php3 | 21 ++++++++-
www/linkmon_list.php3 | 21 ++++++++-
www/linkmon_mon.php3 | 21 ++++++++-
www/linktest.php3 | 21 ++++++++-
www/listrepos.php3 | 21 ++++++++-
www/loadimage.php3 | 21 ++++++++-
www/login.php3 | 21 ++++++++-
www/login_plab.php3 | 21 ++++++++-
www/login_redirect.php | 21 ++++++++-
www/logout.php3 | 21 ++++++++-
www/menu.php3 | 21 ++++++++-
www/modifyexp.php3 | 21 ++++++++-
www/modnodeattributes.php3 | 21 ++++++++-
www/modnodeattributes_form.php3 | 21 ++++++++-
www/moduserinfo.php3 | 21 ++++++++-
www/moteleds.php3 | 21 ++++++++-
www/mungelog.js | 21 ++++++++-
www/mychat.php3 | 21 ++++++++-
www/netemu.php3 | 21 ++++++++-
www/netlab/client.php3 | 21 ++++++++-
www/newgroup.php3 | 21 ++++++++-
www/newimageid.php3 | 21 ++++++++-
www/newimageid_ez.php3 | 21 ++++++++-
www/newmmlist.php3 | 21 ++++++++-
www/newnode-defs.php3 | 21 ++++++++-
www/newnode_edit.php3 | 21 ++++++++-
www/newnodecheckin.php | 21 ++++++++-
www/newnodelog.php3 | 21 ++++++++-
www/newnodelog_form.php3 | 21 ++++++++-
www/newnodes_list.php3 | 21 ++++++++-
www/newosid.php3 | 21 ++++++++-
www/newproject.php3 | 21 ++++++++-
www/news-rss.php3 | 21 ++++++++-
www/news.php3 | 21 ++++++++-
www/node_defs.php | 21 ++++++++-
www/nodecontrol.php3 | 21 ++++++++-
www/nodecontrol_form.php3 | 21 ++++++++-
www/nodecontrol_list.php3 | 21 ++++++++-
www/noderdp.php3 | 21 ++++++++-
www/nodessh.php3 | 21 ++++++++-
www/nodetipacl.php3 | 21 ++++++++-
www/nodeutilization.php | 21 ++++++++-
www/nologins.php3 | 21 ++++++++-
www/nscheck.php3 | 21 ++++++++-
www/nscheck_form.php3 | 21 ++++++++-
www/obstacle_list.php3 | 21 ++++++++-
www/onload.js | 21 ++++++++-
www/osconfig_dump.php | 21 ++++++++-
www/osiddefs.php3 | 21 ++++++++-
www/osinfo_defs.php | 21 ++++++++-
www/pagenotworking.php | 21 ++++++++-
www/panicbutton.php3 | 21 ++++++++-
www/password.php3 | 21 ++++++++-
www/peer_login.php | 21 ++++++++-
www/people.php3 | 21 ++++++++-
www/powertime.php3 | 21 ++++++++-
www/prereserve_node.php3 | 21 ++++++++-
www/profile.php | 21 ++++++++-
www/project_defs.php | 21 ++++++++-
www/projectlist.php3 | 21 ++++++++-
www/protogeni/getsslcert.php3 | 21 ++++++++-
www/protogeni/register_ca.php | 21 ++++++++-
www/pub_defs.php | 21 ++++++++-
www/pubs.html | 21 ++++++++-
www/pubs.php3 | 21 ++++++++-
www/rdp-mime-winxp.c | 21 ++++++++-
www/rdp-mime-winxp.pl | 21 ++++++++-
www/rdp-mime.pl | 21 ++++++++-
www/record_revise.php | 21 ++++++++-
www/remapexp.php3 | 21 ++++++++-
www/replayexp.php3 | 21 ++++++++-
www/reqaccount.php3 | 21 ++++++++-
www/request_idleinfo.php3 | 21 ++++++++-
www/request_swapexp.php3 | 21 ++++++++-
www/resendapproval.php | 21 ++++++++-
www/resendkey.php3 | 21 ++++++++-
www/robotrack/assignnodes.php3 | 21 ++++++++-
www/robotrack/cameras.php3 | 21 ++++++++-
www/robotrack/flooricon.php3 | 21 ++++++++-
www/robotrack/nodeinfo.php3 | 21 ++++++++-
www/robotrack/obstacles.php3 | 21 ++++++++-
www/robotrack/robopipe.php3 | 21 ++++++++-
www/robotrack/robotrack.php3 | 21 ++++++++-
www/robotrack/selector.php3 | 21 ++++++++-
www/robotrack/setdest.php3 | 21 ++++++++-
www/robotrack/virtinfo.php3 | 21 ++++++++-
www/rusage_viz.css | 21 ++++++++-
www/rusage_viz.php | 21 ++++++++-
www/sc2002tut.php3 | 21 ++++++++-
www/sdr/docwrapper.php3 | 21 ++++++++-
www/sdr/faq.html | 21 ++++++++-
www/sdr/index.php3 | 21 ++++++++-
www/sdr/news.html | 21 ++++++++-
www/sdr/preorder_list.php | 21 ++++++++-
www/sdr/users.html | 21 ++++++++-
www/search.php3 | 21 ++++++++-
www/search_cse.php | 21 ++++++++-
www/sec-check/GNUmakefile.in | 21 ++++++++-
www/sec-check/README-FIRST.txt | 21 ++++++++-
www/sec-check/README-background.txt | 21 ++++++++-
www/sec-check/README-concepts.txt | 21 ++++++++-
www/sec-check/README-howto.txt | 21 ++++++++-
www/sec-check/form-input.gawk | 21 ++++++++-
www/sec-check/forms-to-urls.gawk | 21 ++++++++-
www/sec-check/sep-urls.gawk | 21 ++++++++-
www/sec-check/undo-probe.pl | 21 ++++++++-
www/sec-check/urls-to-wget.gawk | 21 ++++++++-
www/sec-check/waitexp | 21 ++++++++-
www/sendemail.php3 | 21 ++++++++-
www/sendtestmsg.php3 | 21 ++++++++-
www/servicepipe.php3 | 21 ++++++++-
www/setnodeloc.php3 | 21 ++++++++-
www/showconlog.php3 | 21 ++++++++-
www/showevents.php | 21 ++++++++-
www/showexp.js | 21 ++++++++-
www/showexp.php3 | 21 ++++++++-
www/showexp_list.php3 | 21 ++++++++-
www/showexpstats.php3 | 21 ++++++++-
www/showgroup.php3 | 21 ++++++++-
www/showimageid.php3 | 21 ++++++++-
www/showimageid_list.php3 | 21 ++++++++-
www/showlasterror.php3 | 21 ++++++++-
www/showlogfile.php3 | 21 ++++++++-
www/showlogfile_sup.php3 | 21 ++++++++-
www/showmmlists.php3 | 21 ++++++++-
www/shownode.php3 | 21 ++++++++-
www/shownodehistory.php3 | 21 ++++++++-
www/shownodelog.php3 | 21 ++++++++-
www/shownodetype.php3 | 21 ++++++++-
www/shownodetype_list.php | 21 ++++++++-
www/shownsfile.php3 | 21 ++++++++-
www/showobstacle.php3 | 21 ++++++++-
www/showosid_list.php3 | 21 ++++++++-
www/showosinfo.php3 | 21 ++++++++-
www/showpolicies.php3 | 21 ++++++++-
www/showpool.php | 21 ++++++++-
www/showproject.php3 | 21 ++++++++-
www/showproject_list.php3 | 21 ++++++++-
www/showpubkeys.php3 | 21 ++++++++-
www/showslice.php | 21 ++++++++-
www/showstats.php3 | 21 ++++++++-
www/showstuff.php3 | 21 ++++++++-
www/showsumstats.php3 | 21 ++++++++-
www/showthumb.php3 | 21 ++++++++-
www/showuser.php3 | 21 ++++++++-
www/showuser_list.php3 | 21 ++++++++-
www/showvlantaghistory.php | 21 ++++++++-
www/software.php3 | 21 ++++++++-
www/spewconlog.php3 | 21 ++++++++-
www/spewevents.php | 21 ++++++++-
www/spewimage.php | 21 ++++++++-
www/spewlogfile.php3 | 21 ++++++++-
www/spewrpmtar.php3 | 21 ++++++++-
www/spitnsdata.php3 | 21 ++++++++-
www/spitreport.php | 21 ++++++++-
www/sponsors.html | 21 ++++++++-
www/ssh-mime-windows.pl | 21 ++++++++-
www/ssh-mime-winxp.c | 21 ++++++++-
www/ssh-mime-winxp.pl | 21 ++++++++-
www/ssh-mime.c | 21 ++++++++-
www/ssh-mime.pl | 21 ++++++++-
www/start.php3 | 21 ++++++++-
www/statechange.php | 21 ++++++++-
www/style-doc.css | 21 ++++++++-
www/style-new.css | 21 ++++++++-
www/style.css | 21 ++++++++-
www/submitpub.php | 21 ++++++++-
www/suuser.php | 21 ++++++++-
www/swapexp.php3 | 21 ++++++++-
www/table_defs.php | 21 ++++++++-
www/tbauth.php3 | 21 ++++++++-
www/telemetry.php3 | 21 ++++++++-
www/template_analyze.php | 21 ++++++++-
www/template_commit.php | 21 ++++++++-
www/template_create.php | 21 ++++++++-
www/template_defs.php | 21 ++++++++-
www/template_editevents.php | 21 ++++++++-
www/template_export.php | 21 ++++++++-
www/template_exprun.php | 21 ++++++++-
www/template_graph.php | 21 ++++++++-
www/template_history.php | 21 ++++++++-
www/template_metadata.php | 21 ++++++++-
www/template_modify.php | 21 ++++++++-
www/template_search.php | 21 ++++++++-
www/template_show.php | 21 ++++++++-
www/template_sup.js | 21 ++++++++-
www/template_swapin.php | 21 ++++++++-
www/textbox.js | 21 ++++++++-
www/timetree/timetree.css | 21 ++++++++-
www/timetree/timetree.js | 21 ++++++++-
www/toggle.php | 21 ++++++++-
www/top2image.php3 | 21 ++++++++-
www/tutorial/GNUmakefile.in | 21 ++++++++-
www/tutorial/docwrapper.php3 | 21 ++++++++-
www/tutorial/loghole.html | 21 ++++++++-
www/tutorial/loghole.html.head | 21 ++++++++-
www/tutorial/mobilewireless.php3 | 21 ++++++++-
www/tutorial/tb_compat.tcl | 21 ++++++++-
www/tutorial/tutorial.php3 | 21 ++++++++-
www/unregister_globals.php | 21 ++++++++-
www/updateaccounts.php3 | 21 ++++++++-
www/updown.php3 | 21 ++++++++-
www/url_defs.php | 21 ++++++++-
www/user_defs.php | 21 ++++++++-
www/usermap/index.php | 23 ++++++++--
www/usermap/usermap.js | 23 ++++++++++
www/usermap/usermap.php | 23 ++++++++--
www/verifyusr.php3 | 21 ++++++++-
www/verifyusr_form.php3 | 21 ++++++++-
www/wanodecheckin.php | 21 ++++++++-
www/webcam.php3 | 21 ++++++++-
www/webcamimg.php3 | 21 ++++++++-
www/webdb/webdb.php3 | 21 ++++++++-
www/websearch.in | 21 ++++++++-
www/widearea_info.php3 | 21 ++++++++-
www/widearea_nodeinfo.php3 | 21 ++++++++-
www/widearea_redirect.php | 21 ++++++++-
www/wideareakeys.php3 | 21 ++++++++-
www/wikiregister.php3 | 21 ++++++++-
www/wireless-stats/getdata.php3 | 21 ++++++++-
www/wireless-stats/src/CollapsablePanel.java | 21 ++++++++-
.../src/CollapsablePanelContainer.java | 21 ++++++++-
www/wireless-stats/src/ControlPanel.java | 21 ++++++++-
www/wireless-stats/src/DataCache.java | 21 ++++++++-
www/wireless-stats/src/DataCacheEvent.java | 21 ++++++++-
www/wireless-stats/src/DataCacheListener.java | 21 ++++++++-
www/wireless-stats/src/DataCacheObject.java | 21 ++++++++-
www/wireless-stats/src/DataSource.java | 21 ++++++++-
.../src/DataSourceListener.java | 21 ++++++++-
www/wireless-stats/src/Dataset.java | 21 ++++++++-
www/wireless-stats/src/DatasetModel.java | 21 ++++++++-
.../src/DatasetModelListener.java | 21 ++++++++-
.../src/EmulabURLDataSource.java | 21 ++++++++-
www/wireless-stats/src/GenericLinkStats.java | 21 ++++++++-
www/wireless-stats/src/GenericStats.java | 21 ++++++++-
.../src/GenericWirelessData.java | 21 ++++++++-
www/wireless-stats/src/ILEStats.java | 21 ++++++++-
www/wireless-stats/src/LinkStats.java | 21 ++++++++-
www/wireless-stats/src/LinkWidget.java | 21 ++++++++-
www/wireless-stats/src/MapDataModel.java | 21 ++++++++-
www/wireless-stats/src/MinHeap.java | 21 ++++++++-
www/wireless-stats/src/MoteLinkViewer.java | 21 ++++++++-
www/wireless-stats/src/NodeLinkModel.java | 21 ++++++++-
www/wireless-stats/src/NodeMapPanel.java | 21 ++++++++-
www/wireless-stats/src/NodePosition.java | 21 ++++++++-
www/wireless-stats/src/NodePositions.java | 21 ++++++++-
www/wireless-stats/src/NodeWidget.java | 21 ++++++++-
www/wireless-stats/src/Position.java | 21 ++++++++-
www/wireless-stats/src/Widget.java | 21 ++++++++-
www/wireless-stats/src/WifiLinkViewer.java | 21 ++++++++-
www/wireless-stats/src/WirelessData.java | 21 ++++++++-
www/wireless-stats/src/WirelessMapApplet.java | 21 ++++++++-
www/wireless-stats/statsapp.php3 | 21 ++++++++-
www/wireless-stats/wifi_test.awk | 21 ++++++++-
www/xmlrpc.php3.in | 21 ++++++++-
www/xmlrpcpipe.php3.in | 21 ++++++++-
xmlrpc/BasicXMLRPCServers.py.in | 21 ++++++++-
xmlrpc/GNUmakefile.in | 21 ++++++++-
xmlrpc/emulab.in | 21 ++++++++-
xmlrpc/emulabclient.py.in | 30 ++++++++-----
xmlrpc/emulabserver.py.in | 21 ++++++++-
xmlrpc/experiment.in | 21 ++++++++-
xmlrpc/fs.in | 21 ++++++++-
xmlrpc/imageid.in | 21 ++++++++-
xmlrpc/libxmlrpc.pm.in | 21 ++++++++-
xmlrpc/node.in | 21 ++++++++-
xmlrpc/osid.in | 21 ++++++++-
xmlrpc/script_wrapper.py.in | 30 ++++++++-----
xmlrpc/server.in | 21 ++++++++-
xmlrpc/sshxmlrpc.py | 30 ++++++++-----
xmlrpc/sshxmlrpc_client.py.in | 30 ++++++++-----
xmlrpc/sshxmlrpc_server.py.in | 21 ++++++++-
xmlrpc/sslxmlrpc_client.py.in | 30 ++++++++-----
xmlrpc/sslxmlrpc_server.py.in | 21 ++++++++-
xmlrpc/user.in | 21 ++++++++-
xmlrpc/webxmlrpc.in | 21 ++++++++-
xmlrpc/xmlrpcapi.php3 | 21 ++++++++-
xmlrpc/xmlrpcbag.in | 21 ++++++++-
3136 files changed, 64522 insertions(+), 12170 deletions(-)
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 3d367cdec6..d7d671c621 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Testbed Makefile
#
diff --git a/GNUmakerules b/GNUmakerules
index 2ae735a070..deaf189f86 100644
--- a/GNUmakerules
+++ b/GNUmakerules
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
# Get rid of a bunch of nasty built-in implicit rules,
# to avoid bogus circular dependencies and make things go faster.
diff --git a/Makeconf.in b/Makeconf.in
index 7f25588ccf..586d44aa09 100644
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Most of the configure-substitution magic is done here.
# All the other makefiles in the NodeOS include
diff --git a/WEBtemplate.in b/WEBtemplate.in
index 775f0f967c..c49b892e23 100644
--- a/WEBtemplate.in
+++ b/WEBtemplate.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/account/GNUmakefile.in b/account/GNUmakefile.in
index 4aa6b74a28..43c3315471 100644
--- a/account/GNUmakefile.in
+++ b/account/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/account/addpubkey.in b/account/addpubkey.in
index e004d830a4..3e804562b9 100644
--- a/account/addpubkey.in
+++ b/account/addpubkey.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/account/addsfskey.in b/account/addsfskey.in
index ec49b69187..9a367760d7 100644
--- a/account/addsfskey.in
+++ b/account/addsfskey.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/account/adduserhook.in b/account/adduserhook.in
index d03c47173a..34291b988f 100644
--- a/account/adduserhook.in
+++ b/account/adduserhook.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/account/dumpproject.in b/account/dumpproject.in
index a24b5f1f8e..5e4475d1a6 100644
--- a/account/dumpproject.in
+++ b/account/dumpproject.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/account/dumpuser.in b/account/dumpuser.in
index d6da0e6a16..d5ced425a5 100644
--- a/account/dumpuser.in
+++ b/account/dumpuser.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/account/genpubkeys.in b/account/genpubkeys.in
index 2ea537a254..f57c16034f 100644
--- a/account/genpubkeys.in
+++ b/account/genpubkeys.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/account/manageremote.in b/account/manageremote.in
index f9c1ba9e66..5a565bc631 100644
--- a/account/manageremote.in
+++ b/account/manageremote.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2010-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/account/mksyscert.in b/account/mksyscert.in
index de67ae7675..1d6afa0d74 100755
--- a/account/mksyscert.in
+++ b/account/mksyscert.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/account/mkusercert.in b/account/mkusercert.in
index b98ce1ea1b..36329c216d 100755
--- a/account/mkusercert.in
+++ b/account/mkusercert.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/account/newproj.in b/account/newproj.in
index 52a67738ab..1efd70b230 100644
--- a/account/newproj.in
+++ b/account/newproj.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/account/newuser.in b/account/newuser.in
index d93906c41d..1c39350258 100644
--- a/account/newuser.in
+++ b/account/newuser.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/account/quotamail.in b/account/quotamail.in
index eb55b7cf01..f033e92c98 100644
--- a/account/quotamail.in
+++ b/account/quotamail.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Found on the internet, and customized for Emulab
diff --git a/account/spewcert.in b/account/spewcert.in
index fcd14bd73d..f98c64f7d9 100644
--- a/account/spewcert.in
+++ b/account/spewcert.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/account/tbacct.in b/account/tbacct.in
index d737111970..7b7095b624 100644
--- a/account/tbacct.in
+++ b/account/tbacct.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/apache/GNUmakefile.in b/apache/GNUmakefile.in
index 642fca74c2..dc2b21595d 100644
--- a/apache/GNUmakefile.in
+++ b/apache/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# For installation only.
diff --git a/assign/GNUmakefile.in b/assign/GNUmakefile.in
index f228248354..3503b883ac 100644
--- a/assign/GNUmakefile.in
+++ b/assign/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/assign/about.txt b/assign/about.txt
index 60821f00d6..f09112845b 100644
--- a/assign/about.txt
+++ b/assign/about.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
Interesting things about Assign
diff --git a/assign/anneal.cc b/assign/anneal.cc
index c15df46f97..dc0a7c6609 100644
--- a/assign/anneal.cc
+++ b/assign/anneal.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: anneal.cc,v 1.46 2009-05-20 18:06:07 tarunp Exp $";
diff --git a/assign/anneal.h b/assign/anneal.h
index adda013f76..19557423f9 100644
--- a/assign/anneal.h
+++ b/assign/anneal.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/annotate.cc b/assign/annotate.cc
index 834ff56450..045f7c487a 100644
--- a/assign/annotate.cc
+++ b/assign/annotate.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/annotate.h b/assign/annotate.h
index 3423ea3a24..a578a40411 100644
--- a/assign/annotate.h
+++ b/assign/annotate.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/annotate_rspec.cc b/assign/annotate_rspec.cc
index 04ccf3c3a5..0807a313ae 100644
--- a/assign/annotate_rspec.cc
+++ b/assign/annotate_rspec.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: annotate_rspec.cc,v 1.9 2009-10-21 20:49:26 tarunp Exp $";
diff --git a/assign/annotate_rspec.h b/assign/annotate_rspec.h
index 9061018183..6aeaefea2e 100644
--- a/assign/annotate_rspec.h
+++ b/assign/annotate_rspec.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/annotate_rspec_v2.cc b/assign/annotate_rspec_v2.cc
index 772953e8b2..e1d8366d59 100644
--- a/assign/annotate_rspec_v2.cc
+++ b/assign/annotate_rspec_v2.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: annotate_rspec_v2.cc,v 1.9 2009-10-21 20:49:26 tarunp Exp $";
diff --git a/assign/annotate_rspec_v2.h b/assign/annotate_rspec_v2.h
index f1def7068f..3b8e171b71 100644
--- a/assign/annotate_rspec_v2.h
+++ b/assign/annotate_rspec_v2.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/annotate_vtop.cc b/assign/annotate_vtop.cc
index 5515b3736c..31dbfd28fb 100644
--- a/assign/annotate_vtop.cc
+++ b/assign/annotate_vtop.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: annotate_vtop.cc,v 1.2 2009-05-20 18:06:07 tarunp Exp $";
diff --git a/assign/annotate_vtop.h b/assign/annotate_vtop.h
index 3ba0616286..e5af9903ed 100644
--- a/assign/annotate_vtop.h
+++ b/assign/annotate_vtop.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/assign.cc b/assign/assign.cc
index 1b8cad7223..b98bef7137 100644
--- a/assign/assign.cc
+++ b/assign/assign.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "port.h"
diff --git a/assign/assign_internals.txt b/assign/assign_internals.txt
index ebc3b7f571..ca57a6ac51 100644
--- a/assign/assign_internals.txt
+++ b/assign/assign_internals.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
PLEASE NOTE: This file is somewhat out of date.
diff --git a/assign/assign_todo.txt b/assign/assign_todo.txt
index cf89a07ce6..afe78539aa 100644
--- a/assign/assign_todo.txt
+++ b/assign/assign_todo.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
This is the current TODO list for assign (not in order by priority):
diff --git a/assign/comet/toy-assign.co b/assign/comet/toy-assign.co
index 69aafea86c..b1512a3b4f 100644
--- a/assign/comet/toy-assign.co
+++ b/assign/comet/toy-assign.co
@@ -1,9 +1,26 @@
/*
* Toy version of assign, written in Comet
* Robert Ricci <ricci@cs.utah.edu>
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
string rcsid = "$Id: toy-assign.co,v 1.1 2005-12-17 00:46:45 ricci Exp $";
diff --git a/assign/common.h b/assign/common.h
index 192f84d567..0256447c59 100644
--- a/assign/common.h
+++ b/assign/common.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __COMMON_H
diff --git a/assign/compile-options.txt b/assign/compile-options.txt
index 6fbbb827e4..36517148e4 100644
--- a/assign/compile-options.txt
+++ b/assign/compile-options.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003,2006,2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
This file documents the compile-time options for assign, and known caveats.
diff --git a/assign/config.cc b/assign/config.cc
index 9556003f8d..0d8d090c12 100644
--- a/assign/config.cc
+++ b/assign/config.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2009 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: config.cc,v 1.6 2009-06-16 21:11:05 ricci Exp $";
diff --git a/assign/config.h b/assign/config.h
index 548b94b2d9..37de87960e 100644
--- a/assign/config.h
+++ b/assign/config.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 1999-2009 The University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __CONFIG_H
diff --git a/assign/delay.h b/assign/delay.h
index e62d5169da..8d93fe8899 100644
--- a/assign/delay.h
+++ b/assign/delay.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006,2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __DELAY_H
diff --git a/assign/emulab_extensions_parser.cc b/assign/emulab_extensions_parser.cc
index f5eabe8daa..46d34118ae 100644
--- a/assign/emulab_extensions_parser.cc
+++ b/assign/emulab_extensions_parser.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/emulab_extensions_parser.h b/assign/emulab_extensions_parser.h
index 42bc6d91a8..c74ff85cf9 100644
--- a/assign/emulab_extensions_parser.h
+++ b/assign/emulab_extensions_parser.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __EMULAB_EXTENSIONS_PARSER_H__
diff --git a/assign/featuredesire.cc b/assign/featuredesire.cc
index c42e182c4d..9a19d08533 100644
--- a/assign/featuredesire.cc
+++ b/assign/featuredesire.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/featuredesire.h b/assign/featuredesire.h
index b98dc154a2..59417dca0d 100644
--- a/assign/featuredesire.h
+++ b/assign/featuredesire.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2009 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __FEATUREDESIRE_H
diff --git a/assign/file_formats.txt b/assign/file_formats.txt
index 63f97299da..46b8123463 100644
--- a/assign/file_formats.txt
+++ b/assign/file_formats.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#####
diff --git a/assign/forwarding.cc b/assign/forwarding.cc
index 6a29589cad..868a7e041f 100644
--- a/assign/forwarding.cc
+++ b/assign/forwarding.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "forwarding.h"
diff --git a/assign/forwarding.h b/assign/forwarding.h
index 61193d6981..323848741a 100644
--- a/assign/forwarding.h
+++ b/assign/forwarding.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* forwarding.h - data structures for recording information about what
* protocol(s) a node can forward
diff --git a/assign/fstring.cc b/assign/fstring.cc
index bf341859bb..d30ea0704b 100644
--- a/assign/fstring.cc
+++ b/assign/fstring.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: fstring.cc,v 1.4 2009-05-20 18:06:08 tarunp Exp $";
diff --git a/assign/fstring.h b/assign/fstring.h
index 28a92f5fe8..5a9296d9cb 100644
--- a/assign/fstring.h
+++ b/assign/fstring.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef FSTRING_H_
diff --git a/assign/fstringtest.cc b/assign/fstringtest.cc
index 4111373e2a..97ba085b95 100644
--- a/assign/fstringtest.cc
+++ b/assign/fstringtest.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* Test program for the fstring library.
*/
diff --git a/assign/maps.h b/assign/maps.h
index 6dac719b35..680ea7338d 100644
--- a/assign/maps.h
+++ b/assign/maps.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/neighborhood.cc b/assign/neighborhood.cc
index 8da58b94f5..ad80e44ba0 100644
--- a/assign/neighborhood.cc
+++ b/assign/neighborhood.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006,2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/neighborhood.h b/assign/neighborhood.h
index a18fcfd18a..acbe3b0bbf 100644
--- a/assign/neighborhood.h
+++ b/assign/neighborhood.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/parse_advertisement_rspec.cc b/assign/parse_advertisement_rspec.cc
index 6309d197b4..05b0a1a58f 100644
--- a/assign/parse_advertisement_rspec.cc
+++ b/assign/parse_advertisement_rspec.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/parse_advertisement_rspec.h b/assign/parse_advertisement_rspec.h
index cdc011364b..496a12af60 100644
--- a/assign/parse_advertisement_rspec.h
+++ b/assign/parse_advertisement_rspec.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2009-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/parse_error_handler.cc b/assign/parse_error_handler.cc
index 300bdd12bd..4ac63a10c3 100644
--- a/assign/parse_error_handler.cc
+++ b/assign/parse_error_handler.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: parse_error_handler.cc,v 1.2 2009-05-20 18:06:08 tarunp Exp $";
diff --git a/assign/parse_error_handler.h b/assign/parse_error_handler.h
index a3bfb2912d..61a03d69e1 100644
--- a/assign/parse_error_handler.h
+++ b/assign/parse_error_handler.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifdef WITH_XML
diff --git a/assign/parse_policy_xml.cc b/assign/parse_policy_xml.cc
index dec0ca8867..b7ad992bf3 100644
--- a/assign/parse_policy_xml.cc
+++ b/assign/parse_policy_xml.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/parse_policy_xml.h b/assign/parse_policy_xml.h
index e187f7849e..3d18a96b39 100644
--- a/assign/parse_policy_xml.h
+++ b/assign/parse_policy_xml.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2009 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/parse_ptop.cc b/assign/parse_ptop.cc
index c9f09d85c4..ffb5929a20 100644
--- a/assign/parse_ptop.cc
+++ b/assign/parse_ptop.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: parse_ptop.cc,v 1.44 2009-05-20 18:06:08 tarunp Exp $";
diff --git a/assign/parse_ptop_xml.cc b/assign/parse_ptop_xml.cc
index b7484ed70e..a39e552e1d 100644
--- a/assign/parse_ptop_xml.cc
+++ b/assign/parse_ptop_xml.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/parse_ptop_xml.h b/assign/parse_ptop_xml.h
index 96335b3318..d4353358e9 100644
--- a/assign/parse_ptop_xml.h
+++ b/assign/parse_ptop_xml.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/parse_request_rspec.cc b/assign/parse_request_rspec.cc
index 07a24efbc8..cfd93711ae 100644
--- a/assign/parse_request_rspec.cc
+++ b/assign/parse_request_rspec.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/parse_request_rspec.h b/assign/parse_request_rspec.h
index 4019800bde..a26ecbc909 100644
--- a/assign/parse_request_rspec.h
+++ b/assign/parse_request_rspec.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2009-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/parse_top.cc b/assign/parse_top.cc
index 37bfef471d..df23db6c08 100644
--- a/assign/parse_top.cc
+++ b/assign/parse_top.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: parse_top.cc,v 1.42 2009-05-20 18:06:08 tarunp Exp $";
diff --git a/assign/parse_vtop_xml.cc b/assign/parse_vtop_xml.cc
index c4b8087e5d..21c7c972c0 100644
--- a/assign/parse_vtop_xml.cc
+++ b/assign/parse_vtop_xml.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: parse_vtop_xml.cc,v 1.2 2009-05-20 18:06:08 tarunp Exp $";
diff --git a/assign/parse_vtop_xml.h b/assign/parse_vtop_xml.h
index df62a64f03..bffd6aeff1 100644
--- a/assign/parse_vtop_xml.h
+++ b/assign/parse_vtop_xml.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifdef WITH_XML
diff --git a/assign/parser.cc b/assign/parser.cc
index d345564863..5eaeef6569 100644
--- a/assign/parser.cc
+++ b/assign/parser.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: parser.cc,v 1.9 2009-05-20 18:06:08 tarunp Exp $";
diff --git a/assign/parser.h b/assign/parser.h
index d3093bc13e..e2aff3d047 100644
--- a/assign/parser.h
+++ b/assign/parser.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __PARSER_H
diff --git a/assign/pclass.cc b/assign/pclass.cc
index c787f9f1c5..884df60b7f 100644
--- a/assign/pclass.cc
+++ b/assign/pclass.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: pclass.cc,v 1.31 2009-06-15 19:42:26 ricci Exp $";
diff --git a/assign/pclass.h b/assign/pclass.h
index 1f7cbf90cb..a47ed5c152 100644
--- a/assign/pclass.h
+++ b/assign/pclass.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __PCLASS_H
diff --git a/assign/pclass_vclass_fixed.txt b/assign/pclass_vclass_fixed.txt
index 55d2f4908c..a53c783841 100644
--- a/assign/pclass_vclass_fixed.txt
+++ b/assign/pclass_vclass_fixed.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
Terminology:
diff --git a/assign/physical.h b/assign/physical.h
index 4bba4e302e..e0be691a67 100644
--- a/assign/physical.h
+++ b/assign/physical.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __PHYSICAL_H
diff --git a/assign/policy.rnc b/assign/policy.rnc
index 1b72402669..faec515ec6 100644
--- a/assign/policy.rnc
+++ b/assign/policy.rnc
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/assign/port.h b/assign/port.h
index cc97ac4db3..a5a2ea1fa1 100644
--- a/assign/port.h
+++ b/assign/port.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// This file may need to be changed depending on the architecture.
diff --git a/assign/ptop-top.xsd b/assign/ptop-top.xsd
index ffd31081e9..c0c44ef0a8 100644
--- a/assign/ptop-top.xsd
+++ b/assign/ptop-top.xsd
@@ -2,9 +2,26 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://emulab.net/resources/ptop/0.1" xmlns:ptop="http://emulab.net/resources/ptop/0.1">
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2005-2007 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<!--
diff --git a/assign/ptop.rnc b/assign/ptop.rnc
index e703a7705a..dbd8e10403 100644
--- a/assign/ptop.rnc
+++ b/assign/ptop.rnc
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/assign/ptop.rng b/assign/ptop.rng
index de3806ae1b..e02ef3b5a1 100644
--- a/assign/ptop.rng
+++ b/assign/ptop.rng
@@ -1,9 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2007-2010 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<!--
diff --git a/assign/rspec_parser.cc b/assign/rspec_parser.cc
index 2ec6a8cc97..a7e8d7a417 100644
--- a/assign/rspec_parser.cc
+++ b/assign/rspec_parser.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/rspec_parser.h b/assign/rspec_parser.h
index 0d39c85fae..3b20662873 100644
--- a/assign/rspec_parser.h
+++ b/assign/rspec_parser.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/rspec_parser_helper.cc b/assign/rspec_parser_helper.cc
index 9ab41132d2..c57634ac6a 100644
--- a/assign/rspec_parser_helper.cc
+++ b/assign/rspec_parser_helper.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/rspec_parser_helper.h b/assign/rspec_parser_helper.h
index 888c1d6c50..24071cece2 100644
--- a/assign/rspec_parser_helper.h
+++ b/assign/rspec_parser_helper.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/rspec_parser_v1.cc b/assign/rspec_parser_v1.cc
index 23fd08c67d..5fb23d76ce 100644
--- a/assign/rspec_parser_v1.cc
+++ b/assign/rspec_parser_v1.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/rspec_parser_v1.h b/assign/rspec_parser_v1.h
index 1174f486b4..1d53863b28 100644
--- a/assign/rspec_parser_v1.h
+++ b/assign/rspec_parser_v1.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/rspec_parser_v2.cc b/assign/rspec_parser_v2.cc
index d7e2b0fc3d..9e8668cd6a 100644
--- a/assign/rspec_parser_v2.cc
+++ b/assign/rspec_parser_v2.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/rspec_parser_v2.h b/assign/rspec_parser_v2.h
index 5f63f96354..2e7198684b 100644
--- a/assign/rspec_parser_v2.h
+++ b/assign/rspec_parser_v2.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/score.cc b/assign/score.cc
index 35da24b47b..72c49015dd 100644
--- a/assign/score.cc
+++ b/assign/score.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: score.cc,v 1.69 2009-12-09 22:53:44 ricci Exp $";
diff --git a/assign/score.h b/assign/score.h
index 18580ac7f1..799d32d9f0 100644
--- a/assign/score.h
+++ b/assign/score.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _SCORE_H
diff --git a/assign/solution.cc b/assign/solution.cc
index 4c9e0ba76a..0e34fa2df1 100644
--- a/assign/solution.cc
+++ b/assign/solution.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: solution.cc,v 1.15 2009-10-21 20:49:26 tarunp Exp $";
diff --git a/assign/solution.h b/assign/solution.h
index 2fbe057bd3..35d3c60b43 100644
--- a/assign/solution.h
+++ b/assign/solution.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/test-ptop.xml b/assign/test-ptop.xml
index e4e6dd1929..42c96ca529 100644
--- a/assign/test-ptop.xml
+++ b/assign/test-ptop.xml
@@ -1,8 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2005-2006 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<!DOCTYPE ptop SYSTEM "ptop.dtd">
<ptop xmlns="http://emulab.net/resources/ptop/0.1" testbed="emulab">
diff --git a/assign/test-top.xml b/assign/test-top.xml
index 26c6a49527..fd2a14147b 100644
--- a/assign/test-top.xml
+++ b/assign/test-top.xml
@@ -1,8 +1,25 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2005-2006 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<vtop pid="testbed" eid="xmltop" xmlns="http://emulab.net/resources/vtop/0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<node name="nodeA">
diff --git a/assign/top.rnc b/assign/top.rnc
index 92886c5549..5b6891f744 100644
--- a/assign/top.rnc
+++ b/assign/top.rnc
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/assign/top.rng b/assign/top.rng
index 3bc9de501c..88d957c732 100644
--- a/assign/top.rng
+++ b/assign/top.rng
@@ -2,9 +2,26 @@
<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2005-2008 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<!--
diff --git a/assign/toptools/anonymize-expinfo b/assign/toptools/anonymize-expinfo
index aa47858931..c424683ef3 100755
--- a/assign/toptools/anonymize-expinfo
+++ b/assign/toptools/anonymize-expinfo
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/assign/toptools/check-top b/assign/toptools/check-top
index 30e9124031..61d2f9057a 100755
--- a/assign/toptools/check-top
+++ b/assign/toptools/check-top
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/assign/toptools/rename-files b/assign/toptools/rename-files
index 0e8fbb4bdd..df8fd5b32a 100755
--- a/assign/toptools/rename-files
+++ b/assign/toptools/rename-files
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/assign/vclass.cc b/assign/vclass.cc
index 523809565b..d28b72f583 100644
--- a/assign/vclass.cc
+++ b/assign/vclass.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
static const char rcsid[] = "$Id: vclass.cc,v 1.13 2009-05-20 18:06:08 tarunp Exp $";
diff --git a/assign/vclass.h b/assign/vclass.h
index 832100e7c4..a4b860e457 100644
--- a/assign/vclass.h
+++ b/assign/vclass.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __VCLASS_H
diff --git a/assign/virtual.h b/assign/virtual.h
index 42a944de57..6683147638 100644
--- a/assign/virtual.h
+++ b/assign/virtual.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __VIRTUAL_H
diff --git a/assign/vtop-top.xsd b/assign/vtop-top.xsd
index cd07158275..7774942893 100644
--- a/assign/vtop-top.xsd
+++ b/assign/vtop-top.xsd
@@ -2,9 +2,26 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://emulab.net/resources/vtop/0.2" xmlns:vtop="http://emulab.net/resources/vtop/0.2">
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2005-2010 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<!--
diff --git a/assign/vtop.rnc b/assign/vtop.rnc
index 2dea52274d..185d3d3740 100644
--- a/assign/vtop.rnc
+++ b/assign/vtop.rnc
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/assign/vtop.rng b/assign/vtop.rng
index f8ef836530..4ba94afa43 100644
--- a/assign/vtop.rng
+++ b/assign/vtop.rng
@@ -1,9 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2007-2009 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<!--
diff --git a/assign/xmlhelpers.cc b/assign/xmlhelpers.cc
index 3b9f160534..b6b05c5bd8 100644
--- a/assign/xmlhelpers.cc
+++ b/assign/xmlhelpers.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifdef WITH_XML
diff --git a/assign/xmlhelpers.h b/assign/xmlhelpers.h
index 2e3ee16463..08aa306d07 100644
--- a/assign/xmlhelpers.h
+++ b/assign/xmlhelpers.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/assign/xsdgen b/assign/xsdgen
index 280c591db9..726307e04f 100755
--- a/assign/xsdgen
+++ b/assign/xsdgen
@@ -1,8 +1,25 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
TRANGCMD="java -jar ${TRANG:-/usr/local/share/java/classes/trang.jar}"
diff --git a/assign/xstr.h b/assign/xstr.h
index 052df2f513..0109080e9d 100644
--- a/assign/xstr.h
+++ b/assign/xstr.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2008 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __XSTR_H
diff --git a/backend/GNUmakefile.in b/backend/GNUmakefile.in
index 019f076aaa..aa8b6db26a 100644
--- a/backend/GNUmakefile.in
+++ b/backend/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/backend/editexp.in b/backend/editexp.in
index 6fa8c90450..122c14e3f6 100644
--- a/backend/editexp.in
+++ b/backend/editexp.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/backend/editgroup.in b/backend/editgroup.in
index 6629f5c74c..51c577c73e 100644
--- a/backend/editgroup.in
+++ b/backend/editgroup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/backend/editimageid.in b/backend/editimageid.in
index 355b37540f..88506d74c7 100644
--- a/backend/editimageid.in
+++ b/backend/editimageid.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/backend/editnodetype.in b/backend/editnodetype.in
index d70c73b512..029f3cfd75 100644
--- a/backend/editnodetype.in
+++ b/backend/editnodetype.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/backend/editsitevars.in b/backend/editsitevars.in
index ae917d22c4..53dab1ef36 100644
--- a/backend/editsitevars.in
+++ b/backend/editsitevars.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/backend/joinproject.in b/backend/joinproject.in
index 93dc9c3830..6fb38c15d3 100644
--- a/backend/joinproject.in
+++ b/backend/joinproject.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/backend/moduserinfo.in b/backend/moduserinfo.in
index faafb5a084..164614ac7a 100644
--- a/backend/moduserinfo.in
+++ b/backend/moduserinfo.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/backend/newgroup.in b/backend/newgroup.in
index 4cb0251827..607fc977a6 100644
--- a/backend/newgroup.in
+++ b/backend/newgroup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/backend/newimageid.in b/backend/newimageid.in
index fc9866411b..fae2baf989 100644
--- a/backend/newimageid.in
+++ b/backend/newimageid.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/backend/newimageid_ez.in b/backend/newimageid_ez.in
index 4aa308fa03..21b33af63b 100644
--- a/backend/newimageid_ez.in
+++ b/backend/newimageid_ez.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/backend/newmmlist.in b/backend/newmmlist.in
index 1e1d6cf033..0b1d6e6679 100644
--- a/backend/newmmlist.in
+++ b/backend/newmmlist.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/backend/newosid.in b/backend/newosid.in
index df3ede1f2b..500e01db99 100644
--- a/backend/newosid.in
+++ b/backend/newosid.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/backend/newscript.in b/backend/newscript.in
index a44267db1b..e55df8b218 100644
--- a/backend/newscript.in
+++ b/backend/newscript.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/bugdb/GNUmakefile.in b/bugdb/GNUmakefile.in
index 9952fa470c..95962936f1 100644
--- a/bugdb/GNUmakefile.in
+++ b/bugdb/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/bugdb/addbugdbproj.in b/bugdb/addbugdbproj.in
index ff3bd0d180..45db42a812 100644
--- a/bugdb/addbugdbproj.in
+++ b/bugdb/addbugdbproj.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/bugdb/addbugdbuser.in b/bugdb/addbugdbuser.in
index 309786ba08..fa502e4db3 100644
--- a/bugdb/addbugdbuser.in
+++ b/bugdb/addbugdbuser.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/bugdb/bugdbgateway.in b/bugdb/bugdbgateway.in
index 5cea0de8ee..28ad918a66 100644
--- a/bugdb/bugdbgateway.in
+++ b/bugdb/bugdbgateway.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/bugdb/bugdbproxy.in b/bugdb/bugdbproxy.in
index 4ba8783b9f..d388af8e11 100644
--- a/bugdb/bugdbproxy.in
+++ b/bugdb/bugdbproxy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/bugdb/bugdbsetup.in b/bugdb/bugdbsetup.in
index 97a2d11727..6fe8b892e6 100644
--- a/bugdb/bugdbsetup.in
+++ b/bugdb/bugdbsetup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/bugdb/bugdbxlogin.in b/bugdb/bugdbxlogin.in
index 6d0e3409b4..ff88840f8a 100644
--- a/bugdb/bugdbxlogin.in
+++ b/bugdb/bugdbxlogin.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/bugdb/exporttickets.in b/bugdb/exporttickets.in
index 6f3f098cb4..3c4a39b6ac 100644
--- a/bugdb/exporttickets.in
+++ b/bugdb/exporttickets.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/bugdb/setbugdbgroups.in b/bugdb/setbugdbgroups.in
index 32707f4eeb..c3d33114a4 100644
--- a/bugdb/setbugdbgroups.in
+++ b/bugdb/setbugdbgroups.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/capture/GNUmakefile.in b/capture/GNUmakefile.in
index d64e1e397b..e0538a989d 100644
--- a/capture/GNUmakefile.in
+++ b/capture/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/capture/capdecls.h b/capture/capdecls.h
index 545271fe89..88ac3751ad 100644
--- a/capture/capdecls.h
+++ b/capture/capdecls.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002, 2008 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#define SERVERPORT 855
diff --git a/capture/caplog.c b/capture/caplog.c
index 205a2ae9c4..5ec0ba65ea 100644
--- a/capture/caplog.c
+++ b/capture/caplog.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2008 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/param.h>
diff --git a/capture/caplog.in b/capture/caplog.in
index 730beab5ac..65f3c41b03 100644
--- a/capture/caplog.in
+++ b/capture/caplog.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/capture/caplogserver.c b/capture/caplogserver.c
index 40f9a64110..2cb1bdb023 100644
--- a/capture/caplogserver.c
+++ b/capture/caplogserver.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/param.h>
diff --git a/capture/capquery.c b/capture/capquery.c
index b545b9096f..3a0834c2d8 100644
--- a/capture/capquery.c
+++ b/capture/capquery.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/capture/capserver.c b/capture/capserver.c
index a2787b9ce0..53a2483e6c 100644
--- a/capture/capserver.c
+++ b/capture/capserver.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/capture/capture.1 b/capture/capture.1
index 498ab2eb5a..1c2fc89ef9 100644
--- a/capture/capture.1
+++ b/capture/capture.1
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2000, 2012 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.Dd April 19, 2000
diff --git a/capture/capture.c b/capture/capture.c
index bbe3d26ab1..945603a1f6 100644
--- a/capture/capture.c
+++ b/capture/capture.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/cdrom/GNUmakefile.in b/cdrom/GNUmakefile.in
index e26c9fda12..87fc477a85 100644
--- a/cdrom/GNUmakefile.in
+++ b/cdrom/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/cdrom/frisboot/rc.d/frisbee b/cdrom/frisboot/rc.d/frisbee
index 8bd03c4942..9a9cbf653d 100755
--- a/cdrom/frisboot/rc.d/frisbee
+++ b/cdrom/frisboot/rc.d/frisbee
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# PROVIDE: frisbee
diff --git a/cdrom/frisboot/waipconfig.pl b/cdrom/frisboot/waipconfig.pl
index 647e6efba2..9c1936fbe6 100755
--- a/cdrom/frisboot/waipconfig.pl
+++ b/cdrom/frisboot/waipconfig.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/cdrom/groklilo/GNUmakefile.in b/cdrom/groklilo/GNUmakefile.in
index b033326b88..7031278f14 100644
--- a/cdrom/groklilo/GNUmakefile.in
+++ b/cdrom/groklilo/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/cdrom/groklilo/Makefile b/cdrom/groklilo/Makefile
index 11df8809fd..022dc46490 100644
--- a/cdrom/groklilo/Makefile
+++ b/cdrom/groklilo/Makefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
CFLAGS += -I. -g -UINBOOTLOADER
diff --git a/cdrom/groklilo/groklilo.c b/cdrom/groklilo/groklilo.c
index b22aa2e204..f46f2580da 100644
--- a/cdrom/groklilo/groklilo.c
+++ b/cdrom/groklilo/groklilo.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2008 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/cdrom/tbbootconfig/GNUmakefile.in b/cdrom/tbbootconfig/GNUmakefile.in
index 015c825f22..4ffe12bb1c 100644
--- a/cdrom/tbbootconfig/GNUmakefile.in
+++ b/cdrom/tbbootconfig/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/cdrom/tbbootconfig/Makefile b/cdrom/tbbootconfig/Makefile
index 5870b5ab9c..b94c8f81b7 100644
--- a/cdrom/tbbootconfig/Makefile
+++ b/cdrom/tbbootconfig/Makefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
CFLAGS += -I. -g
diff --git a/cdrom/tbbootconfig/tbbootconfig.c b/cdrom/tbbootconfig/tbbootconfig.c
index c9352c4a72..8a0432bc9e 100644
--- a/cdrom/tbbootconfig/tbbootconfig.c
+++ b/cdrom/tbbootconfig/tbbootconfig.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/cdrom/tbbootconfig/testbed_boot.h b/cdrom/tbbootconfig/testbed_boot.h
index 0c6bf9405b..0cfcc590ec 100644
--- a/cdrom/tbbootconfig/testbed_boot.h
+++ b/cdrom/tbbootconfig/testbed_boot.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <netinet/in.h>
diff --git a/cdrom/waboot/emulabboot.sh b/cdrom/waboot/emulabboot.sh
index f8999446e5..2a93d7465e 100755
--- a/cdrom/waboot/emulabboot.sh
+++ b/cdrom/waboot/emulabboot.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/cdrom/waboot/netbed-setup.pl b/cdrom/waboot/netbed-setup.pl
index dcf20d6137..25fab5142d 100755
--- a/cdrom/waboot/netbed-setup.pl
+++ b/cdrom/waboot/netbed-setup.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/cdrom/waboot/rc.emulab b/cdrom/waboot/rc.emulab
index e628009f24..4f10dbb2e0 100755
--- a/cdrom/waboot/rc.emulab
+++ b/cdrom/waboot/rc.emulab
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/cdrom/waboot/register.pl b/cdrom/waboot/register.pl
index 8110bc2521..7090536690 100755
--- a/cdrom/waboot/register.pl
+++ b/cdrom/waboot/register.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/cdrom/waboot/register.sh b/cdrom/waboot/register.sh
index 3d94f296d9..a28778df67 100755
--- a/cdrom/waboot/register.sh
+++ b/cdrom/waboot/register.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/cdrom/waboot/waipconfig.pl b/cdrom/waboot/waipconfig.pl
index eb493b9805..36c5a29ec7 100755
--- a/cdrom/waboot/waipconfig.pl
+++ b/cdrom/waboot/waipconfig.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/GNUmakefile.in b/clientside/GNUmakefile.in
index 447332a420..820415dcdc 100644
--- a/clientside/GNUmakefile.in
+++ b/clientside/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/GNUmakerules b/clientside/GNUmakerules
index 374d13f8bc..ff66b78bc1 100644
--- a/clientside/GNUmakerules
+++ b/clientside/GNUmakerules
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
# Get rid of a bunch of nasty built-in implicit rules,
# to avoid bogus circular dependencies and make things go faster.
diff --git a/clientside/Makeconf.in b/clientside/Makeconf.in
index 1ca704cc74..61899ba571 100644
--- a/clientside/Makeconf.in
+++ b/clientside/Makeconf.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Most of the configure-substitution magic is done here.
# All the other makefiles in the NodeOS include
diff --git a/clientside/configure.in b/clientside/configure.in
index 7713c5138c..2269dd87e1 100644
--- a/clientside/configure.in
+++ b/clientside/configure.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
AC_PREREQ(2.62)
diff --git a/clientside/event/GNUmakefile.in b/clientside/event/GNUmakefile.in
index d1652e64b3..002a8d13e7 100644
--- a/clientside/event/GNUmakefile.in
+++ b/clientside/event/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/event/delay-agent/GNUmakefile.in b/clientside/event/delay-agent/GNUmakefile.in
index 388e8225ba..9a57f02358 100644
--- a/clientside/event/delay-agent/GNUmakefile.in
+++ b/clientside/event/delay-agent/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/event/delay-agent/callback.c b/clientside/event/delay-agent/callback.c
index b2124721e2..e6b3efe3f2 100644
--- a/clientside/event/delay-agent/callback.c
+++ b/clientside/event/delay-agent/callback.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2008 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/event/delay-agent/delay.ns b/clientside/event/delay-agent/delay.ns
index f7fde8feff..fd9b7cd4a3 100644
--- a/clientside/event/delay-agent/delay.ns
+++ b/clientside/event/delay-agent/delay.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
source tb_compat.tcl
diff --git a/clientside/event/delay-agent/delay_test.ns b/clientside/event/delay-agent/delay_test.ns
index 972a9e6408..99850e5983 100644
--- a/clientside/event/delay-agent/delay_test.ns
+++ b/clientside/event/delay-agent/delay_test.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Testing the delay agent
diff --git a/clientside/event/delay-agent/main.c b/clientside/event/delay-agent/main.c
index 3c89b47715..5bb7f2b264 100644
--- a/clientside/event/delay-agent/main.c
+++ b/clientside/event/delay-agent/main.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/event/delay-agent/main.h b/clientside/event/delay-agent/main.h
index 4537d4a808..dc3ba43be0 100644
--- a/clientside/event/delay-agent/main.h
+++ b/clientside/event/delay-agent/main.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/event/disk-agent/GNUmakefile.in b/clientside/event/disk-agent/GNUmakefile.in
index f2fe6d6581..d83bf38e5c 100644
--- a/clientside/event/disk-agent/GNUmakefile.in
+++ b/clientside/event/disk-agent/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/event/disk-agent/compile.sh b/clientside/event/disk-agent/compile.sh
index dc3416465c..608e10acca 100755
--- a/clientside/event/disk-agent/compile.sh
+++ b/clientside/event/disk-agent/compile.sh
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
gcc -c /proj/utahstud/ydev/emulab-devel/clientside/lib/event/event.c -o event.o -I/proj/utahstud/ydev/emulab-devel/clientside/lib \
-I /proj/utahstud/ydev/emulab-devel/clientside/lib/libtb -I/proj/utahstud/ydev/ -L/proj/utahstud/ydev/pubsub
diff --git a/clientside/event/disk-agent/disk-agent.cc b/clientside/event/disk-agent/disk-agent.cc
index 67acf60919..560662d5b7 100644
--- a/clientside/event/disk-agent/disk-agent.cc
+++ b/clientside/event/disk-agent/disk-agent.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* This program implements the Disk agent for Emulab.
diff --git a/clientside/event/disk-agent/mkextrafs b/clientside/event/disk-agent/mkextrafs
index 52f2782957..1d1a0b38e4 100755
--- a/clientside/event/disk-agent/mkextrafs
+++ b/clientside/event/disk-agent/mkextrafs
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/event/link-agent/GNUmakefile.in b/clientside/event/link-agent/GNUmakefile.in
index 2adeae022e..07a0d42bbc 100644
--- a/clientside/event/link-agent/GNUmakefile.in
+++ b/clientside/event/link-agent/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/event/link-agent/link-agent.c b/clientside/event/link-agent/link-agent.c
index 13a7a20157..819676c020 100644
--- a/clientside/event/link-agent/link-agent.c
+++ b/clientside/event/link-agent/link-agent.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/event/linktest/GNUmakefile.in b/clientside/event/linktest/GNUmakefile.in
index 0eb37ceecc..a4655d1d61 100644
--- a/clientside/event/linktest/GNUmakefile.in
+++ b/clientside/event/linktest/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/event/linktest/elab_linktest.pl.in b/clientside/event/linktest/elab_linktest.pl.in
index 1ee79db1f3..4dbc396a61 100755
--- a/clientside/event/linktest/elab_linktest.pl.in
+++ b/clientside/event/linktest/elab_linktest.pl.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/clientside/event/linktest/iperf/GNUmakefile.in b/clientside/event/linktest/iperf/GNUmakefile.in
index 2016f6b5a6..ea9c938eff 100644
--- a/clientside/event/linktest/iperf/GNUmakefile.in
+++ b/clientside/event/linktest/iperf/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/event/linktest/iperf/iperf-fetch.sh b/clientside/event/linktest/iperf/iperf-fetch.sh
index 641e6fd454..bab79f21d0 100755
--- a/clientside/event/linktest/iperf/iperf-fetch.sh
+++ b/clientside/event/linktest/iperf/iperf-fetch.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
version=2.0.2
diff --git a/clientside/event/linktest/linktest.c b/clientside/event/linktest/linktest.c
index fc6888eff0..435f99d7cd 100644
--- a/clientside/event/linktest/linktest.c
+++ b/clientside/event/linktest/linktest.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/clientside/event/linktest/linktest.pl b/clientside/event/linktest/linktest.pl
index acc9bbe59a..ff95b9af56 100755
--- a/clientside/event/linktest/linktest.pl
+++ b/clientside/event/linktest/linktest.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w -T
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/clientside/event/linktest/linktest.proxy.in b/clientside/event/linktest/linktest.proxy.in
index fa0202c5c1..f324c2155c 100644
--- a/clientside/event/linktest/linktest.proxy.in
+++ b/clientside/event/linktest/linktest.proxy.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/clientside/event/linktest/linktest_control.in b/clientside/event/linktest/linktest_control.in
index c16ebe156e..563e8a0525 100644
--- a/clientside/event/linktest/linktest_control.in
+++ b/clientside/event/linktest/linktest_control.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/event/linktest/ltevent.c b/clientside/event/linktest/ltevent.c
index 03f8cd57d9..0f8b19fc01 100644
--- a/clientside/event/linktest/ltevent.c
+++ b/clientside/event/linktest/ltevent.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/clientside/event/linktest/rude/GNUmakefile.in b/clientside/event/linktest/rude/GNUmakefile.in
index 5cd83c7006..59d6ad2913 100644
--- a/clientside/event/linktest/rude/GNUmakefile.in
+++ b/clientside/event/linktest/rude/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/event/linktest/rude/rude-fetch.sh b/clientside/event/linktest/rude/rude-fetch.sh
index a376af5bc7..5c802d0279 100755
--- a/clientside/event/linktest/rude/rude-fetch.sh
+++ b/clientside/event/linktest/rude/rude-fetch.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
version=0.70
diff --git a/clientside/event/linktest/run_linktest.pl.in b/clientside/event/linktest/run_linktest.pl.in
index 8e865c6b7e..9955be456d 100644
--- a/clientside/event/linktest/run_linktest.pl.in
+++ b/clientside/event/linktest/run_linktest.pl.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use Getopt::Std;
diff --git a/clientside/event/linktest/switchtest.pl b/clientside/event/linktest/switchtest.pl
index 7393208ef5..e5672bec78 100755
--- a/clientside/event/linktest/switchtest.pl
+++ b/clientside/event/linktest/switchtest.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use lib "/usr/testbed/lib";
diff --git a/clientside/event/linktest/weblinktest.in b/clientside/event/linktest/weblinktest.in
index 779d3f88c1..24cc29dc66 100644
--- a/clientside/event/linktest/weblinktest.in
+++ b/clientside/event/linktest/weblinktest.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/clientside/event/program-agent/GNUmakefile.in b/clientside/event/program-agent/GNUmakefile.in
index 32d87319db..1cb5901fa0 100644
--- a/clientside/event/program-agent/GNUmakefile.in
+++ b/clientside/event/program-agent/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/event/program-agent/program-agent.8 b/clientside/event/program-agent/program-agent.8
index a2e543487d..919e1e0c66 100644
--- a/clientside/event/program-agent/program-agent.8
+++ b/clientside/event/program-agent/program-agent.8
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2004, 2005, 2006 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.TH PROGRAM-AGENT 8 "November 6, 2004" "Emulab" "Emulab Commands Manual"
.OS
diff --git a/clientside/event/program-agent/program-agent.c b/clientside/event/program-agent/program-agent.c
index 1831e0b298..2df1816356 100644
--- a/clientside/event/program-agent/program-agent.c
+++ b/clientside/event/program-agent/program-agent.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/event/proxy/GNUmakefile.in b/clientside/event/proxy/GNUmakefile.in
index 4cf9a5e1b0..cca5a94e04 100644
--- a/clientside/event/proxy/GNUmakefile.in
+++ b/clientside/event/proxy/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/event/proxy/evproxy.c b/clientside/event/proxy/evproxy.c
index 28af629a4e..d13d569233 100644
--- a/clientside/event/proxy/evproxy.c
+++ b/clientside/event/proxy/evproxy.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/event/proxy/evproxyplab.cc b/clientside/event/proxy/evproxyplab.cc
index 4a761da6b4..0f4ab7e140 100644
--- a/clientside/event/proxy/evproxyplab.cc
+++ b/clientside/event/proxy/evproxyplab.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/event/proxy/proxytest.c b/clientside/event/proxy/proxytest.c
index beb3049074..13a4eb8b27 100644
--- a/clientside/event/proxy/proxytest.c
+++ b/clientside/event/proxy/proxytest.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/event/tevc/GNUmakefile.in b/clientside/event/tevc/GNUmakefile.in
index 5264ada897..6256c0c109 100644
--- a/clientside/event/tevc/GNUmakefile.in
+++ b/clientside/event/tevc/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/event/tevc/tevc.c b/clientside/event/tevc/tevc.c
index e3a60d2fdf..441b2d712d 100644
--- a/clientside/event/tevc/tevc.c
+++ b/clientside/event/tevc/tevc.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/event/trafgen/GNUmakefile.in b/clientside/event/trafgen/GNUmakefile.in
index fb6fdaada1..fd9909b7c6 100644
--- a/clientside/event/trafgen/GNUmakefile.in
+++ b/clientside/event/trafgen/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/event/trafgen/event.c b/clientside/event/trafgen/event.c
index 6395fc25b1..4830ae0a49 100644
--- a/clientside/event/trafgen/event.c
+++ b/clientside/event/trafgen/event.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/clientside/event/trafgen/tg-install b/clientside/event/trafgen/tg-install
index d017bfdc8e..1dc7c63d56 100755
--- a/clientside/event/trafgen/tg-install
+++ b/clientside/event/trafgen/tg-install
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
version=2.0
diff --git a/clientside/lib/GNUmakefile.in b/clientside/lib/GNUmakefile.in
index 65376f9ab2..eee8d937aa 100644
--- a/clientside/lib/GNUmakefile.in
+++ b/clientside/lib/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/lib/event/GNUmakefile.in b/clientside/lib/event/GNUmakefile.in
index e16abec7d9..4067249d8a 100644
--- a/clientside/lib/event/GNUmakefile.in
+++ b/clientside/lib/event/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/lib/event/event.c b/clientside/lib/event/event.c
index 47a971a612..426761c67b 100644
--- a/clientside/lib/event/event.c
+++ b/clientside/lib/event/event.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/lib/event/event.h b/clientside/lib/event/event.h
index 941e6a6bc7..b8f54864dd 100644
--- a/clientside/lib/event/event.h
+++ b/clientside/lib/event/event.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/lib/event/event.i b/clientside/lib/event/event.i
index c0ab0efd2d..1c70d900a0 100644
--- a/clientside/lib/event/event.i
+++ b/clientside/lib/event/event.i
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/lib/event/event.pm b/clientside/lib/event/event.pm
index 9af2786c96..8eb00e7a3b 100755
--- a/clientside/lib/event/event.pm
+++ b/clientside/lib/event/event.pm
@@ -391,9 +391,26 @@ bless $callback_data_list, event::callback_data;
# CODE PAST THIS POINT WAS NOT AUTOMATICALLY GENERATED BY SWIG
#
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# For now, this has to get cat'ed onto the end of event.pm, since it
# doesn't seem possible to get SWIG to just pass it through into the
diff --git a/clientside/lib/event/event.pm.tail b/clientside/lib/event/event.pm.tail
index b5f0beffb3..47f979491b 100644
--- a/clientside/lib/event/event.pm.tail
+++ b/clientside/lib/event/event.pm.tail
@@ -2,9 +2,26 @@
# CODE PAST THIS POINT WAS NOT AUTOMATICALLY GENERATED BY SWIG
#
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# For now, this has to get cat'ed onto the end of event.pm, since it
# doesn't seem possible to get SWIG to just pass it through into the
diff --git a/clientside/lib/event/perlvers.pl b/clientside/lib/event/perlvers.pl
index 3b183e7629..316a0b345e 100755
--- a/clientside/lib/event/perlvers.pl
+++ b/clientside/lib/event/perlvers.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/clientside/lib/event/tbevent.py b/clientside/lib/event/tbevent.py
index 2cb901aa61..4b1d089731 100644
--- a/clientside/lib/event/tbevent.py
+++ b/clientside/lib/event/tbevent.py
@@ -511,9 +511,26 @@ cvar = _tbevent.cvar
# CODE PAST THIS POINT WAS NOT AUTOMATICALLY GENERATED BY SWIG
#
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# For now, this has to get cat'ed onto the end of tbevent.py, since it
# doesn't seem possible to get SWIG to just pass it through into the
diff --git a/clientside/lib/event/tbevent.py.tail b/clientside/lib/event/tbevent.py.tail
index 08af94d002..2c98d7e90d 100644
--- a/clientside/lib/event/tbevent.py.tail
+++ b/clientside/lib/event/tbevent.py.tail
@@ -3,9 +3,26 @@
# CODE PAST THIS POINT WAS NOT AUTOMATICALLY GENERATED BY SWIG
#
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# For now, this has to get cat'ed onto the end of tbevent.py, since it
# doesn't seem possible to get SWIG to just pass it through into the
diff --git a/clientside/lib/event/util.c b/clientside/lib/event/util.c
index b6ef455497..9776cf11f0 100644
--- a/clientside/lib/event/util.c
+++ b/clientside/lib/event/util.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/lib/libtb/GNUmakefile.in b/clientside/lib/libtb/GNUmakefile.in
index 2015d1b8c4..0f6b77b6bb 100644
--- a/clientside/lib/libtb/GNUmakefile.in
+++ b/clientside/lib/libtb/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/lib/libtb/be_user.c b/clientside/lib/libtb/be_user.c
index 214dddaf70..d09e44bf1b 100644
--- a/clientside/lib/libtb/be_user.c
+++ b/clientside/lib/libtb/be_user.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
#include <errno.h>
diff --git a/clientside/lib/libtb/be_user.h b/clientside/lib/libtb/be_user.h
index 89406cae13..bd368ef88b 100644
--- a/clientside/lib/libtb/be_user.h
+++ b/clientside/lib/libtb/be_user.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/clientside/lib/libtb/log.c b/clientside/lib/libtb/log.c
index b313446d5c..1c1cfcb716 100644
--- a/clientside/lib/libtb/log.c
+++ b/clientside/lib/libtb/log.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/lib/libtb/log.h b/clientside/lib/libtb/log.h
index 58b2bf4b16..7c556c7309 100644
--- a/clientside/lib/libtb/log.h
+++ b/clientside/lib/libtb/log.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/lib/libtb/popenf.c b/clientside/lib/libtb/popenf.c
index d1492633e2..63e3e70f0a 100644
--- a/clientside/lib/libtb/popenf.c
+++ b/clientside/lib/libtb/popenf.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <unistd.h>
#include <stdlib.h>
diff --git a/clientside/lib/libtb/popenf.h b/clientside/lib/libtb/popenf.h
index 5aee1ee547..764bb800f0 100644
--- a/clientside/lib/libtb/popenf.h
+++ b/clientside/lib/libtb/popenf.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/clientside/lib/libtb/systemf.c b/clientside/lib/libtb/systemf.c
index aaf6d4d852..4410c8636d 100644
--- a/clientside/lib/libtb/systemf.c
+++ b/clientside/lib/libtb/systemf.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
#include <stdlib.h>
diff --git a/clientside/lib/libtb/systemf.h b/clientside/lib/libtb/systemf.h
index 2a17243886..643f7b0b5f 100644
--- a/clientside/lib/libtb/systemf.h
+++ b/clientside/lib/libtb/systemf.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/clientside/lib/libtb/tbdb.c b/clientside/lib/libtb/tbdb.c
index 07c0a9d6c2..c399e6fe39 100644
--- a/clientside/lib/libtb/tbdb.c
+++ b/clientside/lib/libtb/tbdb.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/lib/libtb/tbdb.h b/clientside/lib/libtb/tbdb.h
index 2bcbc57d11..d53495e4c8 100644
--- a/clientside/lib/libtb/tbdb.h
+++ b/clientside/lib/libtb/tbdb.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/lib/libtb/tbdefs.c b/clientside/lib/libtb/tbdefs.c
index 2ccfc3d09d..2ee5391419 100644
--- a/clientside/lib/libtb/tbdefs.c
+++ b/clientside/lib/libtb/tbdefs.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2006, 2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/lib/libtb/tbdefs.h b/clientside/lib/libtb/tbdefs.h
index a00c71ea5c..ebce63b95a 100644
--- a/clientside/lib/libtb/tbdefs.h
+++ b/clientside/lib/libtb/tbdefs.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/lib/libtb/tmcc.c b/clientside/lib/libtb/tmcc.c
index d37c9ff771..26ab824fbe 100644
--- a/clientside/lib/libtb/tmcc.c
+++ b/clientside/lib/libtb/tmcc.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdlib.h>
#include <string.h>
diff --git a/clientside/lib/libtb/tmcc.h b/clientside/lib/libtb/tmcc.h
index 482211bb23..5891aa82d7 100644
--- a/clientside/lib/libtb/tmcc.h
+++ b/clientside/lib/libtb/tmcc.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifdef __cplusplus
diff --git a/clientside/lib/tmcd/GNUmakefile.in b/clientside/lib/tmcd/GNUmakefile.in
index e70179f39e..fb16d03f7c 100644
--- a/clientside/lib/tmcd/GNUmakefile.in
+++ b/clientside/lib/tmcd/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/lib/tmcd/ssl.c b/clientside/lib/tmcd/ssl.c
index 16c4bc91ea..78c738f071 100644
--- a/clientside/lib/tmcd/ssl.c
+++ b/clientside/lib/tmcd/ssl.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/lib/tmcd/ssl.h b/clientside/lib/tmcd/ssl.h
index ffc7c90df0..5b1abf91b7 100644
--- a/clientside/lib/tmcd/ssl.h
+++ b/clientside/lib/tmcd/ssl.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/socket.h>
#include <openssl/x509.h>
diff --git a/clientside/lib/tmcd/tmcd.h b/clientside/lib/tmcd/tmcd.h
index 1c156cc1db..8ac4531bb2 100644
--- a/clientside/lib/tmcd/tmcd.h
+++ b/clientside/lib/tmcd/tmcd.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#define TBSERVER_PORT 7777
diff --git a/clientside/lib/tmcd/tpm.c b/clientside/lib/tmcd/tpm.c
index 93b399d51a..2fac1a4135 100644
--- a/clientside/lib/tmcd/tpm.c
+++ b/clientside/lib/tmcd/tpm.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2009-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef STANDALONE
diff --git a/clientside/lib/tmcd/tpm.h b/clientside/lib/tmcd/tpm.h
index 35d9dd98d9..71de1148df 100644
--- a/clientside/lib/tmcd/tpm.h
+++ b/clientside/lib/tmcd/tpm.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2009-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _ETPM_
diff --git a/clientside/os/GNUmakefile.in b/clientside/os/GNUmakefile.in
index 0da73d237d..0440165d8d 100644
--- a/clientside/os/GNUmakefile.in
+++ b/clientside/os/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/dijkstra/Compressor.cc b/clientside/os/dijkstra/Compressor.cc
index 5050761b45..57953c358c 100644
--- a/clientside/os/dijkstra/Compressor.cc
+++ b/clientside/os/dijkstra/Compressor.cc
@@ -1,9 +1,26 @@
// Compressor.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "lib.h"
diff --git a/clientside/os/dijkstra/Compressor.h b/clientside/os/dijkstra/Compressor.h
index cfa6c293f3..77015fa084 100644
--- a/clientside/os/dijkstra/Compressor.h
+++ b/clientside/os/dijkstra/Compressor.h
@@ -1,9 +1,26 @@
// Compressor.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// This is a parent class for a group of functors. Which functor is
diff --git a/clientside/os/dijkstra/Exception.h b/clientside/os/dijkstra/Exception.h
index 499feffdd6..a24947166a 100644
--- a/clientside/os/dijkstra/Exception.h
+++ b/clientside/os/dijkstra/Exception.h
@@ -1,9 +1,26 @@
// Exception.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Exception.h defines all of the possible things that might go wrong with
diff --git a/clientside/os/dijkstra/GNUmakefile.in b/clientside/os/dijkstra/GNUmakefile.in
index fe2f0341b4..ee1f6e08c7 100644
--- a/clientside/os/dijkstra/GNUmakefile.in
+++ b/clientside/os/dijkstra/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/dijkstra/IpTree.h b/clientside/os/dijkstra/IpTree.h
index 0d93d6394c..1bda2c1582 100644
--- a/clientside/os/dijkstra/IpTree.h
+++ b/clientside/os/dijkstra/IpTree.h
@@ -1,9 +1,26 @@
// IpTree.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef IP_TREE_H_DISTRIBUTED_DIJKSTRA_1
diff --git a/clientside/os/dijkstra/NoneCompressor.cc b/clientside/os/dijkstra/NoneCompressor.cc
index 15e5a2d3f7..c2e83afa8c 100644
--- a/clientside/os/dijkstra/NoneCompressor.cc
+++ b/clientside/os/dijkstra/NoneCompressor.cc
@@ -1,9 +1,26 @@
// NoneCompressor.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "lib.h"
diff --git a/clientside/os/dijkstra/NoneCompressor.h b/clientside/os/dijkstra/NoneCompressor.h
index 8253e097c3..d37bc3d93b 100644
--- a/clientside/os/dijkstra/NoneCompressor.h
+++ b/clientside/os/dijkstra/NoneCompressor.h
@@ -1,9 +1,26 @@
// NoneCompressor.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// This function-object carries out route compression. Actually, the
diff --git a/clientside/os/dijkstra/OptimalIpTree.cc b/clientside/os/dijkstra/OptimalIpTree.cc
index f9dfb72c3e..506db8ff2d 100644
--- a/clientside/os/dijkstra/OptimalIpTree.cc
+++ b/clientside/os/dijkstra/OptimalIpTree.cc
@@ -1,9 +1,26 @@
// OptimalIpTree.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "lib.h"
diff --git a/clientside/os/dijkstra/OptimalIpTree.h b/clientside/os/dijkstra/OptimalIpTree.h
index e031050d07..172b366669 100644
--- a/clientside/os/dijkstra/OptimalIpTree.h
+++ b/clientside/os/dijkstra/OptimalIpTree.h
@@ -1,9 +1,26 @@
// OptimalIpTree.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// This algorithm comes from the paper 'Constructing Optimal IP
diff --git a/clientside/os/dijkstra/SetIterator.h b/clientside/os/dijkstra/SetIterator.h
index 89e28cfb49..ff2f48dbfa 100644
--- a/clientside/os/dijkstra/SetIterator.h
+++ b/clientside/os/dijkstra/SetIterator.h
@@ -1,9 +1,26 @@
// SetIterator.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef SET_ITERATOR_H_DISTRIBUTED_DIJKSTRA_1
diff --git a/clientside/os/dijkstra/SingleSource.cc b/clientside/os/dijkstra/SingleSource.cc
index e6c18b5eaf..c21b4ba8bf 100644
--- a/clientside/os/dijkstra/SingleSource.cc
+++ b/clientside/os/dijkstra/SingleSource.cc
@@ -1,9 +1,26 @@
// SingleSource.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "lib.h"
diff --git a/clientside/os/dijkstra/SingleSource.h b/clientside/os/dijkstra/SingleSource.h
index 809656611a..e5a5364830 100644
--- a/clientside/os/dijkstra/SingleSource.h
+++ b/clientside/os/dijkstra/SingleSource.h
@@ -1,9 +1,26 @@
// SingleSource.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// This data structure represents a graph and single-source
diff --git a/clientside/os/dijkstra/TreeCompressor.cc b/clientside/os/dijkstra/TreeCompressor.cc
index 342d7317ad..0ec5d8d645 100644
--- a/clientside/os/dijkstra/TreeCompressor.cc
+++ b/clientside/os/dijkstra/TreeCompressor.cc
@@ -1,9 +1,26 @@
// TreeCompressor.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "lib.h"
diff --git a/clientside/os/dijkstra/TreeCompressor.h b/clientside/os/dijkstra/TreeCompressor.h
index f6f860fd18..741d71823d 100644
--- a/clientside/os/dijkstra/TreeCompressor.h
+++ b/clientside/os/dijkstra/TreeCompressor.h
@@ -1,9 +1,26 @@
// TreeCompressor.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// This is a function-object which carries out route compression. It
diff --git a/clientside/os/dijkstra/VoteIpTree.cc b/clientside/os/dijkstra/VoteIpTree.cc
index 9e471d1e6d..1764fdd5d4 100644
--- a/clientside/os/dijkstra/VoteIpTree.cc
+++ b/clientside/os/dijkstra/VoteIpTree.cc
@@ -1,9 +1,26 @@
// VoteIpTree.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "lib.h"
diff --git a/clientside/os/dijkstra/VoteIpTree.h b/clientside/os/dijkstra/VoteIpTree.h
index 30452c179e..5742bed5e6 100644
--- a/clientside/os/dijkstra/VoteIpTree.h
+++ b/clientside/os/dijkstra/VoteIpTree.h
@@ -1,9 +1,26 @@
// VoteIpTree.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// VoteIpTree is a sparse binary tree into which IP addresses are
diff --git a/clientside/os/dijkstra/apsp.cc b/clientside/os/dijkstra/apsp.cc
index cf1f2c676b..5a5ffadef3 100644
--- a/clientside/os/dijkstra/apsp.cc
+++ b/clientside/os/dijkstra/apsp.cc
@@ -1,9 +1,26 @@
// drecal.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "lib.h"
diff --git a/clientside/os/dijkstra/bitmath.cc b/clientside/os/dijkstra/bitmath.cc
index 2c72982360..1f519311c8 100644
--- a/clientside/os/dijkstra/bitmath.cc
+++ b/clientside/os/dijkstra/bitmath.cc
@@ -1,9 +1,26 @@
// bitmath.cc
/*
- * EMULAB-COPYRIGHT
- * Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ * Copyright (c) 2003-2004 University of Utah and the Flux Group.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <string>
@@ -14,12 +31,6 @@ using namespace std;
#include "Exception.h"
#include "bitmath.h"
-/*
- * EMULAB-COPYRIGHT
- * Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
- */
-
string ipToString(IPAddress ip)
{
static unsigned int charMask = 0x000000FF;
diff --git a/clientside/os/dijkstra/bitmath.h b/clientside/os/dijkstra/bitmath.h
index f62a5710d3..13a03aa9dc 100644
--- a/clientside/os/dijkstra/bitmath.h
+++ b/clientside/os/dijkstra/bitmath.h
@@ -1,9 +1,26 @@
// bitmath.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Utilities for dealing with ip numbers
diff --git a/clientside/os/dijkstra/check-dijkstra.cc b/clientside/os/dijkstra/check-dijkstra.cc
index 79c3e7ce36..00126b8ab0 100644
--- a/clientside/os/dijkstra/check-dijkstra.cc
+++ b/clientside/os/dijkstra/check-dijkstra.cc
@@ -1,9 +1,26 @@
// check-dijkstra.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// This file is based largely on testbed/tbsetup/ipassign/src/routestat.cc
diff --git a/clientside/os/dijkstra/dijkstra.cc b/clientside/os/dijkstra/dijkstra.cc
index b7b516fafa..149e31efc1 100644
--- a/clientside/os/dijkstra/dijkstra.cc
+++ b/clientside/os/dijkstra/dijkstra.cc
@@ -1,9 +1,26 @@
// dijkstra.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "lib.h"
diff --git a/clientside/os/dijkstra/dijkstra.h b/clientside/os/dijkstra/dijkstra.h
index dcc5dc402c..200ea230da 100644
--- a/clientside/os/dijkstra/dijkstra.h
+++ b/clientside/os/dijkstra/dijkstra.h
@@ -1,9 +1,26 @@
// dijkstra.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef DIJKSTRA_H_DISTRIBUTED_DIJKSTRA_1
diff --git a/clientside/os/dijkstra/drecal.cc b/clientside/os/dijkstra/drecal.cc
index 91e4185e68..e683a1abbf 100644
--- a/clientside/os/dijkstra/drecal.cc
+++ b/clientside/os/dijkstra/drecal.cc
@@ -1,9 +1,26 @@
// drecal.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "lib.h"
diff --git a/clientside/os/dijkstra/lib.h b/clientside/os/dijkstra/lib.h
index cb16a74b6a..4d2751d134 100644
--- a/clientside/os/dijkstra/lib.h
+++ b/clientside/os/dijkstra/lib.h
@@ -1,9 +1,26 @@
// lib.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef LIB_H_DISTRIBUTED_DIJKSTRA_1
diff --git a/clientside/os/dijkstra/route-histogram.cc b/clientside/os/dijkstra/route-histogram.cc
index f848584fcc..9f7cc061ed 100644
--- a/clientside/os/dijkstra/route-histogram.cc
+++ b/clientside/os/dijkstra/route-histogram.cc
@@ -1,9 +1,26 @@
// route-histogram.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// This program is a filter from cin to cout. It creates a histogram
diff --git a/clientside/os/frisbee.redux/GNUmakefile.in b/clientside/os/frisbee.redux/GNUmakefile.in
index eb6b61b407..6812f991e2 100644
--- a/clientside/os/frisbee.redux/GNUmakefile.in
+++ b/clientside/os/frisbee.redux/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/frisbee.redux/Makefile-linux.sa b/clientside/os/frisbee.redux/Makefile-linux.sa
index 754ff16e02..9c9ccfe505 100644
--- a/clientside/os/frisbee.redux/Makefile-linux.sa
+++ b/clientside/os/frisbee.redux/Makefile-linux.sa
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Set to 1 for "secure frisbee" support. Requires openssl libraries.
diff --git a/clientside/os/frisbee.redux/Makefile.sa b/clientside/os/frisbee.redux/Makefile.sa
index 2d470997ae..fb7c66c655 100644
--- a/clientside/os/frisbee.redux/Makefile.sa
+++ b/clientside/os/frisbee.redux/Makefile.sa
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/os/frisbee.redux/client.c b/clientside/os/frisbee.redux/client.c
index d1008b7fc7..7114636272 100644
--- a/clientside/os/frisbee.redux/client.c
+++ b/clientside/os/frisbee.redux/client.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#undef OLD_SCHOOL
diff --git a/clientside/os/frisbee.redux/config.c b/clientside/os/frisbee.redux/config.c
index 4982dac17a..6b72484315 100644
--- a/clientside/os/frisbee.redux/config.c
+++ b/clientside/os/frisbee.redux/config.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/frisbee.redux/config_emulab.c b/clientside/os/frisbee.redux/config_emulab.c
index 9da7959571..3497c4cd59 100644
--- a/clientside/os/frisbee.redux/config_emulab.c
+++ b/clientside/os/frisbee.redux/config_emulab.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/frisbee.redux/config_null.c b/clientside/os/frisbee.redux/config_null.c
index b3a5a53671..caa8617c77 100644
--- a/clientside/os/frisbee.redux/config_null.c
+++ b/clientside/os/frisbee.redux/config_null.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/frisbee.redux/decls.h b/clientside/os/frisbee.redux/decls.h
index 1bd258e146..931d0d8cd8 100644
--- a/clientside/os/frisbee.redux/decls.h
+++ b/clientside/os/frisbee.redux/decls.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/frisbee.redux/event.c b/clientside/os/frisbee.redux/event.c
index 91f3b66eb6..d24436246f 100644
--- a/clientside/os/frisbee.redux/event.c
+++ b/clientside/os/frisbee.redux/event.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002, 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/frisbee.redux/event.h b/clientside/os/frisbee.redux/event.h
index 218281e97a..869b60ccc6 100644
--- a/clientside/os/frisbee.redux/event.h
+++ b/clientside/os/frisbee.redux/event.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002, 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#define STRSIZE 64
diff --git a/clientside/os/frisbee.redux/frisuploadd_emulab.in b/clientside/os/frisbee.redux/frisuploadd_emulab.in
index fc5428a968..dfa13e234d 100644
--- a/clientside/os/frisbee.redux/frisuploadd_emulab.in
+++ b/clientside/os/frisbee.redux/frisuploadd_emulab.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/os/frisbee.redux/frisuploader.c b/clientside/os/frisbee.redux/frisuploader.c
index c04a4b9ab3..b34ecf608e 100644
--- a/clientside/os/frisbee.redux/frisuploader.c
+++ b/clientside/os/frisbee.redux/frisuploader.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/frisbee.redux/log.c b/clientside/os/frisbee.redux/log.c
index 49c9b2a283..1bec0b04e0 100644
--- a/clientside/os/frisbee.redux/log.c
+++ b/clientside/os/frisbee.redux/log.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/frisbee.redux/log.h b/clientside/os/frisbee.redux/log.h
index 96ad81a568..af1eac7d1d 100644
--- a/clientside/os/frisbee.redux/log.h
+++ b/clientside/os/frisbee.redux/log.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/frisbee.redux/mserver.c b/clientside/os/frisbee.redux/mserver.c
index 12227053c7..4badca8430 100644
--- a/clientside/os/frisbee.redux/mserver.c
+++ b/clientside/os/frisbee.redux/mserver.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/frisbee.redux/network.c b/clientside/os/frisbee.redux/network.c
index 7f88ff9eec..1eede4cec2 100644
--- a/clientside/os/frisbee.redux/network.c
+++ b/clientside/os/frisbee.redux/network.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/frisbee.redux/server.c b/clientside/os/frisbee.redux/server.c
index b05e68ed43..f4d2b67467 100644
--- a/clientside/os/frisbee.redux/server.c
+++ b/clientside/os/frisbee.redux/server.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/frisbee.redux/trace-parse.pl b/clientside/os/frisbee.redux/trace-parse.pl
index 37d8563c86..a08959a259 100644
--- a/clientside/os/frisbee.redux/trace-parse.pl
+++ b/clientside/os/frisbee.redux/trace-parse.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
diff --git a/clientside/os/frisbee.redux/trace.c b/clientside/os/frisbee.redux/trace.c
index 85ce4b3180..7c6332250c 100644
--- a/clientside/os/frisbee.redux/trace.c
+++ b/clientside/os/frisbee.redux/trace.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/clientside/os/frisbee.redux/trace.h b/clientside/os/frisbee.redux/trace.h
index a5565ab5d4..16e43f2660 100644
--- a/clientside/os/frisbee.redux/trace.h
+++ b/clientside/os/frisbee.redux/trace.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <pthread.h>
diff --git a/clientside/os/frisbee.redux/upload.c b/clientside/os/frisbee.redux/upload.c
index 276f7c8fa6..7f965e3aed 100644
--- a/clientside/os/frisbee.redux/upload.c
+++ b/clientside/os/frisbee.redux/upload.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/frisbee.redux/uploadio.c b/clientside/os/frisbee.redux/uploadio.c
index aaa36f6d80..05fba6fed4 100644
--- a/clientside/os/frisbee.redux/uploadio.c
+++ b/clientside/os/frisbee.redux/uploadio.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/frisbee.redux/uploadio.h b/clientside/os/frisbee.redux/uploadio.h
index 085d26939b..24ea3eea37 100644
--- a/clientside/os/frisbee.redux/uploadio.h
+++ b/clientside/os/frisbee.redux/uploadio.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <unistd.h>
diff --git a/clientside/os/frisbee.redux/utils.c b/clientside/os/frisbee.redux/utils.c
index 4656185529..d59ca83ab7 100644
--- a/clientside/os/frisbee.redux/utils.c
+++ b/clientside/os/frisbee.redux/utils.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/frisbee.redux/utils.h b/clientside/os/frisbee.redux/utils.h
index 114524b006..45a72567fd 100644
--- a/clientside/os/frisbee.redux/utils.h
+++ b/clientside/os/frisbee.redux/utils.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <time.h>
diff --git a/clientside/os/genhostsfile/GNUmakefile.in b/clientside/os/genhostsfile/GNUmakefile.in
index fce9d83925..3085855d1d 100644
--- a/clientside/os/genhostsfile/GNUmakefile.in
+++ b/clientside/os/genhostsfile/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/genhostsfile/genfromdb.in b/clientside/os/genhostsfile/genfromdb.in
index 33c2c0cb89..e4f8c07a15 100644
--- a/clientside/os/genhostsfile/genfromdb.in
+++ b/clientside/os/genhostsfile/genfromdb.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/os/genhostsfile/genfromtopo.in b/clientside/os/genhostsfile/genfromtopo.in
index ce9c6e1a75..52f538adf2 100644
--- a/clientside/os/genhostsfile/genfromtopo.in
+++ b/clientside/os/genhostsfile/genfromtopo.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/os/genhostsfile/genhostsfile.c b/clientside/os/genhostsfile/genhostsfile.c
index 50aa4bc2dd..6d0eb30161 100644
--- a/clientside/os/genhostsfile/genhostsfile.c
+++ b/clientside/os/genhostsfile/genhostsfile.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/clientside/os/growdisk/GNUmakefile.in b/clientside/os/growdisk/GNUmakefile.in
index 014116b50e..63442313c0 100644
--- a/clientside/os/growdisk/GNUmakefile.in
+++ b/clientside/os/growdisk/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/growdisk/growdisk.c b/clientside/os/growdisk/growdisk.c
index edb3a0445c..3de6c8384f 100644
--- a/clientside/os/growdisk/growdisk.c
+++ b/clientside/os/growdisk/growdisk.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/imagezip/GNUmakefile.in b/clientside/os/imagezip/GNUmakefile.in
index 21de9cc5d2..5f266b69c5 100644
--- a/clientside/os/imagezip/GNUmakefile.in
+++ b/clientside/os/imagezip/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/imagezip/Makefile-linux.sa b/clientside/os/imagezip/Makefile-linux.sa
index 9f66dd1795..f242ca8df6 100644
--- a/clientside/os/imagezip/Makefile-linux.sa
+++ b/clientside/os/imagezip/Makefile-linux.sa
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/os/imagezip/Makefile.sa b/clientside/os/imagezip/Makefile.sa
index e9669ed3c6..ac37a5b594 100644
--- a/clientside/os/imagezip/Makefile.sa
+++ b/clientside/os/imagezip/Makefile.sa
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/os/imagezip/checksum.c b/clientside/os/imagezip/checksum.c
index 2c382ad877..363bf52014 100644
--- a/clientside/os/imagezip/checksum.c
+++ b/clientside/os/imagezip/checksum.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2009-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/imagezip/disksize.c b/clientside/os/imagezip/disksize.c
index 5793ba2757..fee8a41f2d 100644
--- a/clientside/os/imagezip/disksize.c
+++ b/clientside/os/imagezip/disksize.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/imagezip/extfs/GNUmakefile.in b/clientside/os/imagezip/extfs/GNUmakefile.in
index 13c4f7092a..7fe61385ae 100644
--- a/clientside/os/imagezip/extfs/GNUmakefile.in
+++ b/clientside/os/imagezip/extfs/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/imagezip/extfs/extfs.c b/clientside/os/imagezip/extfs/extfs.c
index 1a494125d9..ca25e1b21f 100644
--- a/clientside/os/imagezip/extfs/extfs.c
+++ b/clientside/os/imagezip/extfs/extfs.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/clientside/os/imagezip/extfs/lilo.h b/clientside/os/imagezip/extfs/lilo.h
index 21295904fe..aea249db76 100644
--- a/clientside/os/imagezip/extfs/lilo.h
+++ b/clientside/os/imagezip/extfs/lilo.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/imagezip/extfs/reloc_lilo.c b/clientside/os/imagezip/extfs/reloc_lilo.c
index 2e1b4bba85..5686cfef3e 100644
--- a/clientside/os/imagezip/extfs/reloc_lilo.c
+++ b/clientside/os/imagezip/extfs/reloc_lilo.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004, 2009 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/clientside/os/imagezip/fat/GNUmakefile.in b/clientside/os/imagezip/fat/GNUmakefile.in
index 0a1f474a2c..bee1c9e115 100644
--- a/clientside/os/imagezip/fat/GNUmakefile.in
+++ b/clientside/os/imagezip/fat/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/imagezip/fat/fat_glue.c b/clientside/os/imagezip/fat/fat_glue.c
index ce7902adb0..0c6233baec 100644
--- a/clientside/os/imagezip/fat/fat_glue.c
+++ b/clientside/os/imagezip/fat/fat_glue.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/imagezip/fat/fat_glue.h b/clientside/os/imagezip/fat/fat_glue.h
index 70618bfe2f..af8017dd0c 100644
--- a/clientside/os/imagezip/fat/fat_glue.h
+++ b/clientside/os/imagezip/fat/fat_glue.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/imagezip/ffs/GNUmakefile.in b/clientside/os/imagezip/ffs/GNUmakefile.in
index 4343fc4eb3..fc1058ff87 100644
--- a/clientside/os/imagezip/ffs/GNUmakefile.in
+++ b/clientside/os/imagezip/ffs/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/imagezip/ffs/ffs.c b/clientside/os/imagezip/ffs/ffs.c
index 63ea2c1f66..666fa42249 100644
--- a/clientside/os/imagezip/ffs/ffs.c
+++ b/clientside/os/imagezip/ffs/ffs.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2009 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/clientside/os/imagezip/ffs/ffs.h b/clientside/os/imagezip/ffs/ffs.h
index 3fcbdfbdf7..ec03f78e3f 100644
--- a/clientside/os/imagezip/ffs/ffs.h
+++ b/clientside/os/imagezip/ffs/ffs.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2003, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/imagezip/global.h b/clientside/os/imagezip/global.h
index e454805848..689e17cd24 100644
--- a/clientside/os/imagezip/global.h
+++ b/clientside/os/imagezip/global.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/imagezip/hashmap/GNUmakefile.in b/clientside/os/imagezip/hashmap/GNUmakefile.in
index a88315bf8d..20356188c3 100644
--- a/clientside/os/imagezip/hashmap/GNUmakefile.in
+++ b/clientside/os/imagezip/hashmap/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/imagezip/hashmap/hashmap.c b/clientside/os/imagezip/hashmap/hashmap.c
index 9695ec1a02..09e734a8ed 100644
--- a/clientside/os/imagezip/hashmap/hashmap.c
+++ b/clientside/os/imagezip/hashmap/hashmap.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/clientside/os/imagezip/hashmap/hashmap.h b/clientside/os/imagezip/hashmap/hashmap.h
index 45691cada8..0a8a59e6c0 100644
--- a/clientside/os/imagezip/hashmap/hashmap.h
+++ b/clientside/os/imagezip/hashmap/hashmap.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* XXX from global.h */
diff --git a/clientside/os/imagezip/imagedump.8 b/clientside/os/imagezip/imagedump.8
index d0384b8baa..5219ffd705 100644
--- a/clientside/os/imagezip/imagedump.8
+++ b/clientside/os/imagezip/imagedump.8
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2000-2003 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.Dd January 9, 2003
.Dt IMAGEDUMP 8
diff --git a/clientside/os/imagezip/imagedump.c b/clientside/os/imagezip/imagedump.c
index 67d072234c..16f7955706 100644
--- a/clientside/os/imagezip/imagedump.c
+++ b/clientside/os/imagezip/imagedump.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/imagezip/imagehash.c b/clientside/os/imagezip/imagehash.c
index bb9d5937f9..bd58e12d9c 100644
--- a/clientside/os/imagezip/imagehash.c
+++ b/clientside/os/imagezip/imagehash.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/imagezip/imagehash.h b/clientside/os/imagezip/imagehash.h
index 7e3ff8d778..3655dc89d0 100644
--- a/clientside/os/imagezip/imagehash.h
+++ b/clientside/os/imagezip/imagehash.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#define HASH_MAGIC ".ndzsig"
diff --git a/clientside/os/imagezip/imagehdr.h b/clientside/os/imagezip/imagehdr.h
index 7b2af65062..17dc90ea55 100644
--- a/clientside/os/imagezip/imagehdr.h
+++ b/clientside/os/imagezip/imagehdr.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <inttypes.h>
diff --git a/clientside/os/imagezip/imageunzip.8 b/clientside/os/imagezip/imageunzip.8
index 1ac8d66ff7..a4c94148a6 100644
--- a/clientside/os/imagezip/imageunzip.8
+++ b/clientside/os/imagezip/imageunzip.8
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2000-2003 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.Dd January 9, 2003
.Dt IMAGEUNZIP 8
diff --git a/clientside/os/imagezip/imageunzip.c b/clientside/os/imagezip/imageunzip.c
index 2811da68a7..386b1cea8e 100644
--- a/clientside/os/imagezip/imageunzip.c
+++ b/clientside/os/imagezip/imageunzip.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/imagezip/imagezip.8 b/clientside/os/imagezip/imagezip.8
index 3fa03936d4..0eab310fbc 100644
--- a/clientside/os/imagezip/imagezip.8
+++ b/clientside/os/imagezip/imagezip.8
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2000-2004 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.Dd October 3, 2003
.Dt IMAGEZIP 8
diff --git a/clientside/os/imagezip/imagezip.c b/clientside/os/imagezip/imagezip.c
index 7024ef2774..d6aefb41fe 100644
--- a/clientside/os/imagezip/imagezip.c
+++ b/clientside/os/imagezip/imagezip.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/os/imagezip/ntfs/GNUmakefile.in b/clientside/os/imagezip/ntfs/GNUmakefile.in
index 928d3d9d7c..819ebf5ef8 100644
--- a/clientside/os/imagezip/ntfs/GNUmakefile.in
+++ b/clientside/os/imagezip/ntfs/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/imagezip/ntfs/liblocale/GNUmakefile.in b/clientside/os/imagezip/ntfs/liblocale/GNUmakefile.in
index 1987d1d1be..c69100188e 100644
--- a/clientside/os/imagezip/ntfs/liblocale/GNUmakefile.in
+++ b/clientside/os/imagezip/ntfs/liblocale/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/imagezip/ntfs/libntfs/GNUmakefile.in b/clientside/os/imagezip/ntfs/libntfs/GNUmakefile.in
index 2807d4486e..c2b0679617 100644
--- a/clientside/os/imagezip/ntfs/libntfs/GNUmakefile.in
+++ b/clientside/os/imagezip/ntfs/libntfs/GNUmakefile.in
@@ -1,7 +1,24 @@
#
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
-# EMULAB-COPYRIGHT
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/imagezip/ntfs/libntfs/Makefile-linux.sa b/clientside/os/imagezip/ntfs/libntfs/Makefile-linux.sa
index 857b6a678b..5b384af63b 100644
--- a/clientside/os/imagezip/ntfs/libntfs/Makefile-linux.sa
+++ b/clientside/os/imagezip/ntfs/libntfs/Makefile-linux.sa
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
all: libntfs.a
diff --git a/clientside/os/imagezip/ntfs/ntfs_glue.c b/clientside/os/imagezip/ntfs/ntfs_glue.c
index e23534c983..bb0328df65 100644
--- a/clientside/os/imagezip/ntfs/ntfs_glue.c
+++ b/clientside/os/imagezip/ntfs/ntfs_glue.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2005, 2009 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/clientside/os/imagezip/sliceinfo.h b/clientside/os/imagezip/sliceinfo.h
index dce118f6dd..c8c53aaa80 100644
--- a/clientside/os/imagezip/sliceinfo.h
+++ b/clientside/os/imagezip/sliceinfo.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <inttypes.h>
diff --git a/clientside/os/install-rpm b/clientside/os/install-rpm
index ff85435d35..765178c25a 100644
--- a/clientside/os/install-rpm
+++ b/clientside/os/install-rpm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/os/install-tarfile b/clientside/os/install-tarfile
index 08ef0e2146..685d4d9fa3 100755
--- a/clientside/os/install-tarfile
+++ b/clientside/os/install-tarfile
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/os/install-tarfile.1 b/clientside/os/install-tarfile.1
index bfe41a1215..cecf7772cb 100644
--- a/clientside/os/install-tarfile.1
+++ b/clientside/os/install-tarfile.1
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2004 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.TH INSTALL-TARFILE 1 "October 19, 2004" "Emulab" "Emulab Commands Manual"
.OS
diff --git a/clientside/os/syncd/GNUmakefile.in b/clientside/os/syncd/GNUmakefile.in
index c261a7b94b..ae4be61491 100644
--- a/clientside/os/syncd/GNUmakefile.in
+++ b/clientside/os/syncd/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/syncd/decls.h b/clientside/os/syncd/decls.h
index b5937d3776..187b6ab348 100644
--- a/clientside/os/syncd/decls.h
+++ b/clientside/os/syncd/decls.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <inttypes.h>
diff --git a/clientside/os/syncd/emulab-sync.1 b/clientside/os/syncd/emulab-sync.1
index 12c82c2e4b..77320810e6 100644
--- a/clientside/os/syncd/emulab-sync.1
+++ b/clientside/os/syncd/emulab-sync.1
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2004 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.TH EMULAB-SYNC 1 "April 5, 2004" "Emulab" "Emulab Commands Manual"
.OS
diff --git a/clientside/os/syncd/emulab-sync.c b/clientside/os/syncd/emulab-sync.c
index 6a3d97b02f..5731bb4220 100644
--- a/clientside/os/syncd/emulab-sync.c
+++ b/clientside/os/syncd/emulab-sync.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/clientside/os/syncd/emulab-syncd.1 b/clientside/os/syncd/emulab-syncd.1
index 70e5ad80a4..c261728310 100644
--- a/clientside/os/syncd/emulab-syncd.1
+++ b/clientside/os/syncd/emulab-syncd.1
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2004 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.TH EMULAB-SYNCD 1 "April 5, 2004" "Emulab" "Emulab Commands Manual"
.OS
diff --git a/clientside/os/syncd/emulab-syncd.c b/clientside/os/syncd/emulab-syncd.c
index ce7559d18b..705036a91d 100644
--- a/clientside/os/syncd/emulab-syncd.c
+++ b/clientside/os/syncd/emulab-syncd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/clientside/os/syncd/syncd_test.sh b/clientside/os/syncd/syncd_test.sh
index 2b0782e735..1e763c688b 100644
--- a/clientside/os/syncd/syncd_test.sh
+++ b/clientside/os/syncd/syncd_test.sh
@@ -1,9 +1,26 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
## Variables
diff --git a/clientside/os/zapdisk/GNUmakefile.in b/clientside/os/zapdisk/GNUmakefile.in
index 69d64b6e19..9115d8e633 100644
--- a/clientside/os/zapdisk/GNUmakefile.in
+++ b/clientside/os/zapdisk/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/os/zapdisk/diskzap b/clientside/os/zapdisk/diskzap
index 3c547fb051..823bbb6bbb 100644
--- a/clientside/os/zapdisk/diskzap
+++ b/clientside/os/zapdisk/diskzap
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Front-end script to run the bootblock zapper.
#
diff --git a/clientside/os/zapdisk/zapdisk.c b/clientside/os/zapdisk/zapdisk.c
index 01b85152e2..a7c9313b59 100644
--- a/clientside/os/zapdisk/zapdisk.c
+++ b/clientside/os/zapdisk/zapdisk.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005, 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/sensors/GNUmakefile.in b/clientside/sensors/GNUmakefile.in
index 7c2aa94712..da8b9a82c3 100644
--- a/clientside/sensors/GNUmakefile.in
+++ b/clientside/sensors/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/sensors/canaryd/GNUmakefile.in b/clientside/sensors/canaryd/GNUmakefile.in
index 91ecd02de7..3cb2cccc0f 100644
--- a/clientside/sensors/canaryd/GNUmakefile.in
+++ b/clientside/sensors/canaryd/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/sensors/canaryd/alertlistener.c b/clientside/sensors/canaryd/alertlistener.c
index 8f663039dc..9e3e99d6fb 100644
--- a/clientside/sensors/canaryd/alertlistener.c
+++ b/clientside/sensors/canaryd/alertlistener.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002, 2008 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/sensors/canaryd/auxfuncs.h b/clientside/sensors/canaryd/auxfuncs.h
index 9aed86eba1..319fbadbfe 100644
--- a/clientside/sensors/canaryd/auxfuncs.h
+++ b/clientside/sensors/canaryd/auxfuncs.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
int getnumcpus(void);
diff --git a/clientside/sensors/canaryd/canaryd.c b/clientside/sensors/canaryd/canaryd.c
index 893dc8c73a..3ae0c2043f 100644
--- a/clientside/sensors/canaryd/canaryd.c
+++ b/clientside/sensors/canaryd/canaryd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/clientside/sensors/canaryd/canaryd.h b/clientside/sensors/canaryd/canaryd.h
index e47aeb646c..af5e6f8017 100644
--- a/clientside/sensors/canaryd/canaryd.h
+++ b/clientside/sensors/canaryd/canaryd.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* canaryd.h
diff --git a/clientside/sensors/canaryd/canarydEvents.c b/clientside/sensors/canaryd/canarydEvents.c
index a700c27dde..2606c3f0b5 100644
--- a/clientside/sensors/canaryd/canarydEvents.c
+++ b/clientside/sensors/canaryd/canarydEvents.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2005, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/clientside/sensors/canaryd/canarydEvents.h b/clientside/sensors/canaryd/canarydEvents.h
index 0cc3aae544..4223777f1b 100644
--- a/clientside/sensors/canaryd/canarydEvents.h
+++ b/clientside/sensors/canaryd/canarydEvents.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/clientside/sensors/canaryd/childProcess.c b/clientside/sensors/canaryd/childProcess.c
index 949a2054ae..2ad317aeb5 100644
--- a/clientside/sensors/canaryd/childProcess.c
+++ b/clientside/sensors/canaryd/childProcess.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/clientside/sensors/canaryd/childProcess.h b/clientside/sensors/canaryd/childProcess.h
index da08d3ee98..7f34cd731b 100644
--- a/clientside/sensors/canaryd/childProcess.h
+++ b/clientside/sensors/canaryd/childProcess.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/clientside/sensors/canaryd/feedbacklogs.in b/clientside/sensors/canaryd/feedbacklogs.in
index 657638cf7b..31e95d5d76 100644
--- a/clientside/sensors/canaryd/feedbacklogs.in
+++ b/clientside/sensors/canaryd/feedbacklogs.in
@@ -1,9 +1,26 @@
#! /usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import re
diff --git a/clientside/sensors/canaryd/networkInterface.c b/clientside/sensors/canaryd/networkInterface.c
index 8db1677181..55fb449a90 100644
--- a/clientside/sensors/canaryd/networkInterface.c
+++ b/clientside/sensors/canaryd/networkInterface.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/clientside/sensors/canaryd/networkInterface.h b/clientside/sensors/canaryd/networkInterface.h
index 25495fe8ec..3618d1b827 100644
--- a/clientside/sensors/canaryd/networkInterface.h
+++ b/clientside/sensors/canaryd/networkInterface.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/clientside/sensors/slothd/GNUmakefile.in b/clientside/sensors/slothd/GNUmakefile.in
index ee55b040a1..7b6ada3413 100644
--- a/clientside/sensors/slothd/GNUmakefile.in
+++ b/clientside/sensors/slothd/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/sensors/slothd/clean_tables b/clientside/sensors/slothd/clean_tables
index 2f2ec56997..5641cda1be 100755
--- a/clientside/sensors/slothd/clean_tables
+++ b/clientside/sensors/slothd/clean_tables
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
mysql --execute="delete from node_idlestats" tbdb && \
diff --git a/clientside/sensors/slothd/digest-slothd b/clientside/sensors/slothd/digest-slothd
index 59709ccff2..e5d8863811 100644
--- a/clientside/sensors/slothd/digest-slothd
+++ b/clientside/sensors/slothd/digest-slothd
@@ -1,9 +1,26 @@
#! /usr/local/bin/gawk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/sensors/slothd/iddata_clean b/clientside/sensors/slothd/iddata_clean
index ba2e965717..84c73bdbe0 100755
--- a/clientside/sensors/slothd/iddata_clean
+++ b/clientside/sensors/slothd/iddata_clean
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# iddata_clean - script to purge the aged slothd data from the emulab
diff --git a/clientside/sensors/slothd/idlemon.c b/clientside/sensors/slothd/idlemon.c
index 89a2350a8a..54b100fa3f 100644
--- a/clientside/sensors/slothd/idlemon.c
+++ b/clientside/sensors/slothd/idlemon.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* idlemon is started up at user login on Windows to monitor desktop events
diff --git a/clientside/sensors/slothd/idloadup.pl b/clientside/sensors/slothd/idloadup.pl
index f6187d7288..bf8449838a 100755
--- a/clientside/sensors/slothd/idloadup.pl
+++ b/clientside/sensors/slothd/idloadup.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# You don't want to run this script unless you want to fatten up the DB
diff --git a/clientside/sensors/slothd/sdcollectd.c b/clientside/sensors/slothd/sdcollectd.c
index 73e802ba1e..025f39d1a0 100644
--- a/clientside/sensors/slothd/sdcollectd.c
+++ b/clientside/sensors/slothd/sdcollectd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "sdcollectd.h"
diff --git a/clientside/sensors/slothd/sdcollectd.h b/clientside/sensors/slothd/sdcollectd.h
index 218400765a..d008f09d94 100644
--- a/clientside/sensors/slothd/sdcollectd.h
+++ b/clientside/sensors/slothd/sdcollectd.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2003, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* sdcollectd.h - header file for Slothd Collection Daemon.
diff --git a/clientside/sensors/slothd/sddeploy.in b/clientside/sensors/slothd/sddeploy.in
index 9f32674d1b..dba2e8d64b 100755
--- a/clientside/sensors/slothd/sddeploy.in
+++ b/clientside/sensors/slothd/sddeploy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/sensors/slothd/sdhalt.pl b/clientside/sensors/slothd/sdhalt.pl
index 318ca48674..7b194bd481 100755
--- a/clientside/sensors/slothd/sdhalt.pl
+++ b/clientside/sensors/slothd/sdhalt.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use lib '/usr/testbed/lib';
diff --git a/clientside/sensors/slothd/sdisrunning.in b/clientside/sensors/slothd/sdisrunning.in
index ef1bc8c1f6..37ad640b07 100755
--- a/clientside/sensors/slothd/sdisrunning.in
+++ b/clientside/sensors/slothd/sdisrunning.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/sensors/slothd/slothd.c b/clientside/sensors/slothd/slothd.c
index e4bd4a47c0..7a2333ae74 100644
--- a/clientside/sensors/slothd/slothd.c
+++ b/clientside/sensors/slothd/slothd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2005, 2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "slothd.h"
diff --git a/clientside/sensors/slothd/slothd.h b/clientside/sensors/slothd/slothd.h
index 9e1f834017..dc39bc5b45 100644
--- a/clientside/sensors/slothd/slothd.h
+++ b/clientside/sensors/slothd/slothd.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* slothd.h
diff --git a/clientside/sensors/slothd/utmptest.c b/clientside/sensors/slothd/utmptest.c
index 30a927369b..02e9ba1728 100644
--- a/clientside/sensors/slothd/utmptest.c
+++ b/clientside/sensors/slothd/utmptest.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/clientside/sensors/slothd/webfeedback.in b/clientside/sensors/slothd/webfeedback.in
index 2f47cfa559..b3b8606efc 100644
--- a/clientside/sensors/slothd/webfeedback.in
+++ b/clientside/sensors/slothd/webfeedback.in
@@ -1,9 +1,26 @@
#! /usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/clientside/tmcc/GNUmakefile.in b/clientside/tmcc/GNUmakefile.in
index 1af6448ed0..9c071601c7 100644
--- a/clientside/tmcc/GNUmakefile.in
+++ b/clientside/tmcc/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/tmcc/common/GNUmakefile.in b/clientside/tmcc/common/GNUmakefile.in
index 6a3f51ae6b..0939cd077f 100644
--- a/clientside/tmcc/common/GNUmakefile.in
+++ b/clientside/tmcc/common/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# XXX ONLY RUN THIS INSTALL ON A TESTBED NODE!
diff --git a/clientside/tmcc/common/bootsubnodes b/clientside/tmcc/common/bootsubnodes
index e4cdbe1964..7ac17fc700 100755
--- a/clientside/tmcc/common/bootsubnodes
+++ b/clientside/tmcc/common/bootsubnodes
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use English;
diff --git a/clientside/tmcc/common/bootvnodes b/clientside/tmcc/common/bootvnodes
index f870388b35..d0fe288456 100755
--- a/clientside/tmcc/common/bootvnodes
+++ b/clientside/tmcc/common/bootvnodes
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use English;
diff --git a/clientside/tmcc/common/config/GNUmakefile.in b/clientside/tmcc/common/config/GNUmakefile.in
index 58ba43af2d..34957b73ee 100644
--- a/clientside/tmcc/common/config/GNUmakefile.in
+++ b/clientside/tmcc/common/config/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/common/config/librc.pm b/clientside/tmcc/common/config/librc.pm
index 88679535fd..b9edfce898 100644
--- a/clientside/tmcc/common/config/librc.pm
+++ b/clientside/tmcc/common/config/librc.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/common/config/rc.accounts b/clientside/tmcc/common/config/rc.accounts
index a092a05945..e183488a4c 100755
--- a/clientside/tmcc/common/config/rc.accounts
+++ b/clientside/tmcc/common/config/rc.accounts
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.blobs b/clientside/tmcc/common/config/rc.blobs
index 98c35d3927..28f0d19f9d 100755
--- a/clientside/tmcc/common/config/rc.blobs
+++ b/clientside/tmcc/common/config/rc.blobs
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.config b/clientside/tmcc/common/config/rc.config
index 2cd05c95b4..8080f2baae 100755
--- a/clientside/tmcc/common/config/rc.config
+++ b/clientside/tmcc/common/config/rc.config
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.delays b/clientside/tmcc/common/config/rc.delays
index 1671a08f64..4a6f1e33ca 100755
--- a/clientside/tmcc/common/config/rc.delays
+++ b/clientside/tmcc/common/config/rc.delays
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005, 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.diskagent b/clientside/tmcc/common/config/rc.diskagent
index 7378e860e3..009587e4bd 100755
--- a/clientside/tmcc/common/config/rc.diskagent
+++ b/clientside/tmcc/common/config/rc.diskagent
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.fakejail b/clientside/tmcc/common/config/rc.fakejail
index 3ff8962a00..ab9b75825d 100755
--- a/clientside/tmcc/common/config/rc.fakejail
+++ b/clientside/tmcc/common/config/rc.fakejail
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.firewall b/clientside/tmcc/common/config/rc.firewall
index 61e5f86c16..2d9d843e64 100755
--- a/clientside/tmcc/common/config/rc.firewall
+++ b/clientside/tmcc/common/config/rc.firewall
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.hostnames b/clientside/tmcc/common/config/rc.hostnames
index fbecb371e7..32ccd06406 100755
--- a/clientside/tmcc/common/config/rc.hostnames
+++ b/clientside/tmcc/common/config/rc.hostnames
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.ifconfig b/clientside/tmcc/common/config/rc.ifconfig
index f4adb05848..4ae8a4287e 100755
--- a/clientside/tmcc/common/config/rc.ifconfig
+++ b/clientside/tmcc/common/config/rc.ifconfig
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.keys b/clientside/tmcc/common/config/rc.keys
index 8e37871ad4..b7101b37f0 100755
--- a/clientside/tmcc/common/config/rc.keys
+++ b/clientside/tmcc/common/config/rc.keys
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.linkagent b/clientside/tmcc/common/config/rc.linkagent
index 51f32604a2..244cb37b90 100755
--- a/clientside/tmcc/common/config/rc.linkagent
+++ b/clientside/tmcc/common/config/rc.linkagent
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.localize b/clientside/tmcc/common/config/rc.localize
index 31b728adff..1d4e4f8e26 100755
--- a/clientside/tmcc/common/config/rc.localize
+++ b/clientside/tmcc/common/config/rc.localize
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.misc b/clientside/tmcc/common/config/rc.misc
index 45267b99f1..4507c71204 100755
--- a/clientside/tmcc/common/config/rc.misc
+++ b/clientside/tmcc/common/config/rc.misc
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.mkelab b/clientside/tmcc/common/config/rc.mkelab
index 20c4a13393..536ab7ba0c 100755
--- a/clientside/tmcc/common/config/rc.mkelab
+++ b/clientside/tmcc/common/config/rc.mkelab
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# XXX I hardwire IPs into generated /etc/rc.conf and /etc/rc.resolv.
#
diff --git a/clientside/tmcc/common/config/rc.mksubboss b/clientside/tmcc/common/config/rc.mksubboss
index dc902ce88a..5c81745484 100644
--- a/clientside/tmcc/common/config/rc.mksubboss
+++ b/clientside/tmcc/common/config/rc.mksubboss
@@ -1,8 +1,25 @@
#! /usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/clientside/tmcc/common/config/rc.motelog b/clientside/tmcc/common/config/rc.motelog
index 623203218c..170d87398d 100644
--- a/clientside/tmcc/common/config/rc.motelog
+++ b/clientside/tmcc/common/config/rc.motelog
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.mounts b/clientside/tmcc/common/config/rc.mounts
index 926e63fcc3..7ef3878ce9 100755
--- a/clientside/tmcc/common/config/rc.mounts
+++ b/clientside/tmcc/common/config/rc.mounts
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.progagent b/clientside/tmcc/common/config/rc.progagent
index 0c92dd5ca5..bb88d88c4e 100755
--- a/clientside/tmcc/common/config/rc.progagent
+++ b/clientside/tmcc/common/config/rc.progagent
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.route b/clientside/tmcc/common/config/rc.route
index 2d02edc302..0cb7594462 100755
--- a/clientside/tmcc/common/config/rc.route
+++ b/clientside/tmcc/common/config/rc.route
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.rpms b/clientside/tmcc/common/config/rc.rpms
index 19433145be..5beedde2b5 100755
--- a/clientside/tmcc/common/config/rc.rpms
+++ b/clientside/tmcc/common/config/rc.rpms
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.simulator b/clientside/tmcc/common/config/rc.simulator
index 7e56da5add..ea960e06cc 100755
--- a/clientside/tmcc/common/config/rc.simulator
+++ b/clientside/tmcc/common/config/rc.simulator
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.startcmd b/clientside/tmcc/common/config/rc.startcmd
index 5d0758323c..46e2fde8d7 100755
--- a/clientside/tmcc/common/config/rc.startcmd
+++ b/clientside/tmcc/common/config/rc.startcmd
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.syncserver b/clientside/tmcc/common/config/rc.syncserver
index b6d9f592c4..0562699faa 100755
--- a/clientside/tmcc/common/config/rc.syncserver
+++ b/clientside/tmcc/common/config/rc.syncserver
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.tarfiles b/clientside/tmcc/common/config/rc.tarfiles
index ed262d7343..a3be7bb6ea 100755
--- a/clientside/tmcc/common/config/rc.tarfiles
+++ b/clientside/tmcc/common/config/rc.tarfiles
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.template b/clientside/tmcc/common/config/rc.template
index 79da22dd10..efd2549ef2 100755
--- a/clientside/tmcc/common/config/rc.template
+++ b/clientside/tmcc/common/config/rc.template
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.tiptunnels b/clientside/tmcc/common/config/rc.tiptunnels
index 70b54fd7ff..e51534484d 100644
--- a/clientside/tmcc/common/config/rc.tiptunnels
+++ b/clientside/tmcc/common/config/rc.tiptunnels
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.topomap b/clientside/tmcc/common/config/rc.topomap
index c68698ad82..812d06eb4d 100755
--- a/clientside/tmcc/common/config/rc.topomap
+++ b/clientside/tmcc/common/config/rc.topomap
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.tpmsetup b/clientside/tmcc/common/config/rc.tpmsetup
index abb11c45a0..3fef8ca831 100755
--- a/clientside/tmcc/common/config/rc.tpmsetup
+++ b/clientside/tmcc/common/config/rc.tpmsetup
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.trace b/clientside/tmcc/common/config/rc.trace
index e4e33b0041..4fa7017fae 100644
--- a/clientside/tmcc/common/config/rc.trace
+++ b/clientside/tmcc/common/config/rc.trace
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.trafgen b/clientside/tmcc/common/config/rc.trafgen
index 9016f5dc19..5e8a33da6c 100755
--- a/clientside/tmcc/common/config/rc.trafgen
+++ b/clientside/tmcc/common/config/rc.trafgen
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/config/rc.tunnels b/clientside/tmcc/common/config/rc.tunnels
index 45eb9a6208..9d36b7720b 100755
--- a/clientside/tmcc/common/config/rc.tunnels
+++ b/clientside/tmcc/common/config/rc.tunnels
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/ctrlnode.sh b/clientside/tmcc/common/ctrlnode.sh
index fe57eb5a8f..af0505b4a8 100755
--- a/clientside/tmcc/common/ctrlnode.sh
+++ b/clientside/tmcc/common/ctrlnode.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/common/getblob b/clientside/tmcc/common/getblob
index a574752536..d3b6b41533 100755
--- a/clientside/tmcc/common/getblob
+++ b/clientside/tmcc/common/getblob
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/clientside/tmcc/common/ifdynconfig b/clientside/tmcc/common/ifdynconfig
index 81fe11d0ad..7d3cd23734 100644
--- a/clientside/tmcc/common/ifdynconfig
+++ b/clientside/tmcc/common/ifdynconfig
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/ifsetup b/clientside/tmcc/common/ifsetup
index 793d7dbc81..babb0cea9b 100755
--- a/clientside/tmcc/common/ifsetup
+++ b/clientside/tmcc/common/ifsetup
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/libsetup.pm b/clientside/tmcc/common/libsetup.pm
index 1fa01434db..bfe529bd3c 100644
--- a/clientside/tmcc/common/libsetup.pm
+++ b/clientside/tmcc/common/libsetup.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# TODO: Signal handlers for protecting db files.
diff --git a/clientside/tmcc/common/libtestbed.pm b/clientside/tmcc/common/libtestbed.pm
index 7639571f32..acb87e092d 100644
--- a/clientside/tmcc/common/libtestbed.pm
+++ b/clientside/tmcc/common/libtestbed.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/common/libtmcc.pm b/clientside/tmcc/common/libtmcc.pm
index a10e5bb014..67fa6037c0 100755
--- a/clientside/tmcc/common/libtmcc.pm
+++ b/clientside/tmcc/common/libtmcc.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/common/logboot b/clientside/tmcc/common/logboot
index b5b0a1e2ee..aaf75b1c47 100755
--- a/clientside/tmcc/common/logboot
+++ b/clientside/tmcc/common/logboot
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/ntpstart b/clientside/tmcc/common/ntpstart
index cc24247a78..24a936ffaa 100755
--- a/clientside/tmcc/common/ntpstart
+++ b/clientside/tmcc/common/ntpstart
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/clientside/tmcc/common/osconfig b/clientside/tmcc/common/osconfig
index 034e96c544..c217454d64 100755
--- a/clientside/tmcc/common/osconfig
+++ b/clientside/tmcc/common/osconfig
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/clientside/tmcc/common/paths.pm b/clientside/tmcc/common/paths.pm
index f32fc94ee1..ff9fd59c50 100755
--- a/clientside/tmcc/common/paths.pm
+++ b/clientside/tmcc/common/paths.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package emulabpaths;
use Exporter;
diff --git a/clientside/tmcc/common/paths.sh b/clientside/tmcc/common/paths.sh
index 8223b84c49..fab9f47806 100644
--- a/clientside/tmcc/common/paths.sh
+++ b/clientside/tmcc/common/paths.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/common/rc.bootsetup b/clientside/tmcc/common/rc.bootsetup
index 46c5339959..6f39a66904 100755
--- a/clientside/tmcc/common/rc.bootsetup
+++ b/clientside/tmcc/common/rc.bootsetup
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/rc.canaryd b/clientside/tmcc/common/rc.canaryd
index a56f4b051e..dfaa3f51e4 100644
--- a/clientside/tmcc/common/rc.canaryd
+++ b/clientside/tmcc/common/rc.canaryd
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
USAGE="usage: $0 (start|stop|restart)"
diff --git a/clientside/tmcc/common/rc.ctrlnode b/clientside/tmcc/common/rc.ctrlnode
index 8e73df443c..068f3c9f30 100755
--- a/clientside/tmcc/common/rc.ctrlnode
+++ b/clientside/tmcc/common/rc.ctrlnode
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/rc.inelab b/clientside/tmcc/common/rc.inelab
index b31de5cf44..a458a53c18 100755
--- a/clientside/tmcc/common/rc.inelab
+++ b/clientside/tmcc/common/rc.inelab
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/rc.linktest b/clientside/tmcc/common/rc.linktest
index 965dd1b2b5..14127b8b70 100755
--- a/clientside/tmcc/common/rc.linktest
+++ b/clientside/tmcc/common/rc.linktest
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/rc.pgeni b/clientside/tmcc/common/rc.pgeni
index ef45aa5665..2dbce79fa7 100755
--- a/clientside/tmcc/common/rc.pgeni
+++ b/clientside/tmcc/common/rc.pgeni
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/rc.slothd b/clientside/tmcc/common/rc.slothd
index 43692d6bca..d63d64f14f 100755
--- a/clientside/tmcc/common/rc.slothd
+++ b/clientside/tmcc/common/rc.slothd
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
USAGE="usage: $0 (start|stop|restart)"
diff --git a/clientside/tmcc/common/rc.testbed b/clientside/tmcc/common/rc.testbed
index 2e18403c2d..fa85fbe470 100755
--- a/clientside/tmcc/common/rc.testbed
+++ b/clientside/tmcc/common/rc.testbed
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/common/runcvsup.sh b/clientside/tmcc/common/runcvsup.sh
index 845c2ccdb4..4249c4bd56 100755
--- a/clientside/tmcc/common/runcvsup.sh
+++ b/clientside/tmcc/common/runcvsup.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/common/runstartup b/clientside/tmcc/common/runstartup
index f678f02ad7..673e1c1417 100755
--- a/clientside/tmcc/common/runstartup
+++ b/clientside/tmcc/common/runstartup
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/clientside/tmcc/common/sendevent b/clientside/tmcc/common/sendevent
index d3c41368bc..e3ce1ee547 100755
--- a/clientside/tmcc/common/sendevent
+++ b/clientside/tmcc/common/sendevent
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/clientside/tmcc/common/startcmddone b/clientside/tmcc/common/startcmddone
index 62eb2f24dd..c82ce0969d 100755
--- a/clientside/tmcc/common/startcmddone
+++ b/clientside/tmcc/common/startcmddone
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/clientside/tmcc/common/tmcc.pl b/clientside/tmcc/common/tmcc.pl
index 4ca8b2316c..183c09b148 100755
--- a/clientside/tmcc/common/tmcc.pl
+++ b/clientside/tmcc/common/tmcc.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/common/update b/clientside/tmcc/common/update
index 2dd7edad4c..5d61080be8 100755
--- a/clientside/tmcc/common/update
+++ b/clientside/tmcc/common/update
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use English;
diff --git a/clientside/tmcc/common/vnodesetup b/clientside/tmcc/common/vnodesetup
index 9613730c86..4ffef7f3a6 100755
--- a/clientside/tmcc/common/vnodesetup
+++ b/clientside/tmcc/common/vnodesetup
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
diff --git a/clientside/tmcc/common/watchdog b/clientside/tmcc/common/watchdog
index c93c13ac03..d3075a6b2e 100755
--- a/clientside/tmcc/common/watchdog
+++ b/clientside/tmcc/common/watchdog
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use English;
diff --git a/clientside/tmcc/cygwinseven/GNUmakefile.in b/clientside/tmcc/cygwinseven/GNUmakefile.in
index 3e457bdd8c..c297b24144 100755
--- a/clientside/tmcc/cygwinseven/GNUmakefile.in
+++ b/clientside/tmcc/cygwinseven/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/cygwinseven/liblocsetup.pm b/clientside/tmcc/cygwinseven/liblocsetup.pm
index da21de9036..f8a0d70873 100644
--- a/clientside/tmcc/cygwinseven/liblocsetup.pm
+++ b/clientside/tmcc/cygwinseven/liblocsetup.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/cygwinseven/netbt b/clientside/tmcc/cygwinseven/netbt
index 225c1bb9ae..8e9c347f86 100755
--- a/clientside/tmcc/cygwinseven/netbt
+++ b/clientside/tmcc/cygwinseven/netbt
@@ -1,8 +1,25 @@
#! /bin/bash
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
function usage () {
diff --git a/clientside/tmcc/cygwinseven/prepare b/clientside/tmcc/cygwinseven/prepare
index 09e7e7436f..c42db3b138 100755
--- a/clientside/tmcc/cygwinseven/prepare
+++ b/clientside/tmcc/cygwinseven/prepare
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
#require 'ctime.pl';
diff --git a/clientside/tmcc/cygwinseven/rc.cygwinseven b/clientside/tmcc/cygwinseven/rc.cygwinseven
index 8540836ceb..2473983140 100755
--- a/clientside/tmcc/cygwinseven/rc.cygwinseven
+++ b/clientside/tmcc/cygwinseven/rc.cygwinseven
@@ -1,8 +1,25 @@
#!/bin/bash
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# rc.cygwinxp - CygWin-specific startup. Run by rc.bootsetup on CygWin.
diff --git a/clientside/tmcc/cygwinseven/rc.lmhosts b/clientside/tmcc/cygwinseven/rc.lmhosts
index cd893a4eac..b9af1cea1f 100755
--- a/clientside/tmcc/cygwinseven/rc.lmhosts
+++ b/clientside/tmcc/cygwinseven/rc.lmhosts
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/cygwinseven/rc.reboot b/clientside/tmcc/cygwinseven/rc.reboot
index f04ec32aa4..d102cde1e2 100755
--- a/clientside/tmcc/cygwinseven/rc.reboot
+++ b/clientside/tmcc/cygwinseven/rc.reboot
@@ -1,8 +1,25 @@
#!/bin/bash
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# rc.reboot - CygWin-specific reboot script.
#
diff --git a/clientside/tmcc/cygwinseven/tbshutdown b/clientside/tmcc/cygwinseven/tbshutdown
index f2c8bd38a2..4e4b46f41e 100644
--- a/clientside/tmcc/cygwinseven/tbshutdown
+++ b/clientside/tmcc/cygwinseven/tbshutdown
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/clientside/tmcc/cygwinxp/GNUmakefile.in b/clientside/tmcc/cygwinxp/GNUmakefile.in
index d4b36af9fc..b2848d6f7b 100644
--- a/clientside/tmcc/cygwinxp/GNUmakefile.in
+++ b/clientside/tmcc/cygwinxp/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/cygwinxp/clean_logonui b/clientside/tmcc/cygwinxp/clean_logonui
index bde77ee8c5..47e644c014 100755
--- a/clientside/tmcc/cygwinxp/clean_logonui
+++ b/clientside/tmcc/cygwinxp/clean_logonui
@@ -1,8 +1,25 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# clean_logonui - Kill the logonui.exe task periodically. It is instantly
# restarted by Windows, but is "cleaned out" in the process.
diff --git a/clientside/tmcc/cygwinxp/liblocsetup.pm b/clientside/tmcc/cygwinxp/liblocsetup.pm
index a9ce926849..3b07d28405 100644
--- a/clientside/tmcc/cygwinxp/liblocsetup.pm
+++ b/clientside/tmcc/cygwinxp/liblocsetup.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/cygwinxp/netbt b/clientside/tmcc/cygwinxp/netbt
index 225c1bb9ae..8e9c347f86 100755
--- a/clientside/tmcc/cygwinxp/netbt
+++ b/clientside/tmcc/cygwinxp/netbt
@@ -1,8 +1,25 @@
#! /bin/bash
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
function usage () {
diff --git a/clientside/tmcc/cygwinxp/prepare b/clientside/tmcc/cygwinxp/prepare
index e1d9dc0a7d..525da634d2 100755
--- a/clientside/tmcc/cygwinxp/prepare
+++ b/clientside/tmcc/cygwinxp/prepare
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
require 'ctime.pl';
diff --git a/clientside/tmcc/cygwinxp/rc.cygwinxp b/clientside/tmcc/cygwinxp/rc.cygwinxp
index d187dc15df..2e285aa08b 100755
--- a/clientside/tmcc/cygwinxp/rc.cygwinxp
+++ b/clientside/tmcc/cygwinxp/rc.cygwinxp
@@ -1,8 +1,25 @@
#!/bin/bash
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# rc.cygwinxp - CygWin-specific startup. Run by rc.bootsetup on CygWin.
diff --git a/clientside/tmcc/cygwinxp/rc.firstboot b/clientside/tmcc/cygwinxp/rc.firstboot
index 1299d60c87..c263fa9a58 100644
--- a/clientside/tmcc/cygwinxp/rc.firstboot
+++ b/clientside/tmcc/cygwinxp/rc.firstboot
@@ -1,8 +1,25 @@
#!/bin/bash
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# rc.firstboot - CygWin-specific startup.
diff --git a/clientside/tmcc/cygwinxp/rc.lmhosts b/clientside/tmcc/cygwinxp/rc.lmhosts
index cd893a4eac..b9af1cea1f 100755
--- a/clientside/tmcc/cygwinxp/rc.lmhosts
+++ b/clientside/tmcc/cygwinxp/rc.lmhosts
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/cygwinxp/rc.reboot b/clientside/tmcc/cygwinxp/rc.reboot
index f04ec32aa4..d102cde1e2 100755
--- a/clientside/tmcc/cygwinxp/rc.reboot
+++ b/clientside/tmcc/cygwinxp/rc.reboot
@@ -1,8 +1,25 @@
#!/bin/bash
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# rc.reboot - CygWin-specific reboot script.
#
diff --git a/clientside/tmcc/cygwinxp/reboot b/clientside/tmcc/cygwinxp/reboot
index f00331dfad..c9e81ec6ff 100755
--- a/clientside/tmcc/cygwinxp/reboot
+++ b/clientside/tmcc/cygwinxp/reboot
@@ -1,8 +1,25 @@
#!/bin/bash
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Installed as /sbin/reboot on CygWin, invoked with no arguments by Emulab.
#
diff --git a/clientside/tmcc/cygwinxp/tbshutdown b/clientside/tmcc/cygwinxp/tbshutdown
index f2c8bd38a2..4e4b46f41e 100644
--- a/clientside/tmcc/cygwinxp/tbshutdown
+++ b/clientside/tmcc/cygwinxp/tbshutdown
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/clientside/tmcc/dostype.c b/clientside/tmcc/dostype.c
index d56e5c1005..6d8d61d2e9 100644
--- a/clientside/tmcc/dostype.c
+++ b/clientside/tmcc/dostype.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/tmcc/dp/GNUmakefile.in b/clientside/tmcc/dp/GNUmakefile.in
index 75981d69bf..0de2dbf3c6 100644
--- a/clientside/tmcc/dp/GNUmakefile.in
+++ b/clientside/tmcc/dp/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/dp/emulab.sh b/clientside/tmcc/dp/emulab.sh
index cacf52ea8e..85e2b72f92 100755
--- a/clientside/tmcc/dp/emulab.sh
+++ b/clientside/tmcc/dp/emulab.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
PATH=/sbin:/bin:/usr/sbin:/usr/bin
[ -f /etc/default/rcS ] && . /etc/default/rcS
diff --git a/clientside/tmcc/dp/emulabctl b/clientside/tmcc/dp/emulabctl
index 790e5794f4..fddb701dc0 100644
--- a/clientside/tmcc/dp/emulabctl
+++ b/clientside/tmcc/dp/emulabctl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use English;
diff --git a/clientside/tmcc/dp/mkemuman.sh b/clientside/tmcc/dp/mkemuman.sh
index 0df1aebfac..e5a56853ae 100755
--- a/clientside/tmcc/dp/mkemuman.sh
+++ b/clientside/tmcc/dp/mkemuman.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/fedora/GNUmakefile.in b/clientside/tmcc/fedora/GNUmakefile.in
index 95844ac825..65740a636f 100644
--- a/clientside/tmcc/fedora/GNUmakefile.in
+++ b/clientside/tmcc/fedora/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/fedora/delaysetup b/clientside/tmcc/fedora/delaysetup
index 9fc98b12b2..588ef060a2 100755
--- a/clientside/tmcc/fedora/delaysetup
+++ b/clientside/tmcc/fedora/delaysetup
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/fedora/ifcfg-eth99 b/clientside/tmcc/fedora/ifcfg-eth99
index 1ac1db5650..e93eabb8bf 100644
--- a/clientside/tmcc/fedora/ifcfg-eth99
+++ b/clientside/tmcc/fedora/ifcfg-eth99
@@ -1,8 +1,25 @@
#/bin/sh -
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/fedora/mkifcfgs b/clientside/tmcc/fedora/mkifcfgs
index f56d393cb8..62cb6cf2b2 100755
--- a/clientside/tmcc/fedora/mkifcfgs
+++ b/clientside/tmcc/fedora/mkifcfgs
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/fedora15/GNUmakefile.in b/clientside/tmcc/fedora15/GNUmakefile.in
index 59c1290c0b..6809a61a91 100644
--- a/clientside/tmcc/fedora15/GNUmakefile.in
+++ b/clientside/tmcc/fedora15/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/fedora15/delaysetup b/clientside/tmcc/fedora15/delaysetup
index e617c725ab..243846d5ed 100755
--- a/clientside/tmcc/fedora15/delaysetup
+++ b/clientside/tmcc/fedora15/delaysetup
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/fedora15/emulab-systemd-swaps b/clientside/tmcc/fedora15/emulab-systemd-swaps
index a970d1c63c..d2e850e88d 100755
--- a/clientside/tmcc/fedora15/emulab-systemd-swaps
+++ b/clientside/tmcc/fedora15/emulab-systemd-swaps
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/fedora15/ifcfg-eth99 b/clientside/tmcc/fedora15/ifcfg-eth99
index 3aff3fb019..53dc7390fb 100644
--- a/clientside/tmcc/fedora15/ifcfg-eth99
+++ b/clientside/tmcc/fedora15/ifcfg-eth99
@@ -1,8 +1,25 @@
#/bin/sh -
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/fedora15/ifup-emulabcnet b/clientside/tmcc/fedora15/ifup-emulabcnet
index 56db4d4b65..ee587e3d97 100755
--- a/clientside/tmcc/fedora15/ifup-emulabcnet
+++ b/clientside/tmcc/fedora15/ifup-emulabcnet
@@ -1,8 +1,25 @@
#/bin/sh -
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# HACK: run dhclient on all interfaces, and do nothing else
diff --git a/clientside/tmcc/fedora15/mkifcfgs b/clientside/tmcc/fedora15/mkifcfgs
index f56d393cb8..62cb6cf2b2 100755
--- a/clientside/tmcc/fedora15/mkifcfgs
+++ b/clientside/tmcc/fedora15/mkifcfgs
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/fedora15/rc.local b/clientside/tmcc/fedora15/rc.local
index 5595388f51..45fa1f7ed7 100755
--- a/clientside/tmcc/fedora15/rc.local
+++ b/clientside/tmcc/fedora15/rc.local
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/fedora15/testbed b/clientside/tmcc/fedora15/testbed
index a4b91a7c23..d462854dc6 100644
--- a/clientside/tmcc/fedora15/testbed
+++ b/clientside/tmcc/fedora15/testbed
@@ -1,8 +1,25 @@
#!/bin/bash
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/findif.c b/clientside/tmcc/findif.c
index 0f7d48ccbb..4e73f55b2e 100644
--- a/clientside/tmcc/findif.c
+++ b/clientside/tmcc/findif.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2001-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* BSD code derived from:
* $FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.51.2.21 2004/03/15 07:25:30 ru Exp $
diff --git a/clientside/tmcc/freebsd/GNUmakefile.in b/clientside/tmcc/freebsd/GNUmakefile.in
index 3b7f267fae..f8ec336d64 100644
--- a/clientside/tmcc/freebsd/GNUmakefile.in
+++ b/clientside/tmcc/freebsd/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/freebsd/camwce b/clientside/tmcc/freebsd/camwce
index f75b1e5895..98c20b1396 100644
--- a/clientside/tmcc/freebsd/camwce
+++ b/clientside/tmcc/freebsd/camwce
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Wicked sleezy script for turning write-cache-enable (WCE) on and off
# for a SCSI drive. It is sleezy because it acts both as the user interface
diff --git a/clientside/tmcc/freebsd/cdboot/rc.cdboot b/clientside/tmcc/freebsd/cdboot/rc.cdboot
index 82befa50bf..d835be92ec 100755
--- a/clientside/tmcc/freebsd/cdboot/rc.cdboot
+++ b/clientside/tmcc/freebsd/cdboot/rc.cdboot
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/freebsd/chipset.awk b/clientside/tmcc/freebsd/chipset.awk
index d6483570ab..13ef2c281b 100755
--- a/clientside/tmcc/freebsd/chipset.awk
+++ b/clientside/tmcc/freebsd/chipset.awk
@@ -1,8 +1,25 @@
#!/usr/bin/awk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
BEGIN {
diff --git a/clientside/tmcc/freebsd/control_interface b/clientside/tmcc/freebsd/control_interface
index 14286c512d..b7c172c695 100755
--- a/clientside/tmcc/freebsd/control_interface
+++ b/clientside/tmcc/freebsd/control_interface
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/freebsd/cpuspeed.awk b/clientside/tmcc/freebsd/cpuspeed.awk
index 1fe7050868..a8e1d1a3b1 100755
--- a/clientside/tmcc/freebsd/cpuspeed.awk
+++ b/clientside/tmcc/freebsd/cpuspeed.awk
@@ -1,8 +1,25 @@
#!/usr/bin/awk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
BEGIN {
diff --git a/clientside/tmcc/freebsd/delaysetup b/clientside/tmcc/freebsd/delaysetup
index 6fc5406abe..dde98bad88 100644
--- a/clientside/tmcc/freebsd/delaysetup
+++ b/clientside/tmcc/freebsd/delaysetup
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/freebsd/dhclient b/clientside/tmcc/freebsd/dhclient
index bda8652980..d03dabf3f8 100755
--- a/clientside/tmcc/freebsd/dhclient
+++ b/clientside/tmcc/freebsd/dhclient
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/freebsd/dhclient-enter-hooks b/clientside/tmcc/freebsd/dhclient-enter-hooks
index bd8d1b2826..6c89e5a33a 100644
--- a/clientside/tmcc/freebsd/dhclient-enter-hooks
+++ b/clientside/tmcc/freebsd/dhclient-enter-hooks
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/freebsd/dhclient-exit-hooks b/clientside/tmcc/freebsd/dhclient-exit-hooks
index 5788c1ba6e..2f6b737a3a 100644
--- a/clientside/tmcc/freebsd/dhclient-exit-hooks
+++ b/clientside/tmcc/freebsd/dhclient-exit-hooks
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/freebsd/frisbee/prepare b/clientside/tmcc/freebsd/frisbee/prepare
index 3c99dc22ca..da56fc9762 100644
--- a/clientside/tmcc/freebsd/frisbee/prepare
+++ b/clientside/tmcc/freebsd/frisbee/prepare
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/freebsd/init/GNUmakefile.in b/clientside/tmcc/freebsd/init/GNUmakefile.in
index c7f2010b68..8959b64a1c 100644
--- a/clientside/tmcc/freebsd/init/GNUmakefile.in
+++ b/clientside/tmcc/freebsd/init/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/tmcc/freebsd/jail/injail.c b/clientside/tmcc/freebsd/jail/injail.c
index c9ceddc672..b7c2f5f473 100644
--- a/clientside/tmcc/freebsd/jail/injail.c
+++ b/clientside/tmcc/freebsd/jail/injail.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/clientside/tmcc/freebsd/jail/mkjail.pl b/clientside/tmcc/freebsd/jail/mkjail.pl
index 694d4f5650..e12f4f31ce 100755
--- a/clientside/tmcc/freebsd/jail/mkjail.pl
+++ b/clientside/tmcc/freebsd/jail/mkjail.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Kernel, jail, netstat, route, ifconfig, ipfw, header files.
#
diff --git a/clientside/tmcc/freebsd/jail/rc.injail b/clientside/tmcc/freebsd/jail/rc.injail
index 43a39818ca..4c3a709b04 100755
--- a/clientside/tmcc/freebsd/jail/rc.injail
+++ b/clientside/tmcc/freebsd/jail/rc.injail
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/freebsd/liblocsetup.pm b/clientside/tmcc/freebsd/liblocsetup.pm
index 5a3a11aa28..df911e6a5f 100644
--- a/clientside/tmcc/freebsd/liblocsetup.pm
+++ b/clientside/tmcc/freebsd/liblocsetup.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/freebsd/mkextrafs.pl b/clientside/tmcc/freebsd/mkextrafs.pl
index 4627c1fdd5..4e2d0ff0aa 100755
--- a/clientside/tmcc/freebsd/mkextrafs.pl
+++ b/clientside/tmcc/freebsd/mkextrafs.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/freebsd/newnode-testbed.sh b/clientside/tmcc/freebsd/newnode-testbed.sh
index be34f385c1..12a3ff189a 100644
--- a/clientside/tmcc/freebsd/newnode-testbed.sh
+++ b/clientside/tmcc/freebsd/newnode-testbed.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# PROVIDE: testbed
# REQUIRE: sshd
diff --git a/clientside/tmcc/freebsd/nodetype b/clientside/tmcc/freebsd/nodetype
index 7b1ac37ea7..0fb48cf7d3 100755
--- a/clientside/tmcc/freebsd/nodetype
+++ b/clientside/tmcc/freebsd/nodetype
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/freebsd/prepare b/clientside/tmcc/freebsd/prepare
index 7a5fd4579f..a363bb2ce7 100755
--- a/clientside/tmcc/freebsd/prepare
+++ b/clientside/tmcc/freebsd/prepare
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/freebsd/rc.bridges b/clientside/tmcc/freebsd/rc.bridges
index f69405c54c..4f46663623 100755
--- a/clientside/tmcc/freebsd/rc.bridges
+++ b/clientside/tmcc/freebsd/rc.bridges
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/clientside/tmcc/freebsd/rc.delayagent b/clientside/tmcc/freebsd/rc.delayagent
index d82d18afa9..a3edd82cd9 100755
--- a/clientside/tmcc/freebsd/rc.delayagent
+++ b/clientside/tmcc/freebsd/rc.delayagent
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/freebsd/rc.frisbee b/clientside/tmcc/freebsd/rc.frisbee
index e5bef31b54..93a052bcdd 100755
--- a/clientside/tmcc/freebsd/rc.frisbee
+++ b/clientside/tmcc/freebsd/rc.frisbee
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Optional flag argument says "do not reboot"
#
diff --git a/clientside/tmcc/freebsd/rc.healthd b/clientside/tmcc/freebsd/rc.healthd
index b091087bfc..b27167114b 100755
--- a/clientside/tmcc/freebsd/rc.healthd
+++ b/clientside/tmcc/freebsd/rc.healthd
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/freebsd/rc.ipod b/clientside/tmcc/freebsd/rc.ipod
index 87ed919b4f..ca1f1e613e 100755
--- a/clientside/tmcc/freebsd/rc.ipod
+++ b/clientside/tmcc/freebsd/rc.ipod
@@ -1,8 +1,25 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/freebsd/rc.kname b/clientside/tmcc/freebsd/rc.kname
index ae11470c1c..6500b629bc 100644
--- a/clientside/tmcc/freebsd/rc.kname
+++ b/clientside/tmcc/freebsd/rc.kname
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/freebsd/rc.mfs b/clientside/tmcc/freebsd/rc.mfs
index d60b448915..bbe73c91ec 100755
--- a/clientside/tmcc/freebsd/rc.mfs
+++ b/clientside/tmcc/freebsd/rc.mfs
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/freebsd/rc.nfshack b/clientside/tmcc/freebsd/rc.nfshack
index 10e51e81f9..ebe2ffa1f1 100644
--- a/clientside/tmcc/freebsd/rc.nfshack
+++ b/clientside/tmcc/freebsd/rc.nfshack
@@ -1,8 +1,25 @@
#/bin/sh -
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/freebsd/sethostname.in b/clientside/tmcc/freebsd/sethostname.in
index 3d25d0ef2b..37dd9c6b2a 100644
--- a/clientside/tmcc/freebsd/sethostname.in
+++ b/clientside/tmcc/freebsd/sethostname.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/clientside/tmcc/freebsd/slicefix b/clientside/tmcc/freebsd/slicefix
index d47637c7a3..252d92113e 100755
--- a/clientside/tmcc/freebsd/slicefix
+++ b/clientside/tmcc/freebsd/slicefix
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
if [ -r /etc/emulab/paths.sh ]; then
diff --git a/clientside/tmcc/freebsd/tbshutdown b/clientside/tmcc/freebsd/tbshutdown
index 510808b834..905bc21ae2 100755
--- a/clientside/tmcc/freebsd/tbshutdown
+++ b/clientside/tmcc/freebsd/tbshutdown
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/clientside/tmcc/freebsd/testbed.sh b/clientside/tmcc/freebsd/testbed.sh
index f517691e14..95d96d8b5b 100755
--- a/clientside/tmcc/freebsd/testbed.sh
+++ b/clientside/tmcc/freebsd/testbed.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# PROVIDE: testbed
# REQUIRE: pubsub sshd
diff --git a/clientside/tmcc/freebsd10/GNUmakefile.in b/clientside/tmcc/freebsd10/GNUmakefile.in
index a86a788a96..bc54efb9a8 100644
--- a/clientside/tmcc/freebsd10/GNUmakefile.in
+++ b/clientside/tmcc/freebsd10/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/freebsd10/rc.freebsd b/clientside/tmcc/freebsd10/rc.freebsd
index 447d676180..85867ee952 100755
--- a/clientside/tmcc/freebsd10/rc.freebsd
+++ b/clientside/tmcc/freebsd10/rc.freebsd
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/freebsd5/GNUmakefile.in b/clientside/tmcc/freebsd5/GNUmakefile.in
index e2beba55a6..de22275f8e 100644
--- a/clientside/tmcc/freebsd5/GNUmakefile.in
+++ b/clientside/tmcc/freebsd5/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/freebsd5/cdboot/rc.dhclient b/clientside/tmcc/freebsd5/cdboot/rc.dhclient
index f6749f5152..db0aef6a14 100644
--- a/clientside/tmcc/freebsd5/cdboot/rc.dhclient
+++ b/clientside/tmcc/freebsd5/cdboot/rc.dhclient
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# In rc.conf, we have told it to just to configure lo0. Then when the
# rc.d/dhclient script is executed, it sources this (/etc/rc.conf.d/dhclient)
diff --git a/clientside/tmcc/freebsd5/rc.dhclient b/clientside/tmcc/freebsd5/rc.dhclient
index 259cf44f94..4aa21a0941 100644
--- a/clientside/tmcc/freebsd5/rc.dhclient
+++ b/clientside/tmcc/freebsd5/rc.dhclient
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# In rc.conf, we have told it to just to configure lo0. Then when the
# rc.d/dhclient script is executed, it sources this (/etc/rc.conf.d/dhclient)
diff --git a/clientside/tmcc/freebsd6/GNUmakefile.in b/clientside/tmcc/freebsd6/GNUmakefile.in
index 04e13f56fd..6682ec9516 100644
--- a/clientside/tmcc/freebsd6/GNUmakefile.in
+++ b/clientside/tmcc/freebsd6/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/freebsd7/GNUmakefile.in b/clientside/tmcc/freebsd7/GNUmakefile.in
index e4999f64d7..a4090d03be 100644
--- a/clientside/tmcc/freebsd7/GNUmakefile.in
+++ b/clientside/tmcc/freebsd7/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/freebsd7/mfs-newnode-testbed.sh b/clientside/tmcc/freebsd7/mfs-newnode-testbed.sh
index be34f385c1..12a3ff189a 100644
--- a/clientside/tmcc/freebsd7/mfs-newnode-testbed.sh
+++ b/clientside/tmcc/freebsd7/mfs-newnode-testbed.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# PROVIDE: testbed
# REQUIRE: sshd
diff --git a/clientside/tmcc/freebsd7/rc.freebsd b/clientside/tmcc/freebsd7/rc.freebsd
index 447d676180..85867ee952 100755
--- a/clientside/tmcc/freebsd7/rc.freebsd
+++ b/clientside/tmcc/freebsd7/rc.freebsd
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/freebsd9/GNUmakefile.in b/clientside/tmcc/freebsd9/GNUmakefile.in
index a86a788a96..bc54efb9a8 100644
--- a/clientside/tmcc/freebsd9/GNUmakefile.in
+++ b/clientside/tmcc/freebsd9/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/freebsd9/rc.freebsd b/clientside/tmcc/freebsd9/rc.freebsd
index 447d676180..85867ee952 100755
--- a/clientside/tmcc/freebsd9/rc.freebsd
+++ b/clientside/tmcc/freebsd9/rc.freebsd
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/linux-sg/GNUmakefile.in b/clientside/tmcc/linux-sg/GNUmakefile.in
index 852a0fd198..b8f55383da 100644
--- a/clientside/tmcc/linux-sg/GNUmakefile.in
+++ b/clientside/tmcc/linux-sg/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/linux-sg/dhcpcd.exe b/clientside/tmcc/linux-sg/dhcpcd.exe
index 107c411449..9ec250ab7b 100755
--- a/clientside/tmcc/linux-sg/dhcpcd.exe
+++ b/clientside/tmcc/linux-sg/dhcpcd.exe
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/linux-sg/rc.stargate b/clientside/tmcc/linux-sg/rc.stargate
index 7135b5a7bd..53a4a938a9 100755
--- a/clientside/tmcc/linux-sg/rc.stargate
+++ b/clientside/tmcc/linux-sg/rc.stargate
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/linux-sg/testbed b/clientside/tmcc/linux-sg/testbed
index de4854eb61..390c9cdcd4 100755
--- a/clientside/tmcc/linux-sg/testbed
+++ b/clientside/tmcc/linux-sg/testbed
@@ -1,8 +1,25 @@
#!/bin/bash
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/linux/GNUmakefile.in b/clientside/tmcc/linux/GNUmakefile.in
index 9b9c63f5d1..3c25c1dca5 100644
--- a/clientside/tmcc/linux/GNUmakefile.in
+++ b/clientside/tmcc/linux/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/linux/cdboot/rc.cdboot b/clientside/tmcc/linux/cdboot/rc.cdboot
index 902620ee86..8634c34e0a 100755
--- a/clientside/tmcc/linux/cdboot/rc.cdboot
+++ b/clientside/tmcc/linux/cdboot/rc.cdboot
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/linux/chipset.awk b/clientside/tmcc/linux/chipset.awk
index a5f3bdc70a..005edd48fe 100755
--- a/clientside/tmcc/linux/chipset.awk
+++ b/clientside/tmcc/linux/chipset.awk
@@ -1,8 +1,25 @@
#!/usr/bin/awk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
BEGIN {
diff --git a/clientside/tmcc/linux/control_interface b/clientside/tmcc/linux/control_interface
index 14286c512d..b7c172c695 100755
--- a/clientside/tmcc/linux/control_interface
+++ b/clientside/tmcc/linux/control_interface
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/linux/cpuspeed.awk b/clientside/tmcc/linux/cpuspeed.awk
index 6bca383e80..c6ef92e63b 100755
--- a/clientside/tmcc/linux/cpuspeed.awk
+++ b/clientside/tmcc/linux/cpuspeed.awk
@@ -1,8 +1,25 @@
#!/usr/bin/awk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
/^cpu MHz.*(29[5-9][0-9]|30[0-4][0-9])\.[0-9]+$/ {
diff --git a/clientside/tmcc/linux/delaysetup b/clientside/tmcc/linux/delaysetup
index deccd2d334..8499a3cce3 100755
--- a/clientside/tmcc/linux/delaysetup
+++ b/clientside/tmcc/linux/delaysetup
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/linux/dhclient-enter-hooks b/clientside/tmcc/linux/dhclient-enter-hooks
index 7f76842f6a..f3f1caa064 100644
--- a/clientside/tmcc/linux/dhclient-enter-hooks
+++ b/clientside/tmcc/linux/dhclient-enter-hooks
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
OLDETCDIR="$ETCDIR"
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/linux/dhclient-exit-hooks b/clientside/tmcc/linux/dhclient-exit-hooks
index 46b445b11f..578834025c 100644
--- a/clientside/tmcc/linux/dhclient-exit-hooks
+++ b/clientside/tmcc/linux/dhclient-exit-hooks
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
OLDETCDIR="$ETCDIR"
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/linux/fixup-fstab-swaps b/clientside/tmcc/linux/fixup-fstab-swaps
index e2b02e479d..deab26bca0 100755
--- a/clientside/tmcc/linux/fixup-fstab-swaps
+++ b/clientside/tmcc/linux/fixup-fstab-swaps
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007, 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/linux/ifcfg-eth99 b/clientside/tmcc/linux/ifcfg-eth99
index 45cbb07fa6..4dcc41f560 100644
--- a/clientside/tmcc/linux/ifcfg-eth99
+++ b/clientside/tmcc/linux/ifcfg-eth99
@@ -1,8 +1,25 @@
#/bin/sh -
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/linux/ifforce b/clientside/tmcc/linux/ifforce
index 277ac27a64..4020c6adfd 100755
--- a/clientside/tmcc/linux/ifforce
+++ b/clientside/tmcc/linux/ifforce
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/linux/ixpboot b/clientside/tmcc/linux/ixpboot
index 0dc22fe759..594f54521f 100755
--- a/clientside/tmcc/linux/ixpboot
+++ b/clientside/tmcc/linux/ixpboot
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# TODO: Startup command in rc.ixp. Use old version.
diff --git a/clientside/tmcc/linux/liblocsetup.pm b/clientside/tmcc/linux/liblocsetup.pm
index da4960d66e..fc7d7e5a21 100644
--- a/clientside/tmcc/linux/liblocsetup.pm
+++ b/clientside/tmcc/linux/liblocsetup.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/linux/libvnode.pm b/clientside/tmcc/linux/libvnode.pm
index 0bdd6ea927..c44c6e6dee 100644
--- a/clientside/tmcc/linux/libvnode.pm
+++ b/clientside/tmcc/linux/libvnode.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Implements the libvnode API for OpenVZ support in Emulab.
#
diff --git a/clientside/tmcc/linux/mkextrafs.pl b/clientside/tmcc/linux/mkextrafs.pl
index a34a99fb42..784c0e1d32 100755
--- a/clientside/tmcc/linux/mkextrafs.pl
+++ b/clientside/tmcc/linux/mkextrafs.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/linux/mkifcfgs b/clientside/tmcc/linux/mkifcfgs
index f56d393cb8..62cb6cf2b2 100755
--- a/clientside/tmcc/linux/mkifcfgs
+++ b/clientside/tmcc/linux/mkifcfgs
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/linux/mkvnode.pl b/clientside/tmcc/linux/mkvnode.pl
index e0a9c11281..2c3cf054eb 100755
--- a/clientside/tmcc/linux/mkvnode.pl
+++ b/clientside/tmcc/linux/mkvnode.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use Getopt::Std;
diff --git a/clientside/tmcc/linux/mkvserver.pl b/clientside/tmcc/linux/mkvserver.pl
index 353dd083db..4eaf505aae 100755
--- a/clientside/tmcc/linux/mkvserver.pl
+++ b/clientside/tmcc/linux/mkvserver.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Kernel, jail, netstat, route, ifconfig, ipfw, header files.
#
diff --git a/clientside/tmcc/linux/netfpgactl b/clientside/tmcc/linux/netfpgactl
index abd31270fc..39cdcf9c21 100755
--- a/clientside/tmcc/linux/netfpgactl
+++ b/clientside/tmcc/linux/netfpgactl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# drag in nf2 libs
diff --git a/clientside/tmcc/linux/nodetype b/clientside/tmcc/linux/nodetype
index ddce989916..fe4a362dda 100755
--- a/clientside/tmcc/linux/nodetype
+++ b/clientside/tmcc/linux/nodetype
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/linux/openvz/create-image b/clientside/tmcc/linux/openvz/create-image
index 8c208e3aa6..2630c602d8 100755
--- a/clientside/tmcc/linux/openvz/create-image
+++ b/clientside/tmcc/linux/openvz/create-image
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/linux/openvz/libvnode_openvz.pm b/clientside/tmcc/linux/openvz/libvnode_openvz.pm
index 61dc5e83b0..4260da02d3 100644
--- a/clientside/tmcc/linux/openvz/libvnode_openvz.pm
+++ b/clientside/tmcc/linux/openvz/libvnode_openvz.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Implements the libvnode API for OpenVZ support in Emulab.
#
diff --git a/clientside/tmcc/linux/prepare b/clientside/tmcc/linux/prepare
index 5d1cdd8a2f..25c4600cbe 100755
--- a/clientside/tmcc/linux/prepare
+++ b/clientside/tmcc/linux/prepare
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/linux/rc.frisbee b/clientside/tmcc/linux/rc.frisbee
index 06a0ceb20c..f81885ad6c 100755
--- a/clientside/tmcc/linux/rc.frisbee
+++ b/clientside/tmcc/linux/rc.frisbee
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Optional flag argument says "do not reboot"
#
diff --git a/clientside/tmcc/linux/rc.healthd b/clientside/tmcc/linux/rc.healthd
index 8c8f4210fe..99300552cf 100755
--- a/clientside/tmcc/linux/rc.healthd
+++ b/clientside/tmcc/linux/rc.healthd
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/linux/rc.ipod b/clientside/tmcc/linux/rc.ipod
index 76d5edd1e9..3133404ade 100755
--- a/clientside/tmcc/linux/rc.ipod
+++ b/clientside/tmcc/linux/rc.ipod
@@ -1,8 +1,25 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/linux/rc.ixp b/clientside/tmcc/linux/rc.ixp
index 2206f39033..697fb3bcbc 100644
--- a/clientside/tmcc/linux/rc.ixp
+++ b/clientside/tmcc/linux/rc.ixp
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# A totally bogus hack. This is run on the card. Must copy to /opt/config.
diff --git a/clientside/tmcc/linux/rc.kname b/clientside/tmcc/linux/rc.kname
index e25d2aaa7c..5b78aadb74 100644
--- a/clientside/tmcc/linux/rc.kname
+++ b/clientside/tmcc/linux/rc.kname
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/linux/rc.linux b/clientside/tmcc/linux/rc.linux
index 346095bb76..be24a68871 100755
--- a/clientside/tmcc/linux/rc.linux
+++ b/clientside/tmcc/linux/rc.linux
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/linux/rc.local b/clientside/tmcc/linux/rc.local
index ef5252ec37..9f10a6e7c5 100755
--- a/clientside/tmcc/linux/rc.local
+++ b/clientside/tmcc/linux/rc.local
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/linux/rc.mfs b/clientside/tmcc/linux/rc.mfs
index d60b448915..bbe73c91ec 100755
--- a/clientside/tmcc/linux/rc.mfs
+++ b/clientside/tmcc/linux/rc.mfs
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/linux/sethostname.dhclient.in b/clientside/tmcc/linux/sethostname.dhclient.in
index c28e9d7239..e58ff14623 100644
--- a/clientside/tmcc/linux/sethostname.dhclient.in
+++ b/clientside/tmcc/linux/sethostname.dhclient.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/clientside/tmcc/linux/slicefix b/clientside/tmcc/linux/slicefix
index 301f813f07..ca2c412525 100755
--- a/clientside/tmcc/linux/slicefix
+++ b/clientside/tmcc/linux/slicefix
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
if [ -r /etc/emulab/paths.sh ]; then
diff --git a/clientside/tmcc/linux/tbprepare b/clientside/tmcc/linux/tbprepare
index febe922237..c139090c51 100644
--- a/clientside/tmcc/linux/tbprepare
+++ b/clientside/tmcc/linux/tbprepare
@@ -1,8 +1,25 @@
#!/bin/bash
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/linux/testbed b/clientside/tmcc/linux/testbed
index f35a050e49..4ca99c9a16 100644
--- a/clientside/tmcc/linux/testbed
+++ b/clientside/tmcc/linux/testbed
@@ -1,8 +1,25 @@
#!/bin/bash
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/linux/vnodectl b/clientside/tmcc/linux/vnodectl
index c88ca9a768..fcf504269d 100644
--- a/clientside/tmcc/linux/vnodectl
+++ b/clientside/tmcc/linux/vnodectl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/linux/vserver/rc.invserver b/clientside/tmcc/linux/vserver/rc.invserver
index 2b520e6751..75f8e7690d 100755
--- a/clientside/tmcc/linux/vserver/rc.invserver
+++ b/clientside/tmcc/linux/vserver/rc.invserver
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/clientside/tmcc/linux/xen/capturevm.pl b/clientside/tmcc/linux/xen/capturevm.pl
index 2cd2862f25..6be0e7c2c8 100755
--- a/clientside/tmcc/linux/xen/capturevm.pl
+++ b/clientside/tmcc/linux/xen/capturevm.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use Getopt::Std;
diff --git a/clientside/tmcc/linux/xen/libvnode_xen.pm b/clientside/tmcc/linux/xen/libvnode_xen.pm
index a1d58943a6..397dcb4b54 100644
--- a/clientside/tmcc/linux/xen/libvnode_xen.pm
+++ b/clientside/tmcc/linux/xen/libvnode_xen.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Implements the libvnode API for Xen support in Emulab.
#
diff --git a/clientside/tmcc/linux/xen/restorevm.pl b/clientside/tmcc/linux/xen/restorevm.pl
index cb6d74323f..ee3c9e76b6 100755
--- a/clientside/tmcc/linux/xen/restorevm.pl
+++ b/clientside/tmcc/linux/xen/restorevm.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use Getopt::Std;
diff --git a/clientside/tmcc/linux/xen/xenbridge-setup b/clientside/tmcc/linux/xen/xenbridge-setup
index 8141814a43..0ed56b71c5 100755
--- a/clientside/tmcc/linux/xen/xenbridge-setup
+++ b/clientside/tmcc/linux/xen/xenbridge-setup
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use English;
diff --git a/clientside/tmcc/linux9/GNUmakefile.in b/clientside/tmcc/linux9/GNUmakefile.in
index 4edbabbdca..8d18bd9f01 100644
--- a/clientside/tmcc/linux9/GNUmakefile.in
+++ b/clientside/tmcc/linux9/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/linux9/ifcfg-eth99 b/clientside/tmcc/linux9/ifcfg-eth99
index e1d6696cfd..631c4cbf06 100644
--- a/clientside/tmcc/linux9/ifcfg-eth99
+++ b/clientside/tmcc/linux9/ifcfg-eth99
@@ -1,8 +1,25 @@
#/bin/sh -
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/linux9/mkifcfgs b/clientside/tmcc/linux9/mkifcfgs
index f56d393cb8..62cb6cf2b2 100755
--- a/clientside/tmcc/linux9/mkifcfgs
+++ b/clientside/tmcc/linux9/mkifcfgs
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/openbsd/GNUmakefile.in b/clientside/tmcc/openbsd/GNUmakefile.in
index 0867a6ffef..b78658c2cc 100644
--- a/clientside/tmcc/openbsd/GNUmakefile.in
+++ b/clientside/tmcc/openbsd/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/openbsd/chipset.awk b/clientside/tmcc/openbsd/chipset.awk
index 7711d60d15..607a819359 100755
--- a/clientside/tmcc/openbsd/chipset.awk
+++ b/clientside/tmcc/openbsd/chipset.awk
@@ -1,8 +1,25 @@
#!/usr/bin/awk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
BEGIN {
diff --git a/clientside/tmcc/openbsd/control_interface b/clientside/tmcc/openbsd/control_interface
index 48ac48d7f8..6113f5cbf3 100755
--- a/clientside/tmcc/openbsd/control_interface
+++ b/clientside/tmcc/openbsd/control_interface
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/openbsd/cpuspeed.awk b/clientside/tmcc/openbsd/cpuspeed.awk
index 169cfd2c8a..72311a73b9 100755
--- a/clientside/tmcc/openbsd/cpuspeed.awk
+++ b/clientside/tmcc/openbsd/cpuspeed.awk
@@ -1,8 +1,25 @@
#!/usr/bin/awk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
/^cpu0:.*\) (19|20)[0-9][0-9] MHz/ {
diff --git a/clientside/tmcc/openbsd/dhclient b/clientside/tmcc/openbsd/dhclient
index 83a1bffbde..f7620ad621 100755
--- a/clientside/tmcc/openbsd/dhclient
+++ b/clientside/tmcc/openbsd/dhclient
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/openbsd/dhclient-exit-hooks b/clientside/tmcc/openbsd/dhclient-exit-hooks
index f6e3211c7c..1dba2a1381 100644
--- a/clientside/tmcc/openbsd/dhclient-exit-hooks
+++ b/clientside/tmcc/openbsd/dhclient-exit-hooks
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
if [ x"$new_host_name" != x ]; then
diff --git a/clientside/tmcc/openbsd/nodetype b/clientside/tmcc/openbsd/nodetype
index 88184abc37..66c6aff436 100755
--- a/clientside/tmcc/openbsd/nodetype
+++ b/clientside/tmcc/openbsd/nodetype
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/osstuff.sh b/clientside/tmcc/osstuff.sh
index 9ee0954f1e..2d53c4950a 100755
--- a/clientside/tmcc/osstuff.sh
+++ b/clientside/tmcc/osstuff.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/plab/GNUmakefile.in b/clientside/tmcc/plab/GNUmakefile.in
index 5a2211f944..c24cb44e1e 100644
--- a/clientside/tmcc/plab/GNUmakefile.in
+++ b/clientside/tmcc/plab/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/tmcc/plab/fixsudo.sh b/clientside/tmcc/plab/fixsudo.sh
index 40e4dac88b..c46a502e73 100755
--- a/clientside/tmcc/plab/fixsudo.sh
+++ b/clientside/tmcc/plab/fixsudo.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
TMPSUDOERS=/tmp/sudoers
diff --git a/clientside/tmcc/plab/mkrootball b/clientside/tmcc/plab/mkrootball
index 8154b63022..ec273e02e3 100755
--- a/clientside/tmcc/plab/mkrootball
+++ b/clientside/tmcc/plab/mkrootball
@@ -1,8 +1,25 @@
#!/usr/bin/env bash
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# This is a hack
diff --git a/clientside/tmcc/plab/plabrusage b/clientside/tmcc/plab/plabrusage
index a9a74bee0a..b6ddcd5acc 100755
--- a/clientside/tmcc/plab/plabrusage
+++ b/clientside/tmcc/plab/plabrusage
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use English;
diff --git a/clientside/tmcc/plab/rc.inplab b/clientside/tmcc/plab/rc.inplab
index 394a2434ba..ac17b21a1b 100755
--- a/clientside/tmcc/plab/rc.inplab
+++ b/clientside/tmcc/plab/rc.inplab
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/clientside/tmcc/plab/rc.vinit b/clientside/tmcc/plab/rc.vinit
index 60a64c2f25..0ea3d549ae 100755
--- a/clientside/tmcc/plab/rc.vinit
+++ b/clientside/tmcc/plab/rc.vinit
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/plab/runevents b/clientside/tmcc/plab/runevents
index 42c5e87300..f80da4991c 100644
--- a/clientside/tmcc/plab/runevents
+++ b/clientside/tmcc/plab/runevents
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# This script is a wrapper around the program-agent to handle
diff --git a/clientside/tmcc/ron/GNUmakefile.in b/clientside/tmcc/ron/GNUmakefile.in
index 90a1d22347..d4a70b9c36 100644
--- a/clientside/tmcc/ron/GNUmakefile.in
+++ b/clientside/tmcc/ron/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/ron/cvsup.sh b/clientside/tmcc/ron/cvsup.sh
index f4d558e547..12f91acb9f 100755
--- a/clientside/tmcc/ron/cvsup.sh
+++ b/clientside/tmcc/ron/cvsup.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/ron/emulab.sh b/clientside/tmcc/ron/emulab.sh
index b3c848646c..51d69ed9ef 100755
--- a/clientside/tmcc/ron/emulab.sh
+++ b/clientside/tmcc/ron/emulab.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/ron/emulabctl b/clientside/tmcc/ron/emulabctl
index 1a911c88de..248acdbdd6 100755
--- a/clientside/tmcc/ron/emulabctl
+++ b/clientside/tmcc/ron/emulabctl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use English;
diff --git a/clientside/tmcc/ron/mkemuman.sh b/clientside/tmcc/ron/mkemuman.sh
index 6cc7437b1d..eaa90f0ab1 100755
--- a/clientside/tmcc/ron/mkemuman.sh
+++ b/clientside/tmcc/ron/mkemuman.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/ron/prepare b/clientside/tmcc/ron/prepare
index 529af7208d..951867e4fa 100755
--- a/clientside/tmcc/ron/prepare
+++ b/clientside/tmcc/ron/prepare
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
require 'ctime.pl';
diff --git a/clientside/tmcc/ron/webserver.pl b/clientside/tmcc/ron/webserver.pl
index 7fe4146d53..80ff8cd026 100755
--- a/clientside/tmcc/ron/webserver.pl
+++ b/clientside/tmcc/ron/webserver.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use English;
diff --git a/clientside/tmcc/tmcc.c b/clientside/tmcc/tmcc.c
index e3c3189555..b143494f62 100644
--- a/clientside/tmcc/tmcc.c
+++ b/clientside/tmcc/tmcc.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/clientside/tmcc/ubuntu10/GNUmakefile.in b/clientside/tmcc/ubuntu10/GNUmakefile.in
index f43525ee7e..5182fd06f2 100644
--- a/clientside/tmcc/ubuntu10/GNUmakefile.in
+++ b/clientside/tmcc/ubuntu10/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/ubuntu10/dhclient-enter-hooks b/clientside/tmcc/ubuntu10/dhclient-enter-hooks
index 40d4435533..8d04c36c73 100755
--- a/clientside/tmcc/ubuntu10/dhclient-enter-hooks
+++ b/clientside/tmcc/ubuntu10/dhclient-enter-hooks
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/ubuntu10/dhclient-exit-hooks b/clientside/tmcc/ubuntu10/dhclient-exit-hooks
index 3043c84326..1b1187462b 100644
--- a/clientside/tmcc/ubuntu10/dhclient-exit-hooks
+++ b/clientside/tmcc/ubuntu10/dhclient-exit-hooks
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/ubuntu10/rc.local b/clientside/tmcc/ubuntu10/rc.local
index a8b8766cf0..1c6f94eb38 100644
--- a/clientside/tmcc/ubuntu10/rc.local
+++ b/clientside/tmcc/ubuntu10/rc.local
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/ubuntu11/GNUmakefile.in b/clientside/tmcc/ubuntu11/GNUmakefile.in
index e0758162b8..bb12f4da63 100644
--- a/clientside/tmcc/ubuntu11/GNUmakefile.in
+++ b/clientside/tmcc/ubuntu11/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/ubuntu11/dhclient-enter-hooks b/clientside/tmcc/ubuntu11/dhclient-enter-hooks
index 40d4435533..8d04c36c73 100755
--- a/clientside/tmcc/ubuntu11/dhclient-enter-hooks
+++ b/clientside/tmcc/ubuntu11/dhclient-enter-hooks
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/ubuntu11/dhclient-exit-hooks b/clientside/tmcc/ubuntu11/dhclient-exit-hooks
index 3043c84326..1b1187462b 100644
--- a/clientside/tmcc/ubuntu11/dhclient-exit-hooks
+++ b/clientside/tmcc/ubuntu11/dhclient-exit-hooks
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/ubuntu11/rc.local b/clientside/tmcc/ubuntu11/rc.local
index a8b8766cf0..1c6f94eb38 100644
--- a/clientside/tmcc/ubuntu11/rc.local
+++ b/clientside/tmcc/ubuntu11/rc.local
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/ubuntu7/GNUmakefile.in b/clientside/tmcc/ubuntu7/GNUmakefile.in
index 1f0abf2b3b..c0038d9dbb 100644
--- a/clientside/tmcc/ubuntu7/GNUmakefile.in
+++ b/clientside/tmcc/ubuntu7/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/ubuntu7/dhclient-enter-hooks b/clientside/tmcc/ubuntu7/dhclient-enter-hooks
index 40d4435533..8d04c36c73 100755
--- a/clientside/tmcc/ubuntu7/dhclient-enter-hooks
+++ b/clientside/tmcc/ubuntu7/dhclient-enter-hooks
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/ubuntu7/dhclient-exit-hooks b/clientside/tmcc/ubuntu7/dhclient-exit-hooks
index 3043c84326..1b1187462b 100644
--- a/clientside/tmcc/ubuntu7/dhclient-exit-hooks
+++ b/clientside/tmcc/ubuntu7/dhclient-exit-hooks
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. /etc/emulab/paths.sh
diff --git a/clientside/tmcc/ubuntu7/rc.local b/clientside/tmcc/ubuntu7/rc.local
index a8b8766cf0..1c6f94eb38 100644
--- a/clientside/tmcc/ubuntu7/rc.local
+++ b/clientside/tmcc/ubuntu7/rc.local
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/widearea/cpwa.sh b/clientside/tmcc/widearea/cpwa.sh
index 03bc95a8fa..3f548f1d39 100755
--- a/clientside/tmcc/widearea/cpwa.sh
+++ b/clientside/tmcc/widearea/cpwa.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/clientside/tmcc/widearea/rc.frisbee b/clientside/tmcc/widearea/rc.frisbee
index c2f8083d31..96aa96f570 100755
--- a/clientside/tmcc/widearea/rc.frisbee
+++ b/clientside/tmcc/widearea/rc.frisbee
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Optional flag argument says "do not reboot"
#
diff --git a/clientside/tools/GNUmakefile.in b/clientside/tools/GNUmakefile.in
index c24d667530..81c64f4f41 100644
--- a/clientside/tools/GNUmakefile.in
+++ b/clientside/tools/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/tools/pcapper/GNUmakefile.in b/clientside/tools/pcapper/GNUmakefile.in
index c6b57ebac1..94c636a884 100644
--- a/clientside/tools/pcapper/GNUmakefile.in
+++ b/clientside/tools/pcapper/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/clientside/tools/pcapper/pcapper.c b/clientside/tools/pcapper/pcapper.c
index 196665e9fa..3f413661f7 100644
--- a/clientside/tools/pcapper/pcapper.c
+++ b/clientside/tools/pcapper/pcapper.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2009 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/collab/GNUmakefile.in b/collab/GNUmakefile.in
index 22bd164dd3..a08f062044 100644
--- a/collab/GNUmakefile.in
+++ b/collab/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/collab/cvstools/GNUmakefile.in b/collab/cvstools/GNUmakefile.in
index 7d215fb249..92776b59c9 100644
--- a/collab/cvstools/GNUmakefile.in
+++ b/collab/cvstools/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/collab/cvstools/cvs.proxy.in b/collab/cvstools/cvs.proxy.in
index 81519918c8..06de5db30a 100644
--- a/collab/cvstools/cvs.proxy.in
+++ b/collab/cvstools/cvs.proxy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/cvstools/cvs_ctrl.in b/collab/cvstools/cvs_ctrl.in
index 8700b104e0..c7a66c6309 100644
--- a/collab/cvstools/cvs_ctrl.in
+++ b/collab/cvstools/cvs_ctrl.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/cvstools/cvsrepo_ctrl.in b/collab/cvstools/cvsrepo_ctrl.in
index f1740d7a87..247ca39201 100644
--- a/collab/cvstools/cvsrepo_ctrl.in
+++ b/collab/cvstools/cvsrepo_ctrl.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/cvstools/cvsrepo_ctrl.proxy.in b/collab/cvstools/cvsrepo_ctrl.proxy.in
index 6f14e351bd..f52499f01d 100644
--- a/collab/cvstools/cvsrepo_ctrl.proxy.in
+++ b/collab/cvstools/cvsrepo_ctrl.proxy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Errno;
diff --git a/collab/cvstools/webcvsrepo_ctrl.in b/collab/cvstools/webcvsrepo_ctrl.in
index 35ce9b87c9..66c43d4b67 100644
--- a/collab/cvstools/webcvsrepo_ctrl.in
+++ b/collab/cvstools/webcvsrepo_ctrl.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/collab/exp-vis/GNUmakefile.in b/collab/exp-vis/GNUmakefile.in
index 20f613a32c..df813319cd 100644
--- a/collab/exp-vis/GNUmakefile.in
+++ b/collab/exp-vis/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/collab/exp-vis/fetch-vis.in b/collab/exp-vis/fetch-vis.in
index f4b0d41f34..e83d3bc387 100644
--- a/collab/exp-vis/fetch-vis.in
+++ b/collab/exp-vis/fetch-vis.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -T
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/collab/exp-vis/write-vis-auth.in b/collab/exp-vis/write-vis-auth.in
index dc527f7dea..5668f53399 100644
--- a/collab/exp-vis/write-vis-auth.in
+++ b/collab/exp-vis/write-vis-auth.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use Getopt::Std;
diff --git a/collab/exp-vis/write-vis-auth.proxy.in b/collab/exp-vis/write-vis-auth.proxy.in
index 6587637afd..5c35164ac5 100644
--- a/collab/exp-vis/write-vis-auth.proxy.in
+++ b/collab/exp-vis/write-vis-auth.proxy.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set -e
diff --git a/collab/jabber/GNUmakefile.in b/collab/jabber/GNUmakefile.in
index 808fe01761..542f23db59 100644
--- a/collab/jabber/GNUmakefile.in
+++ b/collab/jabber/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/collab/jabber/addjabberchat.in b/collab/jabber/addjabberchat.in
index d22df4b606..b7115954df 100644
--- a/collab/jabber/addjabberchat.in
+++ b/collab/jabber/addjabberchat.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/jabber/addjabberuser.in b/collab/jabber/addjabberuser.in
index 26079ae2bd..d5197347f9 100644
--- a/collab/jabber/addjabberuser.in
+++ b/collab/jabber/addjabberuser.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/jabber/deljabberchat.in b/collab/jabber/deljabberchat.in
index c0e77a3281..f7c56def3a 100644
--- a/collab/jabber/deljabberchat.in
+++ b/collab/jabber/deljabberchat.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/jabber/deljabberuser.in b/collab/jabber/deljabberuser.in
index ecd91096ac..1404eb2be8 100644
--- a/collab/jabber/deljabberuser.in
+++ b/collab/jabber/deljabberuser.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/jabber/jabberproxy.in b/collab/jabber/jabberproxy.in
index 516a0aa454..a5b99ba320 100644
--- a/collab/jabber/jabberproxy.in
+++ b/collab/jabber/jabberproxy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/jabber/jabbersetup.in b/collab/jabber/jabbersetup.in
index f0b4b20420..083ec73c3a 100644
--- a/collab/jabber/jabbersetup.in
+++ b/collab/jabber/jabbersetup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/jabber/modjabberbuddies.in b/collab/jabber/modjabberbuddies.in
index 1a0010e7f4..f236f493a1 100644
--- a/collab/jabber/modjabberbuddies.in
+++ b/collab/jabber/modjabberbuddies.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/jabber/setchatmembers.in b/collab/jabber/setchatmembers.in
index e2d472267f..ba82dbfa65 100644
--- a/collab/jabber/setchatmembers.in
+++ b/collab/jabber/setchatmembers.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/GNUmakefile.in b/collab/mailman/GNUmakefile.in
index ff922cf365..fb4c2d2de9 100644
--- a/collab/mailman/GNUmakefile.in
+++ b/collab/mailman/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/collab/mailman/addmmlist.in b/collab/mailman/addmmlist.in
index 47a8b235bb..b8a7603cee 100644
--- a/collab/mailman/addmmlist.in
+++ b/collab/mailman/addmmlist.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/addmmuser.in b/collab/mailman/addmmuser.in
index 7b1e6b585c..5f20f34543 100644
--- a/collab/mailman/addmmuser.in
+++ b/collab/mailman/addmmuser.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/addprojadminlist.in b/collab/mailman/addprojadminlist.in
index 03a1999389..3dcbb31743 100644
--- a/collab/mailman/addprojadminlist.in
+++ b/collab/mailman/addprojadminlist.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/closeprojadminlist.in b/collab/mailman/closeprojadminlist.in
index 61383ef9b6..b93411c911 100644
--- a/collab/mailman/closeprojadminlist.in
+++ b/collab/mailman/closeprojadminlist.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/delmmlist.in b/collab/mailman/delmmlist.in
index 7b09ed9732..c66d6350dc 100644
--- a/collab/mailman/delmmlist.in
+++ b/collab/mailman/delmmlist.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/delmmuser.in b/collab/mailman/delmmuser.in
index 418e0a05df..927d8216fa 100644
--- a/collab/mailman/delmmuser.in
+++ b/collab/mailman/delmmuser.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/genaliases.in b/collab/mailman/genaliases.in
index 667fec35a3..2a5b3d5af8 100644
--- a/collab/mailman/genaliases.in
+++ b/collab/mailman/genaliases.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/mailmanproxy.in b/collab/mailman/mailmanproxy.in
index 2873bc0808..a460332008 100644
--- a/collab/mailman/mailmanproxy.in
+++ b/collab/mailman/mailmanproxy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/mmlistmembership.in b/collab/mailman/mmlistmembership.in
index 667d70dff0..d8cbf49571 100644
--- a/collab/mailman/mmlistmembership.in
+++ b/collab/mailman/mmlistmembership.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/mmmodifymember.in b/collab/mailman/mmmodifymember.in
index 83d4b3141b..dff25019f5 100644
--- a/collab/mailman/mmmodifymember.in
+++ b/collab/mailman/mmmodifymember.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/mmscript.py b/collab/mailman/mmscript.py
index 927d5f60eb..686f7f9680 100644
--- a/collab/mailman/mmscript.py
+++ b/collab/mailman/mmscript.py
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
from Mailman import mm_cfg
from Mailman import MailList
diff --git a/collab/mailman/mmsetup.in b/collab/mailman/mmsetup.in
index 715383af71..76812544c1 100644
--- a/collab/mailman/mmsetup.in
+++ b/collab/mailman/mmsetup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/mmxlogin.in b/collab/mailman/mmxlogin.in
index 1e4455722c..7ba44b738a 100644
--- a/collab/mailman/mmxlogin.in
+++ b/collab/mailman/mmxlogin.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/setmmlistmembers.in b/collab/mailman/setmmlistmembers.in
index 1911fa1343..d58c982a33 100644
--- a/collab/mailman/setmmlistmembers.in
+++ b/collab/mailman/setmmlistmembers.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/setmmpasswd.in b/collab/mailman/setmmpasswd.in
index 7685c6be36..209568f44b 100644
--- a/collab/mailman/setmmpasswd.in
+++ b/collab/mailman/setmmpasswd.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/mailman/webaddmmlist.in b/collab/mailman/webaddmmlist.in
index 6c84e494c3..08faaef2ab 100644
--- a/collab/mailman/webaddmmlist.in
+++ b/collab/mailman/webaddmmlist.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/collab/mailman/webdelmmlist.in b/collab/mailman/webdelmmlist.in
index 8a800e5f90..3924c33a0f 100644
--- a/collab/mailman/webdelmmlist.in
+++ b/collab/mailman/webdelmmlist.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/collab/mailman/webmmlistmembership.in b/collab/mailman/webmmlistmembership.in
index cf982dbdb7..66fd289da3 100644
--- a/collab/mailman/webmmlistmembership.in
+++ b/collab/mailman/webmmlistmembership.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/collab/mailman/websetmmpasswd.in b/collab/mailman/websetmmpasswd.in
index a17f148bc3..472be6683c 100644
--- a/collab/mailman/websetmmpasswd.in
+++ b/collab/mailman/websetmmpasswd.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/collab/trac/GNUmakefile.in b/collab/trac/GNUmakefile.in
index dc99180ea2..77a5ceba3e 100644
--- a/collab/trac/GNUmakefile.in
+++ b/collab/trac/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/collab/trac/email2trac.in b/collab/trac/email2trac.in
index ff07260c37..f008223d85 100644
--- a/collab/trac/email2trac.in
+++ b/collab/trac/email2trac.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/collab/trac/emulab_auth.py b/collab/trac/emulab_auth.py
index 432290a31c..5514d4dc12 100644
--- a/collab/trac/emulab_auth.py
+++ b/collab/trac/emulab_auth.py
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# A little auth module I wrote to allow cross-domain login from emulab
# to the protogeni wiki, but I use it for all of the wikis. The basic
diff --git a/collab/trac/tracproxy.in b/collab/trac/tracproxy.in
index 4dc9a50231..7502638f76 100644
--- a/collab/trac/tracproxy.in
+++ b/collab/trac/tracproxy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/trac/tracsetup.in b/collab/trac/tracsetup.in
index beeeb60fed..3e4ce17302 100644
--- a/collab/trac/tracsetup.in
+++ b/collab/trac/tracsetup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/trac/tracuser.in b/collab/trac/tracuser.in
index 73c52fd06b..61fc1b4e10 100644
--- a/collab/trac/tracuser.in
+++ b/collab/trac/tracuser.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/collab/trac/tracxlogin.in b/collab/trac/tracxlogin.in
index 1de0a768d6..44a704783b 100644
--- a/collab/trac/tracxlogin.in
+++ b/collab/trac/tracxlogin.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/configure.in b/configure.in
index ef01a4722a..907b46f1bd 100755
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
AC_PREREQ(2.62)
diff --git a/daikon/GNUmakefile.in b/daikon/GNUmakefile.in
index c1b72fb57a..073574dd99 100644
--- a/daikon/GNUmakefile.in
+++ b/daikon/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/db/Archive.pm.in b/db/Archive.pm.in
index cba70498ef..70d479a8f6 100644
--- a/db/Archive.pm.in
+++ b/db/Archive.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Archive;
diff --git a/db/EmulabConstants.pm.in b/db/EmulabConstants.pm.in
index b2be0a26a1..852ff52375 100644
--- a/db/EmulabConstants.pm.in
+++ b/db/EmulabConstants.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Emulab constants.
#
diff --git a/db/EmulabFeatures.pm.in b/db/EmulabFeatures.pm.in
index c7c9b32c2f..c5d3428f03 100644
--- a/db/EmulabFeatures.pm.in
+++ b/db/EmulabFeatures.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package EmulabFeatures;
diff --git a/db/Experiment.pm.in b/db/Experiment.pm.in
index 32c62a5bc1..0b4975ee25 100644
--- a/db/Experiment.pm.in
+++ b/db/Experiment.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Experiment;
diff --git a/db/Firewall.pm.in b/db/Firewall.pm.in
index 75e392adbe..6883ae9854 100644
--- a/db/Firewall.pm.in
+++ b/db/Firewall.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/db/GNUmakefile.in b/db/GNUmakefile.in
index c7c43137a3..ef374a6630 100644
--- a/db/GNUmakefile.in
+++ b/db/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/db/Group.pm.in b/db/Group.pm.in
index 211aac18da..a3e97850ba 100644
--- a/db/Group.pm.in
+++ b/db/Group.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Group;
diff --git a/db/Image.pm.in b/db/Image.pm.in
index 7ab8c011fa..754328473d 100644
--- a/db/Image.pm.in
+++ b/db/Image.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Image;
diff --git a/db/Interface.pm.in b/db/Interface.pm.in
index 027559da75..c409bd7f1e 100644
--- a/db/Interface.pm.in
+++ b/db/Interface.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Interface;
diff --git a/db/Lan.pm.in b/db/Lan.pm.in
index 418fa3c451..195275e9ef 100644
--- a/db/Lan.pm.in
+++ b/db/Lan.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Lan;
diff --git a/db/Logfile.pm.in b/db/Logfile.pm.in
index 2447f584df..700f898c9a 100644
--- a/db/Logfile.pm.in
+++ b/db/Logfile.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Logfile;
diff --git a/db/Node.pm.in b/db/Node.pm.in
index 6d36558060..1d475bb9cf 100755
--- a/db/Node.pm.in
+++ b/db/Node.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Node;
use strict;
diff --git a/db/NodeType.pm.in b/db/NodeType.pm.in
index 31e521f250..0ac4624983 100644
--- a/db/NodeType.pm.in
+++ b/db/NodeType.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package NodeType;
diff --git a/db/OSinfo.pm.in b/db/OSinfo.pm.in
index 720a5f649b..3131560e79 100644
--- a/db/OSinfo.pm.in
+++ b/db/OSinfo.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package OSinfo;
diff --git a/db/Port.pm b/db/Port.pm
index 91b068fd6c..d7bcbbd418 100644
--- a/db/Port.pm
+++ b/db/Port.pm
@@ -24,9 +24,26 @@
# or merely parse tokens from string and vice-verse must
# use the converters provided in this class.
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2011, 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Port;
diff --git a/db/Project.pm.in b/db/Project.pm.in
index 0563ffa4d1..7d751e35b4 100644
--- a/db/Project.pm.in
+++ b/db/Project.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Project;
diff --git a/db/User.pm.in b/db/User.pm.in
index bc5e325510..d6af2b9cf1 100644
--- a/db/User.pm.in
+++ b/db/User.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package User;
diff --git a/db/VirtExperiment.pm.in b/db/VirtExperiment.pm.in
index 0c0b41d25d..e5dc8fb31e 100644
--- a/db/VirtExperiment.pm.in
+++ b/db/VirtExperiment.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package VirtExperiment;
use strict;
diff --git a/db/audit.in b/db/audit.in
index 55aeecaec1..dfbfe7070e 100644
--- a/db/audit.in
+++ b/db/audit.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/db/avail.in b/db/avail.in
index 9410ab4c34..c8c9fa4594 100644
--- a/db/avail.in
+++ b/db/avail.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008,2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/db/backup.in b/db/backup.in
index f684d52c99..2376f23aa1 100755
--- a/db/backup.in
+++ b/db/backup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/db/changecreator.in b/db/changecreator.in
index 410a623e7b..70aae4406d 100644
--- a/db/changecreator.in
+++ b/db/changecreator.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/db/changeleader.in b/db/changeleader.in
index b223534987..ed57a53b80 100644
--- a/db/changeleader.in
+++ b/db/changeleader.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/db/changepid.in b/db/changepid.in
index ac835a866d..5e8becff73 100644
--- a/db/changepid.in
+++ b/db/changepid.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/db/changeuid.in b/db/changeuid.in
index 40e42815f0..fa0cfa3047 100644
--- a/db/changeuid.in
+++ b/db/changeuid.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2006, 2007, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/db/checkstats.in b/db/checkstats.in
index d194bfd3c8..d268398e08 100644
--- a/db/checkstats.in
+++ b/db/checkstats.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/db/dbboot.in b/db/dbboot.in
index 74b39a2932..b9de9ead91 100644
--- a/db/dbboot.in
+++ b/db/dbboot.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/db/dbcheck.in b/db/dbcheck.in
index cf78f35e3b..c4fb175cda 100755
--- a/db/dbcheck.in
+++ b/db/dbcheck.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/db/dbfillcheck.in b/db/dbfillcheck.in
index 6fd095626e..1f0a39de7e 100755
--- a/db/dbfillcheck.in
+++ b/db/dbfillcheck.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use Getopt::Std;
diff --git a/db/dbupdate.in b/db/dbupdate.in
index 812782e189..875fa88142 100644
--- a/db/dbupdate.in
+++ b/db/dbupdate.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/db/dhcpd_makeconf.in b/db/dhcpd_makeconf.in
index b2286eed84..4961121ae5 100755
--- a/db/dhcpd_makeconf.in
+++ b/db/dhcpd_makeconf.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/db/dumperrorlog.in b/db/dumperrorlog.in
index 942ff25bb0..7b131f3183 100644
--- a/db/dumperrorlog.in
+++ b/db/dumperrorlog.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/db/dumperrorlog.proxy.in b/db/dumperrorlog.proxy.in
index 666d3804ee..2cfdb756be 100644
--- a/db/dumperrorlog.proxy.in
+++ b/db/dumperrorlog.proxy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/db/elabinelab_bossinit.in b/db/elabinelab_bossinit.in
index 0a6da5e7b3..d0a928995c 100755
--- a/db/elabinelab_bossinit.in
+++ b/db/elabinelab_bossinit.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/db/emdb.pm.in b/db/emdb.pm.in
index 0acc1b25ed..87d60404b0 100644
--- a/db/emdb.pm.in
+++ b/db/emdb.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package emdb;
use strict;
diff --git a/db/emdbi.pm.in b/db/emdbi.pm.in
index 518064a9c5..323c57c19a 100644
--- a/db/emdbi.pm.in
+++ b/db/emdbi.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package emdbi;
use strict;
diff --git a/db/emutil.pm.in b/db/emutil.pm.in
index 371504defc..9412d238a7 100644
--- a/db/emutil.pm.in
+++ b/db/emutil.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Utility routines for Emulab.
#
diff --git a/db/genelists.in b/db/genelists.in
index 4a206eb07c..f9fd44c294 100644
--- a/db/genelists.in
+++ b/db/genelists.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Fcntl ':flock';
use English;
diff --git a/db/genelists.proxy.in b/db/genelists.proxy.in
index b621e6d79f..9b3dd07040 100644
--- a/db/genelists.proxy.in
+++ b/db/genelists.proxy.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Fcntl ':flock';
diff --git a/db/geni_control.in b/db/geni_control.in
index 07fdd13af1..1f3afe7a75 100755
--- a/db/geni_control.in
+++ b/db/geni_control.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009, 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/db/grabron.in b/db/grabron.in
index f46b190445..c3a25f1248 100755
--- a/db/grabron.in
+++ b/db/grabron.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# grabron - Grab data from Dave Andersen's DBSYNC program, and upload it into
diff --git a/db/idlemail.in b/db/idlemail.in
index 4695f50497..b1b3b283e1 100644
--- a/db/idlemail.in
+++ b/db/idlemail.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/db/idletimes.in b/db/idletimes.in
index 33ceaeb8a4..b2b2962b94 100644
--- a/db/idletimes.in
+++ b/db/idletimes.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# idletimes - show how long nodes/expts have been idle
diff --git a/db/if2port.in b/db/if2port.in
index 1ab9c35887..cd7ae8795b 100755
--- a/db/if2port.in
+++ b/db/if2port.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use strict;
diff --git a/db/interswitch.in b/db/interswitch.in
index 315491cbea..b91c0581bc 100755
--- a/db/interswitch.in
+++ b/db/interswitch.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/db/inuse.in b/db/inuse.in
index cf03a005c7..3b24c361b1 100644
--- a/db/inuse.in
+++ b/db/inuse.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002,2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/db/libEmulab.pm.in b/db/libEmulab.pm.in
index 5cf92a85bf..06deafb9d0 100644
--- a/db/libEmulab.pm.in
+++ b/db/libEmulab.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package libEmulab;
use strict;
diff --git a/db/libGeni.pm.in b/db/libGeni.pm.in
index cde8672cad..4f582fd80c 100644
--- a/db/libGeni.pm.in
+++ b/db/libGeni.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009, 2010, 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Merge internet nodes and links to them.
#
diff --git a/db/libadminctrl.pm.in b/db/libadminctrl.pm.in
index ae324f4230..b4e28c1b57 100644
--- a/db/libadminctrl.pm.in
+++ b/db/libadminctrl.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# Admission control policies. These are the ones I could think of, although
diff --git a/db/libdb.pm.in b/db/libdb.pm.in
index 228461ce17..81e9194a80 100644
--- a/db/libdb.pm.in
+++ b/db/libdb.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# This library mostly contains old stuff that should phased out in
# favor of the per-object libraries in this directory.
diff --git a/db/libdb.py.in b/db/libdb.py.in
index 7a4677864e..0b9f01331e 100644
--- a/db/libdb.py.in
+++ b/db/libdb.py.in
@@ -1,8 +1,25 @@
# -*- python -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/db/libtbdb.pm.in b/db/libtbdb.pm.in
index 3251b6c540..7a36cfb369 100644
--- a/db/libtbdb.pm.in
+++ b/db/libtbdb.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/db/mysqld_watchdog.in b/db/mysqld_watchdog.in
index 102b64914b..d80ed0af2a 100644
--- a/db/mysqld_watchdog.in
+++ b/db/mysqld_watchdog.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/db/nalloc.in b/db/nalloc.in
index 8cbf3fa390..890a758d14 100755
--- a/db/nalloc.in
+++ b/db/nalloc.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/db/newwanode.in b/db/newwanode.in
index 1cb3e0bfc2..af427dbb3c 100644
--- a/db/newwanode.in
+++ b/db/newwanode.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/db/nfree.in b/db/nfree.in
index 181e7a899c..dfa9f4420b 100755
--- a/db/nfree.in
+++ b/db/nfree.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/db/node_status.in b/db/node_status.in
index 2a31843bba..ce7c84c55a 100755
--- a/db/node_status.in
+++ b/db/node_status.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/db/nodeip.in b/db/nodeip.in
index 060b8fb773..2110a3555a 100644
--- a/db/nodeip.in
+++ b/db/nodeip.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/db/nodelog.in b/db/nodelog.in
index 3b89c0697b..7e5a9172a4 100644
--- a/db/nodelog.in
+++ b/db/nodelog.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/db/readycount.in b/db/readycount.in
index af0cafc110..c4ce760273 100755
--- a/db/readycount.in
+++ b/db/readycount.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/db/schemacheck.in b/db/schemacheck.in
index 70af578116..4409541abe 100755
--- a/db/schemacheck.in
+++ b/db/schemacheck.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/db/setsitevar.in b/db/setsitevar.in
index fee7699abe..8b88401de0 100644
--- a/db/setsitevar.in
+++ b/db/setsitevar.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/db/showgraph.in b/db/showgraph.in
index be9f17bf69..24b50932ed 100644
--- a/db/showgraph.in
+++ b/db/showgraph.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
if ($#ARGV >= 1 || $#ARGV < 0) {
diff --git a/db/sitevarscheck.in b/db/sitevarscheck.in
index 547def5482..ebf9ccfb5d 100644
--- a/db/sitevarscheck.in
+++ b/db/sitevarscheck.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/db/stategraph.in b/db/stategraph.in
index 0fad1f41c4..c7da345e36 100644
--- a/db/stategraph.in
+++ b/db/stategraph.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use lib '@prefix@/lib';
diff --git a/db/subboss_dhcpd_makeconf.in b/db/subboss_dhcpd_makeconf.in
index 353e571ff8..0bb6ec4fea 100755
--- a/db/subboss_dhcpd_makeconf.in
+++ b/db/subboss_dhcpd_makeconf.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/db/subboss_sync.in b/db/subboss_sync.in
index 7615e8e8f4..3dd59245ec 100755
--- a/db/subboss_sync.in
+++ b/db/subboss_sync.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/db/unixgroups.in b/db/unixgroups.in
index 8cf457c169..6e59a48239 100644
--- a/db/unixgroups.in
+++ b/db/unixgroups.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/db/update_permissions.in b/db/update_permissions.in
index 85395915ec..0e9281cc48 100644
--- a/db/update_permissions.in
+++ b/db/update_permissions.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/db/webcontrol.in b/db/webcontrol.in
index 0f4fafde21..79dbe1f495 100644
--- a/db/webcontrol.in
+++ b/db/webcontrol.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/db/xmlconvert.in b/db/xmlconvert.in
index 64a615660e..a96871fc2d 100644
--- a/db/xmlconvert.in
+++ b/db/xmlconvert.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/dhcpd/GNUmakefile.in b/dhcpd/GNUmakefile.in
index 56bb958dc9..cb90a554d2 100644
--- a/dhcpd/GNUmakefile.in
+++ b/dhcpd/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/discvr/GNUmakefile.in b/discvr/GNUmakefile.in
index 8e76c3999c..16f0c8f05d 100644
--- a/discvr/GNUmakefile.in
+++ b/discvr/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/discvr/cli.c b/discvr/cli.c
index eff34f7486..c3f1d6dc78 100644
--- a/discvr/cli.c
+++ b/discvr/cli.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000 The University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* ---------------------------
*
diff --git a/discvr/discvr.c b/discvr/discvr.c
index e44db5d4fa..f27874490e 100644
--- a/discvr/discvr.c
+++ b/discvr/discvr.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
diff --git a/discvr/discvr.h b/discvr/discvr.h
index 76d68e9615..1ed1df88fb 100644
--- a/discvr/discvr.h
+++ b/discvr/discvr.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*$Id: discvr.h,v 1.10 2002-07-04 14:10:55 stoller Exp $*/
diff --git a/discvr/forw_requests.c b/discvr/forw_requests.c
index e0c983a1bd..cf236fd0a2 100644
--- a/discvr/forw_requests.c
+++ b/discvr/forw_requests.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000 The University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* ---------------------------
*
diff --git a/discvr/generate_namfile.c b/discvr/generate_namfile.c
index d673600e03..aa041fc149 100644
--- a/discvr/generate_namfile.c
+++ b/discvr/generate_namfile.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "discvr.h"
diff --git a/discvr/generate_namfile.h b/discvr/generate_namfile.h
index 692ec065b9..3b08235f0c 100644
--- a/discvr/generate_namfile.h
+++ b/discvr/generate_namfile.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _GEN_NAM_FILE_H_
diff --git a/discvr/get_ifi_info.c b/discvr/get_ifi_info.c
index eed1e9d034..7498d5e8d6 100644
--- a/discvr/get_ifi_info.c
+++ b/discvr/get_ifi_info.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/discvr/get_rtaddrs.c b/discvr/get_rtaddrs.c
index cc5ba81251..375cc3ba48 100644
--- a/discvr/get_rtaddrs.c
+++ b/discvr/get_rtaddrs.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/discvr/if_indextoname.c b/discvr/if_indextoname.c
index b65c5893de..e3db015f7b 100644
--- a/discvr/if_indextoname.c
+++ b/discvr/if_indextoname.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/discvr/net_rt_iflist.c b/discvr/net_rt_iflist.c
index b64e0072fc..56cef9f99a 100644
--- a/discvr/net_rt_iflist.c
+++ b/discvr/net_rt_iflist.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/discvr/packet.h b/discvr/packet.h
index 1cb7da590e..9deeaec3cd 100644
--- a/discvr/packet.h
+++ b/discvr/packet.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000 The University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* ---------------------------
*
diff --git a/discvr/recvfromflags.c b/discvr/recvfromflags.c
index f65af30bbd..b48198ac8c 100644
--- a/discvr/recvfromflags.c
+++ b/discvr/recvfromflags.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/discvr/reply.c b/discvr/reply.c
index 8a979c3416..a4615aaa88 100644
--- a/discvr/reply.c
+++ b/discvr/reply.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000 The University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* ---------------------------
*
diff --git a/discvr/serv.c b/discvr/serv.c
index b80c05c57c..cf0421994b 100644
--- a/discvr/serv.c
+++ b/discvr/serv.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000 The University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* ---------------------------
*
diff --git a/discvr/serv_listen.c b/discvr/serv_listen.c
index 3e81ca8c67..27cf0c0ef7 100644
--- a/discvr/serv_listen.c
+++ b/discvr/serv_listen.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000 The University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* ---------------------------
*
diff --git a/discvr/sock_ntop.c b/discvr/sock_ntop.c
index 8aea1f87d2..7ab40b043c 100644
--- a/discvr/sock_ntop.c
+++ b/discvr/sock_ntop.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/discvr/util.c b/discvr/util.c
index f14b549db2..2c3c2abf26 100644
--- a/discvr/util.c
+++ b/discvr/util.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000 The University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* ---------------------------
*
diff --git a/discvr/util.h b/discvr/util.h
index 4deeec089e..2956b2a9f8 100644
--- a/discvr/util.h
+++ b/discvr/util.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000 The University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* ---------------------------
*
diff --git a/doc/setup-archive/README b/doc/setup-archive/README
index daa04a2b68..2a462b355a 100644
--- a/doc/setup-archive/README
+++ b/doc/setup-archive/README
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
The Emulab installation documentation has been moved to the main Emulab
diff --git a/doc/setup-archive/customize-image.txt b/doc/setup-archive/customize-image.txt
index 5bf99b86e7..797c3d1f02 100644
--- a/doc/setup-archive/customize-image.txt
+++ b/doc/setup-archive/customize-image.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
I. Introduction
diff --git a/doc/setup-archive/setup-cisco.txt b/doc/setup-archive/setup-cisco.txt
index 6b5f7fd4cd..1061b40222 100644
--- a/doc/setup-archive/setup-cisco.txt
+++ b/doc/setup-archive/setup-cisco.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#####
diff --git a/doc/setup-archive/setup-db.txt b/doc/setup-archive/setup-db.txt
index b661f1f00f..23f259f28e 100644
--- a/doc/setup-archive/setup-db.txt
+++ b/doc/setup-archive/setup-db.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#####
diff --git a/doc/setup-archive/setup-fs.txt b/doc/setup-archive/setup-fs.txt
index 0f51486920..6d9be76ad5 100644
--- a/doc/setup-archive/setup-fs.txt
+++ b/doc/setup-archive/setup-fs.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#####
diff --git a/doc/setup-archive/setup-network.txt b/doc/setup-archive/setup-network.txt
index 4d7e423a04..417e7d431c 100644
--- a/doc/setup-archive/setup-network.txt
+++ b/doc/setup-archive/setup-network.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2005, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#####
diff --git a/doc/setup-archive/setup-nodes.txt b/doc/setup-archive/setup-nodes.txt
index 78b3cb86ea..92a5c1c56d 100644
--- a/doc/setup-archive/setup-nodes.txt
+++ b/doc/setup-archive/setup-nodes.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#####
diff --git a/doc/setup-archive/setup-ops.txt b/doc/setup-archive/setup-ops.txt
index 4e5de6dd9c..e4902082e9 100644
--- a/doc/setup-archive/setup-ops.txt
+++ b/doc/setup-archive/setup-ops.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#####
diff --git a/doc/setup-archive/setup-power.txt b/doc/setup-archive/setup-power.txt
index 627b5b5ec7..7db6200d38 100644
--- a/doc/setup-archive/setup-power.txt
+++ b/doc/setup-archive/setup-power.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#####
diff --git a/doc/setup-archive/setup.txt b/doc/setup-archive/setup.txt
index 66e8767f47..c10802c8ec 100644
--- a/doc/setup-archive/setup.txt
+++ b/doc/setup-archive/setup.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2001-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#####
diff --git a/doc/setup-archive/update-testbed.txt b/doc/setup-archive/update-testbed.txt
index a8e46a7c8b..8c2cf389d1 100644
--- a/doc/setup-archive/update-testbed.txt
+++ b/doc/setup-archive/update-testbed.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
Rough steps for upgrading your existing Emulab.
diff --git a/event/API b/event/API
index fad3dc7150..1ff1d974ba 100644
--- a/event/API
+++ b/event/API
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/event/API.PERL b/event/API.PERL
index 5376008863..d3f5c9e857 100644
--- a/event/API.PERL
+++ b/event/API.PERL
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
This is the documentation for the Perl API to the event system...
diff --git a/event/API.PYTHON b/event/API.PYTHON
index 100049ccdf..71406f4d21 100644
--- a/event/API.PYTHON
+++ b/event/API.PYTHON
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
This is the documentation for the Python API to the event system...
diff --git a/event/GNUmakefile.in b/event/GNUmakefile.in
index 7e89063fc0..3e9a0b2b74 100644
--- a/event/GNUmakefile.in
+++ b/event/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/event/etc/GNUmakefile.in b/event/etc/GNUmakefile.in
index 6680aba7f8..048ff108f1 100644
--- a/event/etc/GNUmakefile.in
+++ b/event/etc/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/event/example/GNUmakefile.in b/event/example/GNUmakefile.in
index bc824843e1..d8103aadc5 100644
--- a/event/example/GNUmakefile.in
+++ b/event/example/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/event/example/dumpevsubs.c b/event/example/dumpevsubs.c
index bf22a7128a..9c9ff12eb1 100644
--- a/event/example/dumpevsubs.c
+++ b/event/example/dumpevsubs.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/event/example/eventdebug.pl.in b/event/example/eventdebug.pl.in
index 8eaf8bf772..095298509c 100755
--- a/event/example/eventdebug.pl.in
+++ b/event/example/eventdebug.pl.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/event/example/tbrecv.c b/event/example/tbrecv.c
index 7c5fd2b8a9..66297f3a80 100644
--- a/event/example/tbrecv.c
+++ b/event/example/tbrecv.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/event/example/tbrecv.pl.in b/event/example/tbrecv.pl.in
index 1d4f2a4195..213cc92caa 100755
--- a/event/example/tbrecv.pl.in
+++ b/event/example/tbrecv.pl.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/event/example/tbrecv.py.in b/event/example/tbrecv.py.in
index a5a8abc375..d39841f3ee 100644
--- a/event/example/tbrecv.py.in
+++ b/event/example/tbrecv.py.in
@@ -1,8 +1,25 @@
#! /usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/event/example/tbsend-short.pl.in b/event/example/tbsend-short.pl.in
index eb7e585a9d..e7c60fae59 100755
--- a/event/example/tbsend-short.pl.in
+++ b/event/example/tbsend-short.pl.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/event/example/tbsend.c b/event/example/tbsend.c
index 7f51bd38ec..e568cf0d1b 100644
--- a/event/example/tbsend.c
+++ b/event/example/tbsend.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/event/example/tbsend.pl.in b/event/example/tbsend.pl.in
index dbe91f456b..2b00ff7e46 100755
--- a/event/example/tbsend.pl.in
+++ b/event/example/tbsend.pl.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/event/example/tbsend.py.in b/event/example/tbsend.py.in
index e9f2183611..14c7b15b40 100644
--- a/event/example/tbsend.py.in
+++ b/event/example/tbsend.py.in
@@ -1,8 +1,25 @@
#! /usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/event/new_sched/GNUmakefile.in b/event/new_sched/GNUmakefile.in
index 05f045208e..627bbd38e2 100644
--- a/event/new_sched/GNUmakefile.in
+++ b/event/new_sched/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/event/new_sched/Makefile b/event/new_sched/Makefile
index ac2b8c16aa..1834f32de0 100644
--- a/event/new_sched/Makefile
+++ b/event/new_sched/Makefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002, 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Makefile for building event scheduler
#
diff --git a/event/new_sched/console-agent.cc b/event/new_sched/console-agent.cc
index 7f8c561d37..30889195b2 100644
--- a/event/new_sched/console-agent.cc
+++ b/event/new_sched/console-agent.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/event/new_sched/console-agent.h b/event/new_sched/console-agent.h
index 0fcc9ba9bc..17063f6df7 100644
--- a/event/new_sched/console-agent.h
+++ b/event/new_sched/console-agent.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/new_sched/elog2xplot b/event/new_sched/elog2xplot
index eedd7d4186..6e409cf6e1 100644
--- a/event/new_sched/elog2xplot
+++ b/event/new_sched/elog2xplot
@@ -1,8 +1,25 @@
#! /usr/bin/awk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
BEGIN {
diff --git a/event/new_sched/error-record.c b/event/new_sched/error-record.c
index b1b26d6bd1..6edb0052e4 100644
--- a/event/new_sched/error-record.c
+++ b/event/new_sched/error-record.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/new_sched/error-record.h b/event/new_sched/error-record.h
index e07fff6c04..7986e24f24 100644
--- a/event/new_sched/error-record.h
+++ b/event/new_sched/error-record.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/new_sched/event-sched.8 b/event/new_sched/event-sched.8
index 7354e22c6d..200819d4a0 100644
--- a/event/new_sched/event-sched.8
+++ b/event/new_sched/event-sched.8
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.TH EVENT-SCHED 8 "November 11, 2004" "Emulab" "Emulab Commands Manual"
.OS
diff --git a/event/new_sched/event-sched.c b/event/new_sched/event-sched.c
index 7d13a4b513..8eac3f6799 100644
--- a/event/new_sched/event-sched.c
+++ b/event/new_sched/event-sched.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/event/new_sched/event-sched.h b/event/new_sched/event-sched.h
index 0da6002e4a..76bf507165 100644
--- a/event/new_sched/event-sched.h
+++ b/event/new_sched/event-sched.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/event/new_sched/group-agent.c b/event/new_sched/group-agent.c
index 35f6d7e297..a12f957008 100644
--- a/event/new_sched/group-agent.c
+++ b/event/new_sched/group-agent.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/new_sched/group-agent.h b/event/new_sched/group-agent.h
index bada0ff0d7..84054fbc1a 100644
--- a/event/new_sched/group-agent.h
+++ b/event/new_sched/group-agent.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/new_sched/listNode.c b/event/new_sched/listNode.c
index 969596f8ca..6d792eac0d 100644
--- a/event/new_sched/listNode.c
+++ b/event/new_sched/listNode.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/new_sched/listNode.h b/event/new_sched/listNode.h
index f4e36d72c5..c524e2e7a0 100644
--- a/event/new_sched/listNode.h
+++ b/event/new_sched/listNode.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/new_sched/local-agent.c b/event/new_sched/local-agent.c
index 1d5f2e499f..7737d08ed1 100644
--- a/event/new_sched/local-agent.c
+++ b/event/new_sched/local-agent.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/new_sched/local-agent.h b/event/new_sched/local-agent.h
index f4988961f1..d2576e8709 100644
--- a/event/new_sched/local-agent.h
+++ b/event/new_sched/local-agent.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/new_sched/node-agent.cc b/event/new_sched/node-agent.cc
index bc21568404..5096acc40f 100644
--- a/event/new_sched/node-agent.cc
+++ b/event/new_sched/node-agent.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/event/new_sched/node-agent.h b/event/new_sched/node-agent.h
index 6ae88a2c8a..bd59725f55 100644
--- a/event/new_sched/node-agent.h
+++ b/event/new_sched/node-agent.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/new_sched/queue.c b/event/new_sched/queue.c
index c606fd4d64..a0648daa74 100644
--- a/event/new_sched/queue.c
+++ b/event/new_sched/queue.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/event/new_sched/rpc.cc b/event/new_sched/rpc.cc
index 1f53868587..49f74e7250 100644
--- a/event/new_sched/rpc.cc
+++ b/event/new_sched/rpc.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/event/new_sched/rpc.h b/event/new_sched/rpc.h
index 01e3fafbaf..76673ec552 100644
--- a/event/new_sched/rpc.h
+++ b/event/new_sched/rpc.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _event_sched_rpc_h
diff --git a/event/new_sched/simulator-agent.cc b/event/new_sched/simulator-agent.cc
index fd2ec4fe7b..756cab4364 100644
--- a/event/new_sched/simulator-agent.cc
+++ b/event/new_sched/simulator-agent.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/new_sched/simulator-agent.h b/event/new_sched/simulator-agent.h
index 93dd7831af..53632056b5 100644
--- a/event/new_sched/simulator-agent.h
+++ b/event/new_sched/simulator-agent.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/new_sched/timeline-agent.c b/event/new_sched/timeline-agent.c
index ee928d67ee..8d9d2dd888 100644
--- a/event/new_sched/timeline-agent.c
+++ b/event/new_sched/timeline-agent.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/new_sched/timeline-agent.h b/event/new_sched/timeline-agent.h
index 206afd7cf6..4838a1ae66 100644
--- a/event/new_sched/timeline-agent.h
+++ b/event/new_sched/timeline-agent.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/nsetrafgen/GNUmakefile.in b/event/nsetrafgen/GNUmakefile.in
index c3c85ba8c8..d1fb435ed4 100644
--- a/event/nsetrafgen/GNUmakefile.in
+++ b/event/nsetrafgen/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/event/nsetrafgen/nseinput.tcl.in b/event/nsetrafgen/nseinput.tcl.in
index 4a3531c3c7..3bee7efbce 100644
--- a/event/nsetrafgen/nseinput.tcl.in
+++ b/event/nsetrafgen/nseinput.tcl.in
@@ -1,9 +1,26 @@
#!/usr/local/etc/emulab/nse
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
global CLIENTVARDIR
diff --git a/event/nsetrafgen/startnse b/event/nsetrafgen/startnse
index 6a5ecfb147..91b89e53e6 100755
--- a/event/nsetrafgen/startnse
+++ b/event/nsetrafgen/startnse
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/event/nsetrafgen/tbevent.cc b/event/nsetrafgen/tbevent.cc
index e30e76844f..19eba37ba2 100644
--- a/event/nsetrafgen/tbevent.cc
+++ b/event/nsetrafgen/tbevent.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "tbevent.h"
diff --git a/event/nsetrafgen/tbevent.h b/event/nsetrafgen/tbevent.h
index 9e7d2e0780..ea1bbe3cbe 100644
--- a/event/nsetrafgen/tbevent.h
+++ b/event/nsetrafgen/tbevent.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef TBEVENT_H
diff --git a/event/nsetrafgen/tbnexthop.cc b/event/nsetrafgen/tbnexthop.cc
index efe6eb1a99..732c668f71 100644
--- a/event/nsetrafgen/tbnexthop.cc
+++ b/event/nsetrafgen/tbnexthop.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/event/nsetrafgen/tbnexthop.h b/event/nsetrafgen/tbnexthop.h
index 4826317742..c8c0b3efe4 100644
--- a/event/nsetrafgen/tbnexthop.h
+++ b/event/nsetrafgen/tbnexthop.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef TBNEXTHOP
diff --git a/event/proxy/GNUmakefile.in b/event/proxy/GNUmakefile.in
index 35955d5d4c..e47c773b5e 100644
--- a/event/proxy/GNUmakefile.in
+++ b/event/proxy/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/event/proxy/eventping.c b/event/proxy/eventping.c
index 547e62da05..1392d2ce38 100644
--- a/event/proxy/eventping.c
+++ b/event/proxy/eventping.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
diff --git a/event/proxy/proxyclient.c b/event/proxy/proxyclient.c
index 8bc6c800fc..4fb6e7966e 100644
--- a/event/proxy/proxyclient.c
+++ b/event/proxy/proxyclient.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/event/proxy/proxyserver.c b/event/proxy/proxyserver.c
index 38a74a5f76..7e85b837ed 100644
--- a/event/proxy/proxyserver.c
+++ b/event/proxy/proxyserver.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003, 2004, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/event/proxy/version0_gateway.c b/event/proxy/version0_gateway.c
index e861fe09fe..d0e0b61617 100644
--- a/event/proxy/version0_gateway.c
+++ b/event/proxy/version0_gateway.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2007-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/event/sched/GNUmakefile.in b/event/sched/GNUmakefile.in
index 28c629a199..ca9790dcf5 100644
--- a/event/sched/GNUmakefile.in
+++ b/event/sched/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/event/sched/Makefile b/event/sched/Makefile
index cb7cf9044a..60c37e949c 100644
--- a/event/sched/Makefile
+++ b/event/sched/Makefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Makefile for building event scheduler
#
diff --git a/event/sched/console-agent.cc b/event/sched/console-agent.cc
index 7f8c561d37..30889195b2 100644
--- a/event/sched/console-agent.cc
+++ b/event/sched/console-agent.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/event/sched/console-agent.h b/event/sched/console-agent.h
index 0fcc9ba9bc..17063f6df7 100644
--- a/event/sched/console-agent.h
+++ b/event/sched/console-agent.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/sched/elog2xplot b/event/sched/elog2xplot
index eedd7d4186..6e409cf6e1 100644
--- a/event/sched/elog2xplot
+++ b/event/sched/elog2xplot
@@ -1,8 +1,25 @@
#! /usr/bin/awk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
BEGIN {
diff --git a/event/sched/error-record.c b/event/sched/error-record.c
index b1b26d6bd1..6edb0052e4 100644
--- a/event/sched/error-record.c
+++ b/event/sched/error-record.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/sched/error-record.h b/event/sched/error-record.h
index e07fff6c04..7986e24f24 100644
--- a/event/sched/error-record.h
+++ b/event/sched/error-record.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/sched/event-sched.8 b/event/sched/event-sched.8
index 7354e22c6d..200819d4a0 100644
--- a/event/sched/event-sched.8
+++ b/event/sched/event-sched.8
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.TH EVENT-SCHED 8 "November 11, 2004" "Emulab" "Emulab Commands Manual"
.OS
diff --git a/event/sched/event-sched.c b/event/sched/event-sched.c
index c2b54ce3b7..899994e59d 100644
--- a/event/sched/event-sched.c
+++ b/event/sched/event-sched.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/event/sched/event-sched.h b/event/sched/event-sched.h
index 0da6002e4a..76bf507165 100644
--- a/event/sched/event-sched.h
+++ b/event/sched/event-sched.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/event/sched/group-agent.c b/event/sched/group-agent.c
index 35f6d7e297..a12f957008 100644
--- a/event/sched/group-agent.c
+++ b/event/sched/group-agent.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/sched/group-agent.h b/event/sched/group-agent.h
index bada0ff0d7..84054fbc1a 100644
--- a/event/sched/group-agent.h
+++ b/event/sched/group-agent.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/sched/listNode.c b/event/sched/listNode.c
index 969596f8ca..6d792eac0d 100644
--- a/event/sched/listNode.c
+++ b/event/sched/listNode.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/sched/listNode.h b/event/sched/listNode.h
index f4e36d72c5..c524e2e7a0 100644
--- a/event/sched/listNode.h
+++ b/event/sched/listNode.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/sched/local-agent.c b/event/sched/local-agent.c
index 1d5f2e499f..7737d08ed1 100644
--- a/event/sched/local-agent.c
+++ b/event/sched/local-agent.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/sched/local-agent.h b/event/sched/local-agent.h
index f4988961f1..d2576e8709 100644
--- a/event/sched/local-agent.h
+++ b/event/sched/local-agent.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/sched/node-agent.cc b/event/sched/node-agent.cc
index 3353dba083..1e8dff0904 100644
--- a/event/sched/node-agent.cc
+++ b/event/sched/node-agent.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/event/sched/node-agent.h b/event/sched/node-agent.h
index 6ae88a2c8a..bd59725f55 100644
--- a/event/sched/node-agent.h
+++ b/event/sched/node-agent.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/sched/queue.c b/event/sched/queue.c
index b8dc3fead2..20e72da59b 100644
--- a/event/sched/queue.c
+++ b/event/sched/queue.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/event/sched/rpc.cc b/event/sched/rpc.cc
index 5bf1323cd1..3323ebaa08 100644
--- a/event/sched/rpc.cc
+++ b/event/sched/rpc.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/event/sched/rpc.h b/event/sched/rpc.h
index 2cf7be0bc8..91756abe6a 100644
--- a/event/sched/rpc.h
+++ b/event/sched/rpc.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _event_sched_rpc_h
diff --git a/event/sched/simulator-agent.cc b/event/sched/simulator-agent.cc
index fd2ec4fe7b..756cab4364 100644
--- a/event/sched/simulator-agent.cc
+++ b/event/sched/simulator-agent.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/sched/simulator-agent.h b/event/sched/simulator-agent.h
index 93dd7831af..53632056b5 100644
--- a/event/sched/simulator-agent.h
+++ b/event/sched/simulator-agent.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/sched/timeline-agent.c b/event/sched/timeline-agent.c
index ee928d67ee..8d9d2dd888 100644
--- a/event/sched/timeline-agent.c
+++ b/event/sched/timeline-agent.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/sched/timeline-agent.h b/event/sched/timeline-agent.h
index 206afd7cf6..4838a1ae66 100644
--- a/event/sched/timeline-agent.h
+++ b/event/sched/timeline-agent.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/event/simple-agent/compile.sh b/event/simple-agent/compile.sh
index dc3416465c..608e10acca 100755
--- a/event/simple-agent/compile.sh
+++ b/event/simple-agent/compile.sh
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
gcc -c /proj/utahstud/ydev/emulab-devel/clientside/lib/event/event.c -o event.o -I/proj/utahstud/ydev/emulab-devel/clientside/lib \
-I /proj/utahstud/ydev/emulab-devel/clientside/lib/libtb -I/proj/utahstud/ydev/ -L/proj/utahstud/ydev/pubsub
diff --git a/event/simple-agent/disk-agent.cc b/event/simple-agent/disk-agent.cc
index d014f92000..49aa902f3b 100644
--- a/event/simple-agent/disk-agent.cc
+++ b/event/simple-agent/disk-agent.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* This program implements the Disk agent for Emulab Event System.
diff --git a/event/simple-agent/main.cc b/event/simple-agent/main.cc
index 51f515ab42..8ed92c7dce 100644
--- a/event/simple-agent/main.cc
+++ b/event/simple-agent/main.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// main.cc
diff --git a/event/simple-agent/mkextrafs b/event/simple-agent/mkextrafs
index 52f2782957..1d1a0b38e4 100755
--- a/event/simple-agent/mkextrafs
+++ b/event/simple-agent/mkextrafs
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/event/simple-agent/tbdefs.h b/event/simple-agent/tbdefs.h
index b10478bf01..93b0dff423 100644
--- a/event/simple-agent/tbdefs.h
+++ b/event/simple-agent/tbdefs.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/event/stated/GNUmakefile.in b/event/stated/GNUmakefile.in
index 734916c5b1..2226580317 100644
--- a/event/stated/GNUmakefile.in
+++ b/event/stated/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/event/stated/StateWait.pm b/event/stated/StateWait.pm
index 1f2ceb50be..29dbe3f7f9 100755
--- a/event/stated/StateWait.pm
+++ b/event/stated/StateWait.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/event/stated/TimeoutQueue.pm b/event/stated/TimeoutQueue.pm
index 5d92c998fb..4ba60f2045 100755
--- a/event/stated/TimeoutQueue.pm
+++ b/event/stated/TimeoutQueue.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/event/stated/stated.in b/event/stated/stated.in
index c554294114..a2787e1e52 100755
--- a/event/stated/stated.in
+++ b/event/stated/stated.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/event/stated/waitForState.in b/event/stated/waitForState.in
index 7236e3c69e..0db864b54d 100644
--- a/event/stated/waitForState.in
+++ b/event/stated/waitForState.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/firewall/GNUmakefile.in b/firewall/GNUmakefile.in
index 172540277d..8219bda17b 100644
--- a/firewall/GNUmakefile.in
+++ b/firewall/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/firewall/fw-rules b/firewall/fw-rules
index 03712e7929..76427bd964 100644
--- a/firewall/fw-rules
+++ b/firewall/fw-rules
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/firewall/genconfig-iptables.pl b/firewall/genconfig-iptables.pl
index fa36beb2f3..2e6ba11ff4 100755
--- a/firewall/genconfig-iptables.pl
+++ b/firewall/genconfig-iptables.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use English;
diff --git a/firewall/genconfig.pl b/firewall/genconfig.pl
index 058666ceeb..67aae9d255 100755
--- a/firewall/genconfig.pl
+++ b/firewall/genconfig.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use English;
diff --git a/firewall/initfwvars.pl.in b/firewall/initfwvars.pl.in
index c1c097bae6..34d899fb76 100755
--- a/firewall/initfwvars.pl.in
+++ b/firewall/initfwvars.pl.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#CREATE TABLE firewall_vars (
diff --git a/firewall/iptables-fw-rules b/firewall/iptables-fw-rules
index 083ce63fb6..ca218ed83f 100644
--- a/firewall/iptables-fw-rules
+++ b/firewall/iptables-fw-rules
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/flash/GNUmakefile.in b/flash/GNUmakefile.in
index ce148605ed..014f52efd6 100644
--- a/flash/GNUmakefile.in
+++ b/flash/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/hyperviewer/GNUMakefile b/hyperviewer/GNUMakefile
index ced1260378..fe6ae3f172 100644
--- a/hyperviewer/GNUMakefile
+++ b/hyperviewer/GNUMakefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Makefile for the hyperviewer application directory. See ROADMAP for details.
diff --git a/hyperviewer/README b/hyperviewer/README
index 79f495c189..7116114b2c 100644
--- a/hyperviewer/README
+++ b/hyperviewer/README
@@ -8,16 +8,24 @@ HyperViewer sources are included in the hypviewer subdirectory.
See the hypviewer/README and hypviewer/COPYRIGHT files for more information.
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
-#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/hyperviewer/_hv.cpp b/hyperviewer/_hv.cpp
index 9370d74817..0c550401a3 100644
--- a/hyperviewer/_hv.cpp
+++ b/hyperviewer/_hv.cpp
@@ -721,18 +721,26 @@ static swig_type_info *swig_types[9];
#define SWIG_name "_hv"
//
-// EMULAB-COPYRIGHT
// Copyright (c) 2004 University of Utah and the Flux Group.
-// All rights reserved.
-//
-// Permission to use, copy, modify and distribute this software is hereby
-// granted provided that (1) source code retains these copyright, permission,
-// and disclaimer notices, and (2) redistributions including binaries
-// reproduce the notices in supporting documentation.
-//
-// THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-// CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-// FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+//
+// {{{EMULAB-LICENSE
+//
+// This file is part of the Emulab network testbed software.
+//
+// This file is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// This file is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this file. If not, see <http://www.gnu.org/licenses/>.
+//
+// }}}
//
#include <string>
diff --git a/hyperviewer/emulabclient.py b/hyperviewer/emulabclient.py
index 8cf2835dbf..45f7010f2a 100644
--- a/hyperviewer/emulabclient.py
+++ b/hyperviewer/emulabclient.py
@@ -1,8 +1,25 @@
#! /usr/bin/env python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
import socket
diff --git a/hyperviewer/exptToHv.py b/hyperviewer/exptToHv.py
index 2e7702f4f7..5477d60aaf 100644
--- a/hyperviewer/exptToHv.py
+++ b/hyperviewer/exptToHv.py
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# exptToHv - Get an experiment topology via xmlrpc, and write a HyperViewer .hyp file.
diff --git a/hyperviewer/hv.i b/hyperviewer/hv.i
index bce3b2c9a7..37fe466374 100644
--- a/hyperviewer/hv.i
+++ b/hyperviewer/hv.i
@@ -1,18 +1,26 @@
%module hv
%{
//
-// EMULAB-COPYRIGHT
// Copyright (c) 2004 University of Utah and the Flux Group.
-// All rights reserved.
-//
-// Permission to use, copy, modify and distribute this software is hereby
-// granted provided that (1) source code retains these copyright, permission,
-// and disclaimer notices, and (2) redistributions including binaries
-// reproduce the notices in supporting documentation.
-//
-// THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-// CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-// FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+//
+// {{{EMULAB-LICENSE
+//
+// This file is part of the Emulab network testbed software.
+//
+// This file is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// This file is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this file. If not, see <http://www.gnu.org/licenses/>.
+//
+// }}}
//
#include <string>
diff --git a/hyperviewer/hv.mod b/hyperviewer/hv.mod
index 5831dcb922..383284780c 100644
--- a/hyperviewer/hv.mod
+++ b/hyperviewer/hv.mod
@@ -1,18 +1,26 @@
%module hv
%{
//
-// EMULAB-COPYRIGHT
// Copyright (c) 2004 University of Utah and the Flux Group.
-// All rights reserved.
-//
-// Permission to use, copy, modify and distribute this software is hereby
-// granted provided that (1) source code retains these copyright, permission,
-// and disclaimer notices, and (2) redistributions including binaries
-// reproduce the notices in supporting documentation.
-//
-// THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-// CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-// FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+//
+// {{{EMULAB-LICENSE
+//
+// This file is part of the Emulab network testbed software.
+//
+// This file is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// This file is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this file. If not, see <http://www.gnu.org/licenses/>.
+//
+// }}}
//
#include <string>
diff --git a/hyperviewer/hvFrameUI.py b/hyperviewer/hvFrameUI.py
index 1ebfa53d4e..78f95bb5ea 100755
--- a/hyperviewer/hvFrameUI.py
+++ b/hyperviewer/hvFrameUI.py
@@ -1,18 +1,26 @@
#!/usr/bin/env python
# generated by wxGlade 0.3.1 on Fri May 14 10:24:08 2004
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
-#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
from wxPython.wx import *
from wxPython.glcanvas import *
diff --git a/hyperviewer/hvmain.cpp b/hyperviewer/hvmain.cpp
index 0e438f8abe..856aadc90c 100644
--- a/hyperviewer/hvmain.cpp
+++ b/hyperviewer/hvmain.cpp
@@ -1,16 +1,24 @@
//
-// EMULAB-COPYRIGHT
// Copyright (c) 2004 University of Utah and the Flux Group.
-// All rights reserved.
-//
-// Permission to use, copy, modify and distribute this software is hereby
-// granted provided that (1) source code retains these copyright, permission,
-// and disclaimer notices, and (2) redistributions including binaries
-// reproduce the notices in supporting documentation.
-//
-// THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-// CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-// FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+//
+// {{{EMULAB-LICENSE
+//
+// This file is part of the Emulab network testbed software.
+//
+// This file is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// This file is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this file. If not, see <http://www.gnu.org/licenses/>.
+//
+// }}}
//
// hvmain.cpp - hypview for SWIG into _hv.so, based on hypviewer/examples/glut/main.cpp .
diff --git a/hyperviewer/hypview b/hyperviewer/hypview
index 2cd8a02322..2cf7969254 100755
--- a/hyperviewer/hypview
+++ b/hyperviewer/hypview
@@ -2,18 +2,26 @@
#
# hypview - Wrapper script for the hyperviewer application.
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
-#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Optionally use shared libs under the local directory.
diff --git a/hyperviewer/hypview.py b/hyperviewer/hypview.py
index 1ccad9d371..66b62e21a5 100755
--- a/hyperviewer/hypview.py
+++ b/hyperviewer/hypview.py
@@ -3,18 +3,26 @@
# hypview - HyperViewer application.
# For description of script args, invoke with any dash arg or see the "usage:" message below.
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
-#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
##import pdb
diff --git a/hyperviewer/sshxmlrpc.py b/hyperviewer/sshxmlrpc.py
index 7fc728416f..0fa904aceb 100644
--- a/hyperviewer/sshxmlrpc.py
+++ b/hyperviewer/sshxmlrpc.py
@@ -1,16 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
-#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
##########################################################################
# Some bits of this file are from xmlrpclib.py, which is:
diff --git a/hyperviewer/win32/_hv.cpp b/hyperviewer/win32/_hv.cpp
index bb41e1bf35..753cbc64ae 100644
--- a/hyperviewer/win32/_hv.cpp
+++ b/hyperviewer/win32/_hv.cpp
@@ -724,18 +724,26 @@ static swig_type_info *swig_types[12];
#define SWIG_name "_hv"
//
-// EMULAB-COPYRIGHT
// Copyright (c) 2004 University of Utah and the Flux Group.
-// All rights reserved.
-//
-// Permission to use, copy, modify and distribute this software is hereby
-// granted provided that (1) source code retains these copyright, permission,
-// and disclaimer notices, and (2) redistributions including binaries
-// reproduce the notices in supporting documentation.
-//
-// THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-// CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-// FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+//
+// {{{EMULAB-LICENSE
+//
+// This file is part of the Emulab network testbed software.
+//
+// This file is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// This file is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this file. If not, see <http://www.gnu.org/licenses/>.
+//
+// }}}
//
#include <string>
diff --git a/image-test/ImageTest.pm b/image-test/ImageTest.pm
index 55efa4d0d3..b5167e5b91 100644
--- a/image-test/ImageTest.pm
+++ b/image-test/ImageTest.pm
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package ImageTest;
diff --git a/image-test/image-test b/image-test/image-test
index b3abfb2e04..6d4a4c4291 100755
--- a/image-test/image-test
+++ b/image-test/image-test
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
########################################################################
diff --git a/image-test/tests/lan/nsfile.ns b/image-test/tests/lan/nsfile.ns
index c88b7da618..81b84e93c6 100644
--- a/image-test/tests/lan/nsfile.ns
+++ b/image-test/tests/lan/nsfile.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set ns [new Simulator]
diff --git a/image-test/tests/linkdelay/nsfile.ns b/image-test/tests/linkdelay/nsfile.ns
index 9243f67b51..60175d3106 100644
--- a/image-test/tests/linkdelay/nsfile.ns
+++ b/image-test/tests/linkdelay/nsfile.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set ns [new Simulator]
diff --git a/image-test/tests/linktest-hilat/nsfile.ns b/image-test/tests/linktest-hilat/nsfile.ns
index aad51c5a09..d3bd4442ce 100644
--- a/image-test/tests/linktest-hilat/nsfile.ns
+++ b/image-test/tests/linktest-hilat/nsfile.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set ns [new Simulator]
diff --git a/image-test/tests/linktest-lobw/nsfile.ns b/image-test/tests/linktest-lobw/nsfile.ns
index 05c19a38a5..26a69b5d2a 100644
--- a/image-test/tests/linktest-lobw/nsfile.ns
+++ b/image-test/tests/linktest-lobw/nsfile.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set ns [new Simulator]
diff --git a/image-test/tests/linktest-nse/nsfile.ns b/image-test/tests/linktest-nse/nsfile.ns
index 5aa0335ac3..5bf4166c9b 100644
--- a/image-test/tests/linktest-nse/nsfile.ns
+++ b/image-test/tests/linktest-nse/nsfile.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set ns [new Simulator]
diff --git a/image-test/tests/pair/nsfile.ns b/image-test/tests/pair/nsfile.ns
index a13ed03807..f132619de8 100644
--- a/image-test/tests/pair/nsfile.ns
+++ b/image-test/tests/pair/nsfile.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set ns [new Simulator]
diff --git a/image-test/tests/router-manual/nsfile.ns b/image-test/tests/router-manual/nsfile.ns
index bc5daaf437..72aba48c50 100644
--- a/image-test/tests/router-manual/nsfile.ns
+++ b/image-test/tests/router-manual/nsfile.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set ns [new Simulator]
diff --git a/image-test/tests/router-manual/tests.pl b/image-test/tests/router-manual/tests.pl
index 19fed2492f..17dbe95461 100644
--- a/image-test/tests/router-manual/tests.pl
+++ b/image-test/tests/router-manual/tests.pl
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
test_traceroute 'node1', 'nodeA', qw(node3-lan nodeA-link);
diff --git a/image-test/tests/router/nsfile.ns b/image-test/tests/router/nsfile.ns
index 4e9a93383c..d87662e141 100644
--- a/image-test/tests/router/nsfile.ns
+++ b/image-test/tests/router/nsfile.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set ns [new Simulator]
diff --git a/image-test/tests/router/tests.pl b/image-test/tests/router/tests.pl
index 91a6f544e9..49e5b7c389 100644
--- a/image-test/tests/router/tests.pl
+++ b/image-test/tests/router/tests.pl
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# need the delay here to give time for the routes to converge when the
diff --git a/image-test/tests/single/nsfile.ns b/image-test/tests/single/nsfile.ns
index f252fb51bc..831c24dafb 100644
--- a/image-test/tests/single/nsfile.ns
+++ b/image-test/tests/single/nsfile.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set ns [new Simulator]
diff --git a/image-test/tests/single/tests.pl b/image-test/tests/single/tests.pl
index 011b3c2137..64a5e96d8b 100644
--- a/image-test/tests/single/tests.pl
+++ b/image-test/tests/single/tests.pl
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
test_rcmd 'tar', [], 'node', 'test -e /usr/tar.gz';
diff --git a/image-test/tests/sync/nsfile.ns b/image-test/tests/sync/nsfile.ns
index 9e1ceb2466..f6b8ae18f2 100644
--- a/image-test/tests/sync/nsfile.ns
+++ b/image-test/tests/sync/nsfile.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set ns [new Simulator]
diff --git a/image-test/tests/sync/tests.pl b/image-test/tests/sync/tests.pl
index e5691b44e3..d422e114ee 100644
--- a/image-test/tests/sync/tests.pl
+++ b/image-test/tests/sync/tests.pl
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
sub compare_file($@) {
diff --git a/image-test/tests/traffic-gen/nsfile.ns b/image-test/tests/traffic-gen/nsfile.ns
index 2dcaab6506..413a8285e8 100644
--- a/image-test/tests/traffic-gen/nsfile.ns
+++ b/image-test/tests/traffic-gen/nsfile.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set ns [new Simulator]
diff --git a/image-test/tests/traffic-gen/tests.pl b/image-test/tests/traffic-gen/tests.pl
index 15036d229d..8733d26399 100644
--- a/image-test/tests/traffic-gen/tests.pl
+++ b/image-test/tests/traffic-gen/tests.pl
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use IO::Socket;
diff --git a/install/GNUmakefile.in b/install/GNUmakefile.in
index f5bd53f6d5..8dc8c78647 100644
--- a/install/GNUmakefile.in
+++ b/install/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/install/boss-install.in b/install/boss-install.in
index 9c2f80cc94..133f0a4e45 100644
--- a/install/boss-install.in
+++ b/install/boss-install.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/install/clrhouse-install.in b/install/clrhouse-install.in
index 70050d62ee..74dd7020ee 100644
--- a/install/clrhouse-install.in
+++ b/install/clrhouse-install.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/install/dump-descriptors.in b/install/dump-descriptors.in
index e39fe77ab3..0d252b991f 100644
--- a/install/dump-descriptors.in
+++ b/install/dump-descriptors.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Long;
diff --git a/install/emulab-install.in b/install/emulab-install.in
index c2b30036f3..25a82fde0e 100644
--- a/install/emulab-install.in
+++ b/install/emulab-install.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/install/fs-install.in b/install/fs-install.in
index 13d9fcab90..40a9c3ebf5 100644
--- a/install/fs-install.in
+++ b/install/fs-install.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/install/genirack/GNUmakefile.in b/install/genirack/GNUmakefile.in
index 0d1225f7ee..dc9f9cd903 100644
--- a/install/genirack/GNUmakefile.in
+++ b/install/genirack/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/install/genirack/initnodes.pl.in b/install/genirack/initnodes.pl.in
index d39cb600ac..b7fe67a9fe 100644
--- a/install/genirack/initnodes.pl.in
+++ b/install/genirack/initnodes.pl.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/install/images/README b/install/images/README
index 0c00dab872..c98bc0e364 100644
--- a/install/images/README
+++ b/install/images/README
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
Instructions for creating a site-customized image from a "generic" image
provided by Utah. The basic procedure is:
diff --git a/install/installvars.pm.in b/install/installvars.pm.in
index 981c39cff0..933a2fc1a6 100644
--- a/install/installvars.pm.in
+++ b/install/installvars.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# A big set of variables that are common to the installation scripts.
diff --git a/install/libinstall.pm.in b/install/libinstall.pm.in
index f9a93a60e7..c05f355145 100644
--- a/install/libinstall.pm.in
+++ b/install/libinstall.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# A simple library for use in the installation scripts, to make them
diff --git a/install/load-descriptors.in b/install/load-descriptors.in
index 5c831662e5..655d351f01 100644
--- a/install/load-descriptors.in
+++ b/install/load-descriptors.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/install/newclient b/install/newclient
index 9dc17c0441..b155207ffb 100644
--- a/install/newclient
+++ b/install/newclient
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/install/newnode_sshkeys/GNUmakefile.in b/install/newnode_sshkeys/GNUmakefile.in
index 37b3e0e321..3ccb15d483 100644
--- a/install/newnode_sshkeys/GNUmakefile.in
+++ b/install/newnode_sshkeys/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# For installation.
#
diff --git a/install/old-install/boss-install.in b/install/old-install/boss-install.in
index 1736d5b268..c58f8284be 100644
--- a/install/old-install/boss-install.in
+++ b/install/old-install/boss-install.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/install/old-install/fs-install.in b/install/old-install/fs-install.in
index 16103f673d..44cf1f1aa8 100644
--- a/install/old-install/fs-install.in
+++ b/install/old-install/fs-install.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/install/old-install/ops-install.in b/install/old-install/ops-install.in
index eaebccdc5c..15a628356a 100644
--- a/install/old-install/ops-install.in
+++ b/install/old-install/ops-install.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/install/ops-install.in b/install/ops-install.in
index 360450cc3b..73c84cb565 100644
--- a/install/ops-install.in
+++ b/install/ops-install.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/install/testbed-version.in b/install/testbed-version.in
index bc93e2cdeb..49ae243b31 100644
--- a/install/testbed-version.in
+++ b/install/testbed-version.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/install/update-install.in b/install/update-install.in
index 6836e06e12..270d443589 100644
--- a/install/update-install.in
+++ b/install/update-install.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/install/update-mfs.in b/install/update-mfs.in
index 0e020cb007..c36fa17c6c 100644
--- a/install/update-mfs.in
+++ b/install/update-mfs.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/install/update-testbed.in b/install/update-testbed.in
index abdae7ab19..6b5b5bd083 100644
--- a/install/update-testbed.in
+++ b/install/update-testbed.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/ipod/GNUmakefile.in b/ipod/GNUmakefile.in
index 5c83c9dc98..dec943ae03 100644
--- a/ipod/GNUmakefile.in
+++ b/ipod/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/ipod/apod.in b/ipod/apod.in
index ead72ba11f..d134a3d928 100644
--- a/ipod/apod.in
+++ b/ipod/apod.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/ipod/ipod.c b/ipod/ipod.c
index 5ca7fa50d5..89f4531f00 100644
--- a/ipod/ipod.c
+++ b/ipod/ipod.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/mote/GNUmakefile.in b/mote/GNUmakefile.in
index 9527dc8eec..25274b8f5c 100644
--- a/mote/GNUmakefile.in
+++ b/mote/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/mote/motelog/ElabACL.java b/mote/motelog/ElabACL.java
index 97dc785e36..7dfb6f3623 100644
--- a/mote/motelog/ElabACL.java
+++ b/mote/motelog/ElabACL.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.io.*;
diff --git a/mote/motelog/ElabTrustManager.java b/mote/motelog/ElabTrustManager.java
index d8674983d9..8cd1824405 100644
--- a/mote/motelog/ElabTrustManager.java
+++ b/mote/motelog/ElabTrustManager.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import javax.net.ssl.*;
diff --git a/mote/motelog/FieldInfo.java b/mote/motelog/FieldInfo.java
index 4ca58ebbb5..14237c3362 100644
--- a/mote/motelog/FieldInfo.java
+++ b/mote/motelog/FieldInfo.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/mote/motelog/LogPacket.java b/mote/motelog/LogPacket.java
index 51e12faf9d..9d77bfea6b 100644
--- a/mote/motelog/LogPacket.java
+++ b/mote/motelog/LogPacket.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/mote/motelog/MoteLogger.java b/mote/motelog/MoteLogger.java
index a9e9fce174..679eca4c12 100644
--- a/mote/motelog/MoteLogger.java
+++ b/mote/motelog/MoteLogger.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/mote/motelog/NCCSpecParser.java b/mote/motelog/NCCSpecParser.java
index 787fc2718a..c1bb23df42 100644
--- a/mote/motelog/NCCSpecParser.java
+++ b/mote/motelog/NCCSpecParser.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/mote/motelog/PacketReader.java b/mote/motelog/PacketReader.java
index 5638aec292..19fd74c1a8 100644
--- a/mote/motelog/PacketReader.java
+++ b/mote/motelog/PacketReader.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.io.*;
diff --git a/mote/motelog/SQLGenerator.java b/mote/motelog/SQLGenerator.java
index dc26e0d13c..7900777c89 100644
--- a/mote/motelog/SQLGenerator.java
+++ b/mote/motelog/SQLGenerator.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import net.tinyos.message.*;
diff --git a/mote/motelog/SpecData.java b/mote/motelog/SpecData.java
index 32feafdad6..2705f0774a 100644
--- a/mote/motelog/SpecData.java
+++ b/mote/motelog/SpecData.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public class SpecData {
diff --git a/mote/motelog/SynchQueue.java b/mote/motelog/SynchQueue.java
index 005b47ecb3..ab85683634 100644
--- a/mote/motelog/SynchQueue.java
+++ b/mote/motelog/SynchQueue.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.LinkedList;
diff --git a/mote/newmote.in b/mote/newmote.in
index ae45798171..e333a29936 100644
--- a/mote/newmote.in
+++ b/mote/newmote.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/mote/powermon/powerMeasure/Makefile b/mote/powermon/powerMeasure/Makefile
index fda8f9bedf..f83abd605c 100644
--- a/mote/powermon/powerMeasure/Makefile
+++ b/mote/powermon/powerMeasure/Makefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
CC=g++
diff --git a/mote/powermon/powerMeasure/exceptions.cpp b/mote/powermon/powerMeasure/exceptions.cpp
index 359a17ff89..8b50e4cf21 100644
--- a/mote/powermon/powerMeasure/exceptions.cpp
+++ b/mote/powermon/powerMeasure/exceptions.cpp
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdlib.h>
diff --git a/mote/powermon/powerMeasure/exceptions.h b/mote/powermon/powerMeasure/exceptions.h
index d10dce2948..cd55af7213 100644
--- a/mote/powermon/powerMeasure/exceptions.h
+++ b/mote/powermon/powerMeasure/exceptions.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdexcept>
diff --git a/mote/powermon/powerMeasure/main.cpp b/mote/powermon/powerMeasure/main.cpp
index e2f655f551..6bec09e926 100644
--- a/mote/powermon/powerMeasure/main.cpp
+++ b/mote/powermon/powerMeasure/main.cpp
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdlib.h>
diff --git a/mote/powermon/powerMeasure/powerMeasure.cpp b/mote/powermon/powerMeasure/powerMeasure.cpp
index a1a1d4c8de..4adc704db4 100644
--- a/mote/powermon/powerMeasure/powerMeasure.cpp
+++ b/mote/powermon/powerMeasure/powerMeasure.cpp
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/mote/powermon/powerMeasure/powerMeasure.h b/mote/powermon/powerMeasure/powerMeasure.h
index 2fdc109135..633c0e9a47 100644
--- a/mote/powermon/powerMeasure/powerMeasure.h
+++ b/mote/powermon/powerMeasure/powerMeasure.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/mote/sgtools/GNUmakefile b/mote/sgtools/GNUmakefile
index fc27debdae..2bcf43a6b8 100644
--- a/mote/sgtools/GNUmakefile
+++ b/mote/sgtools/GNUmakefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/mote/sgtools/GNUmakefile.in b/mote/sgtools/GNUmakefile.in
index 9e11469e8b..0a63e5c1d3 100644
--- a/mote/sgtools/GNUmakefile.in
+++ b/mote/sgtools/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/mote/sgtools/SGGPIO.C b/mote/sgtools/SGGPIO.C
index a7d2a1b878..f782e0a9a0 100644
--- a/mote/sgtools/SGGPIO.C
+++ b/mote/sgtools/SGGPIO.C
@@ -5,9 +5,26 @@
*
* uisp - The Micro In-System Programmer for Atmel AVR microcontrollers.
*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
****************************************************************************
*/
diff --git a/mote/sgtools/SGGPIO.h b/mote/sgtools/SGGPIO.h
index 13b074fa32..72a9d34fcb 100644
--- a/mote/sgtools/SGGPIO.h
+++ b/mote/sgtools/SGGPIO.h
@@ -5,9 +5,26 @@
*
* uisp - The Micro In-System Programmer for Atmel AVR microcontrollers.
*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
****************************************************************************
*/
diff --git a/mote/sgtools/moteleds.C b/mote/sgtools/moteleds.C
index d887a28f39..cca5c7cf8f 100644
--- a/mote/sgtools/moteleds.C
+++ b/mote/sgtools/moteleds.C
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/mote/sgtools/motepower.C b/mote/sgtools/motepower.C
index 5aa6ab9e60..61331d911b 100644
--- a/mote/sgtools/motepower.C
+++ b/mote/sgtools/motepower.C
@@ -1,8 +1,25 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/mote/sgtools/wagthedog.C b/mote/sgtools/wagthedog.C
index f63a7bc882..477cbb14bc 100644
--- a/mote/sgtools/wagthedog.C
+++ b/mote/sgtools/wagthedog.C
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/mote/tbsgmotepower.in b/mote/tbsgmotepower.in
index 6b6c03f9a4..96facfcb23 100755
--- a/mote/tbsgmotepower.in
+++ b/mote/tbsgmotepower.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/mote/tbuisp.in b/mote/tbuisp.in
index 89da709a07..c8fbac35d0 100755
--- a/mote/tbuisp.in
+++ b/mote/tbuisp.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/named/GNUmakefile.in b/named/GNUmakefile.in
index f0294b7f1a..c6e1064560 100644
--- a/named/GNUmakefile.in
+++ b/named/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/named/named_makeconf.in b/named/named_makeconf.in
index e07c28c503..e29c42037d 100755
--- a/named/named_makeconf.in
+++ b/named/named_makeconf.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use Socket;
diff --git a/named/named_makeforw.in b/named/named_makeforw.in
index 0ab5323fd0..b06094d1d5 100755
--- a/named/named_makeforw.in
+++ b/named/named_makeforw.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use Socket;
diff --git a/named/named_makerev.in b/named/named_makerev.in
index a74f259634..3d653e2f72 100755
--- a/named/named_makerev.in
+++ b/named/named_makerev.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use Socket;
diff --git a/node_usage/GNUmakefile.in b/node_usage/GNUmakefile.in
index 181a3a9359..9fdda2ac69 100644
--- a/node_usage/GNUmakefile.in
+++ b/node_usage/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/node_usage/analy.in b/node_usage/analy.in
index e94c16a6d3..f1b44d29ff 100644
--- a/node_usage/analy.in
+++ b/node_usage/analy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/node_usage/analy2.in b/node_usage/analy2.in
index e6e3d8f283..4d5b93d741 100755
--- a/node_usage/analy2.in
+++ b/node_usage/analy2.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Data::Dumper;
diff --git a/node_usage/from_ptop.in b/node_usage/from_ptop.in
index 57024e432e..88e9ccf9bf 100755
--- a/node_usage/from_ptop.in
+++ b/node_usage/from_ptop.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/node_usage/gather.in b/node_usage/gather.in
index 8ee86e5b92..fad9d81265 100755
--- a/node_usage/gather.in
+++ b/node_usage/gather.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/node_usage/get-start-date.in b/node_usage/get-start-date.in
index 083537fb31..b2b0597d0a 100755
--- a/node_usage/get-start-date.in
+++ b/node_usage/get-start-date.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/node_usage/mk-php-pages.in b/node_usage/mk-php-pages.in
index 5712cb3f51..4ac761cef5 100644
--- a/node_usage/mk-php-pages.in
+++ b/node_usage/mk-php-pages.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use warnings;
@@ -38,9 +55,26 @@ sub mk_page ($$$) {
print F <<"---"
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("../defs.php3");
diff --git a/node_usage/mk-plots.in b/node_usage/mk-plots.in
index fa676a9ae6..aabc61c483 100755
--- a/node_usage/mk-plots.in
+++ b/node_usage/mk-plots.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/node_usage/publish.in b/node_usage/publish.in
index fdb022636d..792c792ba4 100755
--- a/node_usage/publish.in
+++ b/node_usage/publish.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
cd @prefix@/data/node_usage/
diff --git a/node_usage/refresh.in b/node_usage/refresh.in
index eceb8ef72e..630224ac63 100755
--- a/node_usage/refresh.in
+++ b/node_usage/refresh.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set -e
diff --git a/node_usage/sanity.in b/node_usage/sanity.in
index 0407e79df2..cc3bced1cc 100755
--- a/node_usage/sanity.in
+++ b/node_usage/sanity.in
@@ -1,8 +1,25 @@
#/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Data::Dumper;
diff --git a/os/GNUmakefile.in b/os/GNUmakefile.in
index 5d74cb74a6..687379adac 100644
--- a/os/GNUmakefile.in
+++ b/os/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/os/create-image b/os/create-image
index 67b4b3ffb3..8ba7c6568e 100755
--- a/os/create-image
+++ b/os/create-image
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/os/create-swapimage b/os/create-swapimage
index 34f642dfcd..fe8d7122a6 100644
--- a/os/create-swapimage
+++ b/os/create-swapimage
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/os/split-image.sh.in b/os/split-image.sh.in
index 74e6e3f752..bb60f6b996 100755
--- a/os/split-image.sh.in
+++ b/os/split-image.sh.in
@@ -1,9 +1,26 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/os/template_record b/os/template_record
index 0bb255d429..b114d52bc1 100755
--- a/os/template_record
+++ b/os/template_record
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/patches/wireshark-1.8.0-emulab.patch b/patches/wireshark-1.8.0-emulab.patch
index 1f62f07489..fcbe379d26 100644
--- a/patches/wireshark-1.8.0-emulab.patch
+++ b/patches/wireshark-1.8.0-emulab.patch
@@ -715,9 +715,26 @@ diff -rNu epan/dissectors/packet-frisbee.h epan/dissectors/packet-frisbee.h
+ */
+
+/*
-+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2000-2011 University of Utah and the Flux Group.
-+ * All rights reserved.
++ *
++ * {{{EMULAB-LICENSE
++ *
++ * This file is part of the Emulab network testbed software.
++ *
++ * This file is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Affero General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or (at
++ * your option) any later version.
++ *
++ * This file is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
++ * License for more details.
++ *
++ * You should have received a copy of the GNU Affero General Public License
++ * along with this file. If not, see <http://www.gnu.org/licenses/>.
++ *
++ * }}}
+ */
+
+/*
diff --git a/pelab/CorrelationR.sh b/pelab/CorrelationR.sh
index 211157cc67..4ce68c1791 100755
--- a/pelab/CorrelationR.sh
+++ b/pelab/CorrelationR.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
InputFile1="\"$1\""
diff --git a/pelab/GNUmakefile b/pelab/GNUmakefile
index d4e394d111..0f2fb41cc2 100644
--- a/pelab/GNUmakefile
+++ b/pelab/GNUmakefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Standalone makefile for building Flexlab binaries
#
diff --git a/pelab/GNUmakefile.in b/pelab/GNUmakefile.in
index 02fe65bc1b..14cd6822a3 100644
--- a/pelab/GNUmakefile.in
+++ b/pelab/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/pelab/SanityCheck.py b/pelab/SanityCheck.py
index 9a74479b5e..5317949d21 100755
--- a/pelab/SanityCheck.py
+++ b/pelab/SanityCheck.py
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#########################################################
diff --git a/pelab/UdpSanityCheck.py b/pelab/UdpSanityCheck.py
index 66c716be37..8fc88e4bf3 100755
--- a/pelab/UdpSanityCheck.py
+++ b/pelab/UdpSanityCheck.py
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#########################################################
diff --git a/pelab/auto-compile.sh b/pelab/auto-compile.sh
index fb944c46ba..eff4aed08c 100644
--- a/pelab/auto-compile.sh
+++ b/pelab/auto-compile.sh
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
cd stub
gmake
diff --git a/pelab/auto-pelab.ns b/pelab/auto-pelab.ns
index c62712bbba..e1229c20b7 100644
--- a/pelab/auto-pelab.ns
+++ b/pelab/auto-pelab.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
source tb_compat.tcl
diff --git a/pelab/auto-pelab.tm b/pelab/auto-pelab.tm
index 2486f08860..6a8045faaa 100644
--- a/pelab/auto-pelab.tm
+++ b/pelab/auto-pelab.tm
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
source tb_compat.tcl
diff --git a/pelab/bgmon/Cmdqueue.pm b/pelab/bgmon/Cmdqueue.pm
index 18ee04e4c1..64bc8bddc4 100644
--- a/pelab/bgmon/Cmdqueue.pm
+++ b/pelab/bgmon/Cmdqueue.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Cmdqueue;
diff --git a/pelab/bgmon/GNUmakefile.in b/pelab/bgmon/GNUmakefile.in
index d977b53e17..bd73cc6cb8 100644
--- a/pelab/bgmon/GNUmakefile.in
+++ b/pelab/bgmon/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/pelab/bgmon/automanage.pl b/pelab/bgmon/automanage.pl
index 7376c46bc9..d36a0707bc 100644
--- a/pelab/bgmon/automanage.pl
+++ b/pelab/bgmon/automanage.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/pelab/bgmon/automanagerclient.pl b/pelab/bgmon/automanagerclient.pl
index 46329e77a2..3422e53dea 100644
--- a/pelab/bgmon/automanagerclient.pl
+++ b/pelab/bgmon/automanagerclient.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/pelab/bgmon/bgmon.pl b/pelab/bgmon/bgmon.pl
index 3f2cdbc7f5..7bbc54789e 100644
--- a/pelab/bgmon/bgmon.pl
+++ b/pelab/bgmon/bgmon.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
=pod
diff --git a/pelab/bgmon/find-asymmetric b/pelab/bgmon/find-asymmetric
index 34877778a5..cb1291c57d 100755
--- a/pelab/bgmon/find-asymmetric
+++ b/pelab/bgmon/find-asymmetric
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Mysql;
diff --git a/pelab/bgmon/flexlab-canonicalization-misc-notes.txt b/pelab/bgmon/flexlab-canonicalization-misc-notes.txt
index f1880f83b2..87d72239f4 100644
--- a/pelab/bgmon/flexlab-canonicalization-misc-notes.txt
+++ b/pelab/bgmon/flexlab-canonicalization-misc-notes.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
NOTICE: The "measured_by" field in the table "pair_data" is
diff --git a/pelab/bgmon/fpingwrapper.pl b/pelab/bgmon/fpingwrapper.pl
index 10f80f37ac..9221a01018 100755
--- a/pelab/bgmon/fpingwrapper.pl
+++ b/pelab/bgmon/fpingwrapper.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/pelab/bgmon/getstats.pl b/pelab/bgmon/getstats.pl
index ce84e01cb0..1218254b2c 100644
--- a/pelab/bgmon/getstats.pl
+++ b/pelab/bgmon/getstats.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/bgmon/iperfwrapper.pl b/pelab/bgmon/iperfwrapper.pl
index fa22d88368..0d71b6dcc8 100755
--- a/pelab/bgmon/iperfwrapper.pl
+++ b/pelab/bgmon/iperfwrapper.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/pelab/bgmon/libpelabdb.pm b/pelab/bgmon/libpelabdb.pm
index d8162fe3ca..2bda56d406 100644
--- a/pelab/bgmon/libpelabdb.pm
+++ b/pelab/bgmon/libpelabdb.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/bgmon/libwanetmon.pm b/pelab/bgmon/libwanetmon.pm
index 59ef25b10e..5d2988f6b3 100644
--- a/pelab/bgmon/libwanetmon.pm
+++ b/pelab/bgmon/libwanetmon.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/pelab/bgmon/manager.pl b/pelab/bgmon/manager.pl
index a7c9d5e929..6bad624b64 100644
--- a/pelab/bgmon/manager.pl
+++ b/pelab/bgmon/manager.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use lib '/usr/testbed/lib';
diff --git a/pelab/bgmon/managerclient.pl b/pelab/bgmon/managerclient.pl
index 86dd93dfe9..ae539befaa 100644
--- a/pelab/bgmon/managerclient.pl
+++ b/pelab/bgmon/managerclient.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -W
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/bgmon/opsrecv.pl b/pelab/bgmon/opsrecv.pl
index 4807bab554..61d73a5925 100644
--- a/pelab/bgmon/opsrecv.pl
+++ b/pelab/bgmon/opsrecv.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
########################
diff --git a/pelab/bgmon/packbgmon b/pelab/bgmon/packbgmon
index 22cb7e91dc..a20cc8d6c9 100755
--- a/pelab/bgmon/packbgmon
+++ b/pelab/bgmon/packbgmon
@@ -1,8 +1,25 @@
#!/bin/bash
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
rm bgmon.tar.gz
diff --git a/pelab/bgmon/pair-data-stats.pl b/pelab/bgmon/pair-data-stats.pl
index 6f75ed8605..c1a6471893 100644
--- a/pelab/bgmon/pair-data-stats.pl
+++ b/pelab/bgmon/pair-data-stats.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/bgmon/parsenodenames.pl b/pelab/bgmon/parsenodenames.pl
index 8be08c14ca..33329c1fd1 100644
--- a/pelab/bgmon/parsenodenames.pl
+++ b/pelab/bgmon/parsenodenames.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/pelab/bgmon/pelab.sh b/pelab/bgmon/pelab.sh
index 82a1844839..9d81f95f4b 100755
--- a/pelab/bgmon/pelab.sh
+++ b/pelab/bgmon/pelab.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/bgmon/runbgmon b/pelab/bgmon/runbgmon
index 40f05deb72..68fa6214f4 100755
--- a/pelab/bgmon/runbgmon
+++ b/pelab/bgmon/runbgmon
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
diff --git a/pelab/bgmon/runopswanetmon.csh b/pelab/bgmon/runopswanetmon.csh
index 65062da4cd..bcfd6f3769 100755
--- a/pelab/bgmon/runopswanetmon.csh
+++ b/pelab/bgmon/runopswanetmon.csh
@@ -1,8 +1,25 @@
#!/bin/csh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
perl opsrecv.pl -e tbres/pelabbgmon -d1 >! log.opsrecv &
diff --git a/pelab/bgmon/stopOpsWanetmon.pl b/pelab/bgmon/stopOpsWanetmon.pl
index 6341f63a36..a5e618a9a9 100644
--- a/pelab/bgmon/stopOpsWanetmon.pl
+++ b/pelab/bgmon/stopOpsWanetmon.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/bgmon/testsend.pl b/pelab/bgmon/testsend.pl
index eb9f3a104f..fbe69eb3b2 100644
--- a/pelab/bgmon/testsend.pl
+++ b/pelab/bgmon/testsend.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/bgmon/wanetmon_meeting_7-6.txt b/pelab/bgmon/wanetmon_meeting_7-6.txt
index f810cb578e..3a86311eee 100644
--- a/pelab/bgmon/wanetmon_meeting_7-6.txt
+++ b/pelab/bgmon/wanetmon_meeting_7-6.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
Pelab - Wanetmon
Meeting July 6, 2006
diff --git a/pelab/bgmon/wanetmon_overview.txt b/pelab/bgmon/wanetmon_overview.txt
index e5051e7443..84b394a8c5 100644
--- a/pelab/bgmon/wanetmon_overview.txt
+++ b/pelab/bgmon/wanetmon_overview.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
Wanetmon Architecture for PeLab
diff --git a/pelab/bw-bottleneck/backfill_dummynet/delayagent_callback.c b/pelab/bw-bottleneck/backfill_dummynet/delayagent_callback.c
index 0b724376e3..078dff51a3 100644
--- a/pelab/bw-bottleneck/backfill_dummynet/delayagent_callback.c
+++ b/pelab/bw-bottleneck/backfill_dummynet/delayagent_callback.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2003, 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/pelab/bw-bottleneck/backfill_dummynet/fbsd410/delay-agent/callback.c b/pelab/bw-bottleneck/backfill_dummynet/fbsd410/delay-agent/callback.c
index 76e5ccddbe..f8039b6746 100644
--- a/pelab/bw-bottleneck/backfill_dummynet/fbsd410/delay-agent/callback.c
+++ b/pelab/bw-bottleneck/backfill_dummynet/fbsd410/delay-agent/callback.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2008 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/pelab/bw-bottleneck/backfill_dummynet/fbsd410/delay-agent/main.h b/pelab/bw-bottleneck/backfill_dummynet/fbsd410/delay-agent/main.h
index 4537d4a808..dc3ba43be0 100644
--- a/pelab/bw-bottleneck/backfill_dummynet/fbsd410/delay-agent/main.h
+++ b/pelab/bw-bottleneck/backfill_dummynet/fbsd410/delay-agent/main.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/pelab/bw-bottleneck/createClusters.pl b/pelab/bw-bottleneck/createClusters.pl
index 4f98a23a5a..3578bbadc3 100644
--- a/pelab/bw-bottleneck/createClusters.pl
+++ b/pelab/bw-bottleneck/createClusters.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Long;
diff --git a/pelab/bw-bottleneck/multiplex-monitor.py b/pelab/bw-bottleneck/multiplex-monitor.py
index 7dd8cd02d6..e425528405 100755
--- a/pelab/bw-bottleneck/multiplex-monitor.py
+++ b/pelab/bw-bottleneck/multiplex-monitor.py
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Monitors the application's behaviour and report to the network model.
diff --git a/pelab/bw-bottleneck/sharedBottle.pl b/pelab/bw-bottleneck/sharedBottle.pl
index f17450d6cc..2a70ab2d76 100644
--- a/pelab/bw-bottleneck/sharedBottle.pl
+++ b/pelab/bw-bottleneck/sharedBottle.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/pelab/bw-bottleneck/wavelet/WaveletR.sh b/pelab/bw-bottleneck/wavelet/WaveletR.sh
index 6b62211031..2e8c36621d 100755
--- a/pelab/bw-bottleneck/wavelet/WaveletR.sh
+++ b/pelab/bw-bottleneck/wavelet/WaveletR.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/pelab/bw-bottleneck/wavelet/client.py b/pelab/bw-bottleneck/wavelet/client.py
index 8ed0fcf758..a03e0c42a4 100644
--- a/pelab/bw-bottleneck/wavelet/client.py
+++ b/pelab/bw-bottleneck/wavelet/client.py
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/pelab/bw-bottleneck/wavelet/processDelay.py b/pelab/bw-bottleneck/wavelet/processDelay.py
index 2d959c70d5..366855deb2 100644
--- a/pelab/bw-bottleneck/wavelet/processDelay.py
+++ b/pelab/bw-bottleneck/wavelet/processDelay.py
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/pelab/bw-bottleneck/wavelet/server.py b/pelab/bw-bottleneck/wavelet/server.py
index c000568ede..f654408b9c 100644
--- a/pelab/bw-bottleneck/wavelet/server.py
+++ b/pelab/bw-bottleneck/wavelet/server.py
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/pelab/cloudinfo-set b/pelab/cloudinfo-set
index 41638cea6b..21b6a81090 100755
--- a/pelab/cloudinfo-set
+++ b/pelab/cloudinfo-set
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/cloudinfo.in b/pelab/cloudinfo.in
index b3c13f6644..f518247f6c 100644
--- a/pelab/cloudinfo.in
+++ b/pelab/cloudinfo.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/common-env.sh b/pelab/common-env.sh
index 76d4f25da1..6a2f6b465a 100755
--- a/pelab/common-env.sh
+++ b/pelab/common-env.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/db/GNUmakefile.in b/pelab/db/GNUmakefile.in
index 70b733e6a6..73c9c2c59e 100644
--- a/pelab/db/GNUmakefile.in
+++ b/pelab/db/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/pelab/db/pelab_dbpush.in b/pelab/db/pelab_dbpush.in
index 005ff5cba0..ed05eef1f3 100644
--- a/pelab/db/pelab_dbpush.in
+++ b/pelab/db/pelab_dbpush.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/pelab/db/pelab_opspush.in b/pelab/db/pelab_opspush.in
index 5319410fc0..26bfa6c228 100644
--- a/pelab/db/pelab_opspush.in
+++ b/pelab/db/pelab_opspush.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/pelab/db/pelab_opspush.proxy.in b/pelab/db/pelab_opspush.proxy.in
index 0089be9fd8..ab71aa9921 100644
--- a/pelab/db/pelab_opspush.proxy.in
+++ b/pelab/db/pelab_opspush.proxy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Mysql;
diff --git a/pelab/db/pelab_sql_dbpush.in b/pelab/db/pelab_sql_dbpush.in
index a129d31be3..81f7821daf 100644
--- a/pelab/db/pelab_sql_dbpush.in
+++ b/pelab/db/pelab_sql_dbpush.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/dbmonitor/auto-dbmonitor.sh b/pelab/dbmonitor/auto-dbmonitor.sh
index 1631c03a05..9985c453e7 100644
--- a/pelab/dbmonitor/auto-dbmonitor.sh
+++ b/pelab/dbmonitor/auto-dbmonitor.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
ARGS=$*
diff --git a/pelab/dbmonitor/dbmonitor.pl b/pelab/dbmonitor/dbmonitor.pl
index e581a1adbe..ee98f0582b 100755
--- a/pelab/dbmonitor/dbmonitor.pl
+++ b/pelab/dbmonitor/dbmonitor.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/dbmonitor/libtbdb.pm b/pelab/dbmonitor/libtbdb.pm
index 15b58c7c17..7f91eb27e7 100644
--- a/pelab/dbmonitor/libtbdb.pm
+++ b/pelab/dbmonitor/libtbdb.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/dbmonitor/run-dbmonitor.sh b/pelab/dbmonitor/run-dbmonitor.sh
index 3484a90fe9..8becf4ef65 100644
--- a/pelab/dbmonitor/run-dbmonitor.sh
+++ b/pelab/dbmonitor/run-dbmonitor.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/flexdataclient.in b/pelab/flexdataclient.in
index 0bb2fe590e..bfd0273474 100644
--- a/pelab/flexdataclient.in
+++ b/pelab/flexdataclient.in
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/pelab/flexdatasrv.in b/pelab/flexdatasrv.in
index 250776214d..5d9ae429d2 100644
--- a/pelab/flexdatasrv.in
+++ b/pelab/flexdatasrv.in
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/goodnodes.pl b/pelab/goodnodes.pl
index 238786bc30..0881a744f0 100644
--- a/pelab/goodnodes.pl
+++ b/pelab/goodnodes.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/init-by-file.pl b/pelab/init-by-file.pl
index d5c963de4c..7a14a57d65 100644
--- a/pelab/init-by-file.pl
+++ b/pelab/init-by-file.pl
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#usage: init-by-file.pl proj exp input-file
diff --git a/pelab/init-elabnodes.pl b/pelab/init-elabnodes.pl
index 9617ea6c7f..f8f1dc1177 100755
--- a/pelab/init-elabnodes.pl
+++ b/pelab/init-elabnodes.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/install-tarball b/pelab/install-tarball
index fc0e027452..d27ad3322f 100755
--- a/pelab/install-tarball
+++ b/pelab/install-tarball
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
TEVC=/usr/testbed/bin/tevc
diff --git a/pelab/iperfd/GNUmakefile b/pelab/iperfd/GNUmakefile
index 6dedc35300..9f6bad212b 100644
--- a/pelab/iperfd/GNUmakefile
+++ b/pelab/iperfd/GNUmakefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
CFLAGS=-std=c99 -pedantic -Wall -Werror -O
diff --git a/pelab/iperfd/iperfd.c b/pelab/iperfd/iperfd.c
index d286d92ac7..07f4a48e65 100644
--- a/pelab/iperfd/iperfd.c
+++ b/pelab/iperfd/iperfd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/pelab/iplane/init-iplane.pl b/pelab/iplane/init-iplane.pl
index c8ceb7bbb7..bcf5d6243f 100644
--- a/pelab/iplane/init-iplane.pl
+++ b/pelab/iplane/init-iplane.pl
@@ -1,8 +1,25 @@
#!/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Socket;
diff --git a/pelab/iplane/iplane_pairwise.rb b/pelab/iplane/iplane_pairwise.rb
index fcc30ed570..f75185ff99 100644
--- a/pelab/iplane/iplane_pairwise.rb
+++ b/pelab/iplane/iplane_pairwise.rb
@@ -1,8 +1,25 @@
#!/usr/bin/ruby
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/libnetmon/GNUmakefile b/pelab/libnetmon/GNUmakefile
index 4df7aa850f..27a6d7495e 100644
--- a/pelab/libnetmon/GNUmakefile
+++ b/pelab/libnetmon/GNUmakefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SYSTEM := $(shell uname -s)
diff --git a/pelab/libnetmon/instrument-simple.sh b/pelab/libnetmon/instrument-simple.sh
index c9fb62c837..2e4393e5d5 100755
--- a/pelab/libnetmon/instrument-simple.sh
+++ b/pelab/libnetmon/instrument-simple.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH
diff --git a/pelab/libnetmon/instrument-standalone.sh b/pelab/libnetmon/instrument-standalone.sh
index 86a1c7121a..ed2d1b0663 100755
--- a/pelab/libnetmon/instrument-standalone.sh
+++ b/pelab/libnetmon/instrument-standalone.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/libnetmon/libnetmon-format3.txt b/pelab/libnetmon/libnetmon-format3.txt
index 9347e9562e..948d4802c2 100644
--- a/pelab/libnetmon/libnetmon-format3.txt
+++ b/pelab/libnetmon/libnetmon-format3.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
Line format 3 for libnetmon:
diff --git a/pelab/libnetmon/libnetmon.c b/pelab/libnetmon/libnetmon.c
index 55308e274f..467251bad1 100644
--- a/pelab/libnetmon/libnetmon.c
+++ b/pelab/libnetmon/libnetmon.c
@@ -1,6 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* libnetmon, a library for monitoring network traffic sent by a process. See
* README for instructions.
diff --git a/pelab/libnetmon/libnetmon.h b/pelab/libnetmon/libnetmon.h
index 07af731e65..39554f9a22 100644
--- a/pelab/libnetmon/libnetmon.h
+++ b/pelab/libnetmon/libnetmon.h
@@ -1,6 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* Header for libnetmon, a library for monitoring network traffic sent by a
* process. See README for instructions.
diff --git a/pelab/libnetmon/netmon.h b/pelab/libnetmon/netmon.h
index 2dec15805a..5ad03a1d84 100644
--- a/pelab/libnetmon/netmon.h
+++ b/pelab/libnetmon/netmon.h
@@ -1,6 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* libnetmon, a library for monitoring network traffic sent by a process. See
* README for instructions.
diff --git a/pelab/libnetmon/netmond.c b/pelab/libnetmon/netmond.c
index 9e68ae16a6..106ed3b5f3 100644
--- a/pelab/libnetmon/netmond.c
+++ b/pelab/libnetmon/netmond.c
@@ -1,6 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* netmond, a 'server' for libnetmon - simply repeat what a process being
* monitored with libnetmon tell us on a unix-domian socket
diff --git a/pelab/libnetmon/netmonup.c b/pelab/libnetmon/netmonup.c
index c19c19eef1..62b00b5606 100644
--- a/pelab/libnetmon/netmonup.c
+++ b/pelab/libnetmon/netmonup.c
@@ -1,6 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdlib.h>
diff --git a/pelab/libwanetmondb.pm b/pelab/libwanetmondb.pm
index ae10896d54..a9dc86ab26 100644
--- a/pelab/libwanetmondb.pm
+++ b/pelab/libwanetmondb.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/magent/CircularTraffic.cc b/pelab/magent/CircularTraffic.cc
index d319c215ee..bc39427643 100644
--- a/pelab/magent/CircularTraffic.cc
+++ b/pelab/magent/CircularTraffic.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// CircularTraffic.cc
diff --git a/pelab/magent/CircularTraffic.h b/pelab/magent/CircularTraffic.h
index 7369204e06..1af8dd3ee2 100644
--- a/pelab/magent/CircularTraffic.h
+++ b/pelab/magent/CircularTraffic.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// CircularTraffic.h
diff --git a/pelab/magent/Command.cc b/pelab/magent/Command.cc
index 5e32015911..117557b21e 100644
--- a/pelab/magent/Command.cc
+++ b/pelab/magent/Command.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Command.cc
diff --git a/pelab/magent/Command.h b/pelab/magent/Command.h
index 70c77d81d2..33a69003ae 100755
--- a/pelab/magent/Command.h
+++ b/pelab/magent/Command.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Command.h
diff --git a/pelab/magent/CommandInput.h b/pelab/magent/CommandInput.h
index 262726173e..37fc4edff3 100755
--- a/pelab/magent/CommandInput.h
+++ b/pelab/magent/CommandInput.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// CommandInput.h
diff --git a/pelab/magent/CommandOutput.h b/pelab/magent/CommandOutput.h
index f768300c6a..e6de53b6f5 100755
--- a/pelab/magent/CommandOutput.h
+++ b/pelab/magent/CommandOutput.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// CommandOutput.h
diff --git a/pelab/magent/Connection.cc b/pelab/magent/Connection.cc
index 05e404ee9d..747d30fc16 100755
--- a/pelab/magent/Connection.cc
+++ b/pelab/magent/Connection.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Connection.cc
diff --git a/pelab/magent/Connection.h b/pelab/magent/Connection.h
index 09814343f9..583462c899 100755
--- a/pelab/magent/Connection.h
+++ b/pelab/magent/Connection.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Connection.h
diff --git a/pelab/magent/ConnectionModel.h b/pelab/magent/ConnectionModel.h
index 53d895958c..18b0aa7106 100644
--- a/pelab/magent/ConnectionModel.h
+++ b/pelab/magent/ConnectionModel.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// ConnectionModel.h
diff --git a/pelab/magent/Decayer.cc b/pelab/magent/Decayer.cc
index b14fb0cc35..81bb3c2fd5 100644
--- a/pelab/magent/Decayer.cc
+++ b/pelab/magent/Decayer.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Decayer.cc
diff --git a/pelab/magent/Decayer.h b/pelab/magent/Decayer.h
index a258421387..47ca5f3d33 100644
--- a/pelab/magent/Decayer.h
+++ b/pelab/magent/Decayer.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Decayer.h
diff --git a/pelab/magent/DelaySensor.cc b/pelab/magent/DelaySensor.cc
index bab62b6520..6f085543ef 100644
--- a/pelab/magent/DelaySensor.cc
+++ b/pelab/magent/DelaySensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// DelaySensor.cc
diff --git a/pelab/magent/DelaySensor.h b/pelab/magent/DelaySensor.h
index 785ec762d3..63abe699f7 100644
--- a/pelab/magent/DelaySensor.h
+++ b/pelab/magent/DelaySensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// DelaySensor.h
diff --git a/pelab/magent/DirectInput.cc b/pelab/magent/DirectInput.cc
index 0bec3d1074..350d2e807d 100644
--- a/pelab/magent/DirectInput.cc
+++ b/pelab/magent/DirectInput.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// DirectInput.cc
diff --git a/pelab/magent/DirectInput.h b/pelab/magent/DirectInput.h
index 6bf3326c9d..0ecfa209e5 100644
--- a/pelab/magent/DirectInput.h
+++ b/pelab/magent/DirectInput.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// DirectInput.h
diff --git a/pelab/magent/EwmaThroughputSensor.cc b/pelab/magent/EwmaThroughputSensor.cc
index eacd29e497..9aae9305f6 100644
--- a/pelab/magent/EwmaThroughputSensor.cc
+++ b/pelab/magent/EwmaThroughputSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// EwmaThroughputSensor.cc
diff --git a/pelab/magent/EwmaThroughputSensor.h b/pelab/magent/EwmaThroughputSensor.h
index 99b010cefe..539e8f6cb9 100644
--- a/pelab/magent/EwmaThroughputSensor.h
+++ b/pelab/magent/EwmaThroughputSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// EwmaThroughputSensor.h
diff --git a/pelab/magent/GNUmakefile b/pelab/magent/GNUmakefile
index baa36e6d85..ddfa459c14 100644
--- a/pelab/magent/GNUmakefile
+++ b/pelab/magent/GNUmakefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCS=$(wildcard *.cc)
diff --git a/pelab/magent/KernelTcp.cc b/pelab/magent/KernelTcp.cc
index ce6c2db94c..6cbf04be8e 100755
--- a/pelab/magent/KernelTcp.cc
+++ b/pelab/magent/KernelTcp.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// KernelTcp.cc
diff --git a/pelab/magent/KernelTcp.h b/pelab/magent/KernelTcp.h
index fa12e6c1c8..065db9c978 100755
--- a/pelab/magent/KernelTcp.h
+++ b/pelab/magent/KernelTcp.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// KernelTcp.h
diff --git a/pelab/magent/LeastSquaresThroughput.cc b/pelab/magent/LeastSquaresThroughput.cc
index 71a5b8825c..66efda9b3c 100644
--- a/pelab/magent/LeastSquaresThroughput.cc
+++ b/pelab/magent/LeastSquaresThroughput.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// LeastSquaresThroughput.cc
diff --git a/pelab/magent/LeastSquaresThroughput.h b/pelab/magent/LeastSquaresThroughput.h
index 6778e6cd1b..94dbcfc8e5 100644
--- a/pelab/magent/LeastSquaresThroughput.h
+++ b/pelab/magent/LeastSquaresThroughput.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// LeastSquaresThroughput.h
diff --git a/pelab/magent/Makefile b/pelab/magent/Makefile
index 020e63ab27..cd9e24b700 100644
--- a/pelab/magent/Makefile
+++ b/pelab/magent/Makefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#CC=g++ -g
diff --git a/pelab/magent/MaxDelaySensor.cc b/pelab/magent/MaxDelaySensor.cc
index a72f3f88e4..d446c426a4 100644
--- a/pelab/magent/MaxDelaySensor.cc
+++ b/pelab/magent/MaxDelaySensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// MaxDelaySensor.cc
diff --git a/pelab/magent/MaxDelaySensor.h b/pelab/magent/MaxDelaySensor.h
index b4206baec2..a05b35ba77 100644
--- a/pelab/magent/MaxDelaySensor.h
+++ b/pelab/magent/MaxDelaySensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// MaxDelaySensor.h
diff --git a/pelab/magent/MinDelaySensor.cc b/pelab/magent/MinDelaySensor.cc
index 84a96708aa..6755c51784 100644
--- a/pelab/magent/MinDelaySensor.cc
+++ b/pelab/magent/MinDelaySensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// MinDelaySensor.cc
diff --git a/pelab/magent/MinDelaySensor.h b/pelab/magent/MinDelaySensor.h
index 89a5052abf..e23fae593a 100644
--- a/pelab/magent/MinDelaySensor.h
+++ b/pelab/magent/MinDelaySensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// MinDelaySensor.h
diff --git a/pelab/magent/PacketSensor.cc b/pelab/magent/PacketSensor.cc
index 4a73f83390..ae963dc3af 100644
--- a/pelab/magent/PacketSensor.cc
+++ b/pelab/magent/PacketSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// PacketSensor.cc
diff --git a/pelab/magent/PacketSensor.h b/pelab/magent/PacketSensor.h
index abb619fcc8..4a5488a057 100644
--- a/pelab/magent/PacketSensor.h
+++ b/pelab/magent/PacketSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// PacketSensor.h
diff --git a/pelab/magent/Sensor.cc b/pelab/magent/Sensor.cc
index 0a7b49f1cb..bd2419a5db 100644
--- a/pelab/magent/Sensor.cc
+++ b/pelab/magent/Sensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Sensor.cc
diff --git a/pelab/magent/Sensor.h b/pelab/magent/Sensor.h
index eebbe85be6..dd1e0affa3 100755
--- a/pelab/magent/Sensor.h
+++ b/pelab/magent/Sensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Sensor.h
diff --git a/pelab/magent/SensorList.cc b/pelab/magent/SensorList.cc
index e9559c7cc5..12bb5c48c9 100755
--- a/pelab/magent/SensorList.cc
+++ b/pelab/magent/SensorList.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// SensorList.cc
diff --git a/pelab/magent/SensorList.h b/pelab/magent/SensorList.h
index 2840ab316c..0874c7d3fc 100755
--- a/pelab/magent/SensorList.h
+++ b/pelab/magent/SensorList.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// SensorList.h
diff --git a/pelab/magent/StateSensor.cc b/pelab/magent/StateSensor.cc
index 9e1c35aea4..482fc621b0 100644
--- a/pelab/magent/StateSensor.cc
+++ b/pelab/magent/StateSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// StateSensor.cc
diff --git a/pelab/magent/StateSensor.h b/pelab/magent/StateSensor.h
index e7e579aa3c..c85072c1d2 100644
--- a/pelab/magent/StateSensor.h
+++ b/pelab/magent/StateSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// StateSensor.h
diff --git a/pelab/magent/TSThroughputSensor.cc b/pelab/magent/TSThroughputSensor.cc
index 7a1e32159e..0cd7176c86 100644
--- a/pelab/magent/TSThroughputSensor.cc
+++ b/pelab/magent/TSThroughputSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// TSThroughputSensor.cc
diff --git a/pelab/magent/TSThroughputSensor.h b/pelab/magent/TSThroughputSensor.h
index b4db97ceae..e2a0bea866 100644
--- a/pelab/magent/TSThroughputSensor.h
+++ b/pelab/magent/TSThroughputSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/pelab/magent/ThroughputSensor.cc b/pelab/magent/ThroughputSensor.cc
index 45e15a7f99..f09f8942ec 100644
--- a/pelab/magent/ThroughputSensor.cc
+++ b/pelab/magent/ThroughputSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// ThroughputSensor.cc
diff --git a/pelab/magent/ThroughputSensor.h b/pelab/magent/ThroughputSensor.h
index ea3877460c..0f07b5a57b 100644
--- a/pelab/magent/ThroughputSensor.h
+++ b/pelab/magent/ThroughputSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// ThroughputSensor.h
diff --git a/pelab/magent/Time.cc b/pelab/magent/Time.cc
index b85dc06145..35d9ea16be 100644
--- a/pelab/magent/Time.cc
+++ b/pelab/magent/Time.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Time.cc
diff --git a/pelab/magent/Time.h b/pelab/magent/Time.h
index d50f4b93f4..47982a9838 100755
--- a/pelab/magent/Time.h
+++ b/pelab/magent/Time.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Time.h
diff --git a/pelab/magent/TrafficModel.h b/pelab/magent/TrafficModel.h
index bf33378f0f..c8b519522c 100644
--- a/pelab/magent/TrafficModel.h
+++ b/pelab/magent/TrafficModel.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// TrafficModel.h
diff --git a/pelab/magent/TrivialCommandOutput.cc b/pelab/magent/TrivialCommandOutput.cc
index f4044afbca..5ad3a84ae0 100644
--- a/pelab/magent/TrivialCommandOutput.cc
+++ b/pelab/magent/TrivialCommandOutput.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// TrivialCommandOutput.cc
diff --git a/pelab/magent/TrivialCommandOutput.h b/pelab/magent/TrivialCommandOutput.h
index f497bb3bcd..b7225fc4c5 100644
--- a/pelab/magent/TrivialCommandOutput.h
+++ b/pelab/magent/TrivialCommandOutput.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// TrivialCommandOutput.h
diff --git a/pelab/magent/UDP/DESIGN_RFC.txt b/pelab/magent/UDP/DESIGN_RFC.txt
index 1188c97ccb..b3baa881c3 100644
--- a/pelab/magent/UDP/DESIGN_RFC.txt
+++ b/pelab/magent/UDP/DESIGN_RFC.txt
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
Application Centric Internet Modelling - UDP
--------------------------------------------
diff --git a/pelab/magent/UDP/README_UDP.txt b/pelab/magent/UDP/README_UDP.txt
index 578767874e..9b91177614 100644
--- a/pelab/magent/UDP/README_UDP.txt
+++ b/pelab/magent/UDP/README_UDP.txt
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
ACIM for UDP applications
-------------------------
diff --git a/pelab/magent/UDP/UdpClientDir/Makefile.Client b/pelab/magent/UDP/UdpClientDir/Makefile.Client
index fac46db263..86a4c69605 100644
--- a/pelab/magent/UDP/UdpClientDir/Makefile.Client
+++ b/pelab/magent/UDP/UdpClientDir/Makefile.Client
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
EXECUTABLE=UdpClient
diff --git a/pelab/magent/UDP/UdpClientDir/UdpAvgThroughputSensor.cc b/pelab/magent/UDP/UdpClientDir/UdpAvgThroughputSensor.cc
index 19d2d96fe6..140b751924 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpAvgThroughputSensor.cc
+++ b/pelab/magent/UDP/UdpClientDir/UdpAvgThroughputSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpAvgThroughputSensor.h"
diff --git a/pelab/magent/UDP/UdpClientDir/UdpAvgThroughputSensor.h b/pelab/magent/UDP/UdpClientDir/UdpAvgThroughputSensor.h
index a672610fa8..419eca2310 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpAvgThroughputSensor.h
+++ b/pelab/magent/UDP/UdpClientDir/UdpAvgThroughputSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_AVG_THROUGHPUT_SENSOR_PELAB_H
diff --git a/pelab/magent/UDP/UdpClientDir/UdpClient.cc b/pelab/magent/UDP/UdpClientDir/UdpClient.cc
index 09ed78c491..975047433d 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpClient.cc
+++ b/pelab/magent/UDP/UdpClientDir/UdpClient.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdlib.h>
diff --git a/pelab/magent/UDP/UdpClientDir/UdpLibs.h b/pelab/magent/UDP/UdpClientDir/UdpLibs.h
index ced89f9364..209f080f46 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpLibs.h
+++ b/pelab/magent/UDP/UdpClientDir/UdpLibs.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDPLIBS_PELAB_H
diff --git a/pelab/magent/UDP/UdpClientDir/UdpLossSensor.cc b/pelab/magent/UDP/UdpClientDir/UdpLossSensor.cc
index 118f50115c..40aa8a9c29 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpLossSensor.cc
+++ b/pelab/magent/UDP/UdpClientDir/UdpLossSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpLossSensor.h"
diff --git a/pelab/magent/UDP/UdpClientDir/UdpLossSensor.h b/pelab/magent/UDP/UdpClientDir/UdpLossSensor.h
index 74e13a5527..8f8494f1d5 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpLossSensor.h
+++ b/pelab/magent/UDP/UdpClientDir/UdpLossSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_LOSS_SENSOR_PELAB_H
diff --git a/pelab/magent/UDP/UdpClientDir/UdpMaxDelaySensor.cc b/pelab/magent/UDP/UdpClientDir/UdpMaxDelaySensor.cc
index c7c9d87659..d320eb9258 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpMaxDelaySensor.cc
+++ b/pelab/magent/UDP/UdpClientDir/UdpMaxDelaySensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpMaxDelaySensor.h"
diff --git a/pelab/magent/UDP/UdpClientDir/UdpMaxDelaySensor.h b/pelab/magent/UDP/UdpClientDir/UdpMaxDelaySensor.h
index 643c11b79c..c44d3add5c 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpMaxDelaySensor.h
+++ b/pelab/magent/UDP/UdpClientDir/UdpMaxDelaySensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_MAX_DELAY_SENSOR_PELAB_H
diff --git a/pelab/magent/UDP/UdpClientDir/UdpMinDelaySensor.cc b/pelab/magent/UDP/UdpClientDir/UdpMinDelaySensor.cc
index b50f1d15cf..7bfd71fa3e 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpMinDelaySensor.cc
+++ b/pelab/magent/UDP/UdpClientDir/UdpMinDelaySensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpMinDelaySensor.h"
diff --git a/pelab/magent/UDP/UdpClientDir/UdpMinDelaySensor.h b/pelab/magent/UDP/UdpClientDir/UdpMinDelaySensor.h
index 89d0766d56..5d59dcc6a8 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpMinDelaySensor.h
+++ b/pelab/magent/UDP/UdpClientDir/UdpMinDelaySensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_MIN_DELAY_SENSOR_PELAB_H
diff --git a/pelab/magent/UDP/UdpClientDir/UdpPacketInfo.cc b/pelab/magent/UDP/UdpClientDir/UdpPacketInfo.cc
index 5a006977ae..1e01d431b2 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpPacketInfo.cc
+++ b/pelab/magent/UDP/UdpClientDir/UdpPacketInfo.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpPacketInfo.h"
diff --git a/pelab/magent/UDP/UdpClientDir/UdpPacketInfo.h b/pelab/magent/UDP/UdpClientDir/UdpPacketInfo.h
index 31bf85d6ff..87e915be94 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpPacketInfo.h
+++ b/pelab/magent/UDP/UdpClientDir/UdpPacketInfo.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_PACKET_INFO_PELAB_H
diff --git a/pelab/magent/UDP/UdpClientDir/UdpPacketSensor.cc b/pelab/magent/UDP/UdpClientDir/UdpPacketSensor.cc
index 5e5bd6d5d9..fd38514c42 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpPacketSensor.cc
+++ b/pelab/magent/UDP/UdpClientDir/UdpPacketSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpPacketSensor.h"
diff --git a/pelab/magent/UDP/UdpClientDir/UdpPacketSensor.h b/pelab/magent/UDP/UdpClientDir/UdpPacketSensor.h
index c8a6990ad7..80f2e78d7c 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpPacketSensor.h
+++ b/pelab/magent/UDP/UdpClientDir/UdpPacketSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_PACKET_SENSOR_PELAB_H
diff --git a/pelab/magent/UDP/UdpClientDir/UdpRttSensor.cc b/pelab/magent/UDP/UdpClientDir/UdpRttSensor.cc
index de03a8fb02..33a39c3d14 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpRttSensor.cc
+++ b/pelab/magent/UDP/UdpClientDir/UdpRttSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpRttSensor.h"
diff --git a/pelab/magent/UDP/UdpClientDir/UdpRttSensor.h b/pelab/magent/UDP/UdpClientDir/UdpRttSensor.h
index d1219002ea..e107d75872 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpRttSensor.h
+++ b/pelab/magent/UDP/UdpClientDir/UdpRttSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_RTT_SENSOR_PELAB_H
diff --git a/pelab/magent/UDP/UdpClientDir/UdpSensor.cc b/pelab/magent/UDP/UdpClientDir/UdpSensor.cc
index af7060035e..ad2747d0db 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpSensor.cc
+++ b/pelab/magent/UDP/UdpClientDir/UdpSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpSensor.h"
diff --git a/pelab/magent/UDP/UdpClientDir/UdpSensor.h b/pelab/magent/UDP/UdpClientDir/UdpSensor.h
index 522180b67a..1e3ffc7250 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpSensor.h
+++ b/pelab/magent/UDP/UdpClientDir/UdpSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _UDP_SENSOR_PELAB_H
diff --git a/pelab/magent/UDP/UdpClientDir/UdpSensorList.cc b/pelab/magent/UDP/UdpClientDir/UdpSensorList.cc
index 7e5b21f747..7c27314a13 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpSensorList.cc
+++ b/pelab/magent/UDP/UdpClientDir/UdpSensorList.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpSensorList.h"
diff --git a/pelab/magent/UDP/UdpClientDir/UdpSensorList.h b/pelab/magent/UDP/UdpClientDir/UdpSensorList.h
index 20ee9c7f8a..55d96a347e 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpSensorList.h
+++ b/pelab/magent/UDP/UdpClientDir/UdpSensorList.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _UDP_SENSORLIST_PELAB_H
diff --git a/pelab/magent/UDP/UdpClientDir/UdpState.h b/pelab/magent/UDP/UdpClientDir/UdpState.h
index 8a25d438c4..8f32786fba 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpState.h
+++ b/pelab/magent/UDP/UdpClientDir/UdpState.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_STATE_PELAB_H
diff --git a/pelab/magent/UDP/UdpClientDir/UdpThroughputSensor.cc b/pelab/magent/UDP/UdpClientDir/UdpThroughputSensor.cc
index bc8f9072a6..3c5e1cbfd6 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpThroughputSensor.cc
+++ b/pelab/magent/UDP/UdpClientDir/UdpThroughputSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpThroughputSensor.h"
diff --git a/pelab/magent/UDP/UdpClientDir/UdpThroughputSensor.h b/pelab/magent/UDP/UdpClientDir/UdpThroughputSensor.h
index ddb7a05664..1f17c70e92 100644
--- a/pelab/magent/UDP/UdpClientDir/UdpThroughputSensor.h
+++ b/pelab/magent/UDP/UdpClientDir/UdpThroughputSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_THROUGHPUT_SENSOR_PELAB_H
diff --git a/pelab/magent/UDP/UdpClientDir/makeGnuPlot.py b/pelab/magent/UDP/UdpClientDir/makeGnuPlot.py
index fc22f4307b..0b31d42532 100755
--- a/pelab/magent/UDP/UdpClientDir/makeGnuPlot.py
+++ b/pelab/magent/UDP/UdpClientDir/makeGnuPlot.py
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/pelab/magent/UDP/UdpClientDir/plot.gp b/pelab/magent/UDP/UdpClientDir/plot.gp
index 7de51d08a6..8549ac641f 100644
--- a/pelab/magent/UDP/UdpClientDir/plot.gp
+++ b/pelab/magent/UDP/UdpClientDir/plot.gp
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set xlabel "Time( micro sec )"
diff --git a/pelab/magent/UDP/UdpClientDir/runClient.sh b/pelab/magent/UDP/UdpClientDir/runClient.sh
index 523cb00eb8..b74f29504f 100755
--- a/pelab/magent/UDP/UdpClientDir/runClient.sh
+++ b/pelab/magent/UDP/UdpClientDir/runClient.sh
@@ -1,9 +1,26 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/pelab/magent/UDP/UdpClientDir/showTputGraph.sh b/pelab/magent/UDP/UdpClientDir/showTputGraph.sh
index 596073ec09..345bed5500 100755
--- a/pelab/magent/UDP/UdpClientDir/showTputGraph.sh
+++ b/pelab/magent/UDP/UdpClientDir/showTputGraph.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/pelab/magent/UDP/UdpServerDir/GNUmakefile b/pelab/magent/UDP/UdpServerDir/GNUmakefile
index af8e6b3d1e..8ff866ef46 100644
--- a/pelab/magent/UDP/UdpServerDir/GNUmakefile
+++ b/pelab/magent/UDP/UdpServerDir/GNUmakefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
EXECUTABLE=UdpServer
diff --git a/pelab/magent/UDP/UdpServerDir/UdpServer.cc b/pelab/magent/UDP/UdpServerDir/UdpServer.cc
index c908b3168f..17c7394c0b 100644
--- a/pelab/magent/UDP/UdpServerDir/UdpServer.cc
+++ b/pelab/magent/UDP/UdpServerDir/UdpServer.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpServer.h"
diff --git a/pelab/magent/UDP/UdpServerDir/UdpServer.h b/pelab/magent/UDP/UdpServerDir/UdpServer.h
index 68b2106d88..54a6fe81af 100644
--- a/pelab/magent/UDP/UdpServerDir/UdpServer.h
+++ b/pelab/magent/UDP/UdpServerDir/UdpServer.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _UDP_SERVER_H_PELAB
diff --git a/pelab/magent/UDP/UdpServerDir/makeServerPlot.py b/pelab/magent/UDP/UdpServerDir/makeServerPlot.py
index 29e499d960..271309a3dd 100755
--- a/pelab/magent/UDP/UdpServerDir/makeServerPlot.py
+++ b/pelab/magent/UDP/UdpServerDir/makeServerPlot.py
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/pelab/magent/UDP/UdpServerDir/plot.gp b/pelab/magent/UDP/UdpServerDir/plot.gp
index 8f6f3d4551..fd0c4ca335 100644
--- a/pelab/magent/UDP/UdpServerDir/plot.gp
+++ b/pelab/magent/UDP/UdpServerDir/plot.gp
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
set xlabel "Time( micro sec )"
diff --git a/pelab/magent/UDP/UdpServerDir/runServer.sh b/pelab/magent/UDP/UdpServerDir/runServer.sh
index dfa61b7f2d..3e91d82c4f 100755
--- a/pelab/magent/UDP/UdpServerDir/runServer.sh
+++ b/pelab/magent/UDP/UdpServerDir/runServer.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/pelab/magent/UdpAvgThroughputSensor.cc b/pelab/magent/UdpAvgThroughputSensor.cc
index 7de8380883..047913549e 100644
--- a/pelab/magent/UdpAvgThroughputSensor.cc
+++ b/pelab/magent/UdpAvgThroughputSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpAvgThroughputSensor.h"
diff --git a/pelab/magent/UdpAvgThroughputSensor.h b/pelab/magent/UdpAvgThroughputSensor.h
index 8190789698..a0224f311b 100644
--- a/pelab/magent/UdpAvgThroughputSensor.h
+++ b/pelab/magent/UdpAvgThroughputSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_AVG_THROUGHPUT_SENSOR_PELAB_H
diff --git a/pelab/magent/UdpLossSensor.cc b/pelab/magent/UdpLossSensor.cc
index 27ae40dc85..c0ce395025 100644
--- a/pelab/magent/UdpLossSensor.cc
+++ b/pelab/magent/UdpLossSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpLossSensor.h"
diff --git a/pelab/magent/UdpLossSensor.h b/pelab/magent/UdpLossSensor.h
index 57183cc179..94ae9d62e0 100644
--- a/pelab/magent/UdpLossSensor.h
+++ b/pelab/magent/UdpLossSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_LOSS_SENSOR_PELAB_H
diff --git a/pelab/magent/UdpMaxDelaySensor.cc b/pelab/magent/UdpMaxDelaySensor.cc
index c84d4609f3..d00597d7ac 100644
--- a/pelab/magent/UdpMaxDelaySensor.cc
+++ b/pelab/magent/UdpMaxDelaySensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpMaxDelaySensor.h"
diff --git a/pelab/magent/UdpMaxDelaySensor.h b/pelab/magent/UdpMaxDelaySensor.h
index 7d3aa054ff..3f53043c48 100644
--- a/pelab/magent/UdpMaxDelaySensor.h
+++ b/pelab/magent/UdpMaxDelaySensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_MAX_DELAY_SENSOR_PELAB_H
diff --git a/pelab/magent/UdpMinDelaySensor.cc b/pelab/magent/UdpMinDelaySensor.cc
index 19ed6269ba..3ee5eb29b0 100644
--- a/pelab/magent/UdpMinDelaySensor.cc
+++ b/pelab/magent/UdpMinDelaySensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpMinDelaySensor.h"
diff --git a/pelab/magent/UdpMinDelaySensor.h b/pelab/magent/UdpMinDelaySensor.h
index 9284073fff..9852f55ec8 100644
--- a/pelab/magent/UdpMinDelaySensor.h
+++ b/pelab/magent/UdpMinDelaySensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_MIN_DELAY_SENSOR_PELAB_H
diff --git a/pelab/magent/UdpPacketSensor.cc b/pelab/magent/UdpPacketSensor.cc
index 0f915ce268..2285476374 100644
--- a/pelab/magent/UdpPacketSensor.cc
+++ b/pelab/magent/UdpPacketSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpPacketSensor.h"
diff --git a/pelab/magent/UdpPacketSensor.h b/pelab/magent/UdpPacketSensor.h
index f34c28e4c6..5cc6c46ce2 100644
--- a/pelab/magent/UdpPacketSensor.h
+++ b/pelab/magent/UdpPacketSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_PACKET_SENSOR_PELAB_H
diff --git a/pelab/magent/UdpRttSensor.cc b/pelab/magent/UdpRttSensor.cc
index 25be19d412..369c087d1d 100644
--- a/pelab/magent/UdpRttSensor.cc
+++ b/pelab/magent/UdpRttSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpRttSensor.h"
diff --git a/pelab/magent/UdpRttSensor.h b/pelab/magent/UdpRttSensor.h
index cdf7d456de..9ee4730798 100644
--- a/pelab/magent/UdpRttSensor.h
+++ b/pelab/magent/UdpRttSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_RTT_SENSOR_PELAB_H
diff --git a/pelab/magent/UdpThroughputSensor.cc b/pelab/magent/UdpThroughputSensor.cc
index bdc7f8fb11..e0eb3b967a 100644
--- a/pelab/magent/UdpThroughputSensor.cc
+++ b/pelab/magent/UdpThroughputSensor.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "UdpThroughputSensor.h"
diff --git a/pelab/magent/UdpThroughputSensor.h b/pelab/magent/UdpThroughputSensor.h
index 021f96a9a4..96dc20fd26 100644
--- a/pelab/magent/UdpThroughputSensor.h
+++ b/pelab/magent/UdpThroughputSensor.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef UDP_THROUGHPUT_SENSOR_PELAB_H
diff --git a/pelab/magent/auto-magent.sh b/pelab/magent/auto-magent.sh
index c8af108baf..12f972adfa 100644
--- a/pelab/magent/auto-magent.sh
+++ b/pelab/magent/auto-magent.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
ARGS=$*
diff --git a/pelab/magent/lib.cc b/pelab/magent/lib.cc
index 1b98008266..1a7c944375 100644
--- a/pelab/magent/lib.cc
+++ b/pelab/magent/lib.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// lib.cc
diff --git a/pelab/magent/lib.h b/pelab/magent/lib.h
index 87c9a1135f..404e665735 100755
--- a/pelab/magent/lib.h
+++ b/pelab/magent/lib.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// lib.h
diff --git a/pelab/magent/libreplay.c b/pelab/magent/libreplay.c
index 1ee37596ab..c790a69065 100644
--- a/pelab/magent/libreplay.c
+++ b/pelab/magent/libreplay.c
@@ -1,6 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* libnetmon, a library for monitoring network traffic sent by a process. See
* README for instructions.
diff --git a/pelab/magent/libreplay.h b/pelab/magent/libreplay.h
index df314816aa..83af417871 100644
--- a/pelab/magent/libreplay.h
+++ b/pelab/magent/libreplay.h
@@ -1,6 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* Header for libnetmon, a library for monitoring network traffic sent by a
* process. See README for instructions.
diff --git a/pelab/magent/log.cc b/pelab/magent/log.cc
index de09c71b5a..9359bfdca0 100644
--- a/pelab/magent/log.cc
+++ b/pelab/magent/log.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// log.c
diff --git a/pelab/magent/log.h b/pelab/magent/log.h
index 80c7216ed2..e44723b32a 100644
--- a/pelab/magent/log.h
+++ b/pelab/magent/log.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// log.h
diff --git a/pelab/magent/main.cc b/pelab/magent/main.cc
index e9a6b2503f..ca7d640922 100755
--- a/pelab/magent/main.cc
+++ b/pelab/magent/main.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// main.cc
diff --git a/pelab/magent/makeUdpPlots.py b/pelab/magent/makeUdpPlots.py
index 3cc42171a4..d1a6719416 100755
--- a/pelab/magent/makeUdpPlots.py
+++ b/pelab/magent/makeUdpPlots.py
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/pelab/magent/mock-monitor/compile.sh b/pelab/magent/mock-monitor/compile.sh
index a2eb387353..b24e80e1e3 100644
--- a/pelab/magent/mock-monitor/compile.sh
+++ b/pelab/magent/mock-monitor/compile.sh
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
g++ -o udpmon udpmon.cc ../TSThroughputSensor.o ../CircularTraffic.o ../Command.o ../Connection.o ../Decayer.o ../DelaySensor.o ../DirectInput.o ../EwmaThroughputSensor.o ../KernelTcp.o ../LeastSquaresThroughput.o ../MaxDelaySensor.o ../MinDelaySensor.o ../PacketSensor.o ../Sensor.o ../SensorList.o ../StateSensor.o ../ThroughputSensor.o ../Time.o ../TrivialCommandOutput.o ../lib.o ../log.o ../saveload.o ../UdpPacketSensor.o ../UdpThroughputSensor.o ../UdpMinDelaySensor.o ../UdpMaxDelaySensor.o ../UdpRttSensor.o ../UdpLossSensor.o ../UdpAvgThroughputSensor.o -lm -lpcap
diff --git a/pelab/magent/mock-monitor/udpmon.cc b/pelab/magent/mock-monitor/udpmon.cc
index 860a1b579f..ebf3d699d9 100644
--- a/pelab/magent/mock-monitor/udpmon.cc
+++ b/pelab/magent/mock-monitor/udpmon.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// dumb-client.c
diff --git a/pelab/magent/run-magent.sh b/pelab/magent/run-magent.sh
index d151843dfd..e49110c9ce 100644
--- a/pelab/magent/run-magent.sh
+++ b/pelab/magent/run-magent.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/magent/saveload.cc b/pelab/magent/saveload.cc
index 5d2987a956..181620488c 100644
--- a/pelab/magent/saveload.cc
+++ b/pelab/magent/saveload.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// saveload.cc
diff --git a/pelab/magent/saveload.h b/pelab/magent/saveload.h
index b31be1f0dc..50ea3781fc 100644
--- a/pelab/magent/saveload.h
+++ b/pelab/magent/saveload.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// saveload.h
diff --git a/pelab/make-tarball b/pelab/make-tarball
index 312c032304..a8151f8acd 100755
--- a/pelab/make-tarball
+++ b/pelab/make-tarball
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
files="pelab/auto-pelab.ns pelab/common-env.sh pelab/init-elabnodes.pl pelab/run-sanity.sh pelab/dbmonitor pelab/libnetmon pelab/magent pelab/monitor pelab/pelabdb.pwd pelab/stub pelab/iperfd"
diff --git a/pelab/manual-magent.sh b/pelab/manual-magent.sh
index 6e4ba76458..035970815b 100644
--- a/pelab/manual-magent.sh
+++ b/pelab/manual-magent.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010, University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
iperfd/iperfd -s -p 4242 &
diff --git a/pelab/monitor/auto-monitor.sh b/pelab/monitor/auto-monitor.sh
index 59e8ce45d3..49a65f95e9 100644
--- a/pelab/monitor/auto-monitor.sh
+++ b/pelab/monitor/auto-monitor.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
ARGS=$*
diff --git a/pelab/monitor/gen-ip-mapping.pl b/pelab/monitor/gen-ip-mapping.pl
index ceb7d215c4..6141fa0b82 100644
--- a/pelab/monitor/gen-ip-mapping.pl
+++ b/pelab/monitor/gen-ip-mapping.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/monitor/instrument-env.sh b/pelab/monitor/instrument-env.sh
index 9987135103..a340e561c3 100755
--- a/pelab/monitor/instrument-env.sh
+++ b/pelab/monitor/instrument-env.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
. `dirname $0`/../common-env.sh
diff --git a/pelab/monitor/instrument.sh b/pelab/monitor/instrument.sh
index 12d41c1fb3..1d24b5e5e9 100755
--- a/pelab/monitor/instrument.sh
+++ b/pelab/monitor/instrument.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/monitor/monitor.py b/pelab/monitor/monitor.py
index 4b9633586d..fd5b02eca0 100755
--- a/pelab/monitor/monitor.py
+++ b/pelab/monitor/monitor.py
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Monitors the application's behaviour and report to the network model.
diff --git a/pelab/monitor/run-fake.sh b/pelab/monitor/run-fake.sh
index ef8a659bda..3e3224c232 100755
--- a/pelab/monitor/run-fake.sh
+++ b/pelab/monitor/run-fake.sh
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Run in directory of monitor.
diff --git a/pelab/monitor/run-iperf.sh b/pelab/monitor/run-iperf.sh
index f08c40ae89..47c311d424 100644
--- a/pelab/monitor/run-iperf.sh
+++ b/pelab/monitor/run-iperf.sh
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
sh instrument.sh ../iperf -i 0.5 -c elab1 -t 30 -w 256k
diff --git a/pelab/monitor/run-monitor-libnetmon.sh b/pelab/monitor/run-monitor-libnetmon.sh
index 95dbb9d3b6..a19dc69ed0 100755
--- a/pelab/monitor/run-monitor-libnetmon.sh
+++ b/pelab/monitor/run-monitor-libnetmon.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/monitor/run-monitor.sh b/pelab/monitor/run-monitor.sh
index 868f2c590a..fb4c9bae5a 100755
--- a/pelab/monitor/run-monitor.sh
+++ b/pelab/monitor/run-monitor.sh
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Usage: sh run-monitor.sh <experiment-name> <ip-address>
diff --git a/pelab/monitor/timediff.pl b/pelab/monitor/timediff.pl
index 1b1d8afce9..a63d0081e2 100755
--- a/pelab/monitor/timediff.pl
+++ b/pelab/monitor/timediff.pl
@@ -1,8 +1,25 @@
#! /usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
diff --git a/pelab/netmond2tput.pl b/pelab/netmond2tput.pl
index b3567b436c..9a875ea84b 100644
--- a/pelab/netmond2tput.pl
+++ b/pelab/netmond2tput.pl
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
$usage = "Usage: netmond2tput.pl <elab-file> <planet-file> <planet-logfile>
diff --git a/pelab/opsdbcheck.pl b/pelab/opsdbcheck.pl
index 170896b505..8de94ce898 100644
--- a/pelab/opsdbcheck.pl
+++ b/pelab/opsdbcheck.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Script to test if data is being entered into the ops db properly.
diff --git a/pelab/parastream/GNUmakefile b/pelab/parastream/GNUmakefile
index b88c9b5114..3dc3047880 100644
--- a/pelab/parastream/GNUmakefile
+++ b/pelab/parastream/GNUmakefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
CC = gcc
diff --git a/pelab/parastream/parastream.c b/pelab/parastream/parastream.c
index 198c7f6199..99ad2ab504 100644
--- a/pelab/parastream/parastream.c
+++ b/pelab/parastream/parastream.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/time.h>
diff --git a/pelab/parastream/parastreamd.c b/pelab/parastream/parastreamd.c
index c30979dd5c..02d20c09e8 100644
--- a/pelab/parastream/parastreamd.c
+++ b/pelab/parastream/parastreamd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/time.h>
diff --git a/pelab/reset-elabc.pl b/pelab/reset-elabc.pl
index c59e5cb664..498aa4d7dd 100755
--- a/pelab/reset-elabc.pl
+++ b/pelab/reset-elabc.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
$proj = $ARGV[0];
diff --git a/pelab/reset-plab.sh b/pelab/reset-plab.sh
index 86d88aee56..f65602ac2e 100644
--- a/pelab/reset-plab.sh
+++ b/pelab/reset-plab.sh
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#/usr/testbed/bin/tevc -e tbres/pelab-generated now elabc-elab-1 modify dest=10.0.0.2 delay=$1
diff --git a/pelab/resetlinks.py b/pelab/resetlinks.py
index 54e6b3ad7b..2f459e8705 100644
--- a/pelab/resetlinks.py
+++ b/pelab/resetlinks.py
@@ -1,8 +1,25 @@
#! /usr/bin/env python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/run-sanity.sh b/pelab/run-sanity.sh
index c0fb88599b..5bb2180c58 100755
--- a/pelab/run-sanity.sh
+++ b/pelab/run-sanity.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/run-tcpdump.sh b/pelab/run-tcpdump.sh
index 4c2b5df48f..d70208afe1 100755
--- a/pelab/run-tcpdump.sh
+++ b/pelab/run-tcpdump.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
if [ $# -lt 2 ]; then
diff --git a/pelab/schedmon/GNUmakefile b/pelab/schedmon/GNUmakefile
index dde71b7404..1b33fad788 100644
--- a/pelab/schedmon/GNUmakefile
+++ b/pelab/schedmon/GNUmakefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SYSTEM := $(shell uname -s)
diff --git a/pelab/schedmon/mktar.sh b/pelab/schedmon/mktar.sh
index 7e6cf5d988..0d54836a6c 100755
--- a/pelab/schedmon/mktar.sh
+++ b/pelab/schedmon/mktar.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
cd ..
diff --git a/pelab/schedmon/schedmon-run.sh b/pelab/schedmon/schedmon-run.sh
index 77357edac6..2abc3a4929 100755
--- a/pelab/schedmon/schedmon-run.sh
+++ b/pelab/schedmon/schedmon-run.sh
@@ -1,8 +1,25 @@
#/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SCHEDMON="/local/schedmon/schedmon -s 10000 -n 100 -t -l 59 -b"
diff --git a/pelab/schedmon/schedmon.c b/pelab/schedmon/schedmon.c
index 3fe751de42..c9ceb5558b 100644
--- a/pelab/schedmon/schedmon.c
+++ b/pelab/schedmon/schedmon.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdlib.h>
diff --git a/pelab/showsamples.pl b/pelab/showsamples.pl
index a77a7c1b6e..a1777a81c3 100755
--- a/pelab/showsamples.pl
+++ b/pelab/showsamples.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/start-experiment b/pelab/start-experiment
index ecb35953dc..68960bc04a 100644
--- a/pelab/start-experiment
+++ b/pelab/start-experiment
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/pelab/start-run b/pelab/start-run
index 86261f766f..1ee6e99d71 100755
--- a/pelab/start-run
+++ b/pelab/start-run
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
waitfor="-w"
diff --git a/pelab/stop-experiment b/pelab/stop-experiment
index 3e4bbce25a..69c7879a7e 100644
--- a/pelab/stop-experiment
+++ b/pelab/stop-experiment
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/pelab/stop-run b/pelab/stop-run
index 3356234bbe..5c1bbb3491 100755
--- a/pelab/stop-run
+++ b/pelab/stop-run
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
waitfor="-w"
diff --git a/pelab/stub/Makefile b/pelab/stub/Makefile
index 97d9ae5f47..8fab262a95 100644
--- a/pelab/stub/Makefile
+++ b/pelab/stub/Makefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
all: stubd stub-monitor dumb-client dumb-server
diff --git a/pelab/stub/auto-stub.sh b/pelab/stub/auto-stub.sh
index f02fff27d7..cff6d39947 100644
--- a/pelab/stub/auto-stub.sh
+++ b/pelab/stub/auto-stub.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
ARGS=$*
diff --git a/pelab/stub/dumb-client.c b/pelab/stub/dumb-client.c
index a23d184c50..2f919e990a 100644
--- a/pelab/stub/dumb-client.c
+++ b/pelab/stub/dumb-client.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// dumb-client.c
diff --git a/pelab/stub/dumb-server.c b/pelab/stub/dumb-server.c
index a0551b48b8..3b71947f95 100644
--- a/pelab/stub/dumb-server.c
+++ b/pelab/stub/dumb-server.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// dumb-server.c
diff --git a/pelab/stub/log.c b/pelab/stub/log.c
index 49414b6a72..ba96125541 100644
--- a/pelab/stub/log.c
+++ b/pelab/stub/log.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// log.c
diff --git a/pelab/stub/log.h b/pelab/stub/log.h
index aef81a0021..3072cd8777 100644
--- a/pelab/stub/log.h
+++ b/pelab/stub/log.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// log.h
diff --git a/pelab/stub/lookup.cc b/pelab/stub/lookup.cc
index 4d23cb77d6..12c0879e1e 100755
--- a/pelab/stub/lookup.cc
+++ b/pelab/stub/lookup.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// lookup.cc
diff --git a/pelab/stub/run-stub.sh b/pelab/stub/run-stub.sh
index 0c966e7f50..94ac0ae15f 100644
--- a/pelab/stub/run-stub.sh
+++ b/pelab/stub/run-stub.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/pelab/stub/stub-monitor.c b/pelab/stub/stub-monitor.c
index 9ca448f4fb..64177b03a0 100644
--- a/pelab/stub/stub-monitor.c
+++ b/pelab/stub/stub-monitor.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/pelab/stub/stub-pcap.c b/pelab/stub/stub-pcap.c
index a7e2b9e5a9..e2e30459e2 100644
--- a/pelab/stub/stub-pcap.c
+++ b/pelab/stub/stub-pcap.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "stub.h"
diff --git a/pelab/stub/stub.h b/pelab/stub/stub.h
index 7a7b51affe..66ccbdcbb4 100644
--- a/pelab/stub/stub.h
+++ b/pelab/stub/stub.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _STUB_H
diff --git a/pelab/stub/stubd.c b/pelab/stub/stubd.c
index 66d7a28374..1dbf48e804 100644
--- a/pelab/stub/stubd.c
+++ b/pelab/stub/stubd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/****************************************************************************
diff --git a/pelab/stub/stubm.c b/pelab/stub/stubm.c
index 9c9bb9b8c4..6211e54577 100644
--- a/pelab/stub/stubm.c
+++ b/pelab/stub/stubm.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/****************************************************************************
diff --git a/pelab/stub/which-iface.sh b/pelab/stub/which-iface.sh
index 4834dea97b..aba9c4dd07 100644
--- a/pelab/stub/which-iface.sh
+++ b/pelab/stub/which-iface.sh
@@ -1,8 +1,25 @@
#!/usr/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
LINKNAME=planetc
diff --git a/pelab/supafly/GNUmakefile b/pelab/supafly/GNUmakefile
index cd3b0dbf7c..3a6b38f9e4 100644
--- a/pelab/supafly/GNUmakefile
+++ b/pelab/supafly/GNUmakefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
CC = gcc
diff --git a/pelab/supafly/cryptic-driver.pl b/pelab/supafly/cryptic-driver.pl
index 6c51dfedfd..c3a68208e6 100755
--- a/pelab/supafly/cryptic-driver.pl
+++ b/pelab/supafly/cryptic-driver.pl
@@ -1,9 +1,26 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
sub numerically($$);
diff --git a/pelab/supafly/cryptic.c b/pelab/supafly/cryptic.c
index 4117882394..64a8e8c0f6 100644
--- a/pelab/supafly/cryptic.c
+++ b/pelab/supafly/cryptic.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/pelab/supafly/crypto.c b/pelab/supafly/crypto.c
index 3b4a320060..5339acce58 100644
--- a/pelab/supafly/crypto.c
+++ b/pelab/supafly/crypto.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/pelab/supafly/crypto.h b/pelab/supafly/crypto.h
index 8900262477..cea53d45b3 100644
--- a/pelab/supafly/crypto.h
+++ b/pelab/supafly/crypto.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __CRYPTO_H__
diff --git a/pelab/supafly/defs.h b/pelab/supafly/defs.h
index be81fe0fb1..771b440570 100644
--- a/pelab/supafly/defs.h
+++ b/pelab/supafly/defs.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __DEFS_H__
diff --git a/pelab/supafly/logparse.pl b/pelab/supafly/logparse.pl
index 7d7c644da3..038565ae88 100755
--- a/pelab/supafly/logparse.pl
+++ b/pelab/supafly/logparse.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/pelab/supafly/scripts/log_analyzer.pl b/pelab/supafly/scripts/log_analyzer.pl
index d392070519..05ca3652ac 100755
--- a/pelab/supafly/scripts/log_analyzer.pl
+++ b/pelab/supafly/scripts/log_analyzer.pl
@@ -1,9 +1,26 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#-----------------------------#
diff --git a/pelab/supafly/scripts/plot.sh b/pelab/supafly/scripts/plot.sh
index ef2bb5630e..0f38694549 100755
--- a/pelab/supafly/scripts/plot.sh
+++ b/pelab/supafly/scripts/plot.sh
@@ -1,9 +1,26 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
## GNUPlot commands
diff --git a/pelab/supafly/sfmiddleman.c b/pelab/supafly/sfmiddleman.c
index ad82ddff93..911b60c6b0 100644
--- a/pelab/supafly/sfmiddleman.c
+++ b/pelab/supafly/sfmiddleman.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/pelab/supafly/sfreceiver.c b/pelab/supafly/sfreceiver.c
index 6da482e212..3da173eba7 100644
--- a/pelab/supafly/sfreceiver.c
+++ b/pelab/supafly/sfreceiver.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/pelab/supafly/sfsender.c b/pelab/supafly/sfsender.c
index e8bc4bf200..3ff129dc10 100644
--- a/pelab/supafly/sfsender.c
+++ b/pelab/supafly/sfsender.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/pelab/supafly/util.c b/pelab/supafly/util.c
index f4641c6e5a..8634c5c661 100644
--- a/pelab/supafly/util.c
+++ b/pelab/supafly/util.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "util.h"
diff --git a/pelab/supafly/util.h b/pelab/supafly/util.h
index 9cc0bad6db..f6b7de4d56 100644
--- a/pelab/supafly/util.h
+++ b/pelab/supafly/util.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __UTIL_H__
diff --git a/protogeni/GNUmakefile.in b/protogeni/GNUmakefile.in
index 076926e895..19fbda73e0 100644
--- a/protogeni/GNUmakefile.in
+++ b/protogeni/GNUmakefile.in
@@ -1,7 +1,30 @@
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/protogeni/etc/GNUmakefile.in b/protogeni/etc/GNUmakefile.in
index 07492211e6..530463dea9 100644
--- a/protogeni/etc/GNUmakefile.in
+++ b/protogeni/etc/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/protogeni/flack/LICENSES b/protogeni/flack/LICENSES
index c17b667f8c..2fa416cd35 100644
--- a/protogeni/flack/LICENSES
+++ b/protogeni/flack/LICENSES
@@ -1,4 +1,29 @@
-Unless otherwise stated, all files are GENIPUBLIC-COPYRIGHT
+Unless otherwise stated, all files are licensed under the GENI Public License:
+
+{{{GENIPUBLIC-LICENSE
+
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
=====================
Third party binaries:
@@ -78,4 +103,4 @@ Adobe Systems Incorporated
--------------------------
- src/com/flack/shared/utils/DateUtil.as
* See: http://code.google.com/p/as3corelib/source/browse/trunk/src/com/adobe/utils/DateUtil.as
- - src/com/flack/shared/display/skins/*
\ No newline at end of file
+ - src/com/flack/shared/display/skins/*
diff --git a/protogeni/flack/src/com/flack/emulab/EmulabMain.as b/protogeni/flack/src/com/flack/emulab/EmulabMain.as
index b78d79ed53..e4f604b6f6 100644
--- a/protogeni/flack/src/com/flack/emulab/EmulabMain.as
+++ b/protogeni/flack/src/com/flack/emulab/EmulabMain.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab
{
diff --git a/protogeni/flack/src/com/flack/emulab/display/DisplayUtil.as b/protogeni/flack/src/com/flack/emulab/display/DisplayUtil.as
index 52ba826801..3f6e26fbf0 100644
--- a/protogeni/flack/src/com/flack/emulab/display/DisplayUtil.as
+++ b/protogeni/flack/src/com/flack/emulab/display/DisplayUtil.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.display
{
diff --git a/protogeni/flack/src/com/flack/emulab/display/NameValueVgroup.mxml b/protogeni/flack/src/com/flack/emulab/display/NameValueVgroup.mxml
index 1ea5479d05..3ecc08737a 100644
--- a/protogeni/flack/src/com/flack/emulab/display/NameValueVgroup.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/NameValueVgroup.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/NumberValueVgroup.mxml b/protogeni/flack/src/com/flack/emulab/display/NumberValueVgroup.mxml
index 598131486f..c4c2e9763a 100644
--- a/protogeni/flack/src/com/flack/emulab/display/NumberValueVgroup.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/NumberValueVgroup.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/PhysicalNodeItemRenderer.mxml b/protogeni/flack/src/com/flack/emulab/display/PhysicalNodeItemRenderer.mxml
index 0f82598070..22d3e4e395 100644
--- a/protogeni/flack/src/com/flack/emulab/display/PhysicalNodeItemRenderer.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/PhysicalNodeItemRenderer.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/PhysicalNodeList.mxml b/protogeni/flack/src/com/flack/emulab/display/PhysicalNodeList.mxml
index 1b217a8659..1f293aa30f 100644
--- a/protogeni/flack/src/com/flack/emulab/display/PhysicalNodeList.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/PhysicalNodeList.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/VirtualLinkList.mxml b/protogeni/flack/src/com/flack/emulab/display/VirtualLinkList.mxml
index 89bd08ce8d..ae61dea51f 100644
--- a/protogeni/flack/src/com/flack/emulab/display/VirtualLinkList.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/VirtualLinkList.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/VirtualNodeItemRenderer.mxml b/protogeni/flack/src/com/flack/emulab/display/VirtualNodeItemRenderer.mxml
index 8121c3dc87..1ed840f6a6 100644
--- a/protogeni/flack/src/com/flack/emulab/display/VirtualNodeItemRenderer.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/VirtualNodeItemRenderer.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/VirtualNodeList.mxml b/protogeni/flack/src/com/flack/emulab/display/VirtualNodeList.mxml
index 4d38836a97..aceb06d163 100644
--- a/protogeni/flack/src/com/flack/emulab/display/VirtualNodeList.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/VirtualNodeList.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/areas/CreateExperimentArea.mxml b/protogeni/flack/src/com/flack/emulab/display/areas/CreateExperimentArea.mxml
index 80763cb236..d34c511cb4 100644
--- a/protogeni/flack/src/com/flack/emulab/display/areas/CreateExperimentArea.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/areas/CreateExperimentArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/areas/EmulabUserArea.mxml b/protogeni/flack/src/com/flack/emulab/display/areas/EmulabUserArea.mxml
index 3956e4d222..8b1f1f766f 100644
--- a/protogeni/flack/src/com/flack/emulab/display/areas/EmulabUserArea.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/areas/EmulabUserArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/areas/ExperimentArea.mxml b/protogeni/flack/src/com/flack/emulab/display/areas/ExperimentArea.mxml
index e24bac2b20..5405eb014e 100644
--- a/protogeni/flack/src/com/flack/emulab/display/areas/ExperimentArea.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/areas/ExperimentArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/areas/ManagerArea.mxml b/protogeni/flack/src/com/flack/emulab/display/areas/ManagerArea.mxml
index 46f763de92..5ef11bfbec 100644
--- a/protogeni/flack/src/com/flack/emulab/display/areas/ManagerArea.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/areas/ManagerArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/areas/VirtualLinkArea.mxml b/protogeni/flack/src/com/flack/emulab/display/areas/VirtualLinkArea.mxml
index a858157dd3..c6578ffe30 100644
--- a/protogeni/flack/src/com/flack/emulab/display/areas/VirtualLinkArea.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/areas/VirtualLinkArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/areas/VirtualLinkCollectionArea.mxml b/protogeni/flack/src/com/flack/emulab/display/areas/VirtualLinkCollectionArea.mxml
index 23c92413c6..37c86271d4 100644
--- a/protogeni/flack/src/com/flack/emulab/display/areas/VirtualLinkCollectionArea.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/areas/VirtualLinkCollectionArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/areas/VirtualNodeArea.mxml b/protogeni/flack/src/com/flack/emulab/display/areas/VirtualNodeArea.mxml
index 62ff3e3907..635341b250 100644
--- a/protogeni/flack/src/com/flack/emulab/display/areas/VirtualNodeArea.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/areas/VirtualNodeArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/areas/VirtualNodeCollectionArea.mxml b/protogeni/flack/src/com/flack/emulab/display/areas/VirtualNodeCollectionArea.mxml
index 045b72e1c8..b4ce48dfd7 100644
--- a/protogeni/flack/src/com/flack/emulab/display/areas/VirtualNodeCollectionArea.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/areas/VirtualNodeCollectionArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/areas/WelcomeArea.mxml b/protogeni/flack/src/com/flack/emulab/display/areas/WelcomeArea.mxml
index 1d9f763d09..39fd618944 100644
--- a/protogeni/flack/src/com/flack/emulab/display/areas/WelcomeArea.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/areas/WelcomeArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/experimenter/ExecuteServiceComponent.mxml b/protogeni/flack/src/com/flack/emulab/display/experimenter/ExecuteServiceComponent.mxml
index d96698c55f..c17bed9589 100644
--- a/protogeni/flack/src/com/flack/emulab/display/experimenter/ExecuteServiceComponent.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/experimenter/ExecuteServiceComponent.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/experimenter/IComponentsArea.as b/protogeni/flack/src/com/flack/emulab/display/experimenter/IComponentsArea.as
index 9b8958d029..03c293eee2 100644
--- a/protogeni/flack/src/com/flack/emulab/display/experimenter/IComponentsArea.as
+++ b/protogeni/flack/src/com/flack/emulab/display/experimenter/IComponentsArea.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.display.experimenter
{
diff --git a/protogeni/flack/src/com/flack/emulab/display/experimenter/InstallServiceComponent.mxml b/protogeni/flack/src/com/flack/emulab/display/experimenter/InstallServiceComponent.mxml
index 8190623d00..538a061c96 100644
--- a/protogeni/flack/src/com/flack/emulab/display/experimenter/InstallServiceComponent.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/experimenter/InstallServiceComponent.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/experimenter/elabview/ElabinelabView.mxml b/protogeni/flack/src/com/flack/emulab/display/experimenter/elabview/ElabinelabView.mxml
index c3ff1d2b68..0a71f35020 100644
--- a/protogeni/flack/src/com/flack/emulab/display/experimenter/elabview/ElabinelabView.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/experimenter/elabview/ElabinelabView.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasBranchLabel.mxml b/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasBranchLabel.mxml
index b84ed4552c..f7cd30c79d 100644
--- a/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasBranchLabel.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasBranchLabel.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasLink.as b/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasLink.as
index 3cca0bdf04..3eff0d03ad 100644
--- a/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasLink.as
+++ b/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasLink.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.display.experimenter.graphview
{
diff --git a/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasLinkCollection.as b/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasLinkCollection.as
index 1131182901..650257f1a3 100644
--- a/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasLinkCollection.as
+++ b/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasLinkCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.display.experimenter.graphview
{
diff --git a/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasLinkLabel.mxml b/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasLinkLabel.mxml
index 98f4b075d6..4196da6920 100644
--- a/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasLinkLabel.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasLinkLabel.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasNode.mxml b/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasNode.mxml
index cff749235c..04b337a51d 100644
--- a/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasNode.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasNode.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasNodeCollection.as b/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasNodeCollection.as
index 1b93b7d6bf..a3c12be7b7 100644
--- a/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasNodeCollection.as
+++ b/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/CanvasNodeCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.display.experimenter.graphview
{
diff --git a/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/ExperimentCanvas.mxml b/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/ExperimentCanvas.mxml
index bb5095a3bb..ae6ed1ab4e 100644
--- a/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/ExperimentCanvas.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/experimenter/graphview/ExperimentCanvas.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/experimenter/nsview/ExperimentNsView.mxml b/protogeni/flack/src/com/flack/emulab/display/experimenter/nsview/ExperimentNsView.mxml
index 464078505b..202821731d 100644
--- a/protogeni/flack/src/com/flack/emulab/display/experimenter/nsview/ExperimentNsView.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/experimenter/nsview/ExperimentNsView.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/panes/EmulabSearchPane.mxml b/protogeni/flack/src/com/flack/emulab/display/panes/EmulabSearchPane.mxml
index 14775c48ab..d4600ef895 100644
--- a/protogeni/flack/src/com/flack/emulab/display/panes/EmulabSearchPane.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/panes/EmulabSearchPane.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/panes/EmulabUserPane.mxml b/protogeni/flack/src/com/flack/emulab/display/panes/EmulabUserPane.mxml
index 3fbc491f95..725464570b 100644
--- a/protogeni/flack/src/com/flack/emulab/display/panes/EmulabUserPane.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/panes/EmulabUserPane.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/panes/ExperimentItem.mxml b/protogeni/flack/src/com/flack/emulab/display/panes/ExperimentItem.mxml
index 2a19bd7a0c..f61ef28615 100644
--- a/protogeni/flack/src/com/flack/emulab/display/panes/ExperimentItem.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/panes/ExperimentItem.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/windows/LoginWindow.mxml b/protogeni/flack/src/com/flack/emulab/display/windows/LoginWindow.mxml
index 52d44607fd..646097d371 100644
--- a/protogeni/flack/src/com/flack/emulab/display/windows/LoginWindow.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/windows/LoginWindow.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/display/windows/TextInputWindow.mxml b/protogeni/flack/src/com/flack/emulab/display/windows/TextInputWindow.mxml
index 644d420e4d..2a1ab482dc 100644
--- a/protogeni/flack/src/com/flack/emulab/display/windows/TextInputWindow.mxml
+++ b/protogeni/flack/src/com/flack/emulab/display/windows/TextInputWindow.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/emulab/resources/EmulabUser.as b/protogeni/flack/src/com/flack/emulab/resources/EmulabUser.as
index 42b2e2d1a2..7bdcbd13c0 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/EmulabUser.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/EmulabUser.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/NamedObject.as b/protogeni/flack/src/com/flack/emulab/resources/NamedObject.as
index 789c63d73b..e4a90e8d5f 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/NamedObject.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/NamedObject.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/physical/Osid.as b/protogeni/flack/src/com/flack/emulab/resources/physical/Osid.as
index 492b41a448..709adb29a4 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/physical/Osid.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/physical/Osid.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/physical/OsidCollection.as b/protogeni/flack/src/com/flack/emulab/resources/physical/OsidCollection.as
index 82eb71fc7a..df0a7b9c71 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/physical/OsidCollection.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/physical/OsidCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/physical/PhysicalNode.as b/protogeni/flack/src/com/flack/emulab/resources/physical/PhysicalNode.as
index a4762b7263..5ec59d1df5 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/physical/PhysicalNode.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/physical/PhysicalNode.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/physical/PhysicalNodeCollection.as b/protogeni/flack/src/com/flack/emulab/resources/physical/PhysicalNodeCollection.as
index d651f322aa..01aed8c3e4 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/physical/PhysicalNodeCollection.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/physical/PhysicalNodeCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/sites/EmulabManager.as b/protogeni/flack/src/com/flack/emulab/resources/sites/EmulabManager.as
index 24482f12d0..00e2c9a22e 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/sites/EmulabManager.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/sites/EmulabManager.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/sites/Project.as b/protogeni/flack/src/com/flack/emulab/resources/sites/Project.as
index 32da1059a1..817777eede 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/sites/Project.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/sites/Project.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/sites/ProjectCollection.as b/protogeni/flack/src/com/flack/emulab/resources/sites/ProjectCollection.as
index 739e1b7c02..6cb77d7642 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/sites/ProjectCollection.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/sites/ProjectCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/sites/Subgroup.as b/protogeni/flack/src/com/flack/emulab/resources/sites/Subgroup.as
index 7f1fc25b66..e17af11054 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/sites/Subgroup.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/sites/Subgroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/sites/SubgroupCollection.as b/protogeni/flack/src/com/flack/emulab/resources/sites/SubgroupCollection.as
index 0b82557ebe..ca791d0b3b 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/sites/SubgroupCollection.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/sites/SubgroupCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/ElabInElab.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/ElabInElab.as
index 3d2aa19363..aa864f7bb2 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/ElabInElab.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/ElabInElab.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/Experiment.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/Experiment.as
index 0b3650a4e8..93de713ddd 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/Experiment.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/Experiment.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/ExperimentCollection.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/ExperimentCollection.as
index 7759179fb6..21fca86c0c 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/ExperimentCollection.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/ExperimentCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/Firewall.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/Firewall.as
index 0d748f3e83..9aa970b84e 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/Firewall.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/Firewall.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/NameValuePair.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/NameValuePair.as
index 4ecb1b377f..ecbdef5ffb 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/NameValuePair.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/NameValuePair.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/NumberValuePair.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/NumberValuePair.as
index 0960d2b05a..117aa5a52e 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/NumberValuePair.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/NumberValuePair.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/ProgramAgent.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/ProgramAgent.as
index 99dc819bed..7818b5b359 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/ProgramAgent.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/ProgramAgent.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/Queue.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/Queue.as
index 41ef015eab..1bc239e0dd 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/Queue.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/Queue.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/TarFile.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/TarFile.as
index 4fca19bd1a..51e5a9079e 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/TarFile.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/TarFile.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/TrafficFlow.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/TrafficFlow.as
index 5d9ce4493c..b7c2dc2ac6 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/TrafficFlow.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/TrafficFlow.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/TrafficGenerator.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/TrafficGenerator.as
index c25ad3e071..49d931c9e7 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/TrafficGenerator.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/TrafficGenerator.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/TrafficGeneratorCollection.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/TrafficGeneratorCollection.as
index 6d9ee2795f..2a78bbf489 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/TrafficGeneratorCollection.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/TrafficGeneratorCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualInterface.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualInterface.as
index 4f185d623a..1856322667 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualInterface.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualInterface.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualInterfaceCollection.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualInterfaceCollection.as
index c9e0ab6e0a..6f74656caa 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualInterfaceCollection.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualInterfaceCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualLink.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualLink.as
index 59782ac972..b39a750fd3 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualLink.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualLink.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualLinkCollection.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualLinkCollection.as
index 13b6180e86..d55fd07363 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualLinkCollection.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualLinkCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualNode.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualNode.as
index 13fe219cd7..8c46708c76 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualNode.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualNode.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualNodeCollection.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualNodeCollection.as
index b48779e6b3..a8318f9f4d 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualNodeCollection.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualNodeCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualType.as b/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualType.as
index d91158b759..9908ee72e4 100644
--- a/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualType.as
+++ b/protogeni/flack/src/com/flack/emulab/resources/virtual/VirtualType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/groups/GetExperimentTaskGroup.as b/protogeni/flack/src/com/flack/emulab/tasks/groups/GetExperimentTaskGroup.as
index c985eee92c..fcfc690891 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/groups/GetExperimentTaskGroup.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/groups/GetExperimentTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.groups
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/groups/GetManagerTaskGroup.as b/protogeni/flack/src/com/flack/emulab/tasks/groups/GetManagerTaskGroup.as
index 09459f282b..ad8c55a996 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/groups/GetManagerTaskGroup.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/groups/GetManagerTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.groups
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/groups/GetUserTaskGroup.as b/protogeni/flack/src/com/flack/emulab/tasks/groups/GetUserTaskGroup.as
index c31f3e4aea..54d54e78a1 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/groups/GetUserTaskGroup.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/groups/GetUserTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.groups
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/groups/ResolveUserTaskGroup.as b/protogeni/flack/src/com/flack/emulab/tasks/groups/ResolveUserTaskGroup.as
index f4fc859be6..7f8104d2f6 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/groups/ResolveUserTaskGroup.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/groups/ResolveUserTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.groups
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/http/GetUserCertTask.as b/protogeni/flack/src/com/flack/emulab/tasks/http/GetUserCertTask.as
index 0c455e4c6c..1f5d16ccc9 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/http/GetUserCertTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/http/GetUserCertTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.http
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/process/GenerateNsTask.as b/protogeni/flack/src/com/flack/emulab/tasks/process/GenerateNsTask.as
index 0964761ffc..9c82fa8dcb 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/process/GenerateNsTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/process/GenerateNsTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.process
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/EmulabXmlrpcTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/EmulabXmlrpcTask.as
index 76aa7bfa2f..9856765aa1 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/EmulabXmlrpcTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/EmulabXmlrpcTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentConstraintsTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentConstraintsTask.as
index b1c2e6b361..bcc031e652 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentConstraintsTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentConstraintsTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentEndExpTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentEndExpTask.as
index 1d622c5105..315328dae5 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentEndExpTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentEndExpTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentEventSysControlTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentEventSysControlTask.as
index d72af45d48..d5da0fb44d 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentEventSysControlTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentEventSysControlTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentExpInfoTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentExpInfoTask.as
index 7ba1ef7e49..a361704c97 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentExpInfoTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentExpInfoTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentGetListTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentGetListTask.as
index 9ecff9c7ac..f46ea0043f 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentGetListTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentGetListTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentGetVizTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentGetVizTask.as
index 9c7df74361..f48eb32fbf 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentGetVizTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentGetVizTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentInfoTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentInfoTask.as
index c08d60f1fe..0cc151c614 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentInfoTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentInfoTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentMetadataTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentMetadataTask.as
index 72925263b5..850e144b91 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentMetadataTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentMetadataTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentModifyTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentModifyTask.as
index b0cf324a91..99c95b7f5f 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentModifyTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentModifyTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentNsCheckTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentNsCheckTask.as
index 47987f4550..0615a9363f 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentNsCheckTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentNsCheckTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentNsFileTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentNsFileTask.as
index 171b1dada1..557d929dc0 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentNsFileTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentNsFileTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentPortStatsTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentPortStatsTask.as
index 5234f91501..beb43a7dc1 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentPortStatsTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentPortStatsTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentRebootTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentRebootTask.as
index b4ea11d17e..12e15d9466 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentRebootTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentRebootTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentReloadTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentReloadTask.as
index 86921bc653..5cd29e8484 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentReloadTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentReloadTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentSaveLogsTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentSaveLogsTask.as
index 82f831d831..1793f589ba 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentSaveLogsTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentSaveLogsTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentStartExpTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentStartExpTask.as
index d6d5568eeb..330afb349b 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentStartExpTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentStartExpTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentStateTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentStateTask.as
index ee5ba84a1b..c9973de208 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentStateTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentStateTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentSwapExpTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentSwapExpTask.as
index 88ff490450..289202117d 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentSwapExpTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentSwapExpTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentVirtualTopologyTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentVirtualTopologyTask.as
index 4c34ef5677..73b28bc5de 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentVirtualTopologyTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/experiment/EmulabExperimentVirtualTopologyTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.experiment
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeAdminModeTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeAdminModeTask.as
index 3eafe19d56..1057ffad7c 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeAdminModeTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeAdminModeTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.geni.tasks.xmlrpc.emulab.node
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeConsoleTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeConsoleTask.as
index 2cac1cff76..aab9c80255 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeConsoleTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeConsoleTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.node
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeCreateImageTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeCreateImageTask.as
index c3bc4f5edf..82ad0aebaa 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeCreateImageTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeCreateImageTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.node
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeGetListTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeGetListTask.as
index 2ca92174d8..c510746983 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeGetListTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeGetListTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.node
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeHostKeysTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeHostKeysTask.as
index cf44460c00..645d6436b8 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeHostKeysTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeHostKeysTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.node
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeRebootTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeRebootTask.as
index a457996353..33b8055681 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeRebootTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeRebootTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.node
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeReloadTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeReloadTask.as
index f5dc1cd481..49f48086f6 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeReloadTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeReloadTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.node
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeSshDescriptionTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeSshDescriptionTask.as
index 36a43547d6..2ce98261e4 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeSshDescriptionTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/node/EmulabNodeSshDescriptionTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.node
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/osid/EmulabOsidGetListTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/osid/EmulabOsidGetListTask.as
index 79e874864c..9f4684a545 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/osid/EmulabOsidGetListTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/osid/EmulabOsidGetListTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.osid
{
diff --git a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/user/EmulabUserMembershipTask.as b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/user/EmulabUserMembershipTask.as
index f082aa6db4..f3f7ec7a9d 100644
--- a/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/user/EmulabUserMembershipTask.as
+++ b/protogeni/flack/src/com/flack/emulab/tasks/xmlrpc/user/EmulabUserMembershipTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.emulab.tasks.xmlrpc.user
{
diff --git a/protogeni/flack/src/com/flack/geni/GeniCache.as b/protogeni/flack/src/com/flack/geni/GeniCache.as
index a3791b1875..a58aa5ca99 100644
--- a/protogeni/flack/src/com/flack/geni/GeniCache.as
+++ b/protogeni/flack/src/com/flack/geni/GeniCache.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni
{
diff --git a/protogeni/flack/src/com/flack/geni/GeniMain.as b/protogeni/flack/src/com/flack/geni/GeniMain.as
index 4eaddf8f6c..2140287676 100644
--- a/protogeni/flack/src/com/flack/geni/GeniMain.as
+++ b/protogeni/flack/src/com/flack/geni/GeniMain.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni
{
diff --git a/protogeni/flack/src/com/flack/geni/GeniUniverse.as b/protogeni/flack/src/com/flack/geni/GeniUniverse.as
index 1d30e4a72e..5936caf5bf 100644
--- a/protogeni/flack/src/com/flack/geni/GeniUniverse.as
+++ b/protogeni/flack/src/com/flack/geni/GeniUniverse.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni
{
diff --git a/protogeni/flack/src/com/flack/geni/RspecUtil.as b/protogeni/flack/src/com/flack/geni/RspecUtil.as
index 8cac92a3e8..7d6608a1e7 100644
--- a/protogeni/flack/src/com/flack/geni/RspecUtil.as
+++ b/protogeni/flack/src/com/flack/geni/RspecUtil.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni
{
diff --git a/protogeni/flack/src/com/flack/geni/display/AddAuthorityWindow.mxml b/protogeni/flack/src/com/flack/geni/display/AddAuthorityWindow.mxml
index 83482c8701..4c3f9072a3 100644
--- a/protogeni/flack/src/com/flack/geni/display/AddAuthorityWindow.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/AddAuthorityWindow.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/ChooseManagerWindow.mxml b/protogeni/flack/src/com/flack/geni/display/ChooseManagerWindow.mxml
index 65caaf2437..10551c05f6 100644
--- a/protogeni/flack/src/com/flack/geni/display/ChooseManagerWindow.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/ChooseManagerWindow.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/ChooseManagersToWatchWindow.mxml b/protogeni/flack/src/com/flack/geni/display/ChooseManagersToWatchWindow.mxml
index 126383809a..4731ac6866 100644
--- a/protogeni/flack/src/com/flack/geni/display/ChooseManagersToWatchWindow.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/ChooseManagersToWatchWindow.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/CreateSliceControl.mxml b/protogeni/flack/src/com/flack/geni/display/CreateSliceControl.mxml
index f6b7efa687..7826fa2d85 100644
--- a/protogeni/flack/src/com/flack/geni/display/CreateSliceControl.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/CreateSliceControl.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/DisplayUtil.as b/protogeni/flack/src/com/flack/geni/display/DisplayUtil.as
index b159eaa130..dc072290ba 100644
--- a/protogeni/flack/src/com/flack/geni/display/DisplayUtil.as
+++ b/protogeni/flack/src/com/flack/geni/display/DisplayUtil.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display
{
diff --git a/protogeni/flack/src/com/flack/geni/display/GeniDataGridRenderer.mxml b/protogeni/flack/src/com/flack/geni/display/GeniDataGridRenderer.mxml
index 4ac73fcfc5..2657478591 100644
--- a/protogeni/flack/src/com/flack/geni/display/GeniDataGridRenderer.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/GeniDataGridRenderer.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
@@ -42,4 +56,4 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
]]>
</fx:Script>
-</s:GridItemRenderer>
\ No newline at end of file
+</s:GridItemRenderer>
diff --git a/protogeni/flack/src/com/flack/geni/display/InterfaceList.mxml b/protogeni/flack/src/com/flack/geni/display/InterfaceList.mxml
index a7f2859cdd..4e93fb1cc6 100644
--- a/protogeni/flack/src/com/flack/geni/display/InterfaceList.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/InterfaceList.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/LogMessageItemRenderer.mxml b/protogeni/flack/src/com/flack/geni/display/LogMessageItemRenderer.mxml
index 9bfae8da27..cf612c734d 100644
--- a/protogeni/flack/src/com/flack/geni/display/LogMessageItemRenderer.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/LogMessageItemRenderer.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/PhysicalLinkList.mxml b/protogeni/flack/src/com/flack/geni/display/PhysicalLinkList.mxml
index ed7e98fa12..d3eebcb172 100644
--- a/protogeni/flack/src/com/flack/geni/display/PhysicalLinkList.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/PhysicalLinkList.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/PhysicalNodeItemRenderer.mxml b/protogeni/flack/src/com/flack/geni/display/PhysicalNodeItemRenderer.mxml
index 727de2b141..22d0525060 100644
--- a/protogeni/flack/src/com/flack/geni/display/PhysicalNodeItemRenderer.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/PhysicalNodeItemRenderer.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/PhysicalNodeList.mxml b/protogeni/flack/src/com/flack/geni/display/PhysicalNodeList.mxml
index d5b775ef1d..c4f5fba779 100644
--- a/protogeni/flack/src/com/flack/geni/display/PhysicalNodeList.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/PhysicalNodeList.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/SliverTypesControl.mxml b/protogeni/flack/src/com/flack/geni/display/SliverTypesControl.mxml
index 68573c3e1f..8caba3aa62 100644
--- a/protogeni/flack/src/com/flack/geni/display/SliverTypesControl.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/SliverTypesControl.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1)import com.geni.resources.DiskImage;
-import com.geni.resources.SliverType;
-import com.geni.resources.SliverTypeCollection;
+{{{GENIPUBLIC-LICENSE
-import mx.collections.ArrayCollection;UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/VirtualLinkList.mxml b/protogeni/flack/src/com/flack/geni/display/VirtualLinkList.mxml
index 1b7d24cba4..883919cfbc 100644
--- a/protogeni/flack/src/com/flack/geni/display/VirtualLinkList.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/VirtualLinkList.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/VirtualNodeItemRenderer.mxml b/protogeni/flack/src/com/flack/geni/display/VirtualNodeItemRenderer.mxml
index bfa2c66046..3e9556ff0b 100644
--- a/protogeni/flack/src/com/flack/geni/display/VirtualNodeItemRenderer.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/VirtualNodeItemRenderer.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/VirtualNodeList.mxml b/protogeni/flack/src/com/flack/geni/display/VirtualNodeList.mxml
index cfdeb8a238..961d620feb 100644
--- a/protogeni/flack/src/com/flack/geni/display/VirtualNodeList.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/VirtualNodeList.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/AddManagerArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/AddManagerArea.mxml
index 1c8d39748a..7d4e2edf51 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/AddManagerArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/AddManagerArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/ExampleSlicesArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/ExampleSlicesArea.mxml
index a1badf93c9..819a1afbbc 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/ExampleSlicesArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/ExampleSlicesArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/GeniUserArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/GeniUserArea.mxml
index 037cf3cd1d..2369ec0af5 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/GeniUserArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/GeniUserArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/ManagerArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/ManagerArea.mxml
index 29873f8c3e..fab0ef2588 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/ManagerArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/ManagerArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/PhysicalInterfaceArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/PhysicalInterfaceArea.mxml
index c78c81473f..3b713719ca 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/PhysicalInterfaceArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/PhysicalInterfaceArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/PhysicalInterfaceCollectionArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/PhysicalInterfaceCollectionArea.mxml
index 9beaea3345..9b387d18af 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/PhysicalInterfaceCollectionArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/PhysicalInterfaceCollectionArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/PhysicalLinkArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/PhysicalLinkArea.mxml
index 42c37389c3..f4b5c9ad4a 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/PhysicalLinkArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/PhysicalLinkArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/PhysicalLinkCollectionArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/PhysicalLinkCollectionArea.mxml
index 4dc9e24929..d837b2c8b7 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/PhysicalLinkCollectionArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/PhysicalLinkCollectionArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/PhysicalNodeArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/PhysicalNodeArea.mxml
index dc5ab3ef45..60cc660013 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/PhysicalNodeArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/PhysicalNodeArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/PhysicalNodeCollectionArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/PhysicalNodeCollectionArea.mxml
index 837ebd89b8..e514341ee7 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/PhysicalNodeCollectionArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/PhysicalNodeCollectionArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/SliceArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/SliceArea.mxml
index f113c6b688..900e342bee 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/SliceArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/SliceArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/SliceLoginsArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/SliceLoginsArea.mxml
index 960fe8e398..63e3f93936 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/SliceLoginsArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/SliceLoginsArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/VirtualLinkArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/VirtualLinkArea.mxml
index 7b4185e2a3..06f1ae99d7 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/VirtualLinkArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/VirtualLinkArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/VirtualLinkCollectionArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/VirtualLinkCollectionArea.mxml
index 401d4483ae..be9422914b 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/VirtualLinkCollectionArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/VirtualLinkCollectionArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/VirtualNodeArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/VirtualNodeArea.mxml
index 585c4e8fcc..b497a5163e 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/VirtualNodeArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/VirtualNodeArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/areas/VirtualNodeCollectionArea.mxml b/protogeni/flack/src/com/flack/geni/display/areas/VirtualNodeCollectionArea.mxml
index 57bef50d9a..950e905c04 100644
--- a/protogeni/flack/src/com/flack/geni/display/areas/VirtualNodeCollectionArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/areas/VirtualNodeCollectionArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/GeniMap.as b/protogeni/flack/src/com/flack/geni/display/mapping/GeniMap.as
index fece93647d..08ec9b6f6b 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/GeniMap.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/GeniMap.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/GeniMapHandler.as b/protogeni/flack/src/com/flack/geni/display/mapping/GeniMapHandler.as
index 19ad7c8fdb..0b3c29419d 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/GeniMapHandler.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/GeniMapHandler.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/GeniMapLink.as b/protogeni/flack/src/com/flack/geni/display/mapping/GeniMapLink.as
index fd2aebec12..fddbb6ef43 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/GeniMapLink.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/GeniMapLink.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/GeniMapNodeMarker.as b/protogeni/flack/src/com/flack/geni/display/mapping/GeniMapNodeMarker.as
index e4f591915d..f6d13b9c44 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/GeniMapNodeMarker.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/GeniMapNodeMarker.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/LatitudeLongitude.as b/protogeni/flack/src/com/flack/geni/display/mapping/LatitudeLongitude.as
index 52bfe2c0e6..ccd7f7a943 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/LatitudeLongitude.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/LatitudeLongitude.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/LatitudeLongitudeBounds.as b/protogeni/flack/src/com/flack/geni/display/mapping/LatitudeLongitudeBounds.as
index d9678249eb..2c34c3f254 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/LatitudeLongitudeBounds.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/LatitudeLongitudeBounds.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMap.mxml b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMap.mxml
index 6e3d28b371..31bda56dcf 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMap.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMap.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapLink.as b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapLink.as
index 5785b8cc1b..dbdd8fd3c3 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapLink.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapLink.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping.mapproviders.esriprovider
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapLinkMarker.as b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapLinkMarker.as
index 196c83099b..73c8c093b0 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapLinkMarker.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapLinkMarker.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping.mapproviders.esriprovider
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapLinkMarkerSymbol.as b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapLinkMarkerSymbol.as
index b72681fc2c..6f7da55e26 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapLinkMarkerSymbol.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapLinkMarkerSymbol.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping.mapproviders.esriprovider
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapNodeMarker.as b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapNodeMarker.as
index 29ba756a71..64f18e2221 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapNodeMarker.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapNodeMarker.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping.mapproviders.esriprovider
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapNodeMarkerInfo.mxml b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapNodeMarkerInfo.mxml
index 8bc25f880c..e0053a5656 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapNodeMarkerInfo.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapNodeMarkerInfo.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapNodeMarkerSymbol.as b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapNodeMarkerSymbol.as
index 1d62ac56d3..779510469a 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapNodeMarkerSymbol.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/esriprovider/EsriMapNodeMarkerSymbol.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping.mapproviders.esriprovider
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMap.mxml b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMap.mxml
index fa91c6e15d..263f45e33e 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMap.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMap.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLink.as b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLink.as
index e185f616b2..31831bef9a 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLink.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLink.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping.mapproviders.googlemapsprovider
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLocationMarker.as b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLocationMarker.as
index 8dd39fdd2b..0898d1e908 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLocationMarker.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLocationMarker.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping.mapproviders.googlemapsprovider
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLocationMarkerIcon.as b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLocationMarkerIcon.as
index 58d50081a3..219d5a2743 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLocationMarkerIcon.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLocationMarkerIcon.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping.mapproviders.googlemapsprovider
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLocationMarkerInfo.mxml b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLocationMarkerInfo.mxml
index e5c05eb276..50806ffe11 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLocationMarkerInfo.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleMapLocationMarkerInfo.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
@@ -183,4 +197,4 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
verticalGap="2"
visible="{includeManagers}"
includeInLayout="{includeManagers}" />
-</mx:VBox>
\ No newline at end of file
+</mx:VBox>
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleZoomToAllControl.as b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleZoomToAllControl.as
index 46e1241644..84308e474c 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleZoomToAllControl.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleZoomToAllControl.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping.mapproviders.googlemapsprovider
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/mapquestprovider/MapquestMapLink.as b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/mapquestprovider/MapquestMapLink.as
index bea335bd7a..5be54a3a40 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/mapquestprovider/MapquestMapLink.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/mapquestprovider/MapquestMapLink.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping.mapproviders.mapquestprovider
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/mapquestprovider/MapquestMapNodeMarker.as b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/mapquestprovider/MapquestMapNodeMarker.as
index 27aa3f03e8..a9c0659c85 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/mapquestprovider/MapquestMapNodeMarker.as
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/mapquestprovider/MapquestMapNodeMarker.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.mapping.mapproviders.mapquestprovider
{
diff --git a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/mapquestprovider/MapquestTilemap.mxml b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/mapquestprovider/MapquestTilemap.mxml
index 7df1de0099..7a16bdadfd 100644
--- a/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/mapquestprovider/MapquestTilemap.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/mapping/mapproviders/mapquestprovider/MapquestTilemap.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/panes/GeniResourcesPane.mxml b/protogeni/flack/src/com/flack/geni/display/panes/GeniResourcesPane.mxml
index a6c7605121..bf6ca9aa77 100644
--- a/protogeni/flack/src/com/flack/geni/display/panes/GeniResourcesPane.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/panes/GeniResourcesPane.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/panes/GeniSearchPane.mxml b/protogeni/flack/src/com/flack/geni/display/panes/GeniSearchPane.mxml
index 2fca175768..856922eab8 100644
--- a/protogeni/flack/src/com/flack/geni/display/panes/GeniSearchPane.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/panes/GeniSearchPane.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/panes/ManagerItem.mxml b/protogeni/flack/src/com/flack/geni/display/panes/ManagerItem.mxml
index d3c7e2cf32..25e6ee75df 100644
--- a/protogeni/flack/src/com/flack/geni/display/panes/ManagerItem.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/panes/ManagerItem.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/panes/ManagersPane.mxml b/protogeni/flack/src/com/flack/geni/display/panes/ManagersPane.mxml
index 1e99e42c8a..c379f6d9b1 100644
--- a/protogeni/flack/src/com/flack/geni/display/panes/ManagersPane.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/panes/ManagersPane.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/panes/SliceItem.mxml b/protogeni/flack/src/com/flack/geni/display/panes/SliceItem.mxml
index f8af708423..9136e65551 100644
--- a/protogeni/flack/src/com/flack/geni/display/panes/SliceItem.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/panes/SliceItem.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/panes/UserPane.mxml b/protogeni/flack/src/com/flack/geni/display/panes/UserPane.mxml
index 7e3bb086a0..88dd4bf160 100644
--- a/protogeni/flack/src/com/flack/geni/display/panes/UserPane.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/panes/UserPane.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/ExecuteServiceComponent.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/ExecuteServiceComponent.mxml
index a80e7b4c56..28931268d3 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/ExecuteServiceComponent.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/ExecuteServiceComponent.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/IComponentsArea.as b/protogeni/flack/src/com/flack/geni/display/slicer/IComponentsArea.as
index 16b2b962bd..fef9fa75d3 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/IComponentsArea.as
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/IComponentsArea.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.slicer
{
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/ImportSliceWindow.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/ImportSliceWindow.mxml
index 019036a689..5c6834cb93 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/ImportSliceWindow.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/ImportSliceWindow.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/InstallServiceComponent.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/InstallServiceComponent.mxml
index cee85ca729..fce4e580d1 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/InstallServiceComponent.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/InstallServiceComponent.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/ManagerVirtualArea.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/ManagerVirtualArea.mxml
index 9696cbe0aa..e139fd691a 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/ManagerVirtualArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/ManagerVirtualArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/ManagersVirtualPane.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/ManagersVirtualPane.mxml
index f042bac69b..b8c38b178c 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/ManagersVirtualPane.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/ManagersVirtualPane.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/SliverInfoArea.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/SliverInfoArea.mxml
index d2ddf4097d..fa04fd5ea1 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/SliverInfoArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/SliverInfoArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/SliversPane.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/SliversPane.mxml
index daf160bff5..31be87494f 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/SliversPane.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/SliversPane.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLink.as b/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLink.as
index 8798bdc503..2b62beee2c 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLink.as
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLink.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.slicer.graphview
{
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLinkBranch.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLinkBranch.mxml
index 141588e2a2..7ce4dc5bb8 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLinkBranch.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLinkBranch.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLinkCollection.as b/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLinkCollection.as
index 9fb2aa11c5..d52c61fe22 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLinkCollection.as
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLinkCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.slicer.graphview
{
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLinkMain.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLinkMain.mxml
index 999630c9ce..4f020b46a1 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLinkMain.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasLinkMain.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasNode.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasNode.mxml
index 75118c1d78..652400860a 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasNode.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasNode.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasNodeCollection.as b/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasNodeCollection.as
index d59b00ccec..aa2b4c989d 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasNodeCollection.as
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/graphview/CanvasNodeCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.display.slicer.graphview
{
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/graphview/SliceCanvas.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/graphview/SliceCanvas.mxml
index 013e923934..7383878abc 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/graphview/SliceCanvas.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/graphview/SliceCanvas.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/listview/ListLink.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/listview/ListLink.mxml
index 9182de469e..03552c55e2 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/listview/ListLink.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/listview/ListLink.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/listview/ListNode.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/listview/ListNode.mxml
index f9e6bf7189..d9fb06422b 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/listview/ListNode.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/listview/ListNode.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/listview/SliceList.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/listview/SliceList.mxml
index 8250b6590a..b6be2bec5e 100644
--- a/protogeni/flack/src/com/flack/geni/display/slicer/listview/SliceList.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/listview/SliceList.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/windows/LoginWindow.mxml b/protogeni/flack/src/com/flack/geni/display/windows/LoginWindow.mxml
index c1f92c3126..d0ecf1d9ac 100644
--- a/protogeni/flack/src/com/flack/geni/display/windows/LoginWindow.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/windows/LoginWindow.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/display/windows/StartWindow.mxml b/protogeni/flack/src/com/flack/geni/display/windows/StartWindow.mxml
index d707a9f791..3a61462f93 100644
--- a/protogeni/flack/src/com/flack/geni/display/windows/StartWindow.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/windows/StartWindow.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/plugins/Plugin.as b/protogeni/flack/src/com/flack/geni/plugins/Plugin.as
index fb81426b38..bcbe2b8843 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/Plugin.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/Plugin.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/PluginArea.mxml b/protogeni/flack/src/com/flack/geni/plugins/PluginArea.mxml
index facb98af6f..1cb1f9ec04 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/PluginArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/plugins/PluginArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/plugins/RspecProcessInterface.as b/protogeni/flack/src/com/flack/geni/plugins/RspecProcessInterface.as
index e12ffbc0cc..1895d91a20 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/RspecProcessInterface.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/RspecProcessInterface.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/SliverTypeInterface.as b/protogeni/flack/src/com/flack/geni/plugins/SliverTypeInterface.as
index e251646581..226566b01d 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/SliverTypeInterface.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/SliverTypeInterface.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/SliverTypePart.mxml b/protogeni/flack/src/com/flack/geni/plugins/SliverTypePart.mxml
index 40ca29f6d6..7d1279ab5d 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/SliverTypePart.mxml
+++ b/protogeni/flack/src/com/flack/geni/plugins/SliverTypePart.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/plugins/emulab/DelayGrid.mxml b/protogeni/flack/src/com/flack/geni/plugins/emulab/DelayGrid.mxml
index 62bef2ecc8..6cd33bf15a 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/emulab/DelayGrid.mxml
+++ b/protogeni/flack/src/com/flack/geni/plugins/emulab/DelayGrid.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/plugins/emulab/DelaySliverType.as b/protogeni/flack/src/com/flack/geni/plugins/emulab/DelaySliverType.as
index 4b1876c042..c7023532cd 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/emulab/DelaySliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/emulab/DelaySliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.emulab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/emulab/Emulab.as b/protogeni/flack/src/com/flack/geni/plugins/emulab/Emulab.as
index 1feb32acb5..1e667670aa 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/emulab/Emulab.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/emulab/Emulab.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.emulab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabArea.mxml b/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabArea.mxml
index 567e5dc826..6b0b272218 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabBbgSliverType.as b/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabBbgSliverType.as
index f29016ba5a..3c43ac1bee 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabBbgSliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabBbgSliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.emulab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabOpenVzSliverType.as b/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabOpenVzSliverType.as
index d6ffb507a1..af2fe4ea74 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabOpenVzSliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabOpenVzSliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.emulab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabSppSliverType.as b/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabSppSliverType.as
index 31eada412b..5e565de012 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabSppSliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/emulab/EmulabSppSliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.emulab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/emulab/FirewallSliverType.as b/protogeni/flack/src/com/flack/geni/plugins/emulab/FirewallSliverType.as
index 99cdff48bf..3bf1ef5337 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/emulab/FirewallSliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/emulab/FirewallSliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.emulab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/emulab/FirewallVgroup.mxml b/protogeni/flack/src/com/flack/geni/plugins/emulab/FirewallVgroup.mxml
index d89bebc633..6935213822 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/emulab/FirewallVgroup.mxml
+++ b/protogeni/flack/src/com/flack/geni/plugins/emulab/FirewallVgroup.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/plugins/emulab/Netfpga2SliverType.as b/protogeni/flack/src/com/flack/geni/plugins/emulab/Netfpga2SliverType.as
index da0a9a3b5e..9ccf2033df 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/emulab/Netfpga2SliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/emulab/Netfpga2SliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.emulab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/emulab/Pipe.as b/protogeni/flack/src/com/flack/geni/plugins/emulab/Pipe.as
index e1723ac6eb..a225159196 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/emulab/Pipe.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/emulab/Pipe.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.emulab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/emulab/PipeCollection.as b/protogeni/flack/src/com/flack/geni/plugins/emulab/PipeCollection.as
index 2480947251..13acb611bb 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/emulab/PipeCollection.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/emulab/PipeCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.emulab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/emulab/RawPcSliverType.as b/protogeni/flack/src/com/flack/geni/plugins/emulab/RawPcSliverType.as
index 04e46f7c9f..a5f792dfaa 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/emulab/RawPcSliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/emulab/RawPcSliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.emulab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/instools/Instools.as b/protogeni/flack/src/com/flack/geni/plugins/instools/Instools.as
index ac4b0fe4a9..0ef9b36eee 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/instools/Instools.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/instools/Instools.as
@@ -1,17 +1,32 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group,
-* University of Kentucky and the Laboratory for Advanced Networking.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ * Copyright (c) 2011-2012 University of Kentucky.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.instools
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/instools/InstoolsArea.mxml b/protogeni/flack/src/com/flack/geni/plugins/instools/InstoolsArea.mxml
index 7eb5564d66..2dc4d1cb87 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/instools/InstoolsArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/plugins/instools/InstoolsArea.mxml
@@ -2,19 +2,33 @@
<!--
-GENIPUBLIC-COPYRIGHT
-Copyright (c) 2008-2012 University of Utah and the Flux Group,
-University of Kentucky and the Laboratory for Advanced Networking.
-All rights reserved.
+Copyright (c) 2008-2012 University of Utah and the Flux Group.
+Copyright (c) 2011-2012 University of Kentucky.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/plugins/instools/SliceInstoolsDetails.as b/protogeni/flack/src/com/flack/geni/plugins/instools/SliceInstoolsDetails.as
index a7f02ca0fd..a652765d6f 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/instools/SliceInstoolsDetails.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/instools/SliceInstoolsDetails.as
@@ -1,17 +1,32 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group,
-* University of Kentucky and the Laboratory for Advanced Networking.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ * Copyright (c) 2011-2012 University of Kentucky.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.instools
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/AddMCNodeTask.as b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/AddMCNodeTask.as
index 259b06cfa1..9f22457f27 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/AddMCNodeTask.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/AddMCNodeTask.as
@@ -1,17 +1,32 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group,
-* University of Kentucky and the Laboratory for Advanced Networking.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ * Copyright (2) 2011-2012 University of Kentucky.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.instools.instasks
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/AddMCNodesTaskGroup.as b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/AddMCNodesTaskGroup.as
index 6618a7e724..2331de8ded 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/AddMCNodesTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/AddMCNodesTaskGroup.as
@@ -1,17 +1,32 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group,
-* University of Kentucky and the Laboratory for Advanced Networking.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ * Copyright (c) 2011-2012 University of Kentucky.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.instools.instasks
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/CreateMCNodesTaskGroup.as b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/CreateMCNodesTaskGroup.as
index 1cecca4cc8..b8e6dbe07e 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/CreateMCNodesTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/CreateMCNodesTaskGroup.as
@@ -1,17 +1,32 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group,
-* University of Kentucky and the Laboratory for Advanced Networking.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ * Copyright (c) 2011-2012 University of Kentucky.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.instools.instasks
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstoolsVersionTask.as b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstoolsVersionTask.as
index a8f5e2b5e3..103da0ccaf 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstoolsVersionTask.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstoolsVersionTask.as
@@ -1,17 +1,32 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group,
-* University of Kentucky and the Laboratory for Advanced Networking.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ * Copyright (c) 2011-2012 University of Kentucky.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.instools.instasks
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstoolsVersionsTaskGroup.as b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstoolsVersionsTaskGroup.as
index 7523b8f5f4..521ddcdb9e 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstoolsVersionsTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstoolsVersionsTaskGroup.as
@@ -1,17 +1,32 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group,
-* University of Kentucky and the Laboratory for Advanced Networking.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ * Copyright (c) 2011-2012 University of Kentucky.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.instools.instasks
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstrumentizeSliceGroupTask.as b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstrumentizeSliceGroupTask.as
index 4ef9e8fad4..3b1de94f11 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstrumentizeSliceGroupTask.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstrumentizeSliceGroupTask.as
@@ -1,17 +1,32 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group,
-* University of Kentucky and the Laboratory for Advanced Networking.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ * Copyright (c) 2011-2012 University of Kentucky.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.instools.instasks
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstrumentizeTask.as b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstrumentizeTask.as
index bdad9cd316..7f9f841d01 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstrumentizeTask.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/InstrumentizeTask.as
@@ -1,17 +1,32 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group,
-* University of Kentucky and the Laboratory for Advanced Networking.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ * Copyright (c) 2011-2012 University of Kentucky.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.instools.instasks
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/PollInstoolsStatusTask.as b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/PollInstoolsStatusTask.as
index 9bf70d81d3..d2edc5b452 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/PollInstoolsStatusTask.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/PollInstoolsStatusTask.as
@@ -1,17 +1,32 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group,
-* University of Kentucky and the Laboratory for Advanced Networking.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ * Copyright (c) 2011-2012 University of Kentucky.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.instools.instasks
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/PollInstoolsStatusTaskGroup.as b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/PollInstoolsStatusTaskGroup.as
index 7028245195..905b021ab7 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/PollInstoolsStatusTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/PollInstoolsStatusTaskGroup.as
@@ -1,17 +1,32 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group,
-* University of Kentucky and the Laboratory for Advanced Networking.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ * Copyright (c) 2011-2012 University of Kentucky.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.instools.instasks
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/SaveManifestTask.as b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/SaveManifestTask.as
index e415f1e658..56f6a7436f 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/SaveManifestTask.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/SaveManifestTask.as
@@ -1,17 +1,32 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group,
-* University of Kentucky and the Laboratory for Advanced Networking.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ * Copyright (c) 2011-2012 University of Kentucky.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.instools.instasks
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/SaveManifestTaskGroup.as b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/SaveManifestTaskGroup.as
index 77f8dd6818..eaea13d25b 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/SaveManifestTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/instools/instasks/SaveManifestTaskGroup.as
@@ -1,17 +1,32 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group,
-* University of Kentucky and the Laboratory for Advanced Networking.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ * Copyright (c) 2011-2012 University of Kentucky.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.instools.instasks
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/openflow/Openflow.as b/protogeni/flack/src/com/flack/geni/plugins/openflow/Openflow.as
index 403e728070..2b9c0f3754 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/openflow/Openflow.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/openflow/Openflow.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.openflow
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/openflow/OpenflowRspecProcessor.as b/protogeni/flack/src/com/flack/geni/plugins/openflow/OpenflowRspecProcessor.as
index 1626f37c49..b067ef5b7f 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/openflow/OpenflowRspecProcessor.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/openflow/OpenflowRspecProcessor.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.openflow
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/planetlab/FwRule.as b/protogeni/flack/src/com/flack/geni/plugins/planetlab/FwRule.as
index 5b03590266..c2aecc9807 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/planetlab/FwRule.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/planetlab/FwRule.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.planetlab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/planetlab/FwRuleComponent.mxml b/protogeni/flack/src/com/flack/geni/plugins/planetlab/FwRuleComponent.mxml
index f775f8ced3..f1a07c35c6 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/planetlab/FwRuleComponent.mxml
+++ b/protogeni/flack/src/com/flack/geni/plugins/planetlab/FwRuleComponent.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1LargeSliverType.as b/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1LargeSliverType.as
index 06235ce0e4..a514b1e97f 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1LargeSliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1LargeSliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.planetlab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1MediumSliverType.as b/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1MediumSliverType.as
index 687683860d..08c4fabcc5 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1MediumSliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1MediumSliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.planetlab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1SmallSliverType.as b/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1SmallSliverType.as
index 1bdeebf6c8..2a2dc7a2a5 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1SmallSliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1SmallSliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.planetlab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1TinySliverType.as b/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1TinySliverType.as
index 365a842bae..d33a93dfc6 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1TinySliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1TinySliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.planetlab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1WorkerSliverType.as b/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1WorkerSliverType.as
index 3c3cf3854e..eb4793593a 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1WorkerSliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1WorkerSliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.planetlab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1XLargeSliverType.as b/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1XLargeSliverType.as
index f05dcede87..eeba69b818 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1XLargeSliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/planetlab/M1XLargeSliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.planetlab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/planetlab/OpenStackSliverType.as b/protogeni/flack/src/com/flack/geni/plugins/planetlab/OpenStackSliverType.as
index 8997866d9a..92626c9554 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/planetlab/OpenStackSliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/planetlab/OpenStackSliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.planetlab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/planetlab/OpenStackVgroup.mxml b/protogeni/flack/src/com/flack/geni/plugins/planetlab/OpenStackVgroup.mxml
index 95937b3d62..4acbb922c0 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/planetlab/OpenStackVgroup.mxml
+++ b/protogeni/flack/src/com/flack/geni/plugins/planetlab/OpenStackVgroup.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/plugins/planetlab/Planetlab.as b/protogeni/flack/src/com/flack/geni/plugins/planetlab/Planetlab.as
index a77707957f..db32aafdb2 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/planetlab/Planetlab.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/planetlab/Planetlab.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.planetlab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/planetlab/PlanetlabArea.mxml b/protogeni/flack/src/com/flack/geni/plugins/planetlab/PlanetlabArea.mxml
index fb10c04eff..80b68f688d 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/planetlab/PlanetlabArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/plugins/planetlab/PlanetlabArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/plugins/planetlab/PlanetlabSliverType.as b/protogeni/flack/src/com/flack/geni/plugins/planetlab/PlanetlabSliverType.as
index 64f2ef5e3b..6e4d2b0e68 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/planetlab/PlanetlabSliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/planetlab/PlanetlabSliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.planetlab
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/planetlab/PlanetlabVgroup.mxml b/protogeni/flack/src/com/flack/geni/plugins/planetlab/PlanetlabVgroup.mxml
index f248cb42bc..ae1d5f4345 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/planetlab/PlanetlabVgroup.mxml
+++ b/protogeni/flack/src/com/flack/geni/plugins/planetlab/PlanetlabVgroup.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/geni/plugins/shadownet/JuniperRouterSliverType.as b/protogeni/flack/src/com/flack/geni/plugins/shadownet/JuniperRouterSliverType.as
index aef1a38e06..c0abe16bdc 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/shadownet/JuniperRouterSliverType.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/shadownet/JuniperRouterSliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.shadownet
{
diff --git a/protogeni/flack/src/com/flack/geni/plugins/shadownet/Shadownet.as b/protogeni/flack/src/com/flack/geni/plugins/shadownet/Shadownet.as
index d27537d5a4..8abff651f5 100644
--- a/protogeni/flack/src/com/flack/geni/plugins/shadownet/Shadownet.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/shadownet/Shadownet.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.plugins.shadownet
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/DiskImage.as b/protogeni/flack/src/com/flack/geni/resources/DiskImage.as
index e081d4cffb..5b5b69bf00 100644
--- a/protogeni/flack/src/com/flack/geni/resources/DiskImage.as
+++ b/protogeni/flack/src/com/flack/geni/resources/DiskImage.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/ExtensionAttribute.as b/protogeni/flack/src/com/flack/geni/resources/ExtensionAttribute.as
index 1b182f579f..0aac264ccc 100644
--- a/protogeni/flack/src/com/flack/geni/resources/ExtensionAttribute.as
+++ b/protogeni/flack/src/com/flack/geni/resources/ExtensionAttribute.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/ExtensionSpace.as b/protogeni/flack/src/com/flack/geni/resources/ExtensionSpace.as
index 001340cff8..3b36f6751d 100644
--- a/protogeni/flack/src/com/flack/geni/resources/ExtensionSpace.as
+++ b/protogeni/flack/src/com/flack/geni/resources/ExtensionSpace.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/ExtensionSpaceCollection.as b/protogeni/flack/src/com/flack/geni/resources/ExtensionSpaceCollection.as
index 103e6538ec..08f6354a8a 100644
--- a/protogeni/flack/src/com/flack/geni/resources/ExtensionSpaceCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/ExtensionSpaceCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/Extensions.as b/protogeni/flack/src/com/flack/geni/resources/Extensions.as
index 4ec2dd371a..d5c1e347df 100644
--- a/protogeni/flack/src/com/flack/geni/resources/Extensions.as
+++ b/protogeni/flack/src/com/flack/geni/resources/Extensions.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/GeniUser.as b/protogeni/flack/src/com/flack/geni/resources/GeniUser.as
index 5ef6515e47..a6285dcf44 100644
--- a/protogeni/flack/src/com/flack/geni/resources/GeniUser.as
+++ b/protogeni/flack/src/com/flack/geni/resources/GeniUser.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/Property.as b/protogeni/flack/src/com/flack/geni/resources/Property.as
index 564443e797..1e6b596232 100644
--- a/protogeni/flack/src/com/flack/geni/resources/Property.as
+++ b/protogeni/flack/src/com/flack/geni/resources/Property.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/PropertyCollection.as b/protogeni/flack/src/com/flack/geni/resources/PropertyCollection.as
index 98391329f1..69ac5e9a1a 100644
--- a/protogeni/flack/src/com/flack/geni/resources/PropertyCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/PropertyCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/SliverType.as b/protogeni/flack/src/com/flack/geni/resources/SliverType.as
index f3b0a5bf3b..f189a40f96 100644
--- a/protogeni/flack/src/com/flack/geni/resources/SliverType.as
+++ b/protogeni/flack/src/com/flack/geni/resources/SliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/SliverTypeCollection.as b/protogeni/flack/src/com/flack/geni/resources/SliverTypeCollection.as
index f636238853..c8a78d6273 100644
--- a/protogeni/flack/src/com/flack/geni/resources/SliverTypeCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/SliverTypeCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/SliverTypes.as b/protogeni/flack/src/com/flack/geni/resources/SliverTypes.as
index c24e99b8e1..cb1617145d 100644
--- a/protogeni/flack/src/com/flack/geni/resources/SliverTypes.as
+++ b/protogeni/flack/src/com/flack/geni/resources/SliverTypes.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/docs/GeniCredential.as b/protogeni/flack/src/com/flack/geni/resources/docs/GeniCredential.as
index d51987fcd3..ce34d6c188 100644
--- a/protogeni/flack/src/com/flack/geni/resources/docs/GeniCredential.as
+++ b/protogeni/flack/src/com/flack/geni/resources/docs/GeniCredential.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.docs
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/physical/DiskImageCollection.as b/protogeni/flack/src/com/flack/geni/resources/physical/DiskImageCollection.as
index 52e8e11716..2afa9cf7e7 100644
--- a/protogeni/flack/src/com/flack/geni/resources/physical/DiskImageCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/physical/DiskImageCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/physical/HardwareType.as b/protogeni/flack/src/com/flack/geni/resources/physical/HardwareType.as
index c186c62a19..38ba1448d6 100644
--- a/protogeni/flack/src/com/flack/geni/resources/physical/HardwareType.as
+++ b/protogeni/flack/src/com/flack/geni/resources/physical/HardwareType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/physical/HardwareTypeCollection.as b/protogeni/flack/src/com/flack/geni/resources/physical/HardwareTypeCollection.as
index 0ba35d9ca4..1afa1f8823 100644
--- a/protogeni/flack/src/com/flack/geni/resources/physical/HardwareTypeCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/physical/HardwareTypeCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/physical/MapLocation.as b/protogeni/flack/src/com/flack/geni/resources/physical/MapLocation.as
index 0fd141367d..3a5f0cd9dc 100644
--- a/protogeni/flack/src/com/flack/geni/resources/physical/MapLocation.as
+++ b/protogeni/flack/src/com/flack/geni/resources/physical/MapLocation.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalInterface.as b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalInterface.as
index 732002d800..7de43801ef 100644
--- a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalInterface.as
+++ b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalInterface.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalInterfaceCollection.as b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalInterfaceCollection.as
index f6b4adf88e..2f6428162c 100644
--- a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalInterfaceCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalInterfaceCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLink.as b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLink.as
index 7aa3f3094c..962ba8056a 100644
--- a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLink.as
+++ b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLink.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLinkCollection.as b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLinkCollection.as
index 49b6ebf3c3..dffa17f2c9 100644
--- a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLinkCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLinkCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLocation.as b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLocation.as
index 2d7b3869d3..9a204c09d1 100644
--- a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLocation.as
+++ b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLocation.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLocationCollection.as b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLocationCollection.as
index d8d61f581a..b3847a5992 100644
--- a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLocationCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalLocationCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalNode.as b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalNode.as
index d8d56d3b58..bec41db445 100644
--- a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalNode.as
+++ b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalNode.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalNodeCollection.as b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalNodeCollection.as
index e7f4175991..190e46be6d 100644
--- a/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalNodeCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/physical/PhysicalNodeCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/sites/GeniAuthority.as b/protogeni/flack/src/com/flack/geni/resources/sites/GeniAuthority.as
index 42b3d0cf8f..87697a7f29 100644
--- a/protogeni/flack/src/com/flack/geni/resources/sites/GeniAuthority.as
+++ b/protogeni/flack/src/com/flack/geni/resources/sites/GeniAuthority.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/sites/GeniAuthorityCollection.as b/protogeni/flack/src/com/flack/geni/resources/sites/GeniAuthorityCollection.as
index 70fca009b7..ab695ec20f 100644
--- a/protogeni/flack/src/com/flack/geni/resources/sites/GeniAuthorityCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/sites/GeniAuthorityCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/sites/GeniManager.as b/protogeni/flack/src/com/flack/geni/resources/sites/GeniManager.as
index 486feeac28..8fd76a4bd9 100644
--- a/protogeni/flack/src/com/flack/geni/resources/sites/GeniManager.as
+++ b/protogeni/flack/src/com/flack/geni/resources/sites/GeniManager.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/sites/GeniManagerCollection.as b/protogeni/flack/src/com/flack/geni/resources/sites/GeniManagerCollection.as
index 3a08a7fd79..45fb5ec6d9 100644
--- a/protogeni/flack/src/com/flack/geni/resources/sites/GeniManagerCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/sites/GeniManagerCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/sites/SupportedLinkType.as b/protogeni/flack/src/com/flack/geni/resources/sites/SupportedLinkType.as
index 71a7dd1c7d..6311885c88 100644
--- a/protogeni/flack/src/com/flack/geni/resources/sites/SupportedLinkType.as
+++ b/protogeni/flack/src/com/flack/geni/resources/sites/SupportedLinkType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/sites/SupportedLinkTypeCollection.as b/protogeni/flack/src/com/flack/geni/resources/sites/SupportedLinkTypeCollection.as
index f78fd67358..2487cb0469 100644
--- a/protogeni/flack/src/com/flack/geni/resources/sites/SupportedLinkTypeCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/sites/SupportedLinkTypeCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/sites/SupportedSliverType.as b/protogeni/flack/src/com/flack/geni/resources/sites/SupportedSliverType.as
index 5f93d60dfe..4f1b88e872 100644
--- a/protogeni/flack/src/com/flack/geni/resources/sites/SupportedSliverType.as
+++ b/protogeni/flack/src/com/flack/geni/resources/sites/SupportedSliverType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/sites/SupportedSliverTypeCollection.as b/protogeni/flack/src/com/flack/geni/resources/sites/SupportedSliverTypeCollection.as
index 6eca534979..8cddbf1bae 100644
--- a/protogeni/flack/src/com/flack/geni/resources/sites/SupportedSliverTypeCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/sites/SupportedSliverTypeCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/sites/authorities/ProtogeniSliceAuthority.as b/protogeni/flack/src/com/flack/geni/resources/sites/authorities/ProtogeniSliceAuthority.as
index 2062a5a315..91c67f0eac 100644
--- a/protogeni/flack/src/com/flack/geni/resources/sites/authorities/ProtogeniSliceAuthority.as
+++ b/protogeni/flack/src/com/flack/geni/resources/sites/authorities/ProtogeniSliceAuthority.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.sites.authorities
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/sites/clearinghouses/ProtogeniClearinghouse.as b/protogeni/flack/src/com/flack/geni/resources/sites/clearinghouses/ProtogeniClearinghouse.as
index a09b0809eb..4a43d190eb 100644
--- a/protogeni/flack/src/com/flack/geni/resources/sites/clearinghouses/ProtogeniClearinghouse.as
+++ b/protogeni/flack/src/com/flack/geni/resources/sites/clearinghouses/ProtogeniClearinghouse.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.sites.clearinghouses
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/sites/managers/OpenflowAggregateManager.as b/protogeni/flack/src/com/flack/geni/resources/sites/managers/OpenflowAggregateManager.as
index 9ee73e098e..14035a4f03 100644
--- a/protogeni/flack/src/com/flack/geni/resources/sites/managers/OpenflowAggregateManager.as
+++ b/protogeni/flack/src/com/flack/geni/resources/sites/managers/OpenflowAggregateManager.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.sites.managers
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/sites/managers/PlanetlabAggregateManager.as b/protogeni/flack/src/com/flack/geni/resources/sites/managers/PlanetlabAggregateManager.as
index e731bf7e9c..c527a9634a 100644
--- a/protogeni/flack/src/com/flack/geni/resources/sites/managers/PlanetlabAggregateManager.as
+++ b/protogeni/flack/src/com/flack/geni/resources/sites/managers/PlanetlabAggregateManager.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.sites.managers
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/sites/managers/ProtogeniComponentManager.as b/protogeni/flack/src/com/flack/geni/resources/sites/managers/ProtogeniComponentManager.as
index 7e452f9408..8510ba6138 100644
--- a/protogeni/flack/src/com/flack/geni/resources/sites/managers/ProtogeniComponentManager.as
+++ b/protogeni/flack/src/com/flack/geni/resources/sites/managers/ProtogeniComponentManager.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.sites.managers
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/ComponentHop.as b/protogeni/flack/src/com/flack/geni/resources/virtual/ComponentHop.as
index 5ea64e958d..5cd853e4da 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/ComponentHop.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/ComponentHop.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/ExecuteService.as b/protogeni/flack/src/com/flack/geni/resources/virtual/ExecuteService.as
index fdbdac591e..cd491b3f2e 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/ExecuteService.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/ExecuteService.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/GeniManagerReference.as b/protogeni/flack/src/com/flack/geni/resources/virtual/GeniManagerReference.as
index 062e3db0fa..3263a3a769 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/GeniManagerReference.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/GeniManagerReference.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/GeniManagerReferenceCollection.as b/protogeni/flack/src/com/flack/geni/resources/virtual/GeniManagerReferenceCollection.as
index c0fca350e2..d435727e2e 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/GeniManagerReferenceCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/GeniManagerReferenceCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/Host.as b/protogeni/flack/src/com/flack/geni/resources/virtual/Host.as
index 487601b73d..4cdec7061f 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/Host.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/Host.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/InstallService.as b/protogeni/flack/src/com/flack/geni/resources/virtual/InstallService.as
index 43c809f9d2..097829cba9 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/InstallService.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/InstallService.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/Ip.as b/protogeni/flack/src/com/flack/geni/resources/virtual/Ip.as
index fc64befff9..b63e9ab757 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/Ip.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/Ip.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/LinkType.as b/protogeni/flack/src/com/flack/geni/resources/virtual/LinkType.as
index 376be531ca..99dcd805f4 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/LinkType.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/LinkType.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/LoginService.as b/protogeni/flack/src/com/flack/geni/resources/virtual/LoginService.as
index e1ef77423d..90da2b037d 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/LoginService.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/LoginService.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/Services.as b/protogeni/flack/src/com/flack/geni/resources/virtual/Services.as
index db9b6a5a32..e3050b8b61 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/Services.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/Services.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/Slice.as b/protogeni/flack/src/com/flack/geni/resources/virtual/Slice.as
index 3223d903a8..578a4d9336 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/Slice.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/Slice.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/SliceCollection.as b/protogeni/flack/src/com/flack/geni/resources/virtual/SliceCollection.as
index 869ef1e7ff..47a7e9acff 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/SliceCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/SliceCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/Sliver.as b/protogeni/flack/src/com/flack/geni/resources/virtual/Sliver.as
index f180b0e2f3..9589784963 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/Sliver.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/Sliver.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/SliverCollection.as b/protogeni/flack/src/com/flack/geni/resources/virtual/SliverCollection.as
index 6e2b11819c..9140ef2847 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/SliverCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/SliverCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/SliverCollectionCollection.as b/protogeni/flack/src/com/flack/geni/resources/virtual/SliverCollectionCollection.as
index cd0fecbd6a..244ebe437f 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/SliverCollectionCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/SliverCollectionCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualComponent.as b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualComponent.as
index 285849aea3..bf995f98e1 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualComponent.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualComponent.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterface.as b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterface.as
index 0f2f410c0d..17b9091dfa 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterface.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterface.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterfaceCollection.as b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterfaceCollection.as
index 299d23ea5a..665b825cc8 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterfaceCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterfaceCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterfaceReference.as b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterfaceReference.as
index 35e35cded3..9668646e30 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterfaceReference.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterfaceReference.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterfaceReferenceCollection.as b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterfaceReferenceCollection.as
index b4d36e321d..efb7c6ad5a 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterfaceReferenceCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualInterfaceReferenceCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualLink.as b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualLink.as
index 7c134252d7..b3742f4728 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualLink.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualLink.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualLinkCollection.as b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualLinkCollection.as
index 38d5e662f3..cf84e4f242 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualLinkCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualLinkCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualNode.as b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualNode.as
index 58c9d4e941..c693b5c19a 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualNode.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualNode.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualNodeCollection.as b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualNodeCollection.as
index 154209386c..40a7bf8d03 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualNodeCollection.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/VirtualNodeCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/ClientInfo.as b/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/ClientInfo.as
index edf9f4810a..e57974ac87 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/ClientInfo.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/ClientInfo.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual.extensions
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/LinkFlackInfo.as b/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/LinkFlackInfo.as
index eab9051472..d5709242e6 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/LinkFlackInfo.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/LinkFlackInfo.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual.extensions
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/MCInfo.as b/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/MCInfo.as
index 634132c252..18b1a57afc 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/MCInfo.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/MCInfo.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual.extensions
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/NodeFlackInfo.as b/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/NodeFlackInfo.as
index f98371e6b3..ce34d4e197 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/NodeFlackInfo.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/NodeFlackInfo.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual.extensions
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/SliceFlackInfo.as b/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/SliceFlackInfo.as
index 9f37da12bf..1d4fb4b97c 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/SliceFlackInfo.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/SliceFlackInfo.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual.extensions
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/slicehistory/SliceHistory.as b/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/slicehistory/SliceHistory.as
index 89837919e7..77cbdf0a7a 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/slicehistory/SliceHistory.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/slicehistory/SliceHistory.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual.extensions.slicehistory
{
diff --git a/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/slicehistory/SliceHistoryItem.as b/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/slicehistory/SliceHistoryItem.as
index 1211893ea6..7587051271 100644
--- a/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/slicehistory/SliceHistoryItem.as
+++ b/protogeni/flack/src/com/flack/geni/resources/virtual/extensions/slicehistory/SliceHistoryItem.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.resources.virtual.extensions.slicehistory
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/GetCertBundlesTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/GetCertBundlesTaskGroup.as
index 6c7a342870..a2d2cc9ba5 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/GetCertBundlesTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/GetCertBundlesTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/GetManagerTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/GetManagerTaskGroup.as
index eb2ff13524..3eca56ded1 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/GetManagerTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/GetManagerTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/GetPublicResourcesTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/GetPublicResourcesTaskGroup.as
index db5165b517..3a57ba14df 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/GetPublicResourcesTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/GetPublicResourcesTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/GetResourcesTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/GetResourcesTaskGroup.as
index 3dc27b6b94..721289d802 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/GetResourcesTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/GetResourcesTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/GetUserTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/GetUserTaskGroup.as
index 5f11e1587f..dc24e45ba8 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/GetUserTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/GetUserTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/InitializeUserTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/InitializeUserTaskGroup.as
index 084b37c00d..1f82be775f 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/InitializeUserTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/InitializeUserTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/ResolveUserTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/ResolveUserTaskGroup.as
index c392b39a31..b7d1adebae 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/ResolveUserTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/ResolveUserTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/CreateSliceTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/CreateSliceTaskGroup.as
index ff263f8553..a5f7f10772 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/CreateSliceTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/CreateSliceTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups.slice
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/CreateSliversTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/CreateSliversTaskGroup.as
index 84f2bdb9a4..5a82374a4f 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/CreateSliversTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/CreateSliversTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups.slice
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/DeleteSliversTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/DeleteSliversTaskGroup.as
index 62d441148d..ce3814a2e5 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/DeleteSliversTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/DeleteSliversTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups.slice
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/GetSliceTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/GetSliceTaskGroup.as
index aa4df7fe97..b9f6fd6d64 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/GetSliceTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/GetSliceTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups.slice
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/ImportSliceTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/ImportSliceTaskGroup.as
index ac19ecc142..1c3948f5e2 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/ImportSliceTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/ImportSliceTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups.slice
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RefreshSliceStatusTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RefreshSliceStatusTaskGroup.as
index 451972b958..084537c071 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RefreshSliceStatusTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RefreshSliceStatusTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups.slice
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RenewSliceTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RenewSliceTaskGroup.as
index 6480471423..2677f2a2b4 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RenewSliceTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RenewSliceTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups.slice
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RestartSliceTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RestartSliceTaskGroup.as
index f6d209795a..032463e1b3 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RestartSliceTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RestartSliceTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups.slice
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RevertToManifestsTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RevertToManifestsTaskGroup.as
index 2be2c009d3..3bea92d420 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RevertToManifestsTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/RevertToManifestsTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups.slice
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/StartSliceTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/StartSliceTaskGroup.as
index 4842a22dff..4b6ffb6747 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/StartSliceTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/StartSliceTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups.slice
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/StopSliceTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/StopSliceTaskGroup.as
index 914bf2301c..7bfb4a7dd0 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/StopSliceTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/StopSliceTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups.slice
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/SubmitSliceTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/SubmitSliceTaskGroup.as
index 4b19e1bf97..89486e05fa 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/SubmitSliceTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/SubmitSliceTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups.slice
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/UpdateSliversTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/UpdateSliversTaskGroup.as
index bf2a2182fe..f698499b67 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/groups/slice/UpdateSliversTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/groups/slice/UpdateSliversTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.groups.slice
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/http/PublicListAuthoritiesTask.as b/protogeni/flack/src/com/flack/geni/tasks/http/PublicListAuthoritiesTask.as
index f9c1d93b27..9c02a5a9ed 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/http/PublicListAuthoritiesTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/http/PublicListAuthoritiesTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.http
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/http/PublicListManagersTask.as b/protogeni/flack/src/com/flack/geni/tasks/http/PublicListManagersTask.as
index 503339c712..b28c678f03 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/http/PublicListManagersTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/http/PublicListManagersTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.http
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/http/PublicListResourcesTask.as b/protogeni/flack/src/com/flack/geni/tasks/http/PublicListResourcesTask.as
index 42d0b1ca4f..bb9ef5a878 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/http/PublicListResourcesTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/http/PublicListResourcesTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.http
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/process/GenerateNsTask.as b/protogeni/flack/src/com/flack/geni/tasks/process/GenerateNsTask.as
index 56ddff06d7..7534088c6f 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/process/GenerateNsTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/process/GenerateNsTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.process
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/process/GenerateRequestManifestTask.as b/protogeni/flack/src/com/flack/geni/tasks/process/GenerateRequestManifestTask.as
index 572761177c..710ace4575 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/process/GenerateRequestManifestTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/process/GenerateRequestManifestTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.process
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/process/ParseAdvertisementTask.as b/protogeni/flack/src/com/flack/geni/tasks/process/ParseAdvertisementTask.as
index 4010ed919d..eae71f86cf 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/process/ParseAdvertisementTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/process/ParseAdvertisementTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.process
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/process/ParseRequestManifestTask.as b/protogeni/flack/src/com/flack/geni/tasks/process/ParseRequestManifestTask.as
index 012d9d719f..ba7493a3ea 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/process/ParseRequestManifestTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/process/ParseRequestManifestTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.process
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/process/StartImportSliceTask.as b/protogeni/flack/src/com/flack/geni/tasks/process/StartImportSliceTask.as
index 31f4964b15..9f064c00df 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/process/StartImportSliceTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/process/StartImportSliceTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.process
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/tests/AuthorityTestGroup.as b/protogeni/flack/src/com/flack/geni/tasks/tests/AuthorityTestGroup.as
index bfdaf88bde..a15579a0c9 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/tests/AuthorityTestGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/tests/AuthorityTestGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.tests
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/tests/ClearinghouseTestGroup.as b/protogeni/flack/src/com/flack/geni/tasks/tests/ClearinghouseTestGroup.as
index 042f0caa2f..785cb9309c 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/tests/ClearinghouseTestGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/tests/ClearinghouseTestGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.tests
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/tests/ManagerAdvertisementsTestGroup.as b/protogeni/flack/src/com/flack/geni/tasks/tests/ManagerAdvertisementsTestGroup.as
index ad93e6bf39..b8413874c0 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/tests/ManagerAdvertisementsTestGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/tests/ManagerAdvertisementsTestGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.tests
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/tests/ManagerAllocationTestGroup.as b/protogeni/flack/src/com/flack/geni/tasks/tests/ManagerAllocationTestGroup.as
index 3f75639f61..6d75f10b83 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/tests/ManagerAllocationTestGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/tests/ManagerAllocationTestGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.tests
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/tests/TestCcrTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/tests/TestCcrTaskGroup.as
index bce2fc6cba..7b78b98947 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/tests/TestCcrTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/tests/TestCcrTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.tests
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/tests/TestCombineMultipleTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/tests/TestCombineMultipleTaskGroup.as
index 7b5f5a8809..14a4fefd57 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/tests/TestCombineMultipleTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/tests/TestCombineMultipleTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.tests
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/tests/TestSliceFailureModesTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/tests/TestSliceFailureModesTaskGroup.as
index 546b2c6e8e..b5da30fb83 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/tests/TestSliceFailureModesTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/tests/TestSliceFailureModesTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.tests
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/tests/TestSliceHistoryTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/tests/TestSliceHistoryTaskGroup.as
index f13421dbbb..12c515c3e6 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/tests/TestSliceHistoryTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/tests/TestSliceHistoryTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.tests
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/tests/TestSliceSuccessModesTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/tests/TestSliceSuccessModesTaskGroup.as
index 27e2c4ba69..211d3454ab 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/tests/TestSliceSuccessModesTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/tests/TestSliceSuccessModesTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.tests
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/tests/TestTaskGroup.as b/protogeni/flack/src/com/flack/geni/tasks/tests/TestTaskGroup.as
index 6092df5700..75a7faf351 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/tests/TestTaskGroup.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/tests/TestTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.tests
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/tests/TestsliceRspec.as b/protogeni/flack/src/com/flack/geni/tasks/tests/TestsliceRspec.as
index db26b1d4ed..64dc379a04 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/tests/TestsliceRspec.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/tests/TestsliceRspec.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.tests
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/tests/TestsliceRspecLeft.as b/protogeni/flack/src/com/flack/geni/tasks/tests/TestsliceRspecLeft.as
index 2509eb612c..53ef00bb97 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/tests/TestsliceRspecLeft.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/tests/TestsliceRspecLeft.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.tests
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/tests/TestsliceRspecRight.as b/protogeni/flack/src/com/flack/geni/tasks/tests/TestsliceRspecRight.as
index 4285e23093..547c9c0912 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/tests/TestsliceRspecRight.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/tests/TestsliceRspecRight.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.tests
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/AllocateTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/AllocateTask.as
index 16d7f49c0d..1ff044293b 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/AllocateTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/AllocateTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.am
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/AmXmlrpcTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/AmXmlrpcTask.as
index 7e0072a2c7..b457435184 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/AmXmlrpcTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/AmXmlrpcTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.am
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/CreateSliverTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/CreateSliverTask.as
index 925ef35b0f..0806dd5e48 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/CreateSliverTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/CreateSliverTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.am
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/DeleteTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/DeleteTask.as
index f256f1d95a..cd60f92e4a 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/DeleteTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/DeleteTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.am
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/GetVersionTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/GetVersionTask.as
index e98d0cd97c..93b322d4f6 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/GetVersionTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/GetVersionTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.am
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/ListManagerResourcesTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/ListManagerResourcesTask.as
index 392d449e8a..1179aed264 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/ListManagerResourcesTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/ListManagerResourcesTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.am
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/ListSliverResourcesTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/ListSliverResourcesTask.as
index ffaecd5669..cb1df4377e 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/ListSliverResourcesTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/ListSliverResourcesTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.am
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/ProvisionTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/ProvisionTask.as
index 442fce38c2..925b67b462 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/ProvisionTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/ProvisionTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.am
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/RenewTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/RenewTask.as
index 931e9e59ef..cca6637c7f 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/RenewTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/RenewTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.am
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/StatusTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/StatusTask.as
index d0b3a34cbc..bebec023b4 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/StatusTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/StatusTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.am
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/ProtogeniXmlrpcTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/ProtogeniXmlrpcTask.as
index 81fa12b94f..7b36a82b54 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/ProtogeniXmlrpcTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/ProtogeniXmlrpcTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/ch/ListComponentsChTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/ch/ListComponentsChTask.as
index 7dca1f220b..813c608e82 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/ch/ListComponentsChTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/ch/ListComponentsChTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.ch
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/ch/WhoAmIChTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/ch/WhoAmIChTask.as
index 1763dba644..c2908bffb5 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/ch/WhoAmIChTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/ch/WhoAmIChTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.ch
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/CreateImageCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/CreateImageCmTask.as
index 51c5bca839..979012c9ae 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/CreateImageCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/CreateImageCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/CreateSliverCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/CreateSliverCmTask.as
index b45b66175b..d4002f407d 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/CreateSliverCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/CreateSliverCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/DeleteSliverCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/DeleteSliverCmTask.as
index 33593fbba2..207748abdf 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/DeleteSliverCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/DeleteSliverCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/DiscoverResourcesCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/DiscoverResourcesCmTask.as
index 7dfb4b8f2e..9556f0e7d1 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/DiscoverResourcesCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/DiscoverResourcesCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/GetSliverCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/GetSliverCmTask.as
index b5f18f51b1..56d474d611 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/GetSliverCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/GetSliverCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/GetTicketCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/GetTicketCmTask.as
index a13a06b05e..b049e9c8d9 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/GetTicketCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/GetTicketCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/GetVersionCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/GetVersionCmTask.as
index 13e8b00ff7..ab137ce289 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/GetVersionCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/GetVersionCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/RedeemTicketCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/RedeemTicketCmTask.as
index 5f564fc111..21c1df726c 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/RedeemTicketCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/RedeemTicketCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/ReleaseTicketCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/ReleaseTicketCmTask.as
index 8fff91fbed..5fd14b2f85 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/ReleaseTicketCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/ReleaseTicketCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/RenewSliverCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/RenewSliverCmTask.as
index 492abf747a..b2aa414bb0 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/RenewSliverCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/RenewSliverCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/ResolveSliverCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/ResolveSliverCmTask.as
index a072dee569..d82c84b39b 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/ResolveSliverCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/ResolveSliverCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/RestartSliverCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/RestartSliverCmTask.as
index 4634e4ba69..3fa7153157 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/RestartSliverCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/RestartSliverCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/SliverStatusCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/SliverStatusCmTask.as
index e02360f5de..aec121657d 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/SliverStatusCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/SliverStatusCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/StartSliverCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/StartSliverCmTask.as
index bfac953636..5298ade170 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/StartSliverCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/StartSliverCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/StopSliverCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/StopSliverCmTask.as
index a0cd6e3652..b67450de17 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/StopSliverCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/StopSliverCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/UpdateSliverCmTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/UpdateSliverCmTask.as
index e7a7c3ed01..9550eba336 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/UpdateSliverCmTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/cm/UpdateSliverCmTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.cm
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/GetSliceCredentialSaTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/GetSliceCredentialSaTask.as
index 445e66c07f..be13508693 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/GetSliceCredentialSaTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/GetSliceCredentialSaTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.sa
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/GetUserCredentialSaTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/GetUserCredentialSaTask.as
index 68b53fec15..ec488c2e4f 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/GetUserCredentialSaTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/GetUserCredentialSaTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.sa
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/GetUserKeysSaTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/GetUserKeysSaTask.as
index 2cb8c5bed4..9a6da2c247 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/GetUserKeysSaTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/GetUserKeysSaTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.sa
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/RegisterSliceSaTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/RegisterSliceSaTask.as
index 54733340f3..b241b92b7c 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/RegisterSliceSaTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/RegisterSliceSaTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.sa
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/RemoveSliceSaTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/RemoveSliceSaTask.as
index 0a8e4e193e..a1a78ecb51 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/RemoveSliceSaTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/RemoveSliceSaTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.sa
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/RenewSliceSaTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/RenewSliceSaTask.as
index 828331f388..864f3d4a7f 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/RenewSliceSaTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/RenewSliceSaTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.sa
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/ResolveSliceSaTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/ResolveSliceSaTask.as
index 4a02291b9a..87e3f82f4a 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/ResolveSliceSaTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/ResolveSliceSaTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.sa
{
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/ResolveUserSaTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/ResolveUserSaTask.as
index 8725c37305..5844cdbc1e 100644
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/ResolveUserSaTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/protogeni/sa/ResolveUserSaTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.geni.tasks.xmlrpc.protogeni.sa
{
diff --git a/protogeni/flack/src/com/flack/shared/FlackDispatcher.as b/protogeni/flack/src/com/flack/shared/FlackDispatcher.as
index 6b93716496..28ce8f4cb7 100644
--- a/protogeni/flack/src/com/flack/shared/FlackDispatcher.as
+++ b/protogeni/flack/src/com/flack/shared/FlackDispatcher.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared
{
diff --git a/protogeni/flack/src/com/flack/shared/FlackEvent.as b/protogeni/flack/src/com/flack/shared/FlackEvent.as
index 626beda94f..8843bc0aef 100644
--- a/protogeni/flack/src/com/flack/shared/FlackEvent.as
+++ b/protogeni/flack/src/com/flack/shared/FlackEvent.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared
{
diff --git a/protogeni/flack/src/com/flack/shared/SharedCache.as b/protogeni/flack/src/com/flack/shared/SharedCache.as
index 18e463b791..af55207a87 100644
--- a/protogeni/flack/src/com/flack/shared/SharedCache.as
+++ b/protogeni/flack/src/com/flack/shared/SharedCache.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared
{
diff --git a/protogeni/flack/src/com/flack/shared/SharedMain.as b/protogeni/flack/src/com/flack/shared/SharedMain.as
index ec4526bd9e..aa52c5f924 100644
--- a/protogeni/flack/src/com/flack/shared/SharedMain.as
+++ b/protogeni/flack/src/com/flack/shared/SharedMain.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared
{
diff --git a/protogeni/flack/src/com/flack/shared/display/TaskGroupPeek.mxml b/protogeni/flack/src/com/flack/shared/display/TaskGroupPeek.mxml
index 52cc93b12e..ea7dba20b6 100644
--- a/protogeni/flack/src/com/flack/shared/display/TaskGroupPeek.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/TaskGroupPeek.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/TaskGroupView.mxml b/protogeni/flack/src/com/flack/shared/display/TaskGroupView.mxml
index 2716c9ecab..3d9bc4cf55 100644
--- a/protogeni/flack/src/com/flack/shared/display/TaskGroupView.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/TaskGroupView.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/TaskPeek.mxml b/protogeni/flack/src/com/flack/shared/display/TaskPeek.mxml
index 9b2fecbd63..e1090409b7 100644
--- a/protogeni/flack/src/com/flack/shared/display/TaskPeek.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/TaskPeek.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/TaskView.mxml b/protogeni/flack/src/com/flack/shared/display/TaskView.mxml
index c77f5f8aa9..65990fc43b 100644
--- a/protogeni/flack/src/com/flack/shared/display/TaskView.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/TaskView.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/areas/AboutArea.mxml b/protogeni/flack/src/com/flack/shared/display/areas/AboutArea.mxml
index 625a692e58..78c7feb6db 100644
--- a/protogeni/flack/src/com/flack/shared/display/areas/AboutArea.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/areas/AboutArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/areas/Area.mxml b/protogeni/flack/src/com/flack/shared/display/areas/Area.mxml
index fa33ae2af2..5cdda40019 100644
--- a/protogeni/flack/src/com/flack/shared/display/areas/Area.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/areas/Area.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/areas/AreaContent.mxml b/protogeni/flack/src/com/flack/shared/display/areas/AreaContent.mxml
index 6841933592..aa6f9a1d3c 100644
--- a/protogeni/flack/src/com/flack/shared/display/areas/AreaContent.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/areas/AreaContent.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/areas/AreaHistoryItem.mxml b/protogeni/flack/src/com/flack/shared/display/areas/AreaHistoryItem.mxml
index 072aa3c155..aa0fdead2a 100644
--- a/protogeni/flack/src/com/flack/shared/display/areas/AreaHistoryItem.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/areas/AreaHistoryItem.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/areas/DocumentArea.mxml b/protogeni/flack/src/com/flack/shared/display/areas/DocumentArea.mxml
index aa754aee19..072c781f5a 100644
--- a/protogeni/flack/src/com/flack/shared/display/areas/DocumentArea.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/areas/DocumentArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/areas/DocumentsArea.mxml b/protogeni/flack/src/com/flack/shared/display/areas/DocumentsArea.mxml
index 541492bf4e..21cf95e366 100644
--- a/protogeni/flack/src/com/flack/shared/display/areas/DocumentsArea.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/areas/DocumentsArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/areas/LogMessageArea.mxml b/protogeni/flack/src/com/flack/shared/display/areas/LogMessageArea.mxml
index 50f482c279..155bcd8e9d 100644
--- a/protogeni/flack/src/com/flack/shared/display/areas/LogMessageArea.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/areas/LogMessageArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/areas/LogMessagesRelatedToArea.mxml b/protogeni/flack/src/com/flack/shared/display/areas/LogMessagesRelatedToArea.mxml
index b0ee0f7d55..d01e26d356 100644
--- a/protogeni/flack/src/com/flack/shared/display/areas/LogMessagesRelatedToArea.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/areas/LogMessagesRelatedToArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/areas/MapContent.mxml b/protogeni/flack/src/com/flack/shared/display/areas/MapContent.mxml
index 933e44e3d5..76e5c5c4c3 100644
--- a/protogeni/flack/src/com/flack/shared/display/areas/MapContent.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/areas/MapContent.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/areas/TaskArea.mxml b/protogeni/flack/src/com/flack/shared/display/areas/TaskArea.mxml
index 4d6d4fed0f..213665c5f5 100644
--- a/protogeni/flack/src/com/flack/shared/display/areas/TaskArea.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/areas/TaskArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/areas/TaskGroupArea.mxml b/protogeni/flack/src/com/flack/shared/display/areas/TaskGroupArea.mxml
index 34e440d7e4..98dbe09bd8 100644
--- a/protogeni/flack/src/com/flack/shared/display/areas/TaskGroupArea.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/areas/TaskGroupArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/areas/TaskerArea.mxml b/protogeni/flack/src/com/flack/shared/display/areas/TaskerArea.mxml
index ce2cc13824..1e1db10826 100644
--- a/protogeni/flack/src/com/flack/shared/display/areas/TaskerArea.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/areas/TaskerArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/components/AdvancedTextArea.mxml b/protogeni/flack/src/com/flack/shared/display/components/AdvancedTextArea.mxml
index 4bb9e41aa3..48188de291 100644
--- a/protogeni/flack/src/com/flack/shared/display/components/AdvancedTextArea.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/components/AdvancedTextArea.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/components/DataButton.as b/protogeni/flack/src/com/flack/shared/display/components/DataButton.as
index d31804e9b6..6cb0e458f1 100644
--- a/protogeni/flack/src/com/flack/shared/display/components/DataButton.as
+++ b/protogeni/flack/src/com/flack/shared/display/components/DataButton.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.display.components
{
diff --git a/protogeni/flack/src/com/flack/shared/display/components/DefaultLine.mxml b/protogeni/flack/src/com/flack/shared/display/components/DefaultLine.mxml
index 98d09825c6..81c4ce8020 100644
--- a/protogeni/flack/src/com/flack/shared/display/components/DefaultLine.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/components/DefaultLine.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/components/DefaultWindow.mxml b/protogeni/flack/src/com/flack/shared/display/components/DefaultWindow.mxml
index 4679adc7c2..a9f98d10d0 100644
--- a/protogeni/flack/src/com/flack/shared/display/components/DefaultWindow.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/components/DefaultWindow.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/components/DocumentWindow.mxml b/protogeni/flack/src/com/flack/shared/display/components/DocumentWindow.mxml
index 52c76859e7..4f44f10722 100644
--- a/protogeni/flack/src/com/flack/shared/display/components/DocumentWindow.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/components/DocumentWindow.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/components/ImageButton.as b/protogeni/flack/src/com/flack/shared/display/components/ImageButton.as
index 9325e6d05a..325912eab5 100644
--- a/protogeni/flack/src/com/flack/shared/display/components/ImageButton.as
+++ b/protogeni/flack/src/com/flack/shared/display/components/ImageButton.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.display.components
{
diff --git a/protogeni/flack/src/com/flack/shared/display/components/MenuButton.mxml b/protogeni/flack/src/com/flack/shared/display/components/MenuButton.mxml
index 21df8ae8ef..a837302b4a 100644
--- a/protogeni/flack/src/com/flack/shared/display/components/MenuButton.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/components/MenuButton.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/components/MultiDocumentWindow.mxml b/protogeni/flack/src/com/flack/shared/display/components/MultiDocumentWindow.mxml
index 7141fc9b43..4e6ebe6bfd 100644
--- a/protogeni/flack/src/com/flack/shared/display/components/MultiDocumentWindow.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/components/MultiDocumentWindow.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/components/NumericEditor.mxml b/protogeni/flack/src/com/flack/shared/display/components/NumericEditor.mxml
index 0f1267aee1..a1676b4b1e 100644
--- a/protogeni/flack/src/com/flack/shared/display/components/NumericEditor.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/components/NumericEditor.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/components/NumericGridRenderer.mxml b/protogeni/flack/src/com/flack/shared/display/components/NumericGridRenderer.mxml
index a79e052c50..394cc555e2 100644
--- a/protogeni/flack/src/com/flack/shared/display/components/NumericGridRenderer.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/components/NumericGridRenderer.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
@@ -35,4 +49,4 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
<s:Label id="valueDisplay" height="100%" verticalAlign="middle" paddingLeft="4" />
-</s:GridItemRenderer>
\ No newline at end of file
+</s:GridItemRenderer>
diff --git a/protogeni/flack/src/com/flack/shared/display/components/PopupTitleWindow.as b/protogeni/flack/src/com/flack/shared/display/components/PopupTitleWindow.as
index e293879236..ea7c12acbe 100644
--- a/protogeni/flack/src/com/flack/shared/display/components/PopupTitleWindow.as
+++ b/protogeni/flack/src/com/flack/shared/display/components/PopupTitleWindow.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.display.components
{
diff --git a/protogeni/flack/src/com/flack/shared/display/components/TextInputWindow.mxml b/protogeni/flack/src/com/flack/shared/display/components/TextInputWindow.mxml
index 9eb31c3562..a7ba38c72a 100644
--- a/protogeni/flack/src/com/flack/shared/display/components/TextInputWindow.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/components/TextInputWindow.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/display/panes/TaskPane.mxml b/protogeni/flack/src/com/flack/shared/display/panes/TaskPane.mxml
index 8b912697f7..4456305313 100644
--- a/protogeni/flack/src/com/flack/shared/display/panes/TaskPane.mxml
+++ b/protogeni/flack/src/com/flack/shared/display/panes/TaskPane.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/flack/src/com/flack/shared/logging/LogMessage.as b/protogeni/flack/src/com/flack/shared/logging/LogMessage.as
index e423491924..3793cf6f1d 100644
--- a/protogeni/flack/src/com/flack/shared/logging/LogMessage.as
+++ b/protogeni/flack/src/com/flack/shared/logging/LogMessage.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.logging
{
diff --git a/protogeni/flack/src/com/flack/shared/logging/LogMessageCollection.as b/protogeni/flack/src/com/flack/shared/logging/LogMessageCollection.as
index 0c8d2a00f8..cf554e0ffb 100644
--- a/protogeni/flack/src/com/flack/shared/logging/LogMessageCollection.as
+++ b/protogeni/flack/src/com/flack/shared/logging/LogMessageCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.logging
{
diff --git a/protogeni/flack/src/com/flack/shared/logging/Logger.as b/protogeni/flack/src/com/flack/shared/logging/Logger.as
index 0b70ee4fe7..3f6c3ed96e 100644
--- a/protogeni/flack/src/com/flack/shared/logging/Logger.as
+++ b/protogeni/flack/src/com/flack/shared/logging/Logger.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.logging
{
diff --git a/protogeni/flack/src/com/flack/shared/resources/FlackUser.as b/protogeni/flack/src/com/flack/shared/resources/FlackUser.as
index 4ccb3399a0..88083767f9 100644
--- a/protogeni/flack/src/com/flack/shared/resources/FlackUser.as
+++ b/protogeni/flack/src/com/flack/shared/resources/FlackUser.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.resources
{
diff --git a/protogeni/flack/src/com/flack/shared/resources/IdentifiableObject.as b/protogeni/flack/src/com/flack/shared/resources/IdentifiableObject.as
index 2ba72181af..e5d452ca62 100644
--- a/protogeni/flack/src/com/flack/shared/resources/IdentifiableObject.as
+++ b/protogeni/flack/src/com/flack/shared/resources/IdentifiableObject.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.resources
{
diff --git a/protogeni/flack/src/com/flack/shared/resources/IdnUrn.as b/protogeni/flack/src/com/flack/shared/resources/IdnUrn.as
index c76956a15d..de874cece1 100644
--- a/protogeni/flack/src/com/flack/shared/resources/IdnUrn.as
+++ b/protogeni/flack/src/com/flack/shared/resources/IdnUrn.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.resources
{
diff --git a/protogeni/flack/src/com/flack/shared/resources/docs/Rspec.as b/protogeni/flack/src/com/flack/shared/resources/docs/Rspec.as
index 6e5699e91f..f17391d690 100644
--- a/protogeni/flack/src/com/flack/shared/resources/docs/Rspec.as
+++ b/protogeni/flack/src/com/flack/shared/resources/docs/Rspec.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.resources.docs
{
diff --git a/protogeni/flack/src/com/flack/shared/resources/docs/RspecVersion.as b/protogeni/flack/src/com/flack/shared/resources/docs/RspecVersion.as
index 1723b8eb8d..2790ac2773 100644
--- a/protogeni/flack/src/com/flack/shared/resources/docs/RspecVersion.as
+++ b/protogeni/flack/src/com/flack/shared/resources/docs/RspecVersion.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.resources.docs
{
diff --git a/protogeni/flack/src/com/flack/shared/resources/docs/RspecVersionCollection.as b/protogeni/flack/src/com/flack/shared/resources/docs/RspecVersionCollection.as
index 482f88c1ce..d6602138a2 100644
--- a/protogeni/flack/src/com/flack/shared/resources/docs/RspecVersionCollection.as
+++ b/protogeni/flack/src/com/flack/shared/resources/docs/RspecVersionCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.resources.docs
{
diff --git a/protogeni/flack/src/com/flack/shared/resources/physical/PhysicalComponent.as b/protogeni/flack/src/com/flack/shared/resources/physical/PhysicalComponent.as
index e9a070b47c..f78a6e3846 100644
--- a/protogeni/flack/src/com/flack/shared/resources/physical/PhysicalComponent.as
+++ b/protogeni/flack/src/com/flack/shared/resources/physical/PhysicalComponent.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.resources.physical
{
diff --git a/protogeni/flack/src/com/flack/shared/resources/sites/ApiDetails.as b/protogeni/flack/src/com/flack/shared/resources/sites/ApiDetails.as
index 3ece4a546d..c32ee38c53 100644
--- a/protogeni/flack/src/com/flack/shared/resources/sites/ApiDetails.as
+++ b/protogeni/flack/src/com/flack/shared/resources/sites/ApiDetails.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/shared/resources/sites/FlackManager.as b/protogeni/flack/src/com/flack/shared/resources/sites/FlackManager.as
index d3ffb146b0..6cc2cc4aad 100644
--- a/protogeni/flack/src/com/flack/shared/resources/sites/FlackManager.as
+++ b/protogeni/flack/src/com/flack/shared/resources/sites/FlackManager.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.resources.sites
{
diff --git a/protogeni/flack/src/com/flack/shared/tasks/ParallelTaskGroup.as b/protogeni/flack/src/com/flack/shared/tasks/ParallelTaskGroup.as
index ec53f424d1..1aadbb2b46 100644
--- a/protogeni/flack/src/com/flack/shared/tasks/ParallelTaskGroup.as
+++ b/protogeni/flack/src/com/flack/shared/tasks/ParallelTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.tasks
{
diff --git a/protogeni/flack/src/com/flack/shared/tasks/SerialTaskGroup.as b/protogeni/flack/src/com/flack/shared/tasks/SerialTaskGroup.as
index 7a3ed72f13..fa67184031 100644
--- a/protogeni/flack/src/com/flack/shared/tasks/SerialTaskGroup.as
+++ b/protogeni/flack/src/com/flack/shared/tasks/SerialTaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.tasks
{
diff --git a/protogeni/flack/src/com/flack/shared/tasks/Task.as b/protogeni/flack/src/com/flack/shared/tasks/Task.as
index acfa02affb..788175fa75 100644
--- a/protogeni/flack/src/com/flack/shared/tasks/Task.as
+++ b/protogeni/flack/src/com/flack/shared/tasks/Task.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.tasks
{
diff --git a/protogeni/flack/src/com/flack/shared/tasks/TaskCollection.as b/protogeni/flack/src/com/flack/shared/tasks/TaskCollection.as
index 17eac84eb2..c04723c848 100644
--- a/protogeni/flack/src/com/flack/shared/tasks/TaskCollection.as
+++ b/protogeni/flack/src/com/flack/shared/tasks/TaskCollection.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.tasks
{
diff --git a/protogeni/flack/src/com/flack/shared/tasks/TaskError.as b/protogeni/flack/src/com/flack/shared/tasks/TaskError.as
index 8121b5dac2..8bbb0c7d74 100644
--- a/protogeni/flack/src/com/flack/shared/tasks/TaskError.as
+++ b/protogeni/flack/src/com/flack/shared/tasks/TaskError.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.tasks
{
diff --git a/protogeni/flack/src/com/flack/shared/tasks/TaskEvent.as b/protogeni/flack/src/com/flack/shared/tasks/TaskEvent.as
index 2c2a1d27d1..e170950734 100644
--- a/protogeni/flack/src/com/flack/shared/tasks/TaskEvent.as
+++ b/protogeni/flack/src/com/flack/shared/tasks/TaskEvent.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.tasks
{
diff --git a/protogeni/flack/src/com/flack/shared/tasks/TaskGroup.as b/protogeni/flack/src/com/flack/shared/tasks/TaskGroup.as
index da78eb34fb..a75d1cff3b 100644
--- a/protogeni/flack/src/com/flack/shared/tasks/TaskGroup.as
+++ b/protogeni/flack/src/com/flack/shared/tasks/TaskGroup.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.tasks
{
diff --git a/protogeni/flack/src/com/flack/shared/tasks/Tasker.as b/protogeni/flack/src/com/flack/shared/tasks/Tasker.as
index 840967e560..c84f2d3976 100644
--- a/protogeni/flack/src/com/flack/shared/tasks/Tasker.as
+++ b/protogeni/flack/src/com/flack/shared/tasks/Tasker.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.tasks
{
diff --git a/protogeni/flack/src/com/flack/shared/tasks/file/FileTask.as b/protogeni/flack/src/com/flack/shared/tasks/file/FileTask.as
index 7088cb3bb8..bcb780a7aa 100644
--- a/protogeni/flack/src/com/flack/shared/tasks/file/FileTask.as
+++ b/protogeni/flack/src/com/flack/shared/tasks/file/FileTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.tasks.file
{
diff --git a/protogeni/flack/src/com/flack/shared/tasks/http/HttpTask.as b/protogeni/flack/src/com/flack/shared/tasks/http/HttpTask.as
index 6972b7f507..7855203c00 100644
--- a/protogeni/flack/src/com/flack/shared/tasks/http/HttpTask.as
+++ b/protogeni/flack/src/com/flack/shared/tasks/http/HttpTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.tasks.http
{
diff --git a/protogeni/flack/src/com/flack/shared/tasks/http/JsHttpTask.as b/protogeni/flack/src/com/flack/shared/tasks/http/JsHttpTask.as
index eed2b02241..91b1f255de 100644
--- a/protogeni/flack/src/com/flack/shared/tasks/http/JsHttpTask.as
+++ b/protogeni/flack/src/com/flack/shared/tasks/http/JsHttpTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.tasks.http
{
diff --git a/protogeni/flack/src/com/flack/shared/tasks/xmlrpc/XmlrpcTask.as b/protogeni/flack/src/com/flack/shared/tasks/xmlrpc/XmlrpcTask.as
index b74cb608bd..f1d79c5d1b 100644
--- a/protogeni/flack/src/com/flack/shared/tasks/xmlrpc/XmlrpcTask.as
+++ b/protogeni/flack/src/com/flack/shared/tasks/xmlrpc/XmlrpcTask.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.tasks.xmlrpc
{
diff --git a/protogeni/flack/src/com/flack/shared/tasks/xmlrpc/XmlrpcUtil.as b/protogeni/flack/src/com/flack/shared/tasks/xmlrpc/XmlrpcUtil.as
index 945ed2d0fb..e98c63f25d 100644
--- a/protogeni/flack/src/com/flack/shared/tasks/xmlrpc/XmlrpcUtil.as
+++ b/protogeni/flack/src/com/flack/shared/tasks/xmlrpc/XmlrpcUtil.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.tasks.xmlrpc
{
diff --git a/protogeni/flack/src/com/flack/shared/utils/ArrayUtil.as b/protogeni/flack/src/com/flack/shared/utils/ArrayUtil.as
index 9659a4b685..6e151ea81f 100644
--- a/protogeni/flack/src/com/flack/shared/utils/ArrayUtil.as
+++ b/protogeni/flack/src/com/flack/shared/utils/ArrayUtil.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.utils
{
diff --git a/protogeni/flack/src/com/flack/shared/utils/ColorUtil.as b/protogeni/flack/src/com/flack/shared/utils/ColorUtil.as
index 8a041a5950..8696444dab 100644
--- a/protogeni/flack/src/com/flack/shared/utils/ColorUtil.as
+++ b/protogeni/flack/src/com/flack/shared/utils/ColorUtil.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008-2012 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package com.flack.shared.utils
diff --git a/protogeni/flack/src/com/flack/shared/utils/CompressUtil.as b/protogeni/flack/src/com/flack/shared/utils/CompressUtil.as
index 6dcbd8ecf6..a15bf94b06 100644
--- a/protogeni/flack/src/com/flack/shared/utils/CompressUtil.as
+++ b/protogeni/flack/src/com/flack/shared/utils/CompressUtil.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.utils
{
diff --git a/protogeni/flack/src/com/flack/shared/utils/ImageUtil.as b/protogeni/flack/src/com/flack/shared/utils/ImageUtil.as
index 654cd47b7f..2a8c70c1e7 100644
--- a/protogeni/flack/src/com/flack/shared/utils/ImageUtil.as
+++ b/protogeni/flack/src/com/flack/shared/utils/ImageUtil.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008-2012 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package com.flack.shared.utils
diff --git a/protogeni/flack/src/com/flack/shared/utils/MathUtil.as b/protogeni/flack/src/com/flack/shared/utils/MathUtil.as
index e4a58c3d22..81f278981c 100644
--- a/protogeni/flack/src/com/flack/shared/utils/MathUtil.as
+++ b/protogeni/flack/src/com/flack/shared/utils/MathUtil.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.utils
{
diff --git a/protogeni/flack/src/com/flack/shared/utils/NetUtil.as b/protogeni/flack/src/com/flack/shared/utils/NetUtil.as
index 4faba77ed0..cf276f9577 100644
--- a/protogeni/flack/src/com/flack/shared/utils/NetUtil.as
+++ b/protogeni/flack/src/com/flack/shared/utils/NetUtil.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.utils
{
diff --git a/protogeni/flack/src/com/flack/shared/utils/StringUtil.as b/protogeni/flack/src/com/flack/shared/utils/StringUtil.as
index 20bb30e490..7a62ab84e9 100644
--- a/protogeni/flack/src/com/flack/shared/utils/StringUtil.as
+++ b/protogeni/flack/src/com/flack/shared/utils/StringUtil.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.flack.shared.utils
{
diff --git a/protogeni/flack/src/com/flack/shared/utils/ViewUtil.as b/protogeni/flack/src/com/flack/shared/utils/ViewUtil.as
index 5a2d044f2b..6a25d6f390 100644
--- a/protogeni/flack/src/com/flack/shared/utils/ViewUtil.as
+++ b/protogeni/flack/src/com/flack/shared/utils/ViewUtil.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008-2012 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package com.flack.shared.utils
diff --git a/protogeni/flack/src/com/mstrum/Asn1Classes.as b/protogeni/flack/src/com/mstrum/Asn1Classes.as
index 5af80b99d6..fab44225b9 100644
--- a/protogeni/flack/src/com/mstrum/Asn1Classes.as
+++ b/protogeni/flack/src/com/mstrum/Asn1Classes.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.mstrum
{
diff --git a/protogeni/flack/src/com/mstrum/Asn1Field.as b/protogeni/flack/src/com/mstrum/Asn1Field.as
index 774ceb0d16..9ba56a1afa 100644
--- a/protogeni/flack/src/com/mstrum/Asn1Field.as
+++ b/protogeni/flack/src/com/mstrum/Asn1Field.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.mstrum
{
diff --git a/protogeni/flack/src/com/mstrum/Asn1Tags.as b/protogeni/flack/src/com/mstrum/Asn1Tags.as
index c2f0ae1f01..91f044142a 100644
--- a/protogeni/flack/src/com/mstrum/Asn1Tags.as
+++ b/protogeni/flack/src/com/mstrum/Asn1Tags.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.mstrum
{
diff --git a/protogeni/flack/src/com/mstrum/DER.as b/protogeni/flack/src/com/mstrum/DER.as
index d97c59cb55..8ae38c703e 100644
--- a/protogeni/flack/src/com/mstrum/DER.as
+++ b/protogeni/flack/src/com/mstrum/DER.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
// Adapted from com.hurlant.util.der.DER
diff --git a/protogeni/flack/src/com/mstrum/Oids.as b/protogeni/flack/src/com/mstrum/Oids.as
index 9240240732..d805a439e7 100644
--- a/protogeni/flack/src/com/mstrum/Oids.as
+++ b/protogeni/flack/src/com/mstrum/Oids.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008-2012 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008-2012 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package com.mstrum
{
diff --git a/protogeni/flack/src/flack.mxml b/protogeni/flack/src/flack.mxml
index a01577c996..80568038ce 100644
--- a/protogeni/flack/src/flack.mxml
+++ b/protogeni/flack/src/flack.mxml
@@ -2,18 +2,32 @@
<!--
-GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group.
-All rights reserved.
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation.
+{{{GENIPUBLIC-LICENSE
-THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+GENI Public License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and/or hardware specification (the "Work") to
+deal in the Work without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Work, and to permit persons to whom the Work
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Work.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+IN THE WORK.
+
+}}}
-->
diff --git a/protogeni/install/configure.in b/protogeni/install/configure.in
index 3f2327ed13..2373644f6c 100755
--- a/protogeni/install/configure.in
+++ b/protogeni/install/configure.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
AC_PREREQ(2.13)
diff --git a/protogeni/lib/GNUmakefile.in b/protogeni/lib/GNUmakefile.in
index b311227179..a8dcc0693a 100644
--- a/protogeni/lib/GNUmakefile.in
+++ b/protogeni/lib/GNUmakefile.in
@@ -1,7 +1,30 @@
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/protogeni/lib/GeniAM.pm.in b/protogeni/lib/GeniAM.pm.in
index d728cc9eee..9ef149af95 100755
--- a/protogeni/lib/GeniAM.pm.in
+++ b/protogeni/lib/GeniAM.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniAM;
diff --git a/protogeni/lib/GeniAggregate.pm.in b/protogeni/lib/GeniAggregate.pm.in
index 67dff2e31c..a90c93faa8 100755
--- a/protogeni/lib/GeniAggregate.pm.in
+++ b/protogeni/lib/GeniAggregate.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniAggregate;
diff --git a/protogeni/lib/GeniAuthority.pm.in b/protogeni/lib/GeniAuthority.pm.in
index 7f64ee2d8a..c30f7f5f26 100755
--- a/protogeni/lib/GeniAuthority.pm.in
+++ b/protogeni/lib/GeniAuthority.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniAuthority;
diff --git a/protogeni/lib/GeniCH.pm.in b/protogeni/lib/GeniCH.pm.in
index 3040e0a88a..1cb2ce7da1 100644
--- a/protogeni/lib/GeniCH.pm.in
+++ b/protogeni/lib/GeniCH.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniCH;
diff --git a/protogeni/lib/GeniCM.pm.in b/protogeni/lib/GeniCM.pm.in
index e26870104e..6242a92e89 100644
--- a/protogeni/lib/GeniCM.pm.in
+++ b/protogeni/lib/GeniCM.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniCM;
diff --git a/protogeni/lib/GeniCMV2.pm.in b/protogeni/lib/GeniCMV2.pm.in
index 7e8101324c..aae93dcacc 100755
--- a/protogeni/lib/GeniCMV2.pm.in
+++ b/protogeni/lib/GeniCMV2.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniCMV2;
diff --git a/protogeni/lib/GeniCertificate.pm.in b/protogeni/lib/GeniCertificate.pm.in
index 483470fb5a..ddd9c1262e 100755
--- a/protogeni/lib/GeniCertificate.pm.in
+++ b/protogeni/lib/GeniCertificate.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniCertificate;
diff --git a/protogeni/lib/GeniComponent.pm.in b/protogeni/lib/GeniComponent.pm.in
index b7f39a56bb..9e229918d8 100644
--- a/protogeni/lib/GeniComponent.pm.in
+++ b/protogeni/lib/GeniComponent.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniComponent;
diff --git a/protogeni/lib/GeniCredential.pm.in b/protogeni/lib/GeniCredential.pm.in
index d39b52dd1e..869defc63c 100755
--- a/protogeni/lib/GeniCredential.pm.in
+++ b/protogeni/lib/GeniCredential.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniCredential;
diff --git a/protogeni/lib/GeniDB.pm.in b/protogeni/lib/GeniDB.pm.in
index cbdd12e643..983198fe8e 100644
--- a/protogeni/lib/GeniDB.pm.in
+++ b/protogeni/lib/GeniDB.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniDB;
use strict;
diff --git a/protogeni/lib/GeniEmulab.pm.in b/protogeni/lib/GeniEmulab.pm.in
index 6edb8a6bf7..876fc08a80 100755
--- a/protogeni/lib/GeniEmulab.pm.in
+++ b/protogeni/lib/GeniEmulab.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniEmulab;
diff --git a/protogeni/lib/GeniEmulabUtil.pm.in b/protogeni/lib/GeniEmulabUtil.pm.in
index d9765b6ce5..ad6ca64fd6 100644
--- a/protogeni/lib/GeniEmulabUtil.pm.in
+++ b/protogeni/lib/GeniEmulabUtil.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniEmulabUtil;
diff --git a/protogeni/lib/GeniFoam.pm.in b/protogeni/lib/GeniFoam.pm.in
index 5ce7f7d3d5..4e22c6129f 100644
--- a/protogeni/lib/GeniFoam.pm.in
+++ b/protogeni/lib/GeniFoam.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniFoam;
diff --git a/protogeni/lib/GeniHRN.pm.in b/protogeni/lib/GeniHRN.pm.in
index 3444a54d31..f3e96a39e7 100755
--- a/protogeni/lib/GeniHRN.pm.in
+++ b/protogeni/lib/GeniHRN.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2009-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniHRN;
diff --git a/protogeni/lib/GeniRegistry.pm.in b/protogeni/lib/GeniRegistry.pm.in
index 443768a27e..d2a4ba8ee0 100755
--- a/protogeni/lib/GeniRegistry.pm.in
+++ b/protogeni/lib/GeniRegistry.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniRegistry;
diff --git a/protogeni/lib/GeniResource.pm.in b/protogeni/lib/GeniResource.pm.in
index 118e1af015..eb4be2a2b5 100644
--- a/protogeni/lib/GeniResource.pm.in
+++ b/protogeni/lib/GeniResource.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniResource;
diff --git a/protogeni/lib/GeniSA.pm.in b/protogeni/lib/GeniSA.pm.in
index 26b94661ac..23e2e57175 100755
--- a/protogeni/lib/GeniSA.pm.in
+++ b/protogeni/lib/GeniSA.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniSA;
diff --git a/protogeni/lib/GeniSES.pm.in b/protogeni/lib/GeniSES.pm.in
index d08d3cbc92..b35793236f 100755
--- a/protogeni/lib/GeniSES.pm.in
+++ b/protogeni/lib/GeniSES.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniSES;
diff --git a/protogeni/lib/GeniSlice.pm.in b/protogeni/lib/GeniSlice.pm.in
index b41a47247e..fd266523bb 100755
--- a/protogeni/lib/GeniSlice.pm.in
+++ b/protogeni/lib/GeniSlice.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniSlice;
diff --git a/protogeni/lib/GeniSliver.pm.in b/protogeni/lib/GeniSliver.pm.in
index 1bf7da5e42..b2a4a8fbfc 100755
--- a/protogeni/lib/GeniSliver.pm.in
+++ b/protogeni/lib/GeniSliver.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniSliver;
diff --git a/protogeni/lib/GeniTicket.pm.in b/protogeni/lib/GeniTicket.pm.in
index cecf4d4f80..6ec9f162d7 100755
--- a/protogeni/lib/GeniTicket.pm.in
+++ b/protogeni/lib/GeniTicket.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniTicket;
diff --git a/protogeni/lib/GeniUsage.pm.in b/protogeni/lib/GeniUsage.pm.in
index 101aba6960..ee1c4cc7e7 100644
--- a/protogeni/lib/GeniUsage.pm.in
+++ b/protogeni/lib/GeniUsage.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2009, 2010, 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniUsage;
diff --git a/protogeni/lib/GeniUser.pm.in b/protogeni/lib/GeniUser.pm.in
index bddae5bf7d..f240180d2c 100755
--- a/protogeni/lib/GeniUser.pm.in
+++ b/protogeni/lib/GeniUser.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniUser;
diff --git a/protogeni/lib/GeniUtil.pm.in b/protogeni/lib/GeniUtil.pm.in
index d6b190377b..df916c4e18 100644
--- a/protogeni/lib/GeniUtil.pm.in
+++ b/protogeni/lib/GeniUtil.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniUtil;
diff --git a/protogeni/lib/GeniXML.pm.in b/protogeni/lib/GeniXML.pm.in
index c0ec1af5b4..bfcbcbd68a 100644
--- a/protogeni/lib/GeniXML.pm.in
+++ b/protogeni/lib/GeniXML.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2010-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
package GeniXML;
diff --git a/protogeni/lib/genischemacheck.pl.in b/protogeni/lib/genischemacheck.pl.in
index a2a0f792eb..8a5c2d2b35 100755
--- a/protogeni/lib/genischemacheck.pl.in
+++ b/protogeni/lib/genischemacheck.pl.in
@@ -1,9 +1,32 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
diff --git a/protogeni/lib/plabnodewrapper.in b/protogeni/lib/plabnodewrapper.in
index ca6328e039..1deb86d99b 100644
--- a/protogeni/lib/plabnodewrapper.in
+++ b/protogeni/lib/plabnodewrapper.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/protogeni/lib/plabslicewrapper.in b/protogeni/lib/plabslicewrapper.in
index 9b6a5a24ad..89860f7f94 100644
--- a/protogeni/lib/plabslicewrapper.in
+++ b/protogeni/lib/plabslicewrapper.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -wT
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/protogeni/protogeniflash/src/Main.as b/protogeni/protogeniflash/src/Main.as
index eb69534f1c..5f72767eeb 100644
--- a/protogeni/protogeniflash/src/Main.as
+++ b/protogeni/protogeniflash/src/Main.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
// Handles some tasks that hide implimentation between the flash and map client
diff --git a/protogeni/protogeniflash/src/protogeni/ProtogeniHandler.as b/protogeni/protogeniflash/src/protogeni/ProtogeniHandler.as
index edd86a6db6..e15ec6eda9 100644
--- a/protogeni/protogeniflash/src/protogeni/ProtogeniHandler.as
+++ b/protogeni/protogeniflash/src/protogeni/ProtogeniHandler.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni
diff --git a/protogeni/protogeniflash/src/protogeni/Util.as b/protogeni/protogeniflash/src/protogeni/Util.as
index 788cca1688..dc97b2f7a4 100644
--- a/protogeni/protogeniflash/src/protogeni/Util.as
+++ b/protogeni/protogeniflash/src/protogeni/Util.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni
diff --git a/protogeni/protogeniflash/src/protogeni/communication/CommunicationUtil.as b/protogeni/protogeniflash/src/protogeni/communication/CommunicationUtil.as
index ecb49f3ea3..6bd685b6e3 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/CommunicationUtil.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/CommunicationUtil.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/Operation.as b/protogeni/protogeniflash/src/protogeni/communication/Operation.as
index 678843e635..a73c464e53 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/Operation.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/Operation.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/ProtogeniRpcHandler.as b/protogeni/protogeniflash/src/protogeni/communication/ProtogeniRpcHandler.as
index d83702d1b5..af126bdda7 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/ProtogeniRpcHandler.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/ProtogeniRpcHandler.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/Request.as b/protogeni/protogeniflash/src/protogeni/communication/Request.as
index a2806d971e..96ccc34266 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/Request.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/Request.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestDiscoverResources.as b/protogeni/protogeniflash/src/protogeni/communication/RequestDiscoverResources.as
index 53744bf432..d8851e67e1 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestDiscoverResources.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestDiscoverResources.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestGetCredential.as b/protogeni/protogeniflash/src/protogeni/communication/RequestGetCredential.as
index ea1dbeb742..df1df1bb8c 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestGetCredential.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestGetCredential.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestGetKeys.as b/protogeni/protogeniflash/src/protogeni/communication/RequestGetKeys.as
index ba90910f65..6dfa009f37 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestGetKeys.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestGetKeys.as
@@ -1,16 +1,31 @@
-/* GENIPUBLIC-COPYRIGHT
-* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
-* All rights reserved.
-*
-* Permission to use, copy, modify and distribute this software is hereby
-* granted provided that (1) source code retains these copyright, permission,
-* and disclaimer notices, and (2) redistributions including binaries
-* reproduce the notices in supporting documentation.
-*
-* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-*/
+/*
+ * Copyright (c) 2008, 2009 University of Utah and the Flux Group.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
+ */
package protogeni.communication
{
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestListComponents.as b/protogeni/protogeniflash/src/protogeni/communication/RequestListComponents.as
index 1b7c1f2872..687f4c484e 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestListComponents.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestListComponents.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestQueue.as b/protogeni/protogeniflash/src/protogeni/communication/RequestQueue.as
index 2921567162..f257149448 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestQueue.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestQueue.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestQueueNode.as b/protogeni/protogeniflash/src/protogeni/communication/RequestQueueNode.as
index b842447dc8..2c7f91e1c8 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestQueueNode.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestQueueNode.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestReleaseTicket.as b/protogeni/protogeniflash/src/protogeni/communication/RequestReleaseTicket.as
index b3676c0431..eee67c86a6 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestReleaseTicket.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestReleaseTicket.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliceCredential.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliceCredential.as
index 100c36d8ca..191807277b 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliceCredential.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliceCredential.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliceDelete.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliceDelete.as
index ede5fc6f64..9459965467 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliceDelete.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliceDelete.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliceEmbedding.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliceEmbedding.as
index 89d30a119c..ea1d5bde34 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliceEmbedding.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliceEmbedding.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliceRegister.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliceRegister.as
index be00ae1078..0b414be39a 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliceRegister.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliceRegister.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliceRemove.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliceRemove.as
index de378ab3b5..b751290969 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliceRemove.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliceRemove.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliceResolve.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliceResolve.as
index 708f5dc2b9..f93557f9ab 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliceResolve.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliceResolve.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverCreate.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverCreate.as
index 049c74282c..50d3b60872 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverCreate.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverCreate.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverDelete.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverDelete.as
index 99e670d1b2..f3ad278500 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverDelete.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverDelete.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverGet.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverGet.as
index c04cfdcda8..4b8042c0a1 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverGet.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverGet.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverResolve.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverResolve.as
index 3e4c7af6e9..3fd1bbd921 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverResolve.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverResolve.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverRestart.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverRestart.as
index 0048921c1b..524c7653dd 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverRestart.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverRestart.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverStart.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverStart.as
index 7a06382a66..1f41a5bc25 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverStart.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverStart.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverStatus.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverStatus.as
index 0a6678e731..7fa56e3d82 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverStatus.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverStatus.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverStop.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverStop.as
index 2d35a7258c..cacc1a14e2 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverStop.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverStop.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverUpdate.as b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverUpdate.as
index 907579ebdc..3241359768 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestSliverUpdate.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestSliverUpdate.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestTicketGet.as b/protogeni/protogeniflash/src/protogeni/communication/RequestTicketGet.as
index 6c4b51e1fb..414f275c13 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestTicketGet.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestTicketGet.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestTicketRedeem.as b/protogeni/protogeniflash/src/protogeni/communication/RequestTicketRedeem.as
index fe2259a065..8f55f01b26 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestTicketRedeem.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestTicketRedeem.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestTicketRelease.as b/protogeni/protogeniflash/src/protogeni/communication/RequestTicketRelease.as
index e19a0ff6c7..dbe3777a2d 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestTicketRelease.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestTicketRelease.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestTicketUpdate.as b/protogeni/protogeniflash/src/protogeni/communication/RequestTicketUpdate.as
index 405274236b..26ad2cb736 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestTicketUpdate.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestTicketUpdate.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestUserResolve.as b/protogeni/protogeniflash/src/protogeni/communication/RequestUserResolve.as
index b472b6472f..0b92086c12 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestUserResolve.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestUserResolve.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/communication/RequestWaitForStatus.as b/protogeni/protogeniflash/src/protogeni/communication/RequestWaitForStatus.as
index 1d0600eaac..8bc56501a1 100644
--- a/protogeni/protogeniflash/src/protogeni/communication/RequestWaitForStatus.as
+++ b/protogeni/protogeniflash/src/protogeni/communication/RequestWaitForStatus.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2008, 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.communication
diff --git a/protogeni/protogeniflash/src/protogeni/display/DisplayUtil.as b/protogeni/protogeniflash/src/protogeni/display/DisplayUtil.as
index b78b8eac9c..44dc4d941c 100644
--- a/protogeni/protogeniflash/src/protogeni/display/DisplayUtil.as
+++ b/protogeni/protogeniflash/src/protogeni/display/DisplayUtil.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
/* Common.as
diff --git a/protogeni/protogeniflash/src/protogeni/resources/ComponentManager.as b/protogeni/protogeniflash/src/protogeni/resources/ComponentManager.as
index 9d12bebfb7..268d9bac82 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/ComponentManager.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/ComponentManager.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/NodeType.as b/protogeni/protogeniflash/src/protogeni/resources/NodeType.as
index 0275e31bca..6b1e82e27a 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/NodeType.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/NodeType.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/PhysicalLink.as b/protogeni/protogeniflash/src/protogeni/resources/PhysicalLink.as
index 6a518aea71..e1c80dd583 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/PhysicalLink.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/PhysicalLink.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/PhysicalLinkGroup.as b/protogeni/protogeniflash/src/protogeni/resources/PhysicalLinkGroup.as
index 5704797232..05125b7269 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/PhysicalLinkGroup.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/PhysicalLinkGroup.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/PhysicalLinkGroupCollection.as b/protogeni/protogeniflash/src/protogeni/resources/PhysicalLinkGroupCollection.as
index 44b8a355b2..a44fb2ece2 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/PhysicalLinkGroupCollection.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/PhysicalLinkGroupCollection.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/PhysicalNode.as b/protogeni/protogeniflash/src/protogeni/resources/PhysicalNode.as
index 75f1490e5b..ca4c7d899c 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/PhysicalNode.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/PhysicalNode.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeGroup.as b/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeGroup.as
index 4f36aa9a25..575b6539a5 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeGroup.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeGroup.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeGroupCollection.as b/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeGroupCollection.as
index 06cec1cd87..9b20f4b613 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeGroupCollection.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeGroupCollection.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeInterface.as b/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeInterface.as
index e167c5962b..127d97ceef 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeInterface.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeInterface.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeInterfaceCollection.as b/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeInterfaceCollection.as
index b208749d29..683a418160 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeInterfaceCollection.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/PhysicalNodeInterfaceCollection.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/Slice.as b/protogeni/protogeniflash/src/protogeni/resources/Slice.as
index e11fb34f1c..2ad878dfc2 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/Slice.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/Slice.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/Sliver.as b/protogeni/protogeniflash/src/protogeni/resources/Sliver.as
index 408ffe01bb..98dc5eebe9 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/Sliver.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/Sliver.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/User.as b/protogeni/protogeniflash/src/protogeni/resources/User.as
index 60f75dc17b..8092b800b5 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/User.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/User.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/VirtualInterface.as b/protogeni/protogeniflash/src/protogeni/resources/VirtualInterface.as
index 2c25944f9a..7df0521b08 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/VirtualInterface.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/VirtualInterface.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/VirtualInterfaceCollection.as b/protogeni/protogeniflash/src/protogeni/resources/VirtualInterfaceCollection.as
index d779bb8f07..f12b9286b8 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/VirtualInterfaceCollection.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/VirtualInterfaceCollection.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/VirtualLink.as b/protogeni/protogeniflash/src/protogeni/resources/VirtualLink.as
index bb509bbd43..3e65e049bb 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/VirtualLink.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/VirtualLink.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/protogeniflash/src/protogeni/resources/VirtualNode.as b/protogeni/protogeniflash/src/protogeni/resources/VirtualNode.as
index 4650843f08..6d5ac921cd 100644
--- a/protogeni/protogeniflash/src/protogeni/resources/VirtualNode.as
+++ b/protogeni/protogeniflash/src/protogeni/resources/VirtualNode.as
@@ -1,15 +1,30 @@
-/* GENIPUBLIC-COPYRIGHT
+/*
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation.
- *
- * THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * {{{GENIPUBLIC-LICENSE
+ *
+ * GENI Public License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and/or hardware specification (the "Work") to
+ * deal in the Work without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Work, and to permit persons to whom the Work
+ * is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Work.
+ *
+ * THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ * IN THE WORK.
+ *
+ * }}}
*/
package protogeni.resources
diff --git a/protogeni/rspec-emulab/0.1/GNUmakefile.in b/protogeni/rspec-emulab/0.1/GNUmakefile.in
index b9764993b7..6aa7237f7e 100644
--- a/protogeni/rspec-emulab/0.1/GNUmakefile.in
+++ b/protogeni/rspec-emulab/0.1/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/protogeni/rspec-emulab/0.2/GNUmakefile.in b/protogeni/rspec-emulab/0.2/GNUmakefile.in
index 73808f0d66..b962295b3a 100644
--- a/protogeni/rspec-emulab/0.2/GNUmakefile.in
+++ b/protogeni/rspec-emulab/0.2/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/protogeni/rspec-emulab/2/GNUmakefile.in b/protogeni/rspec-emulab/2/GNUmakefile.in
index eece0fa5fb..4473f2084c 100644
--- a/protogeni/rspec-emulab/2/GNUmakefile.in
+++ b/protogeni/rspec-emulab/2/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/protogeni/rspec-emulab/GNUmakefile.in b/protogeni/rspec-emulab/GNUmakefile.in
index 5846c992ce..cd95b3fd68 100644
--- a/protogeni/rspec-emulab/GNUmakefile.in
+++ b/protogeni/rspec-emulab/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/protogeni/scripts/GNUmakefile.in b/protogeni/scripts/GNUmakefile.in
index bb3caad1c1..7807801844 100644
--- a/protogeni/scripts/GNUmakefile.in
+++ b/protogeni/scripts/GNUmakefile.in
@@ -1,7 +1,30 @@
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/protogeni/scripts/addauthority.in b/protogeni/scripts/addauthority.in
index 521fd65468..3bee46d5d6 100644
--- a/protogeni/scripts/addauthority.in
+++ b/protogeni/scripts/addauthority.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/advt-merge.py.in b/protogeni/scripts/advt-merge.py.in
index 817127bf31..483291a808 100644
--- a/protogeni/scripts/advt-merge.py.in
+++ b/protogeni/scripts/advt-merge.py.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/protogeni/scripts/cacontrol.in b/protogeni/scripts/cacontrol.in
index ca4e372881..d535ac759c 100644
--- a/protogeni/scripts/cacontrol.in
+++ b/protogeni/scripts/cacontrol.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/ch_daemon.in b/protogeni/scripts/ch_daemon.in
index 9db901351c..89e4d5f68e 100755
--- a/protogeni/scripts/ch_daemon.in
+++ b/protogeni/scripts/ch_daemon.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/cleanupslice.in b/protogeni/scripts/cleanupslice.in
index d83cf1230a..5155656342 100644
--- a/protogeni/scripts/cleanupslice.in
+++ b/protogeni/scripts/cleanupslice.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/cleanupticket.in b/protogeni/scripts/cleanupticket.in
index 63c45d6b24..71dcf495af 100644
--- a/protogeni/scripts/cleanupticket.in
+++ b/protogeni/scripts/cleanupticket.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/delegatecredential.in b/protogeni/scripts/delegatecredential.in
index ed6d871d2a..62fc78ee1b 100644
--- a/protogeni/scripts/delegatecredential.in
+++ b/protogeni/scripts/delegatecredential.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/delgeniuser.in b/protogeni/scripts/delgeniuser.in
index 809a74f957..0424d1ec06 100644
--- a/protogeni/scripts/delgeniuser.in
+++ b/protogeni/scripts/delgeniuser.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/expire_daemon.in b/protogeni/scripts/expire_daemon.in
index e35869dd32..e2b154e1ee 100644
--- a/protogeni/scripts/expire_daemon.in
+++ b/protogeni/scripts/expire_daemon.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/fixcerts.in b/protogeni/scripts/fixcerts.in
index 4ac5f5540b..5e81b86f9f 100644
--- a/protogeni/scripts/fixcerts.in
+++ b/protogeni/scripts/fixcerts.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/genadmincredential.in b/protogeni/scripts/genadmincredential.in
index 43ae387d02..8284af5acf 100644
--- a/protogeni/scripts/genadmincredential.in
+++ b/protogeni/scripts/genadmincredential.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use lib '@prefix@/lib';
diff --git a/protogeni/scripts/genallow_extcred.in b/protogeni/scripts/genallow_extcred.in
index e25a9ab573..dbd0dc9ce5 100644
--- a/protogeni/scripts/genallow_extcred.in
+++ b/protogeni/scripts/genallow_extcred.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use lib '@prefix@/lib';
diff --git a/protogeni/scripts/gencabundle.in b/protogeni/scripts/gencabundle.in
index d9a5ebfd6f..a755b5a7dd 100755
--- a/protogeni/scripts/gencabundle.in
+++ b/protogeni/scripts/gencabundle.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2011-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/gencrl.in b/protogeni/scripts/gencrl.in
index 4fea221377..7a2a20b721 100644
--- a/protogeni/scripts/gencrl.in
+++ b/protogeni/scripts/gencrl.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/gencrlbundle.in b/protogeni/scripts/gencrlbundle.in
index e211abbccc..30873face3 100755
--- a/protogeni/scripts/gencrlbundle.in
+++ b/protogeni/scripts/gencrlbundle.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/genextend_lifetime.in b/protogeni/scripts/genextend_lifetime.in
index d8f98db8f6..6716059249 100755
--- a/protogeni/scripts/genextend_lifetime.in
+++ b/protogeni/scripts/genextend_lifetime.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use lib '@prefix@/lib';
diff --git a/protogeni/scripts/getcacerts.in b/protogeni/scripts/getcacerts.in
index 83935b0bea..035d97b205 100755
--- a/protogeni/scripts/getcacerts.in
+++ b/protogeni/scripts/getcacerts.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/getchcredential.in b/protogeni/scripts/getchcredential.in
index a5bcbeb36c..a728165dda 100644
--- a/protogeni/scripts/getchcredential.in
+++ b/protogeni/scripts/getchcredential.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use lib '@prefix@/lib';
diff --git a/protogeni/scripts/initcerts.in b/protogeni/scripts/initcerts.in
index 21034f28fc..68d3c8d427 100755
--- a/protogeni/scripts/initcerts.in
+++ b/protogeni/scripts/initcerts.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/initclrhouse.in b/protogeni/scripts/initclrhouse.in
index a1f994dc17..c0f231fcea 100755
--- a/protogeni/scripts/initclrhouse.in
+++ b/protogeni/scripts/initclrhouse.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/initsite.in b/protogeni/scripts/initsite.in
index d2840170b0..91354bfe02 100755
--- a/protogeni/scripts/initsite.in
+++ b/protogeni/scripts/initsite.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/listhistory.in b/protogeni/scripts/listhistory.in
index 35551c6dae..c9891e7f6d 100755
--- a/protogeni/scripts/listhistory.in
+++ b/protogeni/scripts/listhistory.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2009-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/listusage.in b/protogeni/scripts/listusage.in
index 58bfcf1aa0..22066f1c14 100644
--- a/protogeni/scripts/listusage.in
+++ b/protogeni/scripts/listusage.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2009-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/planetlab-initscript.pl b/protogeni/scripts/planetlab-initscript.pl
index 3e7ef3fa04..5be944c557 100644
--- a/protogeni/scripts/planetlab-initscript.pl
+++ b/protogeni/scripts/planetlab-initscript.pl
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/postcrl.in b/protogeni/scripts/postcrl.in
index 0559a51c26..29169a2f19 100755
--- a/protogeni/scripts/postcrl.in
+++ b/protogeni/scripts/postcrl.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/register_resources.in b/protogeni/scripts/register_resources.in
index ba490bd161..78b9eb2b1b 100644
--- a/protogeni/scripts/register_resources.in
+++ b/protogeni/scripts/register_resources.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/register_sliver.in b/protogeni/scripts/register_sliver.in
index 966da007e9..df993f33f5 100644
--- a/protogeni/scripts/register_sliver.in
+++ b/protogeni/scripts/register_sliver.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/remauthority.in b/protogeni/scripts/remauthority.in
index 5d7b38ccd4..a81123f821 100644
--- a/protogeni/scripts/remauthority.in
+++ b/protogeni/scripts/remauthority.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/reregister.in b/protogeni/scripts/reregister.in
index 3042ca54ac..5447ab734f 100644
--- a/protogeni/scripts/reregister.in
+++ b/protogeni/scripts/reregister.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/reservevlans.in b/protogeni/scripts/reservevlans.in
index a82bb998e6..b4fcbc9ee2 100644
--- a/protogeni/scripts/reservevlans.in
+++ b/protogeni/scripts/reservevlans.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/resolve-ch.in b/protogeni/scripts/resolve-ch.in
index 19ea39b581..ce4830f22e 100644
--- a/protogeni/scripts/resolve-ch.in
+++ b/protogeni/scripts/resolve-ch.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/resolve.in b/protogeni/scripts/resolve.in
index bc3f013630..6997e6d957 100644
--- a/protogeni/scripts/resolve.in
+++ b/protogeni/scripts/resolve.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/resolvenode.in b/protogeni/scripts/resolvenode.in
index f7580cba5f..8e25e29241 100644
--- a/protogeni/scripts/resolvenode.in
+++ b/protogeni/scripts/resolvenode.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/sa_daemon.in b/protogeni/scripts/sa_daemon.in
index 2bff6610c0..54816e2902 100644
--- a/protogeni/scripts/sa_daemon.in
+++ b/protogeni/scripts/sa_daemon.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/shutdownslice.in b/protogeni/scripts/shutdownslice.in
index cbf7f890e9..7d899af3d3 100644
--- a/protogeni/scripts/shutdownslice.in
+++ b/protogeni/scripts/shutdownslice.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/testclrhouse.in b/protogeni/scripts/testclrhouse.in
index 2df2f2bb27..15687cdc8b 100644
--- a/protogeni/scripts/testclrhouse.in
+++ b/protogeni/scripts/testclrhouse.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2009-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/update.in b/protogeni/scripts/update.in
index 256a632d96..4a3f17dd72 100644
--- a/protogeni/scripts/update.in
+++ b/protogeni/scripts/update.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/updatecert.in b/protogeni/scripts/updatecert.in
index a255f128ef..2d990603fd 100644
--- a/protogeni/scripts/updatecert.in
+++ b/protogeni/scripts/updatecert.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/scripts/webcacontrol.in b/protogeni/scripts/webcacontrol.in
index 9ef4fbeb32..2d920a3305 100644
--- a/protogeni/scripts/webcacontrol.in
+++ b/protogeni/scripts/webcacontrol.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/protogeni/security/GNUmakefile.in b/protogeni/security/GNUmakefile.in
index dbe7a0f19c..faee843abd 100644
--- a/protogeni/security/GNUmakefile.in
+++ b/protogeni/security/GNUmakefile.in
@@ -1,7 +1,30 @@
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/protogeni/security/credential.rnc b/protogeni/security/credential.rnc
index b94e14b52b..0f2b80f2e5 100644
--- a/protogeni/security/credential.rnc
+++ b/protogeni/security/credential.rnc
@@ -1,7 +1,30 @@
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
# ProtoGENI credential and privilege specification. The key points:
diff --git a/protogeni/security/credential.xsd b/protogeni/security/credential.xsd
index c1152114e9..da879aac1f 100644
--- a/protogeni/security/credential.xsd
+++ b/protogeni/security/credential.xsd
@@ -1,9 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2009 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{GENIPUBLIC-LICENSE
+
+ GENI Public License
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and/or hardware specification (the "Work") to
+ deal in the Work without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Work, and to permit persons to whom the Work
+ is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Work.
+
+ THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+ IN THE WORK.
+
+ }}}
-->
<!--
diff --git a/protogeni/security/peers.rnc b/protogeni/security/peers.rnc
index 3a20f5b8ad..8be3a7e8df 100644
--- a/protogeni/security/peers.rnc
+++ b/protogeni/security/peers.rnc
@@ -1,7 +1,30 @@
'#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
default namespace = "http://www.protogeni.net/resources/peers/1"
diff --git a/protogeni/security/protogeni-rspec-common.xsd b/protogeni/security/protogeni-rspec-common.xsd
index 0e31ccb789..e63b91a1ee 100644
--- a/protogeni/security/protogeni-rspec-common.xsd
+++ b/protogeni/security/protogeni-rspec-common.xsd
@@ -5,9 +5,26 @@
<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2008 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<!--
diff --git a/protogeni/security/signgenicred.in b/protogeni/security/signgenicred.in
index 22138b51cb..3377fecdb9 100644
--- a/protogeni/security/signgenicred.in
+++ b/protogeni/security/signgenicred.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/security/top.xsd b/protogeni/security/top.xsd
index 32f0f68d09..56b1d4d0a1 100644
--- a/protogeni/security/top.xsd
+++ b/protogeni/security/top.xsd
@@ -4,9 +4,26 @@
<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2005-2007 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<!--
diff --git a/protogeni/security/verifygenicred.in b/protogeni/security/verifygenicred.in
index e965485e9a..a4b0a9745f 100755
--- a/protogeni/security/verifygenicred.in
+++ b/protogeni/security/verifygenicred.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/test/GNUmakefile.in b/protogeni/test/GNUmakefile.in
index 7953662582..94a6580aaf 100644
--- a/protogeni/test/GNUmakefile.in
+++ b/protogeni/test/GNUmakefile.in
@@ -1,7 +1,30 @@
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/protogeni/test/am/createsliver.py b/protogeni/test/am/createsliver.py
index e21c9b7a9e..a9635428e2 100755
--- a/protogeni/test/am/createsliver.py
+++ b/protogeni/test/am/createsliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/am/deletesliver.py b/protogeni/test/am/deletesliver.py
index 749031e208..862f62fa80 100755
--- a/protogeni/test/am/deletesliver.py
+++ b/protogeni/test/am/deletesliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/am/getversion.py b/protogeni/test/am/getversion.py
index 41ec5b0b60..5799319e92 100755
--- a/protogeni/test/am/getversion.py
+++ b/protogeni/test/am/getversion.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/am/listresources.py b/protogeni/test/am/listresources.py
index 3ed4ec4643..8cdfae2052 100755
--- a/protogeni/test/am/listresources.py
+++ b/protogeni/test/am/listresources.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/am/renewsliver.py b/protogeni/test/am/renewsliver.py
index 707f39d759..0fb893d23d 100755
--- a/protogeni/test/am/renewsliver.py
+++ b/protogeni/test/am/renewsliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/am/sliverstatus.py b/protogeni/test/am/sliverstatus.py
index 2efd52d70b..ba4a32cb5f 100755
--- a/protogeni/test/am/sliverstatus.py
+++ b/protogeni/test/am/sliverstatus.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/binduser.py b/protogeni/test/binduser.py
index c9a8fb2581..19ae4901ba 100755
--- a/protogeni/test/binduser.py
+++ b/protogeni/test/binduser.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/createimage.py b/protogeni/test/createimage.py
index f18684cbe4..9a2c82f98a 100755
--- a/protogeni/test/createimage.py
+++ b/protogeni/test/createimage.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/createsliver.py b/protogeni/test/createsliver.py
index 9ff0c006f2..7d8cfc743b 100755
--- a/protogeni/test/createsliver.py
+++ b/protogeni/test/createsliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/delegate.py b/protogeni/test/delegate.py
index 5302525f48..0da7864273 100755
--- a/protogeni/test/delegate.py
+++ b/protogeni/test/delegate.py
@@ -1,17 +1,32 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
import datetime
import getopt
diff --git a/protogeni/test/deleteslice.py b/protogeni/test/deleteslice.py
index 486e93eb2d..b5d959b73e 100755
--- a/protogeni/test/deleteslice.py
+++ b/protogeni/test/deleteslice.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/deletesliver.py b/protogeni/test/deletesliver.py
index 5b89acc3b3..8aa7287915 100755
--- a/protogeni/test/deletesliver.py
+++ b/protogeni/test/deletesliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/discover.py b/protogeni/test/discover.py
index ffa54a030a..7c5fd9229f 100755
--- a/protogeni/test/discover.py
+++ b/protogeni/test/discover.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/getcredential.py b/protogeni/test/getcredential.py
index bb498cdf0f..2017585735 100755
--- a/protogeni/test/getcredential.py
+++ b/protogeni/test/getcredential.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/getmanifest.py b/protogeni/test/getmanifest.py
index a6ec83d6b9..7271a0871d 100755
--- a/protogeni/test/getmanifest.py
+++ b/protogeni/test/getmanifest.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/getslicecredential.py b/protogeni/test/getslicecredential.py
index f31e60ddcc..b80898fc79 100755
--- a/protogeni/test/getslicecredential.py
+++ b/protogeni/test/getslicecredential.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/getsshkeys.py b/protogeni/test/getsshkeys.py
index 89472fcc1b..0e2c946fd2 100755
--- a/protogeni/test/getsshkeys.py
+++ b/protogeni/test/getsshkeys.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/getticket.py b/protogeni/test/getticket.py
index 4fd484e5f6..47e5bde7db 100755
--- a/protogeni/test/getticket.py
+++ b/protogeni/test/getticket.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/getversion.py b/protogeni/test/getversion.py
index a4bc879d24..54aee1d84c 100755
--- a/protogeni/test/getversion.py
+++ b/protogeni/test/getversion.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/injectevent.py b/protogeni/test/injectevent.py
index d3dfdfa35d..9e0efca560 100755
--- a/protogeni/test/injectevent.py
+++ b/protogeni/test/injectevent.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/list-ch.py b/protogeni/test/list-ch.py
index 816d30c971..7d80fee6f0 100755
--- a/protogeni/test/list-ch.py
+++ b/protogeni/test/list-ch.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/listcomponents.py b/protogeni/test/listcomponents.py
index 9e6da3cf4a..822aef072c 100755
--- a/protogeni/test/listcomponents.py
+++ b/protogeni/test/listcomponents.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/listusage.py b/protogeni/test/listusage.py
index 1fdfcda5c9..8aa290cd75 100755
--- a/protogeni/test/listusage.py
+++ b/protogeni/test/listusage.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/lookupuser.py b/protogeni/test/lookupuser.py
index 31bbedc421..59e25e87c4 100755
--- a/protogeni/test/lookupuser.py
+++ b/protogeni/test/lookupuser.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/map.py b/protogeni/test/map.py
index 701970c1c5..d4427cb241 100755
--- a/protogeni/test/map.py
+++ b/protogeni/test/map.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/redeemticket.py b/protogeni/test/redeemticket.py
index 26fb43f62c..507f0277e4 100755
--- a/protogeni/test/redeemticket.py
+++ b/protogeni/test/redeemticket.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/registerslice.py b/protogeni/test/registerslice.py
index 75843dca73..c954be90a4 100755
--- a/protogeni/test/registerslice.py
+++ b/protogeni/test/registerslice.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/releaseticket.py b/protogeni/test/releaseticket.py
index c4a1828b82..c59f923eba 100755
--- a/protogeni/test/releaseticket.py
+++ b/protogeni/test/releaseticket.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/renewslice.py b/protogeni/test/renewslice.py
index aefe90740e..02d8a5f0af 100755
--- a/protogeni/test/renewslice.py
+++ b/protogeni/test/renewslice.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/renewsliver.py b/protogeni/test/renewsliver.py
index 74b9929d5b..58e6a5d672 100755
--- a/protogeni/test/renewsliver.py
+++ b/protogeni/test/renewsliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/resolve.py b/protogeni/test/resolve.py
index cf6d7aeaf3..e05f951ff4 100755
--- a/protogeni/test/resolve.py
+++ b/protogeni/test/resolve.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2009-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/showcredential.py b/protogeni/test/showcredential.py
index e34f0c87bd..acd330e453 100755
--- a/protogeni/test/showcredential.py
+++ b/protogeni/test/showcredential.py
@@ -1,17 +1,32 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
import os
import re
diff --git a/protogeni/test/shutdownslice.py b/protogeni/test/shutdownslice.py
index 38e7feb1ac..e766148ee5 100755
--- a/protogeni/test/shutdownslice.py
+++ b/protogeni/test/shutdownslice.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/slice.py b/protogeni/test/slice.py
index f1f9582870..a014bd2d0c 100755
--- a/protogeni/test/slice.py
+++ b/protogeni/test/slice.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
import getopt
diff --git a/protogeni/test/sliveraction.py b/protogeni/test/sliveraction.py
index cf99d6284d..8d7eed10e4 100755
--- a/protogeni/test/sliveraction.py
+++ b/protogeni/test/sliveraction.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/sliverstatus.py b/protogeni/test/sliverstatus.py
index 3ebb572a6f..8f8a1341dd 100755
--- a/protogeni/test/sliverstatus.py
+++ b/protogeni/test/sliverstatus.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/stitch.py b/protogeni/test/stitch.py
index 1f06d271a2..1729a98d89 100755
--- a/protogeni/test/stitch.py
+++ b/protogeni/test/stitch.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/test-common.py b/protogeni/test/test-common.py
index 39700157a0..0e80f0d53b 100755
--- a/protogeni/test/test-common.py
+++ b/protogeni/test/test-common.py
@@ -1,16 +1,31 @@
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
from urlparse import urlsplit, urlunsplit
from urllib import splitport
diff --git a/protogeni/test/tuntest-new.py b/protogeni/test/tuntest-new.py
index 662abf3dc1..40bf1a9a78 100644
--- a/protogeni/test/tuntest-new.py
+++ b/protogeni/test/tuntest-new.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/tuntest.py b/protogeni/test/tuntest.py
index bea7fa2d9b..2642420822 100755
--- a/protogeni/test/tuntest.py
+++ b/protogeni/test/tuntest.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/unregisterslice.py b/protogeni/test/unregisterslice.py
index b09618c7cb..b526367a7f 100755
--- a/protogeni/test/unregisterslice.py
+++ b/protogeni/test/unregisterslice.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/updatesliver.py b/protogeni/test/updatesliver.py
index 57f9398b94..4ec6f8ddf0 100755
--- a/protogeni/test/updatesliver.py
+++ b/protogeni/test/updatesliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/version1/binduser.py b/protogeni/test/version1/binduser.py
index 00dda14eb5..99696623b0 100755
--- a/protogeni/test/version1/binduser.py
+++ b/protogeni/test/version1/binduser.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/version1/createsliver.py b/protogeni/test/version1/createsliver.py
index 81fc4adc83..5ebe17fb25 100755
--- a/protogeni/test/version1/createsliver.py
+++ b/protogeni/test/version1/createsliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/version1/deletesliver.py b/protogeni/test/version1/deletesliver.py
index 3769959654..07acd4c9b5 100755
--- a/protogeni/test/version1/deletesliver.py
+++ b/protogeni/test/version1/deletesliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/version1/discover.py b/protogeni/test/version1/discover.py
index d608fb5bc6..8cab1dbaeb 100755
--- a/protogeni/test/version1/discover.py
+++ b/protogeni/test/version1/discover.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/version1/getticket.py b/protogeni/test/version1/getticket.py
index 87bf6103ec..2d1cc4fb33 100755
--- a/protogeni/test/version1/getticket.py
+++ b/protogeni/test/version1/getticket.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/version1/jailtest.py b/protogeni/test/version1/jailtest.py
index a7f74aa619..72681a79da 100755
--- a/protogeni/test/version1/jailtest.py
+++ b/protogeni/test/version1/jailtest.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/version1/linktest.py b/protogeni/test/version1/linktest.py
index 7be834cd4f..781db3b9a3 100755
--- a/protogeni/test/version1/linktest.py
+++ b/protogeni/test/version1/linktest.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/version1/loctuntest.py b/protogeni/test/version1/loctuntest.py
index ed70cff23e..0a241c4757 100755
--- a/protogeni/test/version1/loctuntest.py
+++ b/protogeni/test/version1/loctuntest.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/version1/renewsliver.py b/protogeni/test/version1/renewsliver.py
index 73e26f4071..fa6697c45b 100755
--- a/protogeni/test/version1/renewsliver.py
+++ b/protogeni/test/version1/renewsliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/version1/slicestatus.py b/protogeni/test/version1/slicestatus.py
index fcdf4873a2..31b230e596 100755
--- a/protogeni/test/version1/slicestatus.py
+++ b/protogeni/test/version1/slicestatus.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/version1/sliverstatus.py b/protogeni/test/version1/sliverstatus.py
index c2dc891835..33db5beb4e 100755
--- a/protogeni/test/version1/sliverstatus.py
+++ b/protogeni/test/version1/sliverstatus.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/version1/startsliver.py b/protogeni/test/version1/startsliver.py
index 598c904300..b3bb907eb7 100755
--- a/protogeni/test/version1/startsliver.py
+++ b/protogeni/test/version1/startsliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/version1/tuntest.py b/protogeni/test/version1/tuntest.py
index 12f237d871..17f0e3c005 100755
--- a/protogeni/test/version1/tuntest.py
+++ b/protogeni/test/version1/tuntest.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/waitforsliver.py b/protogeni/test/waitforsliver.py
index d81c127cb5..f5da287bfe 100755
--- a/protogeni/test/waitforsliver.py
+++ b/protogeni/test/waitforsliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/test/whoami.py b/protogeni/test/whoami.py
index fc4ca1b9c4..07a8f6ea24 100755
--- a/protogeni/test/whoami.py
+++ b/protogeni/test/whoami.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/allocatenodes.py b/protogeni/tutorial/allocatenodes.py
index 96eda11609..14d194ecae 100755
--- a/protogeni/tutorial/allocatenodes.py
+++ b/protogeni/tutorial/allocatenodes.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/binduser.py b/protogeni/tutorial/binduser.py
index 814544b2d6..2c689796fa 100755
--- a/protogeni/tutorial/binduser.py
+++ b/protogeni/tutorial/binduser.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/clrhouselist.py b/protogeni/tutorial/clrhouselist.py
index 9777b97712..02eb68edec 100755
--- a/protogeni/tutorial/clrhouselist.py
+++ b/protogeni/tutorial/clrhouselist.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/createsliver.py b/protogeni/tutorial/createsliver.py
index 510796badb..4ed3f9919a 100755
--- a/protogeni/tutorial/createsliver.py
+++ b/protogeni/tutorial/createsliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/delegate.py b/protogeni/tutorial/delegate.py
index 592d71d33e..2f9398c445 100755
--- a/protogeni/tutorial/delegate.py
+++ b/protogeni/tutorial/delegate.py
@@ -1,17 +1,32 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
import datetime
import getopt
diff --git a/protogeni/tutorial/deleteslice.py b/protogeni/tutorial/deleteslice.py
index 13fcf50ebd..2accae14eb 100755
--- a/protogeni/tutorial/deleteslice.py
+++ b/protogeni/tutorial/deleteslice.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/deletesliver.py b/protogeni/tutorial/deletesliver.py
index 5ff02f7e41..f50b6c6c74 100755
--- a/protogeni/tutorial/deletesliver.py
+++ b/protogeni/tutorial/deletesliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/discover.py b/protogeni/tutorial/discover.py
index ffa54a030a..7c5fd9229f 100755
--- a/protogeni/tutorial/discover.py
+++ b/protogeni/tutorial/discover.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/forgetpassphrase.py b/protogeni/tutorial/forgetpassphrase.py
index 85b14c45f3..302be2b9b2 100755
--- a/protogeni/tutorial/forgetpassphrase.py
+++ b/protogeni/tutorial/forgetpassphrase.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/getcredential.py b/protogeni/tutorial/getcredential.py
index bb498cdf0f..2017585735 100755
--- a/protogeni/tutorial/getcredential.py
+++ b/protogeni/tutorial/getcredential.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/getslicecredential.py b/protogeni/tutorial/getslicecredential.py
index ac426eb632..6b85f68f81 100755
--- a/protogeni/tutorial/getslicecredential.py
+++ b/protogeni/tutorial/getslicecredential.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/getticket.py b/protogeni/tutorial/getticket.py
index 41a57e12a1..90e139947d 100755
--- a/protogeni/tutorial/getticket.py
+++ b/protogeni/tutorial/getticket.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/getversion.py b/protogeni/tutorial/getversion.py
index a4bc879d24..54aee1d84c 100755
--- a/protogeni/tutorial/getversion.py
+++ b/protogeni/tutorial/getversion.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/jailtest.py b/protogeni/tutorial/jailtest.py
index a7f74aa619..72681a79da 100755
--- a/protogeni/tutorial/jailtest.py
+++ b/protogeni/tutorial/jailtest.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/linktest.py b/protogeni/tutorial/linktest.py
index 7be834cd4f..781db3b9a3 100755
--- a/protogeni/tutorial/linktest.py
+++ b/protogeni/tutorial/linktest.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/list-ch.py b/protogeni/tutorial/list-ch.py
index 816d30c971..7d80fee6f0 100755
--- a/protogeni/tutorial/list-ch.py
+++ b/protogeni/tutorial/list-ch.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/listcomponents.py b/protogeni/tutorial/listcomponents.py
index 9e6da3cf4a..822aef072c 100755
--- a/protogeni/tutorial/listcomponents.py
+++ b/protogeni/tutorial/listcomponents.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/listusage.py b/protogeni/tutorial/listusage.py
index 5701c8ee6c..d23b966255 100755
--- a/protogeni/tutorial/listusage.py
+++ b/protogeni/tutorial/listusage.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/loctuntest.py b/protogeni/tutorial/loctuntest.py
index ed70cff23e..0a241c4757 100755
--- a/protogeni/tutorial/loctuntest.py
+++ b/protogeni/tutorial/loctuntest.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/lookupuser.py b/protogeni/tutorial/lookupuser.py
index 31bbedc421..59e25e87c4 100755
--- a/protogeni/tutorial/lookupuser.py
+++ b/protogeni/tutorial/lookupuser.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/map.py b/protogeni/tutorial/map.py
index 701970c1c5..d4427cb241 100755
--- a/protogeni/tutorial/map.py
+++ b/protogeni/tutorial/map.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/redeemticket.py b/protogeni/tutorial/redeemticket.py
index 389b211ff2..24748beec7 100755
--- a/protogeni/tutorial/redeemticket.py
+++ b/protogeni/tutorial/redeemticket.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/registerslice.py b/protogeni/tutorial/registerslice.py
index 2900e8eda7..af35ff057b 100755
--- a/protogeni/tutorial/registerslice.py
+++ b/protogeni/tutorial/registerslice.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/releaseticket.py b/protogeni/tutorial/releaseticket.py
index c4a1828b82..c59f923eba 100755
--- a/protogeni/tutorial/releaseticket.py
+++ b/protogeni/tutorial/releaseticket.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/rememberpassphrase.py b/protogeni/tutorial/rememberpassphrase.py
index 473cf8781c..4972f1d9b6 100755
--- a/protogeni/tutorial/rememberpassphrase.py
+++ b/protogeni/tutorial/rememberpassphrase.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/renewsliver.py b/protogeni/tutorial/renewsliver.py
index d920e239b0..ad3444bfd1 100755
--- a/protogeni/tutorial/renewsliver.py
+++ b/protogeni/tutorial/renewsliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/resolve-ch.py b/protogeni/tutorial/resolve-ch.py
index b29846330e..4757a25cb8 100755
--- a/protogeni/tutorial/resolve-ch.py
+++ b/protogeni/tutorial/resolve-ch.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2009-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/resolve.py b/protogeni/tutorial/resolve.py
index cf6d7aeaf3..e05f951ff4 100755
--- a/protogeni/tutorial/resolve.py
+++ b/protogeni/tutorial/resolve.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2009-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/showcredential.py b/protogeni/tutorial/showcredential.py
index 7f67472eec..3d6de59cf8 100755
--- a/protogeni/tutorial/showcredential.py
+++ b/protogeni/tutorial/showcredential.py
@@ -1,17 +1,32 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
import os
import re
diff --git a/protogeni/tutorial/showuser.py b/protogeni/tutorial/showuser.py
index ee027d84bf..c52fa95332 100755
--- a/protogeni/tutorial/showuser.py
+++ b/protogeni/tutorial/showuser.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/shutdownslice.py b/protogeni/tutorial/shutdownslice.py
index 38e7feb1ac..e766148ee5 100755
--- a/protogeni/tutorial/shutdownslice.py
+++ b/protogeni/tutorial/shutdownslice.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/slice.py b/protogeni/tutorial/slice.py
index f1f9582870..a014bd2d0c 100755
--- a/protogeni/tutorial/slice.py
+++ b/protogeni/tutorial/slice.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
import getopt
diff --git a/protogeni/tutorial/slicestatus.py b/protogeni/tutorial/slicestatus.py
index fcdf4873a2..31b230e596 100755
--- a/protogeni/tutorial/slicestatus.py
+++ b/protogeni/tutorial/slicestatus.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/sliveraction.py b/protogeni/tutorial/sliveraction.py
index b544206b65..8012832215 100755
--- a/protogeni/tutorial/sliveraction.py
+++ b/protogeni/tutorial/sliveraction.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/sliverstatus.py b/protogeni/tutorial/sliverstatus.py
index 4040c27e6c..237c51fc2b 100755
--- a/protogeni/tutorial/sliverstatus.py
+++ b/protogeni/tutorial/sliverstatus.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/startsliver.py b/protogeni/tutorial/startsliver.py
index 598c904300..b3bb907eb7 100755
--- a/protogeni/tutorial/startsliver.py
+++ b/protogeni/tutorial/startsliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/test-common.py b/protogeni/tutorial/test-common.py
index 2f6f9cef1a..5b02f061ef 100644
--- a/protogeni/tutorial/test-common.py
+++ b/protogeni/tutorial/test-common.py
@@ -1,16 +1,31 @@
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
from urlparse import urlsplit, urlunsplit
from urllib import splitport
diff --git a/protogeni/tutorial/tuntest.py b/protogeni/tutorial/tuntest.py
index 98ea6e325f..198784ff73 100755
--- a/protogeni/tutorial/tuntest.py
+++ b/protogeni/tutorial/tuntest.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/unregisterslice.py b/protogeni/tutorial/unregisterslice.py
index b09618c7cb..b526367a7f 100755
--- a/protogeni/tutorial/unregisterslice.py
+++ b/protogeni/tutorial/unregisterslice.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/updatesliver.py b/protogeni/tutorial/updatesliver.py
index 4840a6388d..b59a9b8334 100755
--- a/protogeni/tutorial/updatesliver.py
+++ b/protogeni/tutorial/updatesliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/tutorial/waitforsliver.py b/protogeni/tutorial/waitforsliver.py
index a32fe994e1..872a28b065 100755
--- a/protogeni/tutorial/waitforsliver.py
+++ b/protogeni/tutorial/waitforsliver.py
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/xmlrpc/GNUmakefile.in b/protogeni/xmlrpc/GNUmakefile.in
index 8f005c2cef..9e59108299 100644
--- a/protogeni/xmlrpc/GNUmakefile.in
+++ b/protogeni/xmlrpc/GNUmakefile.in
@@ -1,7 +1,30 @@
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/protogeni/xmlrpc/GeniResponse.pm b/protogeni/xmlrpc/GeniResponse.pm
index 6da8b93574..47f8bfedd0 100644
--- a/protogeni/xmlrpc/GeniResponse.pm
+++ b/protogeni/xmlrpc/GeniResponse.pm
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
# Perl code to access an XMLRPC server using http. Derived from the
# Emulab library (pretty sure Dave wrote the http code in that file,
diff --git a/protogeni/xmlrpc/Genixmlrpc.pm.in b/protogeni/xmlrpc/Genixmlrpc.pm.in
index 4f7bf7e7f2..872673035d 100644
--- a/protogeni/xmlrpc/Genixmlrpc.pm.in
+++ b/protogeni/xmlrpc/Genixmlrpc.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
# Perl code to access an XMLRPC server using http. Derived from the
# Emulab library (pretty sure Dave wrote the http code in that file,
diff --git a/protogeni/xmlrpc/geni-am.pm.in b/protogeni/xmlrpc/geni-am.pm.in
index dff11da5b0..84b1cb06ab 100644
--- a/protogeni/xmlrpc/geni-am.pm.in
+++ b/protogeni/xmlrpc/geni-am.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/xmlrpc/protogeni-ch.pm.in b/protogeni/xmlrpc/protogeni-ch.pm.in
index 54fffc7072..abc335a693 100644
--- a/protogeni/xmlrpc/protogeni-ch.pm.in
+++ b/protogeni/xmlrpc/protogeni-ch.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/xmlrpc/protogeni-client.pl.in b/protogeni/xmlrpc/protogeni-client.pl.in
index 86ec273736..4bbfa67ce5 100644
--- a/protogeni/xmlrpc/protogeni-client.pl.in
+++ b/protogeni/xmlrpc/protogeni-client.pl.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/xmlrpc/protogeni-client.py.in b/protogeni/xmlrpc/protogeni-client.py.in
index a31ae905b8..246341c4fc 100755
--- a/protogeni/xmlrpc/protogeni-client.py.in
+++ b/protogeni/xmlrpc/protogeni-client.py.in
@@ -1,17 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
import sys
diff --git a/protogeni/xmlrpc/protogeni-cm.pm.in b/protogeni/xmlrpc/protogeni-cm.pm.in
index f4cdd4aa63..20a324727c 100644
--- a/protogeni/xmlrpc/protogeni-cm.pm.in
+++ b/protogeni/xmlrpc/protogeni-cm.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/xmlrpc/protogeni-emulab.pm.in b/protogeni/xmlrpc/protogeni-emulab.pm.in
index cd411841e7..67a127f18f 100644
--- a/protogeni/xmlrpc/protogeni-emulab.pm.in
+++ b/protogeni/xmlrpc/protogeni-emulab.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/xmlrpc/protogeni-sa.pm.in b/protogeni/xmlrpc/protogeni-sa.pm.in
index 62b5b64c99..9a37153701 100644
--- a/protogeni/xmlrpc/protogeni-sa.pm.in
+++ b/protogeni/xmlrpc/protogeni-sa.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/xmlrpc/protogeni-ses.pm.in b/protogeni/xmlrpc/protogeni-ses.pm.in
index 28bb84de33..bb4a48b188 100644
--- a/protogeni/xmlrpc/protogeni-ses.pm.in
+++ b/protogeni/xmlrpc/protogeni-ses.pm.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/xmlrpc/protogeni-sfa.pl.in b/protogeni/xmlrpc/protogeni-sfa.pl.in
index 18c4c0f286..57571e76ce 100644
--- a/protogeni/xmlrpc/protogeni-sfa.pl.in
+++ b/protogeni/xmlrpc/protogeni-sfa.pl.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/protogeni/xmlrpc/protogeni-wrapper.pl.in b/protogeni/xmlrpc/protogeni-wrapper.pl.in
index 2bc2de5f1b..2513e3d499 100755
--- a/protogeni/xmlrpc/protogeni-wrapper.pl.in
+++ b/protogeni/xmlrpc/protogeni-wrapper.pl.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
#
diff --git a/protogeni/xmlrpc/protogeni.py.in b/protogeni/xmlrpc/protogeni.py.in
index c03ebf616e..d70dad4103 100644
--- a/protogeni/xmlrpc/protogeni.py.in
+++ b/protogeni/xmlrpc/protogeni.py.in
@@ -1,8 +1,31 @@
#! /usr/bin/env python
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
import sys
from SimpleXMLRPCServer import CGIXMLRPCRequestHandler
diff --git a/pxe/GNUmakefile.in b/pxe/GNUmakefile.in
index f5a4187f6b..511b43aa66 100644
--- a/pxe/GNUmakefile.in
+++ b/pxe/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/pxe/bootinfo.c b/pxe/bootinfo.c
index c6fc8c8801..3506b2fed7 100644
--- a/pxe/bootinfo.c
+++ b/pxe/bootinfo.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2009 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/pxe/bootinfo.conf b/pxe/bootinfo.conf
index c1bb9ed311..38b0fead7b 100644
--- a/pxe/bootinfo.conf
+++ b/pxe/bootinfo.conf
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# * * * TESTBED USERS TAKE NOTE: this file is deprecated. * * *
#
diff --git a/pxe/bootinfo.h b/pxe/bootinfo.h
index 4bdb584e2a..5ba597bc29 100644
--- a/pxe/bootinfo.h
+++ b/pxe/bootinfo.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
struct boot_what;
struct boot_info;
diff --git a/pxe/bootinfo.restart.in b/pxe/bootinfo.restart.in
index 38e730f536..06ac31f617 100755
--- a/pxe/bootinfo.restart.in
+++ b/pxe/bootinfo.restart.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
DIR=@prefix@/sbin
diff --git a/pxe/bootinfo_cfile.c b/pxe/bootinfo_cfile.c
index 50a14b403e..07bb74cf09 100644
--- a/pxe/bootinfo_cfile.c
+++ b/pxe/bootinfo_cfile.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/pxe/bootinfo_mysql.c b/pxe/bootinfo_mysql.c
index d469b6db07..0c7c454927 100644
--- a/pxe/bootinfo_mysql.c
+++ b/pxe/bootinfo_mysql.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/pxe/bootinfo_null.c b/pxe/bootinfo_null.c
index b3438e9300..5785bc1589 100644
--- a/pxe/bootinfo_null.c
+++ b/pxe/bootinfo_null.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/pxe/bootinfoclient.c b/pxe/bootinfoclient.c
index 225ffca02d..8b888de5cb 100644
--- a/pxe/bootinfoclient.c
+++ b/pxe/bootinfoclient.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/pxe/bootinfosend.c b/pxe/bootinfosend.c
index 16deb9cdf3..a8c7b6b20d 100644
--- a/pxe/bootinfosend.c
+++ b/pxe/bootinfosend.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/pxe/bootwhat.h b/pxe/bootwhat.h
index aa83303462..103a73902a 100644
--- a/pxe/bootwhat.h
+++ b/pxe/bootwhat.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* Derived from boot/bootwhat.h in the OSKit.
*/
diff --git a/pxe/event-support.c b/pxe/event-support.c
index ef73ab11de..564476e4ac 100644
--- a/pxe/event-support.c
+++ b/pxe/event-support.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifdef EVENTSYS
#include <stdio.h>
diff --git a/pxe/freebsd/sysboot.diffs b/pxe/freebsd/sysboot.diffs
index 0a46ce4d87..631b78708a 100644
--- a/pxe/freebsd/sysboot.diffs
+++ b/pxe/freebsd/sysboot.diffs
@@ -4024,9 +4024,26 @@ diff -ruN 6.2-release/src/sys/boot/i386/emuboot-cd/testbed.c 6.2/src/sys/boot/i3
+++ 6.2/src/sys/boot/i386/emuboot-cd/testbed.c Fri Mar 9 17:10:00 2007
@@ -0,0 +1,259 @@
+/*
-+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2000-2002, 2004, 2007 University of Utah and the Flux Group.
-+ * All rights reserved.
++ *
++ * {{{EMULAB-LICENSE
++ *
++ * This file is part of the Emulab network testbed software.
++ *
++ * This file is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Affero General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or (at
++ * your option) any later version.
++ *
++ * This file is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
++ * License for more details.
++ *
++ * You should have received a copy of the GNU Affero General Public License
++ * along with this file. If not, see <http://www.gnu.org/licenses/>.
++ *
++ * }}}
+ */
+
+/*
@@ -4287,9 +4304,26 @@ diff -ruN 6.2-release/src/sys/boot/i386/emuboot-cd/testbed_boot.h 6.2/src/sys/bo
+++ 6.2/src/sys/boot/i386/emuboot-cd/testbed_boot.h Thu May 27 14:00:18 2004
@@ -0,0 +1,111 @@
+/*
-+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2000-2002 University of Utah and the Flux Group.
-+ * All rights reserved.
++ *
++ * {{{EMULAB-LICENSE
++ *
++ * This file is part of the Emulab network testbed software.
++ *
++ * This file is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Affero General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or (at
++ * your option) any later version.
++ *
++ * This file is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
++ * License for more details.
++ *
++ * You should have received a copy of the GNU Affero General Public License
++ * along with this file. If not, see <http://www.gnu.org/licenses/>.
++ *
++ * }}}
+ */
+
+#include <netinet/in.h>
diff --git a/pxe/main.c b/pxe/main.c
index fbcf4ddfc4..99eefe2091 100644
--- a/pxe/main.c
+++ b/pxe/main.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/rc.d/GNUmakefile.in b/rc.d/GNUmakefile.in
index ea4ffb59cd..499dca867b 100644
--- a/rc.d/GNUmakefile.in
+++ b/rc.d/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# For installation.
#
diff --git a/robots/GNUmakefile.in b/robots/GNUmakefile.in
index c871338be2..df7eb4a496 100644
--- a/robots/GNUmakefile.in
+++ b/robots/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/robots/emc/GNUmakefile.in b/robots/emc/GNUmakefile.in
index 5f0b509339..25efd06892 100644
--- a/robots/emc/GNUmakefile.in
+++ b/robots/emc/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/robots/emc/emcd.c b/robots/emc/emcd.c
index 7367f11ab2..d8217805de 100755
--- a/robots/emc/emcd.c
+++ b/robots/emc/emcd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* emc sets up an interface for accepting commands over an internet socket;
diff --git a/robots/emc/emcd.h b/robots/emc/emcd.h
index cba193da0c..a82337f676 100644
--- a/robots/emc/emcd.h
+++ b/robots/emc/emcd.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __EMCD_H__
diff --git a/robots/emc/loclistener.in b/robots/emc/loclistener.in
index adb79d0f19..5e7615e329 100644
--- a/robots/emc/loclistener.in
+++ b/robots/emc/loclistener.in
@@ -1,9 +1,26 @@
#! /usr/bin/env python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import os, os.path
diff --git a/robots/emc/locpiper.in b/robots/emc/locpiper.in
index 93d678a03f..fb76d31fb1 100644
--- a/robots/emc/locpiper.in
+++ b/robots/emc/locpiper.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/robots/emc/robot_list.c b/robots/emc/robot_list.c
index 2dc554e3e6..8f6076cfa1 100755
--- a/robots/emc/robot_list.c
+++ b/robots/emc/robot_list.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/robots/emc/robot_list.h b/robots/emc/robot_list.h
index c67bf3fbd6..9634998272 100755
--- a/robots/emc/robot_list.h
+++ b/robots/emc/robot_list.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __ROBOT_LIST_H__
diff --git a/robots/emc/test_emcd.sh.in b/robots/emc/test_emcd.sh.in
index 74d0e4ca73..cd70780b92 100644
--- a/robots/emc/test_emcd.sh.in
+++ b/robots/emc/test_emcd.sh.in
@@ -1,9 +1,26 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
## Variables
diff --git a/robots/mezzanine/GNUmakefile.in b/robots/mezzanine/GNUmakefile.in
index cc15d3df7d..0e2593b849 100644
--- a/robots/mezzanine/GNUmakefile.in
+++ b/robots/mezzanine/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/robots/mezzanine/libmezz/blend_tris.c b/robots/mezzanine/libmezz/blend_tris.c
index facb85251c..ad8a2197e2 100644
--- a/robots/mezzanine/libmezz/blend_tris.c
+++ b/robots/mezzanine/libmezz/blend_tris.c
@@ -1,7 +1,24 @@
//
-// EMULAB-COPYRIGHT
// Copyright (c) 2005 University of Utah and the Flux Group.
-// All rights reserved.
+//
+// {{{EMULAB-LICENSE
+//
+// This file is part of the Emulab network testbed software.
+//
+// This file is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// This file is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this file. If not, see <http://www.gnu.org/licenses/>.
+//
+// }}}
//
#include <stdio.h>
diff --git a/robots/mezzanine/libmezz/blend_tris.h b/robots/mezzanine/libmezz/blend_tris.h
index 40cde112f9..a3660682fd 100644
--- a/robots/mezzanine/libmezz/blend_tris.h
+++ b/robots/mezzanine/libmezz/blend_tris.h
@@ -1,7 +1,24 @@
//
-// EMULAB-COPYRIGHT
// Copyright (c) 2005 University of Utah and the Flux Group.
-// All rights reserved.
+//
+// {{{EMULAB-LICENSE
+//
+// This file is part of the Emulab network testbed software.
+//
+// This file is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// This file is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this file. If not, see <http://www.gnu.org/licenses/>.
+//
+// }}}
//
#ifndef BLENDTRIS_H
diff --git a/robots/mezzanine/libmezz/fauxmezz.c b/robots/mezzanine/libmezz/fauxmezz.c
index 57eb601398..c3f1863f36 100644
--- a/robots/mezzanine/libmezz/fauxmezz.c
+++ b/robots/mezzanine/libmezz/fauxmezz.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/robots/mezzanine/libmezz/geom.c b/robots/mezzanine/libmezz/geom.c
index 4966515007..f35baca654 100644
--- a/robots/mezzanine/libmezz/geom.c
+++ b/robots/mezzanine/libmezz/geom.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// geom.c - Some basic linear algebra of points, vectors, and lines.
diff --git a/robots/mezzanine/libmezz/geom.h b/robots/mezzanine/libmezz/geom.h
index 889cfba297..99418ac14a 100644
--- a/robots/mezzanine/libmezz/geom.h
+++ b/robots/mezzanine/libmezz/geom.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// geom.h - Some basic linear algebra of points, vectors, and lines.
diff --git a/robots/mezzanine/libmezz/mezzdump.c b/robots/mezzanine/libmezz/mezzdump.c
index e99fd211d3..8b8a16e053 100644
--- a/robots/mezzanine/libmezz/mezzdump.c
+++ b/robots/mezzanine/libmezz/mezzdump.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/robots/mezzanine/libmezz/test_blend_tris.c b/robots/mezzanine/libmezz/test_blend_tris.c
index efe116a088..eb9bc304b1 100644
--- a/robots/mezzanine/libmezz/test_blend_tris.c
+++ b/robots/mezzanine/libmezz/test_blend_tris.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// test_blend_tris.c - Light testing of the blend_tris.[hc] code.
diff --git a/robots/mezzanine/libmezz/test_geom.c b/robots/mezzanine/libmezz/test_geom.c
index 4e58913f1b..02e2f64cea 100644
--- a/robots/mezzanine/libmezz/test_geom.c
+++ b/robots/mezzanine/libmezz/test_geom.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// test_geom.c - Light testing of the geom.[hc] code.
diff --git a/robots/mtp/GNUmakefile b/robots/mtp/GNUmakefile
index 3c3e7d28b8..ea81278bbc 100644
--- a/robots/mtp/GNUmakefile
+++ b/robots/mtp/GNUmakefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
JRPCGEN_JAR=jrpcgen.jar
diff --git a/robots/mtp/GNUmakefile.in b/robots/mtp/GNUmakefile.in
index d232fc7f34..2e4a76a573 100644
--- a/robots/mtp/GNUmakefile.in
+++ b/robots/mtp/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/robots/mtp/listNode.c b/robots/mtp/listNode.c
index 85155b608c..6c6a4a6117 100644
--- a/robots/mtp/listNode.c
+++ b/robots/mtp/listNode.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/mtp/listNode.h b/robots/mtp/listNode.h
index fc67ed4239..ea13c0b18d 100644
--- a/robots/mtp/listNode.h
+++ b/robots/mtp/listNode.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/mtp/mtp.c b/robots/mtp/mtp.c
index 2632ebeb49..64e68dbb06 100755
--- a/robots/mtp/mtp.c
+++ b/robots/mtp/mtp.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/mtp/mtp.h b/robots/mtp/mtp.h
index e0a8c8ed6a..ecd6239e8a 100755
--- a/robots/mtp/mtp.h
+++ b/robots/mtp/mtp.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/mtp/mtp.x b/robots/mtp/mtp.x
index dcbc0e6ba5..feff8dedf8 100644
--- a/robots/mtp/mtp.x
+++ b/robots/mtp/mtp.x
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/mtp/mtp_dump.c b/robots/mtp/mtp_dump.c
index e7032f0977..c66995d2ab 100644
--- a/robots/mtp/mtp_dump.c
+++ b/robots/mtp/mtp_dump.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/mtp/mtp_recv.c b/robots/mtp/mtp_recv.c
index 2287ce16c8..f4448801ac 100644
--- a/robots/mtp/mtp_recv.c
+++ b/robots/mtp/mtp_recv.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/mtp/mtp_send.c b/robots/mtp/mtp_send.c
index c29f4f7506..83981cbc51 100644
--- a/robots/mtp/mtp_send.c
+++ b/robots/mtp/mtp_send.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/mtp/mtp_test.c b/robots/mtp/mtp_test.c
index ff51afb071..4a5d9e07e9 100644
--- a/robots/mtp/mtp_test.c
+++ b/robots/mtp/mtp_test.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/robots/mtp/test_mtp.sh b/robots/mtp/test_mtp.sh
index 1f0f995e57..cc8e462353 100644
--- a/robots/mtp/test_mtp.sh
+++ b/robots/mtp/test_mtp.sh
@@ -1,9 +1,26 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
## Variables
diff --git a/robots/primotion/GNUmakefile.in b/robots/primotion/GNUmakefile.in
index c2ce4e7e16..df5f0248b3 100644
--- a/robots/primotion/GNUmakefile.in
+++ b/robots/primotion/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/robots/primotion/Makefile b/robots/primotion/Makefile
index 58d4d37de9..1f4f244401 100755
--- a/robots/primotion/Makefile
+++ b/robots/primotion/Makefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Makefile for Garcia robot applications
diff --git a/robots/primotion/brainstem-reset.cc b/robots/primotion/brainstem-reset.cc
index 68aefec1ec..0bd194a04d 100644
--- a/robots/primotion/brainstem-reset.cc
+++ b/robots/primotion/brainstem-reset.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/buttonManager.cc b/robots/primotion/buttonManager.cc
index 1d610bfc66..0bc714ade6 100644
--- a/robots/primotion/buttonManager.cc
+++ b/robots/primotion/buttonManager.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/buttonManager.hh b/robots/primotion/buttonManager.hh
index 4c1d4c6cb9..cd0961c5ef 100644
--- a/robots/primotion/buttonManager.hh
+++ b/robots/primotion/buttonManager.hh
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/circle.cc b/robots/primotion/circle.cc
index 1065734295..ace0173c99 100755
--- a/robots/primotion/circle.cc
+++ b/robots/primotion/circle.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* circle: garcia robot simple circle path
diff --git a/robots/primotion/commotion.cc b/robots/primotion/commotion.cc
index 201569cfa1..f200010097 100755
--- a/robots/primotion/commotion.cc
+++ b/robots/primotion/commotion.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* Garcia robot motion program (command and interactive mode)
diff --git a/robots/primotion/dashboard.cc b/robots/primotion/dashboard.cc
index 050a330f5c..5d5d72bb93 100644
--- a/robots/primotion/dashboard.cc
+++ b/robots/primotion/dashboard.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/dashboard.hh b/robots/primotion/dashboard.hh
index ba68609130..eb26924be0 100644
--- a/robots/primotion/dashboard.hh
+++ b/robots/primotion/dashboard.hh
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/dgrobot/GNUmakefile.in b/robots/primotion/dgrobot/GNUmakefile.in
index 56db027068..4fb1ba3da3 100644
--- a/robots/primotion/dgrobot/GNUmakefile.in
+++ b/robots/primotion/dgrobot/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/robots/primotion/dgrobot/commotion.h b/robots/primotion/dgrobot/commotion.h
index bf0fa88d70..56142e98ca 100755
--- a/robots/primotion/dgrobot/commotion.h
+++ b/robots/primotion/dgrobot/commotion.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* Garcia motion program (command and interactive mode)
diff --git a/robots/primotion/dgrobot/cubicpath.h b/robots/primotion/dgrobot/cubicpath.h
index ad4d98666b..1715983c59 100755
--- a/robots/primotion/dgrobot/cubicpath.h
+++ b/robots/primotion/dgrobot/cubicpath.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* cubicpath.h
diff --git a/robots/primotion/dgrobot/gbehaviors.cc b/robots/primotion/dgrobot/gbehaviors.cc
index 53e8cac382..849331bcf8 100644
--- a/robots/primotion/dgrobot/gbehaviors.cc
+++ b/robots/primotion/dgrobot/gbehaviors.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* Garcia robot behavior class methods
diff --git a/robots/primotion/dgrobot/gbehaviors.h b/robots/primotion/dgrobot/gbehaviors.h
index 4c203f00ed..f93b7f18ef 100644
--- a/robots/primotion/dgrobot/gbehaviors.h
+++ b/robots/primotion/dgrobot/gbehaviors.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* Garcia robot behavior data class
diff --git a/robots/primotion/dgrobot/gcallbacks.cc b/robots/primotion/dgrobot/gcallbacks.cc
index ddd8d3457d..b0eeee3558 100755
--- a/robots/primotion/dgrobot/gcallbacks.cc
+++ b/robots/primotion/dgrobot/gcallbacks.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* Garcia robot callback class methods
diff --git a/robots/primotion/dgrobot/gcallbacks.h b/robots/primotion/dgrobot/gcallbacks.h
index 8589e9cfe8..5f919657ff 100755
--- a/robots/primotion/dgrobot/gcallbacks.h
+++ b/robots/primotion/dgrobot/gcallbacks.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* Callback functions for garcia robot
diff --git a/robots/primotion/dgrobot/grobot.cc b/robots/primotion/dgrobot/grobot.cc
index 847a6e6ec3..04aa9e4a19 100755
--- a/robots/primotion/dgrobot/grobot.cc
+++ b/robots/primotion/dgrobot/grobot.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* Garcia robot class methods
diff --git a/robots/primotion/dgrobot/grobot.h b/robots/primotion/dgrobot/grobot.h
index a02f9f430c..784207b18c 100755
--- a/robots/primotion/dgrobot/grobot.h
+++ b/robots/primotion/dgrobot/grobot.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* Garcia robot class
diff --git a/robots/primotion/dgrobot/grobot_sim.cc b/robots/primotion/dgrobot/grobot_sim.cc
index 67d2f50d4f..e83f3b14ae 100644
--- a/robots/primotion/dgrobot/grobot_sim.cc
+++ b/robots/primotion/dgrobot/grobot_sim.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/robots/primotion/dgrobot/simplepath.cc b/robots/primotion/dgrobot/simplepath.cc
index 4a2ba198d5..7fac765f91 100755
--- a/robots/primotion/dgrobot/simplepath.cc
+++ b/robots/primotion/dgrobot/simplepath.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* simplepath.cc
diff --git a/robots/primotion/dgrobot/simplepath.h b/robots/primotion/dgrobot/simplepath.h
index aabb08921f..8cfc061299 100755
--- a/robots/primotion/dgrobot/simplepath.h
+++ b/robots/primotion/dgrobot/simplepath.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* simplepath.h
diff --git a/robots/primotion/faultDetection.cc b/robots/primotion/faultDetection.cc
index 571b121f28..a92f1745c9 100644
--- a/robots/primotion/faultDetection.cc
+++ b/robots/primotion/faultDetection.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/robots/primotion/faultDetection.hh b/robots/primotion/faultDetection.hh
index cf9ab1d365..b5a872fb4d 100644
--- a/robots/primotion/faultDetection.hh
+++ b/robots/primotion/faultDetection.hh
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _faultDetection_hh
diff --git a/robots/primotion/flash-user-led.cc b/robots/primotion/flash-user-led.cc
index dbd2441987..4c9294e04c 100644
--- a/robots/primotion/flash-user-led.cc
+++ b/robots/primotion/flash-user-led.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/robots/primotion/garcia-pilot.cc b/robots/primotion/garcia-pilot.cc
index fe819fa8a8..2e3075aafd 100644
--- a/robots/primotion/garcia-pilot.cc
+++ b/robots/primotion/garcia-pilot.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/garcia-pilot.hh b/robots/primotion/garcia-pilot.hh
index 75642b1a1a..952c6b64b7 100644
--- a/robots/primotion/garcia-pilot.hh
+++ b/robots/primotion/garcia-pilot.hh
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _garcia_pilot_hh
diff --git a/robots/primotion/garciaUtil.cc b/robots/primotion/garciaUtil.cc
index ace6b340e2..8607e948cd 100644
--- a/robots/primotion/garciaUtil.cc
+++ b/robots/primotion/garciaUtil.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/garciaUtil.hh b/robots/primotion/garciaUtil.hh
index 6341947936..554cdb5893 100644
--- a/robots/primotion/garciaUtil.hh
+++ b/robots/primotion/garciaUtil.hh
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/gorobot.cc b/robots/primotion/gorobot.cc
index 0ed11535ca..638cf875f2 100755
--- a/robots/primotion/gorobot.cc
+++ b/robots/primotion/gorobot.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* gorobot.cc
diff --git a/robots/primotion/gorobotc.cc b/robots/primotion/gorobotc.cc
index 6d176977c4..515a786d17 100644
--- a/robots/primotion/gorobotc.cc
+++ b/robots/primotion/gorobotc.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* gorobotc.cc
diff --git a/robots/primotion/ledManager.cc b/robots/primotion/ledManager.cc
index 8c3653126c..a85cfd9611 100644
--- a/robots/primotion/ledManager.cc
+++ b/robots/primotion/ledManager.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/ledManager.hh b/robots/primotion/ledManager.hh
index 1291ab338c..553335bb04 100644
--- a/robots/primotion/ledManager.hh
+++ b/robots/primotion/ledManager.hh
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/pathmotion.cc b/robots/primotion/pathmotion.cc
index c9c77179b9..a0043b89bc 100755
--- a/robots/primotion/pathmotion.cc
+++ b/robots/primotion/pathmotion.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* pathmotion: garcia robot path generator
diff --git a/robots/primotion/pilot-wrapper.sh b/robots/primotion/pilot-wrapper.sh
index 68b9fa2b33..3f589e1dc6 100644
--- a/robots/primotion/pilot-wrapper.sh
+++ b/robots/primotion/pilot-wrapper.sh
@@ -1,9 +1,26 @@
#! /usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/robots/primotion/pilotButtonCallback.cc b/robots/primotion/pilotButtonCallback.cc
index a96ee2b2a8..6b40c4f8b2 100644
--- a/robots/primotion/pilotButtonCallback.cc
+++ b/robots/primotion/pilotButtonCallback.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/pilotButtonCallback.hh b/robots/primotion/pilotButtonCallback.hh
index 843601695f..682e144bd1 100644
--- a/robots/primotion/pilotButtonCallback.hh
+++ b/robots/primotion/pilotButtonCallback.hh
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/pilotClient.cc b/robots/primotion/pilotClient.cc
index 062ed16113..a65fbeab88 100644
--- a/robots/primotion/pilotClient.cc
+++ b/robots/primotion/pilotClient.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005, 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/pilotClient.hh b/robots/primotion/pilotClient.hh
index e7a3208ce5..365c701b77 100644
--- a/robots/primotion/pilotClient.hh
+++ b/robots/primotion/pilotClient.hh
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/run b/robots/primotion/run
index 040cb59e71..11c41c48ba 100755
--- a/robots/primotion/run
+++ b/robots/primotion/run
@@ -1,9 +1,26 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
export LD_LIBRARY_PATH="/z/garcia/brainstem/aRelease/aUnix/i686:/z/garcia/brainstem/aDebug/aUnix/i686"
diff --git a/robots/primotion/test_gorobot.sh.in b/robots/primotion/test_gorobot.sh.in
index efdc47499b..1a55cc0123 100644
--- a/robots/primotion/test_gorobot.sh.in
+++ b/robots/primotion/test_gorobot.sh.in
@@ -1,9 +1,26 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
## Variables
diff --git a/robots/primotion/watch-user-button.cc b/robots/primotion/watch-user-button.cc
index f5c8ab2994..f62eb9f2ac 100644
--- a/robots/primotion/watch-user-button.cc
+++ b/robots/primotion/watch-user-button.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/robots/primotion/wheelManager.cc b/robots/primotion/wheelManager.cc
index bf5a4c6c15..6219736b70 100644
--- a/robots/primotion/wheelManager.cc
+++ b/robots/primotion/wheelManager.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005, 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/primotion/wheelManager.hh b/robots/primotion/wheelManager.hh
index 47694b863d..9127415f11 100644
--- a/robots/primotion/wheelManager.hh
+++ b/robots/primotion/wheelManager.hh
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/rmcd/GNUmakefile.in b/robots/rmcd/GNUmakefile.in
index 55cc3d5c24..e3597eba0a 100644
--- a/robots/rmcd/GNUmakefile.in
+++ b/robots/rmcd/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/robots/rmcd/masterController.c b/robots/rmcd/masterController.c
index 17c36cceba..3bb1709766 100644
--- a/robots/rmcd/masterController.c
+++ b/robots/rmcd/masterController.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/rmcd/masterController.h b/robots/rmcd/masterController.h
index ada88b2385..1364a3acaf 100644
--- a/robots/rmcd/masterController.h
+++ b/robots/rmcd/masterController.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _rmcd_master_controller_h
diff --git a/robots/rmcd/multi_path.c b/robots/rmcd/multi_path.c
index a182c7fd32..c59f1b9a33 100644
--- a/robots/rmcd/multi_path.c
+++ b/robots/rmcd/multi_path.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/rmcd/obstacles.c b/robots/rmcd/obstacles.c
index 740ec569eb..ae1da0844f 100644
--- a/robots/rmcd/obstacles.c
+++ b/robots/rmcd/obstacles.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/robots/rmcd/obstacles.h b/robots/rmcd/obstacles.h
index 859faab1bf..7f7341a575 100644
--- a/robots/rmcd/obstacles.h
+++ b/robots/rmcd/obstacles.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _obstacles_h
diff --git a/robots/rmcd/pathPlanning.c b/robots/rmcd/pathPlanning.c
index 2526c1bb1b..5956b0a886 100644
--- a/robots/rmcd/pathPlanning.c
+++ b/robots/rmcd/pathPlanning.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/robots/rmcd/pathPlanning.h b/robots/rmcd/pathPlanning.h
index c130d9df0f..1c4c2b71a0 100644
--- a/robots/rmcd/pathPlanning.h
+++ b/robots/rmcd/pathPlanning.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _rmcd_path_planning_h
diff --git a/robots/rmcd/pilotConnection.c b/robots/rmcd/pilotConnection.c
index 5cb0d04139..0f3b2aaeb4 100644
--- a/robots/rmcd/pilotConnection.c
+++ b/robots/rmcd/pilotConnection.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/robots/rmcd/pilotConnection.h b/robots/rmcd/pilotConnection.h
index a002fec919..b356849b99 100644
--- a/robots/rmcd/pilotConnection.h
+++ b/robots/rmcd/pilotConnection.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _pilot_connection_h
diff --git a/robots/rmcd/rclip.c b/robots/rmcd/rclip.c
index 8aa69183e9..52363c9981 100644
--- a/robots/rmcd/rclip.c
+++ b/robots/rmcd/rclip.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/robots/rmcd/rclip.h b/robots/rmcd/rclip.h
index cb595ae93d..6ce19bac90 100644
--- a/robots/rmcd/rclip.h
+++ b/robots/rmcd/rclip.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _rclip_h
diff --git a/robots/rmcd/rcoord.c b/robots/rmcd/rcoord.c
index 797585c230..db7e5b3b90 100644
--- a/robots/rmcd/rcoord.c
+++ b/robots/rmcd/rcoord.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* RMCD: Coordinate transformation functions
diff --git a/robots/rmcd/rcoord.h b/robots/rmcd/rcoord.h
index beeafc985a..80f2914f61 100644
--- a/robots/rmcd/rcoord.h
+++ b/robots/rmcd/rcoord.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
diff --git a/robots/rmcd/rmcd.c b/robots/rmcd/rmcd.c
index a0d23c39a1..de41178d65 100644
--- a/robots/rmcd/rmcd.c
+++ b/robots/rmcd/rmcd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* Robot Master Control Daemon
diff --git a/robots/rmcd/rmcd.h b/robots/rmcd/rmcd.h
index 4b47bac007..673df92c88 100644
--- a/robots/rmcd/rmcd.h
+++ b/robots/rmcd/rmcd.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __RMCD_H__
diff --git a/robots/rmcd/simple_path.c b/robots/rmcd/simple_path.c
index 2a9fd15b44..673db940ee 100644
--- a/robots/rmcd/simple_path.c
+++ b/robots/rmcd/simple_path.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/rmcd/slaveController.c b/robots/rmcd/slaveController.c
index 6159a91968..bbc01d3d35 100644
--- a/robots/rmcd/slaveController.c
+++ b/robots/rmcd/slaveController.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/rmcd/slaveController.h b/robots/rmcd/slaveController.h
index 193a16ecf9..6613588511 100644
--- a/robots/rmcd/slaveController.h
+++ b/robots/rmcd/slaveController.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _rmcd_slave_controller_h
diff --git a/robots/rmcd/test_multi_path.sh b/robots/rmcd/test_multi_path.sh
index 2d16740d9b..d64b609485 100644
--- a/robots/rmcd/test_multi_path.sh
+++ b/robots/rmcd/test_multi_path.sh
@@ -1,9 +1,26 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
## Variables
diff --git a/robots/rmcd/test_path.c b/robots/rmcd/test_path.c
index 7899ed43a4..0aac41d4d8 100644
--- a/robots/rmcd/test_path.c
+++ b/robots/rmcd/test_path.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/rmcd/test_rmcd.sh.in b/robots/rmcd/test_rmcd.sh.in
index 7ac042817a..7de22cc4f0 100644
--- a/robots/rmcd/test_rmcd.sh.in
+++ b/robots/rmcd/test_rmcd.sh.in
@@ -1,9 +1,26 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
## Variables
diff --git a/robots/rmcd/test_simple_path.sh b/robots/rmcd/test_simple_path.sh
index 9c45a27b03..728233876e 100644
--- a/robots/rmcd/test_simple_path.sh
+++ b/robots/rmcd/test_simple_path.sh
@@ -1,9 +1,26 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
## Variables
diff --git a/robots/robomonitord.in b/robots/robomonitord.in
index 515450a7cb..c44cf0e1a9 100644
--- a/robots/robomonitord.in
+++ b/robots/robomonitord.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2005, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/robots/tbsetdest/GNUmakefile.in b/robots/tbsetdest/GNUmakefile.in
index eb8f95cafc..2270d64b69 100644
--- a/robots/tbsetdest/GNUmakefile.in
+++ b/robots/tbsetdest/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/robots/tbsetdest/tbsetdest.cc b/robots/tbsetdest/tbsetdest.cc
index adf2a52a36..7b2a774107 100644
--- a/robots/tbsetdest/tbsetdest.cc
+++ b/robots/tbsetdest/tbsetdest.cc
@@ -36,9 +36,26 @@
*/
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
extern "C" {
diff --git a/robots/tbsetdest/tbsetdest.h b/robots/tbsetdest/tbsetdest.h
index d9dac763aa..4edfd42bfe 100644
--- a/robots/tbsetdest/tbsetdest.h
+++ b/robots/tbsetdest/tbsetdest.h
@@ -35,9 +35,26 @@
*/
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __tbsetdest_h__
diff --git a/robots/tracker/BSpline.java b/robots/tracker/BSpline.java
index e45a880145..fe943d7ca5 100644
--- a/robots/tracker/BSpline.java
+++ b/robots/tracker/BSpline.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
diff --git a/robots/tracker/DrawPanel.java b/robots/tracker/DrawPanel.java
index ebc74a62c2..c44fa7f802 100644
--- a/robots/tracker/DrawPanel.java
+++ b/robots/tracker/DrawPanel.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
diff --git a/robots/tracker/Editor.java b/robots/tracker/Editor.java
index bc5ad76d62..f997920489 100644
--- a/robots/tracker/Editor.java
+++ b/robots/tracker/Editor.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/robots/tracker/GNUmakefile.in b/robots/tracker/GNUmakefile.in
index f0b4ea9b20..a2d75cb464 100644
--- a/robots/tracker/GNUmakefile.in
+++ b/robots/tracker/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/robots/tracker/NodeSelect.java b/robots/tracker/NodeSelect.java
index 4fadd8c7b3..92fe26c793 100644
--- a/robots/tracker/NodeSelect.java
+++ b/robots/tracker/NodeSelect.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
diff --git a/robots/tracker/RoboTrack.java b/robots/tracker/RoboTrack.java
index b3ea040769..2d1ec13a10 100644
--- a/robots/tracker/RoboTrack.java
+++ b/robots/tracker/RoboTrack.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
diff --git a/robots/vmcd/GNUmakefile.in b/robots/vmcd/GNUmakefile.in
index 343d4fd9a3..eb81298927 100644
--- a/robots/vmcd/GNUmakefile.in
+++ b/robots/vmcd/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/robots/vmcd/analysis_w_plot.awk b/robots/vmcd/analysis_w_plot.awk
index 05e4c2df84..df9af1428f 100755
--- a/robots/vmcd/analysis_w_plot.awk
+++ b/robots/vmcd/analysis_w_plot.awk
@@ -1,8 +1,25 @@
#! /usr/bin/awk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# analysis_w_plot.awk - Make gnuplot data files from dump_analyzer output.
#
diff --git a/robots/vmcd/cam-sim.awk b/robots/vmcd/cam-sim.awk
index bb7d1f2f5f..25c0184838 100755
--- a/robots/vmcd/cam-sim.awk
+++ b/robots/vmcd/cam-sim.awk
@@ -1,9 +1,26 @@
#! /usr/bin/awk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/robots/vmcd/camera_checker.c b/robots/vmcd/camera_checker.c
index 51a4125876..daca58f55d 100644
--- a/robots/vmcd/camera_checker.c
+++ b/robots/vmcd/camera_checker.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* camera_checker - Automated check system using fixed permanent fiducials.
diff --git a/robots/vmcd/camera_checker.initd b/robots/vmcd/camera_checker.initd
index 82c8f116ee..5977ec8371 100644
--- a/robots/vmcd/camera_checker.initd
+++ b/robots/vmcd/camera_checker.initd
@@ -1,9 +1,26 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# chkconfig: 2345 30 90
diff --git a/robots/vmcd/camera_data/Makefile b/robots/vmcd/camera_data/Makefile
index e60c02a998..466333757a 100644
--- a/robots/vmcd/camera_data/Makefile
+++ b/robots/vmcd/camera_data/Makefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Makefile for robots/vmcd/camera_data.
diff --git a/robots/vmcd/camera_data/blend_tris.py b/robots/vmcd/camera_data/blend_tris.py
index 2bd5a558d6..13aa6d9501 100644
--- a/robots/vmcd/camera_data/blend_tris.py
+++ b/robots/vmcd/camera_data/blend_tris.py
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import geom
diff --git a/robots/vmcd/camera_data/cal_pts.py b/robots/vmcd/camera_data/cal_pts.py
index c627661944..fa6e1e409d 100755
--- a/robots/vmcd/camera_data/cal_pts.py
+++ b/robots/vmcd/camera_data/cal_pts.py
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# cal_pts.py - Convert dump analysis data into mezzanine.opt calibration pts.
#
diff --git a/robots/vmcd/camera_data/geom.py b/robots/vmcd/camera_data/geom.py
index dbc7565dc1..55e2d6aa53 100644
--- a/robots/vmcd/camera_data/geom.py
+++ b/robots/vmcd/camera_data/geom.py
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# geom.py - Some basic linear algebra of points, vectors, and lines.
# Points and vectors are lists or tuples of numbers.
diff --git a/robots/vmcd/camera_data/output_config.awk b/robots/vmcd/camera_data/output_config.awk
index d25d8e379c..90967d07a3 100755
--- a/robots/vmcd/camera_data/output_config.awk
+++ b/robots/vmcd/camera_data/output_config.awk
@@ -1,8 +1,25 @@
#! /usr/bin/awk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# output_config.awk - Add config data into the dump output file before analysis.
#
diff --git a/robots/vmcd/camera_data/read_analysis.py b/robots/vmcd/camera_data/read_analysis.py
index 39d85a0577..db84b1a656 100644
--- a/robots/vmcd/camera_data/read_analysis.py
+++ b/robots/vmcd/camera_data/read_analysis.py
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# read_analysis.py - Read in data from dump_analyzer.
diff --git a/robots/vmcd/camera_data/subset_fd_output.awk b/robots/vmcd/camera_data/subset_fd_output.awk
index f8321c2665..5ace88ac9e 100755
--- a/robots/vmcd/camera_data/subset_fd_output.awk
+++ b/robots/vmcd/camera_data/subset_fd_output.awk
@@ -1,8 +1,25 @@
#! /usr/bin/awk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# subset_fd_output.awk - Extract a subset of points from file_dumper output.
#
diff --git a/robots/vmcd/camera_data/test_lin_blend.py b/robots/vmcd/camera_data/test_lin_blend.py
index 888f9de9d0..7a2935729c 100755
--- a/robots/vmcd/camera_data/test_lin_blend.py
+++ b/robots/vmcd/camera_data/test_lin_blend.py
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# test_lin_blend.py - Quick prototype of piecewise triangular linear blending.
#
diff --git a/robots/vmcd/camera_data/test_lin_blend2.py b/robots/vmcd/camera_data/test_lin_blend2.py
index 188e8bbf80..3defeead87 100755
--- a/robots/vmcd/camera_data/test_lin_blend2.py
+++ b/robots/vmcd/camera_data/test_lin_blend2.py
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# test_lin_blend2.py - 9 point radial version.
# Quick prototype of piecewise triangular linear blending.
diff --git a/robots/vmcd/camera_data/test_lin_blend3.py b/robots/vmcd/camera_data/test_lin_blend3.py
index 0816bfbdae..39e6e23e54 100755
--- a/robots/vmcd/camera_data/test_lin_blend3.py
+++ b/robots/vmcd/camera_data/test_lin_blend3.py
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# test_lin_blend3.py - 9 point concentric version.
# Quick prototype of piecewise triangular linear blending.
diff --git a/robots/vmcd/dump_analyzer.py b/robots/vmcd/dump_analyzer.py
index 750cef089f..c80f469861 100755
--- a/robots/vmcd/dump_analyzer.py
+++ b/robots/vmcd/dump_analyzer.py
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
import getopt
diff --git a/robots/vmcd/file_dumper.c b/robots/vmcd/file_dumper.c
index 26f4b8ae22..3cead46450 100644
--- a/robots/vmcd/file_dumper.c
+++ b/robots/vmcd/file_dumper.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/robots/vmcd/robotObject.c b/robots/vmcd/robotObject.c
index da1ec4a41f..fae09451e8 100644
--- a/robots/vmcd/robotObject.c
+++ b/robots/vmcd/robotObject.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/robots/vmcd/robotObject.h b/robots/vmcd/robotObject.h
index cad76cf31f..fa37b8e39e 100644
--- a/robots/vmcd/robotObject.h
+++ b/robots/vmcd/robotObject.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _robot_object_h
diff --git a/robots/vmcd/test_vmc-client.sh.in b/robots/vmcd/test_vmc-client.sh.in
index 2e17d7f988..67c0993931 100644
--- a/robots/vmcd/test_vmc-client.sh.in
+++ b/robots/vmcd/test_vmc-client.sh.in
@@ -1,9 +1,26 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
## Variables
diff --git a/robots/vmcd/test_vmcd.sh.in b/robots/vmcd/test_vmcd.sh.in
index 451bbecd4e..91e9057fa0 100644
--- a/robots/vmcd/test_vmcd.sh.in
+++ b/robots/vmcd/test_vmcd.sh.in
@@ -1,9 +1,26 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
## Variables
diff --git a/robots/vmcd/test_vmcd2.sh b/robots/vmcd/test_vmcd2.sh
index c266fef3ad..736e48403d 100644
--- a/robots/vmcd/test_vmcd2.sh
+++ b/robots/vmcd/test_vmcd2.sh
@@ -1,9 +1,26 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
## Variables
diff --git a/robots/vmcd/test_vmcd3.sh b/robots/vmcd/test_vmcd3.sh
index e86cb63c61..5574a20ade 100644
--- a/robots/vmcd/test_vmcd3.sh
+++ b/robots/vmcd/test_vmcd3.sh
@@ -1,9 +1,26 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
## Variables
diff --git a/robots/vmcd/test_vmcd4.sh b/robots/vmcd/test_vmcd4.sh
index 87ffb97fd4..69bc979873 100644
--- a/robots/vmcd/test_vmcd4.sh
+++ b/robots/vmcd/test_vmcd4.sh
@@ -1,9 +1,26 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
## Variables
diff --git a/robots/vmcd/visionTrack.c b/robots/vmcd/visionTrack.c
index f6f6590ff6..2db141c5c2 100644
--- a/robots/vmcd/visionTrack.c
+++ b/robots/vmcd/visionTrack.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005, 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/robots/vmcd/visionTrack.h b/robots/vmcd/visionTrack.h
index 10ebdac54d..88b4891f52 100644
--- a/robots/vmcd/visionTrack.h
+++ b/robots/vmcd/visionTrack.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005, 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _vision_track_h
diff --git a/robots/vmcd/vmc-client.c b/robots/vmcd/vmc-client.c
index 8da2812b76..76526ea368 100644
--- a/robots/vmcd/vmc-client.c
+++ b/robots/vmcd/vmc-client.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/robots/vmcd/vmc-client.initd b/robots/vmcd/vmc-client.initd
index 4c9801093d..c977817d3f 100644
--- a/robots/vmcd/vmc-client.initd
+++ b/robots/vmcd/vmc-client.initd
@@ -1,9 +1,26 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# chkconfig: 2345 30 90
diff --git a/robots/vmcd/vmcd.c b/robots/vmcd/vmcd.c
index 7d3f46a52f..393a4b99fe 100644
--- a/robots/vmcd/vmcd.c
+++ b/robots/vmcd/vmcd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/robots/vmcd/vmcd.h b/robots/vmcd/vmcd.h
index ef1435d451..5d283e6140 100644
--- a/robots/vmcd/vmcd.h
+++ b/robots/vmcd/vmcd.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005, 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _vmcd_h
diff --git a/robots/vmcd/worldTransform.py b/robots/vmcd/worldTransform.py
index ce7137c2fa..47aadc6a82 100644
--- a/robots/vmcd/worldTransform.py
+++ b/robots/vmcd/worldTransform.py
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import math
diff --git a/security/GNUmakefile.in b/security/GNUmakefile.in
index c104e671ee..81fef1f09b 100644
--- a/security/GNUmakefile.in
+++ b/security/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/security/checkenv.pl b/security/checkenv.pl
index 44e1160701..e89890b856 100755
--- a/security/checkenv.pl
+++ b/security/checkenv.pl
@@ -1,9 +1,26 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/security/genlastlog.c b/security/genlastlog.c
index 3035c2d590..6e4d7c228a 100644
--- a/security/genlastlog.c
+++ b/security/genlastlog.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/security/lastlog_daemon.in b/security/lastlog_daemon.in
index 3cad040c2e..500c59f980 100644
--- a/security/lastlog_daemon.in
+++ b/security/lastlog_daemon.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/security/runsuid.c b/security/runsuid.c
index 0b347c95cd..baaa8cc0c4 100644
--- a/security/runsuid.c
+++ b/security/runsuid.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/security/sudoers.in b/security/sudoers.in
index c6ab93bb7b..b8a147666c 100644
--- a/security/sudoers.in
+++ b/security/sudoers.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/security/suexec.c b/security/suexec.c
index 885d5cbea1..fc32d098a5 100644
--- a/security/suexec.c
+++ b/security/suexec.c
@@ -55,9 +55,26 @@
*
*/
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/security/suexec.h b/security/suexec.h
index f24ba84b8d..d32ac10539 100644
--- a/security/suexec.h
+++ b/security/suexec.h
@@ -55,9 +55,26 @@
*
*/
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/sensors/GNUmakefile.in b/sensors/GNUmakefile.in
index 01fc37fecc..2a75c7f0f5 100644
--- a/sensors/GNUmakefile.in
+++ b/sensors/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/sensors/and/GNUmakefile.in b/sensors/and/GNUmakefile.in
index e3597d1ca5..3aa8483b51 100644
--- a/sensors/and/GNUmakefile.in
+++ b/sensors/and/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# This is the Emulab specific makefile.
#
diff --git a/sensors/hmcd/Makefile b/sensors/hmcd/Makefile
index dcc90d4952..488c19a4e3 100644
--- a/sensors/hmcd/Makefile
+++ b/sensors/hmcd/Makefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
CC?=gcc
diff --git a/sensors/hmcd/hmcd.c b/sensors/hmcd/hmcd.c
index 2b7bb01c77..07f5f80593 100644
--- a/sensors/hmcd/hmcd.c
+++ b/sensors/hmcd/hmcd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* Collection agent for healthd 'push' mode - Healthd Master Collection
diff --git a/sensors/hmcd/hmcd.h b/sensors/hmcd/hmcd.h
index d1f2b685c5..ee6a59228b 100644
--- a/sensors/hmcd/hmcd.h
+++ b/sensors/hmcd/hmcd.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* hmcd.h - header file for Healthd Master Collection Daemon, and peer
diff --git a/sensors/hmcd/hmcdgrab.c b/sensors/hmcd/hmcdgrab.c
index 9c4924ccfb..3cedad38ef 100644
--- a/sensors/hmcd/hmcdgrab.c
+++ b/sensors/hmcd/hmcdgrab.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* hcmdgrab - utility to obtain stored data in hcmd */
diff --git a/sensors/nfstrace/GNUmakefile b/sensors/nfstrace/GNUmakefile
index 20fa0416b1..2c2c5b37a0 100644
--- a/sensors/nfstrace/GNUmakefile
+++ b/sensors/nfstrace/GNUmakefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# This makefile is different than all the others...
diff --git a/sensors/nfstrace/GNUmakefile.in b/sensors/nfstrace/GNUmakefile.in
index 5de8b09161..23ceb550e4 100644
--- a/sensors/nfstrace/GNUmakefile.in
+++ b/sensors/nfstrace/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007, 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# This is the Emulab specific makefile.
#
diff --git a/sensors/nfstrace/nfsdump2/GNUmakefile.in b/sensors/nfstrace/nfsdump2/GNUmakefile.in
index f80e189a21..eea7c3d00e 100644
--- a/sensors/nfstrace/nfsdump2/GNUmakefile.in
+++ b/sensors/nfstrace/nfsdump2/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/sensors/nfstrace/nfsdump2/files/listNode.c b/sensors/nfstrace/nfsdump2/files/listNode.c
index 85155b608c..6c6a4a6117 100644
--- a/sensors/nfstrace/nfsdump2/files/listNode.c
+++ b/sensors/nfstrace/nfsdump2/files/listNode.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/sensors/nfstrace/nfsdump2/files/listNode.h b/sensors/nfstrace/nfsdump2/files/listNode.h
index fc67ed4239..ea13c0b18d 100644
--- a/sensors/nfstrace/nfsdump2/files/listNode.h
+++ b/sensors/nfstrace/nfsdump2/files/listNode.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/sensors/nfstrace/nfsdump2/files/mypcap.c b/sensors/nfstrace/nfsdump2/files/mypcap.c
index 12ff334082..778b079c58 100644
--- a/sensors/nfstrace/nfsdump2/files/mypcap.c
+++ b/sensors/nfstrace/nfsdump2/files/mypcap.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/sensors/nfstrace/nfsdump2/files/mypcap.h b/sensors/nfstrace/nfsdump2/files/mypcap.h
index adc4809f01..db77397d30 100644
--- a/sensors/nfstrace/nfsdump2/files/mypcap.h
+++ b/sensors/nfstrace/nfsdump2/files/mypcap.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _mypcap_h
diff --git a/sensors/nfstrace/nfsdump2/files/packetTable.c b/sensors/nfstrace/nfsdump2/files/packetTable.c
index 97261ab445..530d40c5d9 100644
--- a/sensors/nfstrace/nfsdump2/files/packetTable.c
+++ b/sensors/nfstrace/nfsdump2/files/packetTable.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifdef HAVE_CONFIG_H
diff --git a/sensors/nfstrace/nfsdump2/files/packetTable.h b/sensors/nfstrace/nfsdump2/files/packetTable.h
index d405996452..425013e30c 100644
--- a/sensors/nfstrace/nfsdump2/files/packetTable.h
+++ b/sensors/nfstrace/nfsdump2/files/packetTable.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _packet_table_h
diff --git a/sensors/nfstrace/nfsdump2/nfsdump2-install b/sensors/nfstrace/nfsdump2/nfsdump2-install
index cdbd92b8fc..2ce3f12366 100755
--- a/sensors/nfstrace/nfsdump2/nfsdump2-install
+++ b/sensors/nfstrace/nfsdump2/nfsdump2-install
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/sensors/nfstrace/nfsdump2db b/sensors/nfstrace/nfsdump2db
index 93d8aec254..ba4e9b9bf5 100644
--- a/sensors/nfstrace/nfsdump2db
+++ b/sensors/nfstrace/nfsdump2db
@@ -1,9 +1,26 @@
#! /usr/bin/env python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/sensors/nfstrace/nfsdump2db.8 b/sensors/nfstrace/nfsdump2db.8
index 5d79b45ae3..b4428354b9 100644
--- a/sensors/nfstrace/nfsdump2db.8
+++ b/sensors/nfstrace/nfsdump2db.8
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.TH NFSDUMP2DB 8 "Dec 20, 2005" "Emulab" "Emulab Commands Manual"
.OS
diff --git a/sensors/nfstrace/nfstrace.7 b/sensors/nfstrace/nfstrace.7
index 86e086b780..7a43633dc5 100644
--- a/sensors/nfstrace/nfstrace.7
+++ b/sensors/nfstrace/nfstrace.7
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2005 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.TH NFSTRACE 7 "Dec 20, 2005" "Emulab" "Emulab Commands Manual"
.OS
diff --git a/sensors/nfstrace/nfstrace.init.in b/sensors/nfstrace/nfstrace.init.in
index 59ad2ef8a6..57d83f9361 100644
--- a/sensors/nfstrace/nfstrace.init.in
+++ b/sensors/nfstrace/nfstrace.init.in
@@ -6,9 +6,26 @@
# processname: nfstrace
#
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
prefix=@prefix@
diff --git a/sensors/nfstrace/nfstrace.proxy b/sensors/nfstrace/nfstrace.proxy
index 4e92af0f02..012fa72c61 100644
--- a/sensors/nfstrace/nfstrace.proxy
+++ b/sensors/nfstrace/nfstrace.proxy
@@ -1,9 +1,26 @@
#! /usr/bin/env python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/sensors/nfstrace/nfstrace.proxy.8 b/sensors/nfstrace/nfstrace.proxy.8
index 270cc5cae6..68e6fd790c 100644
--- a/sensors/nfstrace/nfstrace.proxy.8
+++ b/sensors/nfstrace/nfstrace.proxy.8
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2005 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.TH NFSTRACE.PROXY 8 "Dec 16, 2005" "Emulab" "Emulab Commands Manual"
.OS
diff --git a/sensors/powermon/GNUmakefile.in b/sensors/powermon/GNUmakefile.in
index 77ebce9ad3..a1e82ed086 100644
--- a/sensors/powermon/GNUmakefile.in
+++ b/sensors/powermon/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/sensors/powermon/powermon.in b/sensors/powermon/powermon.in
index 7bf36966e9..511d366f7e 100644
--- a/sensors/powermon/powermon.in
+++ b/sensors/powermon/powermon.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/sql/GNUmakefile b/sql/GNUmakefile
index 80d012faef..a9af22cb03 100644
--- a/sql/GNUmakefile
+++ b/sql/GNUmakefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# This makefile is different than all the others...
diff --git a/sql/bios_move.pl b/sql/bios_move.pl
index 4b874e5e4f..4f83a13bd6 100755
--- a/sql/bios_move.pl
+++ b/sql/bios_move.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/close-projadminlists.pl b/sql/close-projadminlists.pl
index f13808ad3d..8311fe2602 100755
--- a/sql/close-projadminlists.pl
+++ b/sql/close-projadminlists.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/create-projadminlists.pl b/sql/create-projadminlists.pl
index e81407fa5e..857d0ada28 100755
--- a/sql/create-projadminlists.pl
+++ b/sql/create-projadminlists.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/database-migrate.txt b/sql/database-migrate.txt
index 86c1a624ad..2fb5d63160 100644
--- a/sql/database-migrate.txt
+++ b/sql/database-migrate.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Anytime you change database-create.sql, but sure to put any special
# (sql) instructions that need to be executed to bring an existing DB
diff --git a/sql/delvnodes.pl b/sql/delvnodes.pl
index 822918c016..200eb37806 100755
--- a/sql/delvnodes.pl
+++ b/sql/delvnodes.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/errors-migrate.pl b/sql/errors-migrate.pl
index dee2d600f7..16b6e8b2cb 100644
--- a/sql/errors-migrate.pl
+++ b/sql/errors-migrate.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/sql/fixstats-swapin.pl b/sql/fixstats-swapin.pl
index 4d9e8c9a28..c2e20e9a2e 100644
--- a/sql/fixstats-swapin.pl
+++ b/sql/fixstats-swapin.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/fixstats_swapmod.pl b/sql/fixstats_swapmod.pl
index bd2ae8b23b..e35e75503c 100755
--- a/sql/fixstats_swapmod.pl
+++ b/sql/fixstats_swapmod.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/gentopmaps.pl b/sql/gentopmaps.pl
index 673e7d6586..03e23249c5 100755
--- a/sql/gentopmaps.pl
+++ b/sql/gentopmaps.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/init_newids.pl b/sql/init_newids.pl
index 55e17a4da2..27fea5bcb3 100644
--- a/sql/init_newids.pl
+++ b/sql/init_newids.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/init_nodeattrs.pl b/sql/init_nodeattrs.pl
index 63794a6af4..0e21180f51 100755
--- a/sql/init_nodeattrs.pl
+++ b/sql/init_nodeattrs.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/initcerts.pl b/sql/initcerts.pl
index 5565f27fc6..71cba68894 100755
--- a/sql/initcerts.pl
+++ b/sql/initcerts.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/initkey.pl b/sql/initkey.pl
index 95ae32ff5d..6e250d357c 100755
--- a/sql/initkey.pl
+++ b/sql/initkey.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/initstats.pl b/sql/initstats.pl
index 81892b919d..0c16363f07 100755
--- a/sql/initstats.pl
+++ b/sql/initstats.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/initvinterfaces.pl b/sql/initvinterfaces.pl
index 7f13609add..c4b8e01d45 100755
--- a/sql/initvinterfaces.pl
+++ b/sql/initvinterfaces.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/ipmember.pl b/sql/ipmember.pl
index 7961697bbd..66a7d9fdcb 100755
--- a/sql/ipmember.pl
+++ b/sql/ipmember.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/logfiles.pl b/sql/logfiles.pl
index 324f177f3f..2f55c7f6ae 100755
--- a/sql/logfiles.pl
+++ b/sql/logfiles.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/mod-userstats.pl b/sql/mod-userstats.pl
index 9c0de9bb0d..7e596a5660 100755
--- a/sql/mod-userstats.pl
+++ b/sql/mod-userstats.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/mustdelay.pl b/sql/mustdelay.pl
index a391df08a7..817f255626 100755
--- a/sql/mustdelay.pl
+++ b/sql/mustdelay.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/newlans.pl b/sql/newlans.pl
index deda58195b..ede4638c55 100755
--- a/sql/newlans.pl
+++ b/sql/newlans.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/newstates.pl b/sql/newstates.pl
index e207388c61..4c4c39749d 100644
--- a/sql/newstates.pl
+++ b/sql/newstates.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/nodeutil.pl b/sql/nodeutil.pl
index c8e6b196f2..9fa7fce767 100755
--- a/sql/nodeutil.pl
+++ b/sql/nodeutil.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/nsfiles.pl b/sql/nsfiles.pl
index e1ab8b0129..7a2224e45c 100755
--- a/sql/nsfiles.pl
+++ b/sql/nsfiles.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/resources.pl b/sql/resources.pl
index bf601c11dc..a547ed0afc 100755
--- a/sql/resources.pl
+++ b/sql/resources.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/step2_newids.pl b/sql/step2_newids.pl
index d18ccdb194..54b1488b91 100755
--- a/sql/step2_newids.pl
+++ b/sql/step2_newids.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/step3_newids.pl b/sql/step3_newids.pl
index 97a37b525f..b34bd70670 100755
--- a/sql/step3_newids.pl
+++ b/sql/step3_newids.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/step4_newids.pl b/sql/step4_newids.pl
index b5a8afb088..54bcce02af 100755
--- a/sql/step4_newids.pl
+++ b/sql/step4_newids.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/sql/step5_newids.pl b/sql/step5_newids.pl
index 072aff8e1b..8ac5230ef2 100755
--- a/sql/step5_newids.pl
+++ b/sql/step5_newids.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007, 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/ssl/GNUmakefile.in b/ssl/GNUmakefile.in
index 77de98f313..c57dad0ba1 100644
--- a/ssl/GNUmakefile.in
+++ b/ssl/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/ssl/mkclient.sh b/ssl/mkclient.sh
index 5a2b3ff59a..29318ea756 100755
--- a/ssl/mkclient.sh
+++ b/ssl/mkclient.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
prefix=$1
diff --git a/ssl/mkserial.in b/ssl/mkserial.in
index 400ff3c12f..58f8d2f81f 100644
--- a/ssl/mkserial.in
+++ b/ssl/mkserial.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/ssl/mksig.in b/ssl/mksig.in
index bfe3bb791c..553819be6e 100644
--- a/ssl/mksig.in
+++ b/ssl/mksig.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/ssl/updatecert.in b/ssl/updatecert.in
index 0340899b1d..3e6e3b3d07 100644
--- a/ssl/updatecert.in
+++ b/ssl/updatecert.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010, 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/sysadmin/apachelogroll.sh b/sysadmin/apachelogroll.sh
index b3a25810fd..2d2b0a0070 100755
--- a/sysadmin/apachelogroll.sh
+++ b/sysadmin/apachelogroll.sh
@@ -1,8 +1,25 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2001-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# CONSTANTS INIT
diff --git a/sysadmin/mailphperrors b/sysadmin/mailphperrors
index 6ee8edb47f..b30dbefc36 100755
--- a/sysadmin/mailphperrors
+++ b/sysadmin/mailphperrors
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/GNUmakefile.in b/tbsetup/GNUmakefile.in
index 0ce36ec1c0..4ec09b0e87 100644
--- a/tbsetup/GNUmakefile.in
+++ b/tbsetup/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tbsetup/Template.pm.in b/tbsetup/Template.pm.in
index ec5e98fb15..c615949a94 100644
--- a/tbsetup/Template.pm.in
+++ b/tbsetup/Template.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# XXX Need to deal with locking at some point ...
#
diff --git a/tbsetup/archive_control.in b/tbsetup/archive_control.in
index a4650809a3..5aa01c356d 100755
--- a/tbsetup/archive_control.in
+++ b/tbsetup/archive_control.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/assign_prepass.in b/tbsetup/assign_prepass.in
index 91deed367d..7fee444336 100755
--- a/tbsetup/assign_prepass.in
+++ b/tbsetup/assign_prepass.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/assign_wrapper.in b/tbsetup/assign_wrapper.in
index f975f55772..2dee458211 100755
--- a/tbsetup/assign_wrapper.in
+++ b/tbsetup/assign_wrapper.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/assign_wrapper2.in b/tbsetup/assign_wrapper2.in
index 2995b97168..7edee6de04 100644
--- a/tbsetup/assign_wrapper2.in
+++ b/tbsetup/assign_wrapper2.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005, 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/batch_daemon.in b/tbsetup/batch_daemon.in
index 7830022634..41f67f3cad 100644
--- a/tbsetup/batch_daemon.in
+++ b/tbsetup/batch_daemon.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/batchexp.in b/tbsetup/batchexp.in
index 680887d5d1..ffd1cd2ae5 100755
--- a/tbsetup/batchexp.in
+++ b/tbsetup/batchexp.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/bwconfig.in b/tbsetup/bwconfig.in
index d879d52379..ca6d6f29f8 100644
--- a/tbsetup/bwconfig.in
+++ b/tbsetup/bwconfig.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/tbsetup/checknodes_daemon.in b/tbsetup/checknodes_daemon.in
index 339f915b8f..8705f42c87 100644
--- a/tbsetup/checknodes_daemon.in
+++ b/tbsetup/checknodes_daemon.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/checkpass/GNUmakefile.in b/tbsetup/checkpass/GNUmakefile.in
index 19634203c6..b15aa30eda 100644
--- a/tbsetup/checkpass/GNUmakefile.in
+++ b/tbsetup/checkpass/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/tbsetup/checkports.in b/tbsetup/checkports.in
index 5f5567ffb1..638af76b92 100755
--- a/tbsetup/checkports.in
+++ b/tbsetup/checkports.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/checkup/GNUmakefile.in b/tbsetup/checkup/GNUmakefile.in
index ef8216a3c3..81f3bee3be 100644
--- a/tbsetup/checkup/GNUmakefile.in
+++ b/tbsetup/checkup/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/checkup/checkup_daemon.8 b/tbsetup/checkup/checkup_daemon.8
index 17a8103f45..8c43245212 100644
--- a/tbsetup/checkup/checkup_daemon.8
+++ b/tbsetup/checkup/checkup_daemon.8
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2006 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.TH CHECKUP_DAEMON 8 "Jan 2, 2006" "Emulab" "Emulab Commands Manual"
.OS
diff --git a/tbsetup/checkup/checkup_daemon.in b/tbsetup/checkup/checkup_daemon.in
index 52754a50f7..d20415a52e 100644
--- a/tbsetup/checkup/checkup_daemon.in
+++ b/tbsetup/checkup/checkup_daemon.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/checkup/example_checkup b/tbsetup/checkup/example_checkup
index 9ff67f0fa9..212afe9176 100644
--- a/tbsetup/checkup/example_checkup
+++ b/tbsetup/checkup/example_checkup
@@ -1,8 +1,25 @@
#! /usr/bin/env python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/tbsetup/checkup/linktest.ns b/tbsetup/checkup/linktest.ns
index b93fa12213..a0b8ae2da5 100644
--- a/tbsetup/checkup/linktest.ns
+++ b/tbsetup/checkup/linktest.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# XXX Assumes four ethernet interfaces.
diff --git a/tbsetup/console_reset.in b/tbsetup/console_reset.in
index 515dfd651d..808b4f405c 100644
--- a/tbsetup/console_reset.in
+++ b/tbsetup/console_reset.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/console_setup.in b/tbsetup/console_setup.in
index ca68cd0562..1795587561 100755
--- a/tbsetup/console_setup.in
+++ b/tbsetup/console_setup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/console_setup.proxy.in b/tbsetup/console_setup.proxy.in
index 13f0892a11..eecd85e056 100755
--- a/tbsetup/console_setup.proxy.in
+++ b/tbsetup/console_setup.proxy.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/db2ns.in b/tbsetup/db2ns.in
index 0daf65727c..faaa2e45cc 100644
--- a/tbsetup/db2ns.in
+++ b/tbsetup/db2ns.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/elabinelab.in b/tbsetup/elabinelab.in
index 7996ea7697..87ad6002b5 100644
--- a/tbsetup/elabinelab.in
+++ b/tbsetup/elabinelab.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# TODO: ntpinfo table.
# Current source directory? From where?
diff --git a/tbsetup/endexp.in b/tbsetup/endexp.in
index 8a9f1d6a46..898c73697e 100755
--- a/tbsetup/endexp.in
+++ b/tbsetup/endexp.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/eventsys.proxy.in b/tbsetup/eventsys.proxy.in
index d631042938..fdf78966fa 100644
--- a/tbsetup/eventsys.proxy.in
+++ b/tbsetup/eventsys.proxy.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/eventsys_control.in b/tbsetup/eventsys_control.in
index 230cda1642..ae934f6db5 100755
--- a/tbsetup/eventsys_control.in
+++ b/tbsetup/eventsys_control.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/eventsys_start.in b/tbsetup/eventsys_start.in
index 7a28081e13..5a4e5a2db6 100755
--- a/tbsetup/eventsys_start.in
+++ b/tbsetup/eventsys_start.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/exitonwarn.pm b/tbsetup/exitonwarn.pm
index 9a62a01320..59d3e56004 100644
--- a/tbsetup/exitonwarn.pm
+++ b/tbsetup/exitonwarn.pm
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
$warnings = 0;
diff --git a/tbsetup/exports_setup.in b/tbsetup/exports_setup.in
index 9ebf39d7b8..089e6f9b4d 100644
--- a/tbsetup/exports_setup.in
+++ b/tbsetup/exports_setup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/exports_setup.proxy.in b/tbsetup/exports_setup.proxy.in
index cabe2d1a51..ca7a46f9e1 100644
--- a/tbsetup/exports_setup.proxy.in
+++ b/tbsetup/exports_setup.proxy.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/fetchtar.proxy.in b/tbsetup/fetchtar.proxy.in
index 080477fcf7..8310b69f13 100644
--- a/tbsetup/fetchtar.proxy.in
+++ b/tbsetup/fetchtar.proxy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/frisbeehelper.in b/tbsetup/frisbeehelper.in
index 402c9ffae4..8f22ae4728 100755
--- a/tbsetup/frisbeehelper.in
+++ b/tbsetup/frisbeehelper.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use Getopt::Std;
diff --git a/tbsetup/gentopofile.in b/tbsetup/gentopofile.in
index 47da688866..41de5239af 100644
--- a/tbsetup/gentopofile.in
+++ b/tbsetup/gentopofile.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/idlepower.in b/tbsetup/idlepower.in
index 1eea8f15a9..75311bed0a 100644
--- a/tbsetup/idlepower.in
+++ b/tbsetup/idlepower.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/idleswap.in b/tbsetup/idleswap.in
index 93a387017a..cff50ebe72 100644
--- a/tbsetup/idleswap.in
+++ b/tbsetup/idleswap.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/image_setup.in b/tbsetup/image_setup.in
index d553cb66ff..0f816fdb4a 100644
--- a/tbsetup/image_setup.in
+++ b/tbsetup/image_setup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/ipassign/GNUmakefile.in b/tbsetup/ipassign/GNUmakefile.in
index 29b5082274..b7e4816fda 100644
--- a/tbsetup/ipassign/GNUmakefile.in
+++ b/tbsetup/ipassign/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tbsetup/ipassign/dre/GNUmakefile b/tbsetup/ipassign/dre/GNUmakefile
index 2c8bc92101..9e9d0fb54e 100644
--- a/tbsetup/ipassign/dre/GNUmakefile
+++ b/tbsetup/ipassign/dre/GNUmakefile
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
all: test-heap graph2dot test-dijk test-dijk.opt test-dre test-dre.opt \
dre-histogram dre-histogram.opt name-ga name-ga.opt ordering-to-tree \
diff --git a/tbsetup/ipassign/dre/dijkstra.ml b/tbsetup/ipassign/dre/dijkstra.ml
index 790c68c540..07135b6c7b 100644
--- a/tbsetup/ipassign/dre/dijkstra.ml
+++ b/tbsetup/ipassign/dre/dijkstra.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/dre-histogram.ml b/tbsetup/ipassign/dre/dre-histogram.ml
index 2eb0c44997..9ca011be26 100755
--- a/tbsetup/ipassign/dre/dre-histogram.ml
+++ b/tbsetup/ipassign/dre/dre-histogram.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/dre.ml b/tbsetup/ipassign/dre/dre.ml
index 1d2561aa11..f03109b589 100644
--- a/tbsetup/ipassign/dre/dre.ml
+++ b/tbsetup/ipassign/dre/dre.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/ga.ml b/tbsetup/ipassign/dre/ga.ml
index 542a161fc2..99f3757a75 100644
--- a/tbsetup/ipassign/dre/ga.ml
+++ b/tbsetup/ipassign/dre/ga.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/graph-to-tree.ml b/tbsetup/ipassign/dre/graph-to-tree.ml
index 9c54bab007..abedcd475e 100644
--- a/tbsetup/ipassign/dre/graph-to-tree.ml
+++ b/tbsetup/ipassign/dre/graph-to-tree.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/graph.ml b/tbsetup/ipassign/dre/graph.ml
index 88281de4e6..303dc668d0 100644
--- a/tbsetup/ipassign/dre/graph.ml
+++ b/tbsetup/ipassign/dre/graph.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/graph2dot.ml b/tbsetup/ipassign/dre/graph2dot.ml
index a322b4fd15..b2f8416f41 100644
--- a/tbsetup/ipassign/dre/graph2dot.ml
+++ b/tbsetup/ipassign/dre/graph2dot.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/heap.ml b/tbsetup/ipassign/dre/heap.ml
index 65f7148a45..1da37ec22a 100644
--- a/tbsetup/ipassign/dre/heap.ml
+++ b/tbsetup/ipassign/dre/heap.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/heap.mli b/tbsetup/ipassign/dre/heap.mli
index 937360a846..1992e3552d 100644
--- a/tbsetup/ipassign/dre/heap.mli
+++ b/tbsetup/ipassign/dre/heap.mli
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/help.ml b/tbsetup/ipassign/dre/help.ml
index 16874c2f29..b526a67bcc 100644
--- a/tbsetup/ipassign/dre/help.ml
+++ b/tbsetup/ipassign/dre/help.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/histogram.ml b/tbsetup/ipassign/dre/histogram.ml
index 461921ea04..2f98881dd7 100644
--- a/tbsetup/ipassign/dre/histogram.ml
+++ b/tbsetup/ipassign/dre/histogram.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/ipassign.ml b/tbsetup/ipassign/dre/ipassign.ml
index b3bb164f1b..c38c600bb2 100644
--- a/tbsetup/ipassign/dre/ipassign.ml
+++ b/tbsetup/ipassign/dre/ipassign.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/linklist.ml b/tbsetup/ipassign/dre/linklist.ml
index f100006f48..e432979798 100644
--- a/tbsetup/ipassign/dre/linklist.ml
+++ b/tbsetup/ipassign/dre/linklist.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
type 'a t = None | Node of 'a node and
diff --git a/tbsetup/ipassign/dre/mintree.ml b/tbsetup/ipassign/dre/mintree.ml
index dd51b60da6..5036334d72 100644
--- a/tbsetup/ipassign/dre/mintree.ml
+++ b/tbsetup/ipassign/dre/mintree.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/name-ga.ml b/tbsetup/ipassign/dre/name-ga.ml
index ffd26a4019..055fcb9b1a 100644
--- a/tbsetup/ipassign/dre/name-ga.ml
+++ b/tbsetup/ipassign/dre/name-ga.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/naming.ml b/tbsetup/ipassign/dre/naming.ml
index fc1122f1bd..a1885c8c6d 100644
--- a/tbsetup/ipassign/dre/naming.ml
+++ b/tbsetup/ipassign/dre/naming.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/ordering-to-tree.ml b/tbsetup/ipassign/dre/ordering-to-tree.ml
index 136115b373..930c5634b4 100644
--- a/tbsetup/ipassign/dre/ordering-to-tree.ml
+++ b/tbsetup/ipassign/dre/ordering-to-tree.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/ortc.ml b/tbsetup/ipassign/dre/ortc.ml
index 4713b64775..6ab54af9fa 100644
--- a/tbsetup/ipassign/dre/ortc.ml
+++ b/tbsetup/ipassign/dre/ortc.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
type blob = (Dre.nodeset list * int);;
diff --git a/tbsetup/ipassign/dre/prepass/Partition.cc b/tbsetup/ipassign/dre/prepass/Partition.cc
index 8db4f7bb6c..b019582db0 100644
--- a/tbsetup/ipassign/dre/prepass/Partition.cc
+++ b/tbsetup/ipassign/dre/prepass/Partition.cc
@@ -1,9 +1,26 @@
// Partition.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "prepass.h"
diff --git a/tbsetup/ipassign/dre/prepass/Partition.h b/tbsetup/ipassign/dre/prepass/Partition.h
index a5d877c29d..0efc554773 100644
--- a/tbsetup/ipassign/dre/prepass/Partition.h
+++ b/tbsetup/ipassign/dre/prepass/Partition.h
@@ -1,9 +1,26 @@
// Partition.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef PARTITION_H_IPASSIGN_3
diff --git a/tbsetup/ipassign/dre/prepass/coprocess.cc b/tbsetup/ipassign/dre/prepass/coprocess.cc
index 68e48802cc..165bd02ddb 100644
--- a/tbsetup/ipassign/dre/prepass/coprocess.cc
+++ b/tbsetup/ipassign/dre/prepass/coprocess.cc
@@ -1,9 +1,26 @@
// coprocess.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <unistd.h>
diff --git a/tbsetup/ipassign/dre/prepass/coprocess.h b/tbsetup/ipassign/dre/prepass/coprocess.h
index 3a6400078a..c37fb3a7b6 100644
--- a/tbsetup/ipassign/dre/prepass/coprocess.h
+++ b/tbsetup/ipassign/dre/prepass/coprocess.h
@@ -1,9 +1,26 @@
// coprocess.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef COPROCESS_H_IP_ASSIGN_2
diff --git a/tbsetup/ipassign/dre/prepass/fail-assign.cc b/tbsetup/ipassign/dre/prepass/fail-assign.cc
index 08ef472cce..e0b896600b 100644
--- a/tbsetup/ipassign/dre/prepass/fail-assign.cc
+++ b/tbsetup/ipassign/dre/prepass/fail-assign.cc
@@ -1,9 +1,26 @@
// fail-assign.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <iostream>
diff --git a/tbsetup/ipassign/dre/prepass/prepass.cc b/tbsetup/ipassign/dre/prepass/prepass.cc
index d9a5a45969..cf618c2a74 100644
--- a/tbsetup/ipassign/dre/prepass/prepass.cc
+++ b/tbsetup/ipassign/dre/prepass/prepass.cc
@@ -1,9 +1,26 @@
// prepass.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "prepass.h"
diff --git a/tbsetup/ipassign/dre/prepass/prepass.h b/tbsetup/ipassign/dre/prepass/prepass.h
index 1124ced799..77f9aa4edd 100644
--- a/tbsetup/ipassign/dre/prepass/prepass.h
+++ b/tbsetup/ipassign/dre/prepass/prepass.h
@@ -1,9 +1,26 @@
// prepass.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef PREPASS_H_IPASSIGN_3
diff --git a/tbsetup/ipassign/dre/prepass/trivial-assign.cc b/tbsetup/ipassign/dre/prepass/trivial-assign.cc
index c8a9d5cb23..75e4181245 100644
--- a/tbsetup/ipassign/dre/prepass/trivial-assign.cc
+++ b/tbsetup/ipassign/dre/prepass/trivial-assign.cc
@@ -1,9 +1,26 @@
// trivial-assign.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <iostream>
diff --git a/tbsetup/ipassign/dre/test-dijk.ml b/tbsetup/ipassign/dre/test-dijk.ml
index a97135be91..8464e5fdaa 100644
--- a/tbsetup/ipassign/dre/test-dijk.ml
+++ b/tbsetup/ipassign/dre/test-dijk.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/dre/test-dre.ml b/tbsetup/ipassign/dre/test-dre.ml
index 93eb2392db..6d3057a20e 100755
--- a/tbsetup/ipassign/dre/test-dre.ml
+++ b/tbsetup/ipassign/dre/test-dre.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
*
diff --git a/tbsetup/ipassign/dre/test-heap.ml b/tbsetup/ipassign/dre/test-heap.ml
index ae90f25238..4155f24841 100644
--- a/tbsetup/ipassign/dre/test-heap.ml
+++ b/tbsetup/ipassign/dre/test-heap.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
type h = int Heap.heap;;
diff --git a/tbsetup/ipassign/dre/tree-assign.ml b/tbsetup/ipassign/dre/tree-assign.ml
index 3d0d79d279..f69fae370b 100644
--- a/tbsetup/ipassign/dre/tree-assign.ml
+++ b/tbsetup/ipassign/dre/tree-assign.ml
@@ -1,7 +1,24 @@
(*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*)
(*
diff --git a/tbsetup/ipassign/ipassign_wrapper.in b/tbsetup/ipassign/ipassign_wrapper.in
index 671af57038..2f3036d71d 100644
--- a/tbsetup/ipassign/ipassign_wrapper.in
+++ b/tbsetup/ipassign/ipassign_wrapper.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2007, 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/ipassign/src/Assigner.h b/tbsetup/ipassign/src/Assigner.h
index 91178eb317..320d2988b0 100644
--- a/tbsetup/ipassign/src/Assigner.h
+++ b/tbsetup/ipassign/src/Assigner.h
@@ -1,9 +1,26 @@
// Assigner.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// This is the base class for all ip assignment algorithms. Using
diff --git a/tbsetup/ipassign/src/ConservativeAssigner.cc b/tbsetup/ipassign/src/ConservativeAssigner.cc
index cdc24d460e..2e636bb72b 100644
--- a/tbsetup/ipassign/src/ConservativeAssigner.cc
+++ b/tbsetup/ipassign/src/ConservativeAssigner.cc
@@ -1,9 +1,26 @@
// ConservativeAssigner.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "lib.h"
diff --git a/tbsetup/ipassign/src/ConservativeAssigner.h b/tbsetup/ipassign/src/ConservativeAssigner.h
index 429ea1a947..859f446ebb 100644
--- a/tbsetup/ipassign/src/ConservativeAssigner.h
+++ b/tbsetup/ipassign/src/ConservativeAssigner.h
@@ -1,9 +1,26 @@
// ConservativeAssigner.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// This ip assignment algorithm divides the graph into a set number of
diff --git a/tbsetup/ipassign/src/CutSearchPartition.h b/tbsetup/ipassign/src/CutSearchPartition.h
index 7156d95a89..bcfeda59cd 100644
--- a/tbsetup/ipassign/src/CutSearchPartition.h
+++ b/tbsetup/ipassign/src/CutSearchPartition.h
@@ -1,9 +1,26 @@
// CutSearchPartition.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef CUT_SEARCH_PARTITION_H_IP_ASSIGN_2
diff --git a/tbsetup/ipassign/src/Exception.h b/tbsetup/ipassign/src/Exception.h
index e881946f07..ad8247a18b 100644
--- a/tbsetup/ipassign/src/Exception.h
+++ b/tbsetup/ipassign/src/Exception.h
@@ -1,9 +1,26 @@
// Exception.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Exception.h defines all of the possible things that might go wrong with
diff --git a/tbsetup/ipassign/src/FixedPartition.h b/tbsetup/ipassign/src/FixedPartition.h
index ce24083f79..66806d24c1 100644
--- a/tbsetup/ipassign/src/FixedPartition.h
+++ b/tbsetup/ipassign/src/FixedPartition.h
@@ -1,9 +1,26 @@
// FixedPartition.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// This partitioning scheme uses a fixed number of partitions set on the
diff --git a/tbsetup/ipassign/src/Framework.cc b/tbsetup/ipassign/src/Framework.cc
index 802a55dae5..658b622a4b 100644
--- a/tbsetup/ipassign/src/Framework.cc
+++ b/tbsetup/ipassign/src/Framework.cc
@@ -1,9 +1,26 @@
// Framework.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "lib.h"
diff --git a/tbsetup/ipassign/src/Framework.h b/tbsetup/ipassign/src/Framework.h
index 8c9c5f6ae1..b6212c7867 100644
--- a/tbsetup/ipassign/src/Framework.h
+++ b/tbsetup/ipassign/src/Framework.h
@@ -1,9 +1,26 @@
// Framework.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Framework provides the infrastructure that selects between which
diff --git a/tbsetup/ipassign/src/GNUmakefile.in b/tbsetup/ipassign/src/GNUmakefile.in
index ba5d532031..a8ed8d203f 100644
--- a/tbsetup/ipassign/src/GNUmakefile.in
+++ b/tbsetup/ipassign/src/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tbsetup/ipassign/src/GraphConverter.h b/tbsetup/ipassign/src/GraphConverter.h
index 94fd66c352..3b2b41e7d9 100644
--- a/tbsetup/ipassign/src/GraphConverter.h
+++ b/tbsetup/ipassign/src/GraphConverter.h
@@ -1,9 +1,26 @@
// GraphConverter.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef GRAPH_CONVERTER_H_IP_ASSIGN_2
diff --git a/tbsetup/ipassign/src/HierarchicalAssigner.cc b/tbsetup/ipassign/src/HierarchicalAssigner.cc
index c789708b1b..e469f38127 100644
--- a/tbsetup/ipassign/src/HierarchicalAssigner.cc
+++ b/tbsetup/ipassign/src/HierarchicalAssigner.cc
@@ -1,9 +1,26 @@
// HierarchicalAssigner.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "lib.h"
diff --git a/tbsetup/ipassign/src/HierarchicalAssigner.h b/tbsetup/ipassign/src/HierarchicalAssigner.h
index 2a7a813386..1b6fbb874d 100644
--- a/tbsetup/ipassign/src/HierarchicalAssigner.h
+++ b/tbsetup/ipassign/src/HierarchicalAssigner.h
@@ -1,9 +1,26 @@
// HierarchicalAssigner.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// This assigner uses its Partitioner to recursively divide the graph to
diff --git a/tbsetup/ipassign/src/PTree.h b/tbsetup/ipassign/src/PTree.h
index 1aed780795..860637c79e 100644
--- a/tbsetup/ipassign/src/PTree.h
+++ b/tbsetup/ipassign/src/PTree.h
@@ -1,9 +1,26 @@
// PTree.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef PTREE_H_IP_ASSIGN_2
diff --git a/tbsetup/ipassign/src/Partition.h b/tbsetup/ipassign/src/Partition.h
index 37e7b93400..c325d1bb75 100644
--- a/tbsetup/ipassign/src/Partition.h
+++ b/tbsetup/ipassign/src/Partition.h
@@ -1,9 +1,26 @@
// Partition.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef PARTITION_H_IP_ASSIGN_2
diff --git a/tbsetup/ipassign/src/RatioCutPartition.h b/tbsetup/ipassign/src/RatioCutPartition.h
index 86989d19be..7f1a2848db 100644
--- a/tbsetup/ipassign/src/RatioCutPartition.h
+++ b/tbsetup/ipassign/src/RatioCutPartition.h
@@ -1,9 +1,26 @@
// RatioCutPartition.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef RATIO_CUT_PARTITION_H_IP_ASSIGN_2
diff --git a/tbsetup/ipassign/src/SearchPartition.h b/tbsetup/ipassign/src/SearchPartition.h
index 2d8d1b003f..7e5b3ca28b 100644
--- a/tbsetup/ipassign/src/SearchPartition.h
+++ b/tbsetup/ipassign/src/SearchPartition.h
@@ -1,9 +1,26 @@
// SearchPartition.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef SEARCH_PARTITION_H_IP_ASSIGN_2
diff --git a/tbsetup/ipassign/src/SquareRootPartition.h b/tbsetup/ipassign/src/SquareRootPartition.h
index 20b7292430..9551c83499 100644
--- a/tbsetup/ipassign/src/SquareRootPartition.h
+++ b/tbsetup/ipassign/src/SquareRootPartition.h
@@ -1,9 +1,26 @@
// SquareRootPartition.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef SQUARE_ROOT_PARTITION_H_IP_ASSIGN_2
diff --git a/tbsetup/ipassign/src/add-x.cc b/tbsetup/ipassign/src/add-x.cc
index 8d4c79e970..9396d4824d 100644
--- a/tbsetup/ipassign/src/add-x.cc
+++ b/tbsetup/ipassign/src/add-x.cc
@@ -1,9 +1,26 @@
// add-x.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <iostream>
diff --git a/tbsetup/ipassign/src/bitmath.cc b/tbsetup/ipassign/src/bitmath.cc
index 01ff3c1a95..f9462c9ad3 100644
--- a/tbsetup/ipassign/src/bitmath.cc
+++ b/tbsetup/ipassign/src/bitmath.cc
@@ -1,9 +1,26 @@
// bitmath.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "lib.h"
diff --git a/tbsetup/ipassign/src/bitmath.h b/tbsetup/ipassign/src/bitmath.h
index e156526016..c86a952ab2 100644
--- a/tbsetup/ipassign/src/bitmath.h
+++ b/tbsetup/ipassign/src/bitmath.h
@@ -1,9 +1,26 @@
// bitmath.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Utilities for dealing with ip numbers
diff --git a/tbsetup/ipassign/src/brite2graph.cc b/tbsetup/ipassign/src/brite2graph.cc
index e5d06c2754..485ae8277e 100644
--- a/tbsetup/ipassign/src/brite2graph.cc
+++ b/tbsetup/ipassign/src/brite2graph.cc
@@ -1,9 +1,26 @@
// brite2graph.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <iostream>
diff --git a/tbsetup/ipassign/src/coprocess.cc b/tbsetup/ipassign/src/coprocess.cc
index f0b2efb04e..0bdc0a1c84 100644
--- a/tbsetup/ipassign/src/coprocess.cc
+++ b/tbsetup/ipassign/src/coprocess.cc
@@ -1,9 +1,26 @@
// coprocess.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <unistd.h>
diff --git a/tbsetup/ipassign/src/coprocess.h b/tbsetup/ipassign/src/coprocess.h
index 283f724c0c..543aa0db7d 100644
--- a/tbsetup/ipassign/src/coprocess.h
+++ b/tbsetup/ipassign/src/coprocess.h
@@ -1,9 +1,26 @@
// coprocess.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef COPROCESS_H_IP_ASSIGN_2
diff --git a/tbsetup/ipassign/src/difference.cc b/tbsetup/ipassign/src/difference.cc
index 44860cd1dc..1c3b65fd0b 100644
--- a/tbsetup/ipassign/src/difference.cc
+++ b/tbsetup/ipassign/src/difference.cc
@@ -1,9 +1,26 @@
// difference.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <iostream>
diff --git a/tbsetup/ipassign/src/graph2lan.cc b/tbsetup/ipassign/src/graph2lan.cc
index 2ba426f05a..965cc3da96 100644
--- a/tbsetup/ipassign/src/graph2lan.cc
+++ b/tbsetup/ipassign/src/graph2lan.cc
@@ -1,9 +1,26 @@
// graph2lan.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <iostream>
diff --git a/tbsetup/ipassign/src/graph2single-source.cc b/tbsetup/ipassign/src/graph2single-source.cc
index 729b2d902e..fb599b6e0c 100644
--- a/tbsetup/ipassign/src/graph2single-source.cc
+++ b/tbsetup/ipassign/src/graph2single-source.cc
@@ -1,9 +1,26 @@
// graph2single-source.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <iostream>
diff --git a/tbsetup/ipassign/src/inet2graph.cc b/tbsetup/ipassign/src/inet2graph.cc
index f59ceca1e3..cb28f1533f 100644
--- a/tbsetup/ipassign/src/inet2graph.cc
+++ b/tbsetup/ipassign/src/inet2graph.cc
@@ -1,9 +1,26 @@
// inet2graph.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <iostream>
diff --git a/tbsetup/ipassign/src/ipassign.cc b/tbsetup/ipassign/src/ipassign.cc
index c6dfc9a5fd..918ec715f4 100644
--- a/tbsetup/ipassign/src/ipassign.cc
+++ b/tbsetup/ipassign/src/ipassign.cc
@@ -1,9 +1,26 @@
// ipassign.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// For command line arguments, see README
diff --git a/tbsetup/ipassign/src/lib.h b/tbsetup/ipassign/src/lib.h
index 4ec31c191d..6770cf7f78 100644
--- a/tbsetup/ipassign/src/lib.h
+++ b/tbsetup/ipassign/src/lib.h
@@ -1,9 +1,26 @@
// lib.h
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// project-wide inclusions and declarations go here.
diff --git a/tbsetup/ipassign/src/route2dist.cc b/tbsetup/ipassign/src/route2dist.cc
index 42e92efe0a..252a74dafe 100644
--- a/tbsetup/ipassign/src/route2dist.cc
+++ b/tbsetup/ipassign/src/route2dist.cc
@@ -1,9 +1,26 @@
// route2dist.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <iostream>
diff --git a/tbsetup/ipassign/src/route2lan.cc b/tbsetup/ipassign/src/route2lan.cc
index c0f8b6d141..a40bb0f4b9 100644
--- a/tbsetup/ipassign/src/route2lan.cc
+++ b/tbsetup/ipassign/src/route2lan.cc
@@ -1,9 +1,26 @@
// route2lan.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <iostream>
diff --git a/tbsetup/ipassign/src/single-source.cc b/tbsetup/ipassign/src/single-source.cc
index 697e66c97c..afb7b5eb7b 100644
--- a/tbsetup/ipassign/src/single-source.cc
+++ b/tbsetup/ipassign/src/single-source.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/tbsetup/ipassign/src/top2graph.cc b/tbsetup/ipassign/src/top2graph.cc
index 482a952fb0..0bdeb9fb5f 100644
--- a/tbsetup/ipassign/src/top2graph.cc
+++ b/tbsetup/ipassign/src/top2graph.cc
@@ -1,9 +1,26 @@
// top2graph.cc
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// top2graph is a utility which converts the .top files used for assign into
diff --git a/tbsetup/libArchive.pm.in b/tbsetup/libArchive.pm.in
index 6fa120fcfb..7551393256 100644
--- a/tbsetup/libArchive.pm.in
+++ b/tbsetup/libArchive.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# XXX Need to deal with locking at some point ...
#
diff --git a/tbsetup/libadminmfs.pm.in b/tbsetup/libadminmfs.pm.in
index e74202dfd0..4356ed02ad 100644
--- a/tbsetup/libadminmfs.pm.in
+++ b/tbsetup/libadminmfs.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Admin MFS library. Routines related to getting into and out of the
# admin MFS and executing programs within it.
diff --git a/tbsetup/libaudit.pm.in b/tbsetup/libaudit.pm.in
index ddd9574976..7ce72ff0a4 100644
--- a/tbsetup/libaudit.pm.in
+++ b/tbsetup/libaudit.pm.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package libaudit;
diff --git a/tbsetup/libosload.pm.in b/tbsetup/libosload.pm.in
index 08f1e323df..26524f44c2 100644
--- a/tbsetup/libosload.pm.in
+++ b/tbsetup/libosload.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Osload library. Basically the backend to the osload script, but also used
# where we need finer control of loading of nodes.
diff --git a/tbsetup/libosload_new.pm.in b/tbsetup/libosload_new.pm.in
index 3d45417c4b..7e72f1d777 100644
--- a/tbsetup/libosload_new.pm.in
+++ b/tbsetup/libosload_new.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Osload library. Basically the backend to the osload script, but also used
# where we need finer control of loading of nodes.
diff --git a/tbsetup/libossetup.pm.in b/tbsetup/libossetup.pm.in
index a3f498f2c0..2f08869f26 100644
--- a/tbsetup/libossetup.pm.in
+++ b/tbsetup/libossetup.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package libossetup;
diff --git a/tbsetup/libossetup_switch.pm.in b/tbsetup/libossetup_switch.pm.in
index 2d52c48c29..bdd4602704 100644
--- a/tbsetup/libossetup_switch.pm.in
+++ b/tbsetup/libossetup_switch.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package libossetup_switch;
diff --git a/tbsetup/libptop.pm.in b/tbsetup/libptop.pm.in
index 10bb170403..5e08cc81f4 100644
--- a/tbsetup/libptop.pm.in
+++ b/tbsetup/libptop.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package libptop;
diff --git a/tbsetup/libptop_new.pm.in b/tbsetup/libptop_new.pm.in
index 71a868cdd9..13194f975f 100644
--- a/tbsetup/libptop_new.pm.in
+++ b/tbsetup/libptop_new.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package libptop_new;
diff --git a/tbsetup/libreboot.pm.in b/tbsetup/libreboot.pm.in
index ea22715355..10ffa36584 100644
--- a/tbsetup/libreboot.pm.in
+++ b/tbsetup/libreboot.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# node reboot library. Basically the backend to the node_reboot script, but
# also used where we need finer control of rebooting nodes (and failure).
diff --git a/tbsetup/libtblog.pm.in b/tbsetup/libtblog.pm.in
index 5fcdf0d14a..5e65a686fa 100644
--- a/tbsetup/libtblog.pm.in
+++ b/tbsetup/libtblog.pm.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
=head1 NAME
diff --git a/tbsetup/libtblog_simple.pm b/tbsetup/libtblog_simple.pm
index b71f4084f7..13a3dc8bc0 100644
--- a/tbsetup/libtblog_simple.pm
+++ b/tbsetup/libtblog_simple.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/libtbsetup.pm b/tbsetup/libtbsetup.pm
index 2d3765e512..6928f37784 100644
--- a/tbsetup/libtbsetup.pm
+++ b/tbsetup/libtbsetup.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use POSIX;
diff --git a/tbsetup/libtestbed.pm.in b/tbsetup/libtestbed.pm.in
index fb24de0842..ba1b95a87b 100644
--- a/tbsetup/libtestbed.pm.in
+++ b/tbsetup/libtestbed.pm.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package libtestbed;
diff --git a/tbsetup/libtestbed.py.in b/tbsetup/libtestbed.py.in
index 904cfd6428..b77f72499c 100644
--- a/tbsetup/libtestbed.py.in
+++ b/tbsetup/libtestbed.py.in
@@ -1,8 +1,25 @@
# -*- python -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/tbsetup/libvtop.pm.in b/tbsetup/libvtop.pm.in
index 9dfd8a6d71..fd0e7f6006 100644
--- a/tbsetup/libvtop.pm.in
+++ b/tbsetup/libvtop.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package libvtop;
diff --git a/tbsetup/libvtop_stable.pm.in b/tbsetup/libvtop_stable.pm.in
index 0718ed77eb..4da177f369 100755
--- a/tbsetup/libvtop_stable.pm.in
+++ b/tbsetup/libvtop_stable.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package libvtop_stable;
diff --git a/tbsetup/libvtop_test.pm.in b/tbsetup/libvtop_test.pm.in
index 6d011cf665..cc067e6b14 100755
--- a/tbsetup/libvtop_test.pm.in
+++ b/tbsetup/libvtop_test.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package libvtop_test;
diff --git a/tbsetup/mapper.in b/tbsetup/mapper.in
index 6509dcd8a7..a87000d3e1 100644
--- a/tbsetup/mapper.in
+++ b/tbsetup/mapper.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/mkexpdir.in b/tbsetup/mkexpdir.in
index 7e69b791bb..f84c3b0185 100755
--- a/tbsetup/mkexpdir.in
+++ b/tbsetup/mkexpdir.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/mkgroup.in b/tbsetup/mkgroup.in
index 6be36bf967..4ef302210b 100644
--- a/tbsetup/mkgroup.in
+++ b/tbsetup/mkgroup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/mkproj.in b/tbsetup/mkproj.in
index c008c37a7a..642b19a3fc 100755
--- a/tbsetup/mkproj.in
+++ b/tbsetup/mkproj.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/modgroups.in b/tbsetup/modgroups.in
index 8d28470075..581535d27b 100644
--- a/tbsetup/modgroups.in
+++ b/tbsetup/modgroups.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/named_setup.in b/tbsetup/named_setup.in
index e1a03fa097..26fd4bb991 100644
--- a/tbsetup/named_setup.in
+++ b/tbsetup/named_setup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Socket;
diff --git a/tbsetup/newnode_reboot.in b/tbsetup/newnode_reboot.in
index 1c35df6399..0cbb7f3640 100644
--- a/tbsetup/newnode_reboot.in
+++ b/tbsetup/newnode_reboot.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/nfstrace.in b/tbsetup/nfstrace.in
index 207028ac58..47cb77149d 100644
--- a/tbsetup/nfstrace.in
+++ b/tbsetup/nfstrace.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/node_attributes.in b/tbsetup/node_attributes.in
index 99ac4fd5f5..0332f87b6f 100644
--- a/tbsetup/node_attributes.in
+++ b/tbsetup/node_attributes.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/node_control.in b/tbsetup/node_control.in
index b37b912f2b..8f63f92daf 100644
--- a/tbsetup/node_control.in
+++ b/tbsetup/node_control.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/node_history.in b/tbsetup/node_history.in
index 2c528fa4ee..332860ef0e 100644
--- a/tbsetup/node_history.in
+++ b/tbsetup/node_history.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/node_reboot.in b/tbsetup/node_reboot.in
index 27f23b294f..284c0701b1 100644
--- a/tbsetup/node_reboot.in
+++ b/tbsetup/node_reboot.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/node_update.in b/tbsetup/node_update.in
index 021b203580..cbbc9e13ea 100644
--- a/tbsetup/node_update.in
+++ b/tbsetup/node_update.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/ns2ir/GNUmakefile.in b/tbsetup/ns2ir/GNUmakefile.in
index c93486bb45..8d671bb79f 100644
--- a/tbsetup/ns2ir/GNUmakefile.in
+++ b/tbsetup/ns2ir/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/ns2ir/console.tcl b/tbsetup/ns2ir/console.tcl
index 1b9f9d730f..a73da39837 100644
--- a/tbsetup/ns2ir/console.tcl
+++ b/tbsetup/ns2ir/console.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/custom.tcl b/tbsetup/ns2ir/custom.tcl
index bd244f0beb..5cb8dcee4e 100644
--- a/tbsetup/ns2ir/custom.tcl
+++ b/tbsetup/ns2ir/custom.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/disk.tcl b/tbsetup/ns2ir/disk.tcl
index 6954f258e4..e10c7a79d8 100644
--- a/tbsetup/ns2ir/disk.tcl
+++ b/tbsetup/ns2ir/disk.tcl
@@ -1,9 +1,26 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/elabinelab-opsvm.ns b/tbsetup/ns2ir/elabinelab-opsvm.ns
index b2117a0402..8a5f1a5885 100644
--- a/tbsetup/ns2ir/elabinelab-opsvm.ns
+++ b/tbsetup/ns2ir/elabinelab-opsvm.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/ns2ir/elabinelab-withfsnode.ns b/tbsetup/ns2ir/elabinelab-withfsnode.ns
index 4c51a3a19f..148a7ec12a 100644
--- a/tbsetup/ns2ir/elabinelab-withfsnode.ns
+++ b/tbsetup/ns2ir/elabinelab-withfsnode.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/ns2ir/elabinelab-xen.ns b/tbsetup/ns2ir/elabinelab-xen.ns
index 240f69ab8e..bb344720c4 100644
--- a/tbsetup/ns2ir/elabinelab-xen.ns
+++ b/tbsetup/ns2ir/elabinelab-xen.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010, 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/ns2ir/elabinelab.ns b/tbsetup/ns2ir/elabinelab.ns
index 889500ae4b..cc00fdafc7 100644
--- a/tbsetup/ns2ir/elabinelab.ns
+++ b/tbsetup/ns2ir/elabinelab.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/ns2ir/event.tcl b/tbsetup/ns2ir/event.tcl
index 2a2b04240e..186b7915b8 100644
--- a/tbsetup/ns2ir/event.tcl
+++ b/tbsetup/ns2ir/event.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/firewall.tcl b/tbsetup/ns2ir/firewall.tcl
index 346e01e5ef..96efb3a737 100644
--- a/tbsetup/ns2ir/firewall.tcl
+++ b/tbsetup/ns2ir/firewall.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/fw.ns b/tbsetup/ns2ir/fw.ns
index 75656bfeb2..8a0c82a90e 100644
--- a/tbsetup/ns2ir/fw.ns
+++ b/tbsetup/ns2ir/fw.ns
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/ns2ir/lanlink.tcl b/tbsetup/ns2ir/lanlink.tcl
index 3c22357274..af74c01fde 100644
--- a/tbsetup/ns2ir/lanlink.tcl
+++ b/tbsetup/ns2ir/lanlink.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/node.tcl b/tbsetup/ns2ir/node.tcl
index cef03b410f..b06f5b1e13 100644
--- a/tbsetup/ns2ir/node.tcl
+++ b/tbsetup/ns2ir/node.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/nsenode.tcl b/tbsetup/ns2ir/nsenode.tcl
index cfdf793a3a..7add5c3e00 100644
--- a/tbsetup/ns2ir/nsenode.tcl
+++ b/tbsetup/ns2ir/nsenode.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/nsobject.tcl b/tbsetup/ns2ir/nsobject.tcl
index a34199d81b..d1289fedde 100644
--- a/tbsetup/ns2ir/nsobject.tcl
+++ b/tbsetup/ns2ir/nsobject.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/nstb_compat.tcl b/tbsetup/ns2ir/nstb_compat.tcl
index a2fc42fde3..b6fc67c6c9 100644
--- a/tbsetup/ns2ir/nstb_compat.tcl
+++ b/tbsetup/ns2ir/nstb_compat.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# This is a nop tb_compact.tcl file that should be used when running scripts
diff --git a/tbsetup/ns2ir/null.tcl b/tbsetup/ns2ir/null.tcl
index cda79a32db..3cc2c81304 100644
--- a/tbsetup/ns2ir/null.tcl
+++ b/tbsetup/ns2ir/null.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/parse-ns.in b/tbsetup/ns2ir/parse-ns.in
index f542cbfe55..0cb54f6c1b 100644
--- a/tbsetup/ns2ir/parse-ns.in
+++ b/tbsetup/ns2ir/parse-ns.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/ns2ir/parse.proxy.in b/tbsetup/ns2ir/parse.proxy.in
index f33e97c48f..e126609e66 100644
--- a/tbsetup/ns2ir/parse.proxy.in
+++ b/tbsetup/ns2ir/parse.proxy.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/ns2ir/parse.tcl.in b/tbsetup/ns2ir/parse.tcl.in
index 897224d566..46d98ecd6d 100644
--- a/tbsetup/ns2ir/parse.tcl.in
+++ b/tbsetup/ns2ir/parse.tcl.in
@@ -1,9 +1,26 @@
#!/usr/local/bin/otclsh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006, 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/path.tcl b/tbsetup/ns2ir/path.tcl
index e9dba6cb2a..f30f57da11 100644
--- a/tbsetup/ns2ir/path.tcl
+++ b/tbsetup/ns2ir/path.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
# path.tcl
diff --git a/tbsetup/ns2ir/program.tcl b/tbsetup/ns2ir/program.tcl
index a6487c6de0..bbf1a6c664 100644
--- a/tbsetup/ns2ir/program.tcl
+++ b/tbsetup/ns2ir/program.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/sequence.tcl b/tbsetup/ns2ir/sequence.tcl
index 6be9aeab5a..42195f8510 100644
--- a/tbsetup/ns2ir/sequence.tcl
+++ b/tbsetup/ns2ir/sequence.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/sim.tcl.in b/tbsetup/ns2ir/sim.tcl.in
index 19e8a78a92..2e12de0f65 100644
--- a/tbsetup/ns2ir/sim.tcl.in
+++ b/tbsetup/ns2ir/sim.tcl.in
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/tb_compat.tcl.in b/tbsetup/ns2ir/tb_compat.tcl.in
index 9e8ed5ed8d..fd13e31f50 100644
--- a/tbsetup/ns2ir/tb_compat.tcl.in
+++ b/tbsetup/ns2ir/tb_compat.tcl.in
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# This is the tb_compact.tcl that deals with all the TB specific commands.
diff --git a/tbsetup/ns2ir/timeline.tcl b/tbsetup/ns2ir/timeline.tcl
index 6beb09e293..d4f6ba17c6 100644
--- a/tbsetup/ns2ir/timeline.tcl
+++ b/tbsetup/ns2ir/timeline.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/topography.tcl b/tbsetup/ns2ir/topography.tcl
index 8bbd7d0572..54649377d3 100644
--- a/tbsetup/ns2ir/topography.tcl
+++ b/tbsetup/ns2ir/topography.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
Class Topography -superclass NSObject
diff --git a/tbsetup/ns2ir/traffic.tcl b/tbsetup/ns2ir/traffic.tcl
index 37b03587b9..9fd8cf7ab4 100644
--- a/tbsetup/ns2ir/traffic.tcl
+++ b/tbsetup/ns2ir/traffic.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/ns2ir/vtype.tcl b/tbsetup/ns2ir/vtype.tcl
index 0b27085dab..200d342b2e 100644
--- a/tbsetup/ns2ir/vtype.tcl
+++ b/tbsetup/ns2ir/vtype.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/nscheck.in b/tbsetup/nscheck.in
index dac4f7ce3b..8a280a1eb6 100644
--- a/tbsetup/nscheck.in
+++ b/tbsetup/nscheck.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/nseparse/GNUmakefile.in b/tbsetup/nseparse/GNUmakefile.in
index b371d0dc73..a90926b241 100644
--- a/tbsetup/nseparse/GNUmakefile.in
+++ b/tbsetup/nseparse/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/nseparse/nse.agent.tcl b/tbsetup/nseparse/nse.agent.tcl
index 5dc7838287..650350b51d 100644
--- a/tbsetup/nseparse/nse.agent.tcl
+++ b/tbsetup/nseparse/nse.agent.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/nseparse/nse.node.tcl b/tbsetup/nseparse/nse.node.tcl
index 25d5198557..a368a8f620 100644
--- a/tbsetup/nseparse/nse.node.tcl
+++ b/tbsetup/nseparse/nse.node.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/nseparse/nse.null.tcl b/tbsetup/nseparse/nse.null.tcl
index 97645dda5c..055c56282c 100644
--- a/tbsetup/nseparse/nse.null.tcl
+++ b/tbsetup/nseparse/nse.null.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/nseparse/nse.parse.proxy.in b/tbsetup/nseparse/nse.parse.proxy.in
index c84060f074..7dc08198ff 100644
--- a/tbsetup/nseparse/nse.parse.proxy.in
+++ b/tbsetup/nseparse/nse.parse.proxy.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/nseparse/nse.parse.tcl.in b/tbsetup/nseparse/nse.parse.tcl.in
index b16ca4743f..5c04770603 100644
--- a/tbsetup/nseparse/nse.parse.tcl.in
+++ b/tbsetup/nseparse/nse.parse.tcl.in
@@ -1,9 +1,26 @@
#!/usr/local/bin/otclsh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/nseparse/nse.sim.tcl b/tbsetup/nseparse/nse.sim.tcl
index 41f301548d..cb6928c8e0 100644
--- a/tbsetup/nseparse/nse.sim.tcl
+++ b/tbsetup/nseparse/nse.sim.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
######################################################################
diff --git a/tbsetup/nseparse/parse-nse.in b/tbsetup/nseparse/parse-nse.in
index 7c57b8f5fe..aedf233a59 100644
--- a/tbsetup/nseparse/parse-nse.in
+++ b/tbsetup/nseparse/parse-nse.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/nseparse/tb_compat.tcl b/tbsetup/nseparse/tb_compat.tcl
index 503ddca3b5..931996e842 100644
--- a/tbsetup/nseparse/tb_compat.tcl
+++ b/tbsetup/nseparse/tb_compat.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# This is a nop tb_compact.tcl file that should be used when running scripts
diff --git a/tbsetup/nseswap.in b/tbsetup/nseswap.in
index 81a345d701..4738bdd93b 100644
--- a/tbsetup/nseswap.in
+++ b/tbsetup/nseswap.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Fcntl ':flock';
diff --git a/tbsetup/nsverify/GNUmakefile.in b/tbsetup/nsverify/GNUmakefile.in
index 6174f1528a..aa98a8d7fd 100644
--- a/tbsetup/nsverify/GNUmakefile.in
+++ b/tbsetup/nsverify/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/nsverify/nstbparse.in b/tbsetup/nsverify/nstbparse.in
index e48f1da2db..2792593f4f 100644
--- a/tbsetup/nsverify/nstbparse.in
+++ b/tbsetup/nsverify/nstbparse.in
@@ -1,8 +1,25 @@
#! @prefix@/libexec/nsverify/nstb
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# rename set in order to capture the variable names used in the ns file.
diff --git a/tbsetup/nsverify/tb_compat.tcl b/tbsetup/nsverify/tb_compat.tcl
index 255832fced..daf0a8c2ad 100644
--- a/tbsetup/nsverify/tb_compat.tcl
+++ b/tbsetup/nsverify/tb_compat.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
source ../ns2ir/nstb_compat.tcl
diff --git a/tbsetup/nsverify/verify-ns.in b/tbsetup/nsverify/verify-ns.in
index ba203faa02..5dfc88668f 100644
--- a/tbsetup/nsverify/verify-ns.in
+++ b/tbsetup/nsverify/verify-ns.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/os_load.in b/tbsetup/os_load.in
index 1760329363..96a4612343 100755
--- a/tbsetup/os_load.in
+++ b/tbsetup/os_load.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/os_select.in b/tbsetup/os_select.in
index 080e1480f5..47353e36be 100644
--- a/tbsetup/os_select.in
+++ b/tbsetup/os_select.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# os_select sets the os that should boot next on a node, and sets
diff --git a/tbsetup/os_setup.in b/tbsetup/os_setup.in
index 74787bfb63..bf5fbeca89 100644
--- a/tbsetup/os_setup.in
+++ b/tbsetup/os_setup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/os_setup_old.in b/tbsetup/os_setup_old.in
index bd04fee776..8eab097b4a 100755
--- a/tbsetup/os_setup_old.in
+++ b/tbsetup/os_setup_old.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/panic.in b/tbsetup/panic.in
index f5725135f2..b3169b134b 100755
--- a/tbsetup/panic.in
+++ b/tbsetup/panic.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/plab/GNUmakefile.in b/tbsetup/plab/GNUmakefile.in
index 7c4a2dda7a..659eb7d231 100644
--- a/tbsetup/plab/GNUmakefile.in
+++ b/tbsetup/plab/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tbsetup/plab/etc/GNUmakefile.in b/tbsetup/plab/etc/GNUmakefile.in
index e094954f70..eb56031632 100644
--- a/tbsetup/plab/etc/GNUmakefile.in
+++ b/tbsetup/plab/etc/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tbsetup/plab/etc/fixsudo.sh b/tbsetup/plab/etc/fixsudo.sh
index d5ec59406f..2b01e2f134 100755
--- a/tbsetup/plab/etc/fixsudo.sh
+++ b/tbsetup/plab/etc/fixsudo.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
TMPSUDOERS=/tmp/sudoers
diff --git a/tbsetup/plab/etc/netbed_files/GNUmakefile.in b/tbsetup/plab/etc/netbed_files/GNUmakefile.in
index d3a6e51d15..dc82d896d3 100644
--- a/tbsetup/plab/etc/netbed_files/GNUmakefile.in
+++ b/tbsetup/plab/etc/netbed_files/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tbsetup/plab/libdslice/GNUmakefile.in b/tbsetup/plab/libdslice/GNUmakefile.in
index 4c897c3ca8..1fa5c105a1 100644
--- a/tbsetup/plab/libdslice/GNUmakefile.in
+++ b/tbsetup/plab/libdslice/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/tbsetup/plab/libplab.py.in b/tbsetup/plab/libplab.py.in
index 5e1ef67776..af4eb98c56 100644
--- a/tbsetup/plab/libplab.py.in
+++ b/tbsetup/plab/libplab.py.in
@@ -1,8 +1,25 @@
# -*- python -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2006-2008, 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
"""
diff --git a/tbsetup/plab/libplabmon.pm.in b/tbsetup/plab/libplabmon.pm.in
index c1368241c3..22ec3ba00e 100644
--- a/tbsetup/plab/libplabmon.pm.in
+++ b/tbsetup/plab/libplabmon.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package libplabmon;
diff --git a/tbsetup/plab/libplabnodehist.pm.in b/tbsetup/plab/libplabnodehist.pm.in
index 327cea95fb..f2f9996b65 100644
--- a/tbsetup/plab/libplabnodehist.pm.in
+++ b/tbsetup/plab/libplabnodehist.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package libplabnodehist;
diff --git a/tbsetup/plab/mod_PLC.py.in b/tbsetup/plab/mod_PLC.py.in
index 69f86b6182..063aa8d335 100644
--- a/tbsetup/plab/mod_PLC.py.in
+++ b/tbsetup/plab/mod_PLC.py.in
@@ -1,8 +1,25 @@
# -*- python -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/tbsetup/plab/mod_PLC4.py.in b/tbsetup/plab/mod_PLC4.py.in
index 815964d1c5..ed4ebaecc1 100644
--- a/tbsetup/plab/mod_PLC4.py.in
+++ b/tbsetup/plab/mod_PLC4.py.in
@@ -1,8 +1,25 @@
# -*- python -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2007-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/tbsetup/plab/mod_PLCNM.py.in b/tbsetup/plab/mod_PLCNM.py.in
index 068359f405..2c5aa67c88 100644
--- a/tbsetup/plab/mod_PLCNM.py.in
+++ b/tbsetup/plab/mod_PLCNM.py.in
@@ -1,8 +1,25 @@
# -*- python -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/tbsetup/plab/mod_dslice.py.in b/tbsetup/plab/mod_dslice.py.in
index 7b2f3c576c..0186023a30 100644
--- a/tbsetup/plab/mod_dslice.py.in
+++ b/tbsetup/plab/mod_dslice.py.in
@@ -1,8 +1,25 @@
# -*- python -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/tbsetup/plab/plabdiscover.in b/tbsetup/plab/plabdiscover.in
index a76e08b3bb..63fe3eb4a5 100644
--- a/tbsetup/plab/plabdiscover.in
+++ b/tbsetup/plab/plabdiscover.in
@@ -1,9 +1,26 @@
#!/usr/local/bin/python
# -*- python -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/tbsetup/plab/plabdist.in b/tbsetup/plab/plabdist.in
index a4cdc13c9a..5b7e0ff0d0 100755
--- a/tbsetup/plab/plabdist.in
+++ b/tbsetup/plab/plabdist.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/plab/plabfed.in b/tbsetup/plab/plabfed.in
index f4f07b97ca..5f48c2beb3 100755
--- a/tbsetup/plab/plabfed.in
+++ b/tbsetup/plab/plabfed.in
@@ -1,9 +1,26 @@
#!/usr/local/bin/python
# -*- python -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/tbsetup/plab/plabhttpd.in b/tbsetup/plab/plabhttpd.in
index 66291ec3d2..6470672afe 100755
--- a/tbsetup/plab/plabhttpd.in
+++ b/tbsetup/plab/plabhttpd.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/plab/plablinkdata.in b/tbsetup/plab/plablinkdata.in
index c75a6b7fc6..957fab63aa 100755
--- a/tbsetup/plab/plablinkdata.in
+++ b/tbsetup/plab/plablinkdata.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/plab/plabmetrics.in b/tbsetup/plab/plabmetrics.in
index b2b23532c7..ee969b5494 100755
--- a/tbsetup/plab/plabmetrics.in
+++ b/tbsetup/plab/plabmetrics.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/plab/plabmon_badpool.pm.in b/tbsetup/plab/plabmon_badpool.pm.in
index 23aa195c85..391d4913ef 100644
--- a/tbsetup/plab/plabmon_badpool.pm.in
+++ b/tbsetup/plab/plabmon_badpool.pm.in
@@ -1,8 +1,25 @@
# -*- perl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/plab/plabmon_goodpool.pm.in b/tbsetup/plab/plabmon_goodpool.pm.in
index d3c691688a..0225c35170 100644
--- a/tbsetup/plab/plabmon_goodpool.pm.in
+++ b/tbsetup/plab/plabmon_goodpool.pm.in
@@ -1,8 +1,25 @@
# -*- perl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/plab/plabmonitord.in b/tbsetup/plab/plabmonitord.in
index 32e6f44ff9..18adef719a 100644
--- a/tbsetup/plab/plabmonitord.in
+++ b/tbsetup/plab/plabmonitord.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/plab/plabnode.in b/tbsetup/plab/plabnode.in
index 8975cf3795..8ee5ed4a79 100755
--- a/tbsetup/plab/plabnode.in
+++ b/tbsetup/plab/plabnode.in
@@ -1,9 +1,26 @@
#!/usr/local/bin/python
# -*- python -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# system imports
diff --git a/tbsetup/plab/plabnodehistclean.in b/tbsetup/plab/plabnodehistclean.in
index 9ad2fe4d02..7cfbd7ee64 100644
--- a/tbsetup/plab/plabnodehistclean.in
+++ b/tbsetup/plab/plabnodehistclean.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/plab/plabnodehistmetrics.in b/tbsetup/plab/plabnodehistmetrics.in
index c09a3bb7d2..73012e2767 100755
--- a/tbsetup/plab/plabnodehistmetrics.in
+++ b/tbsetup/plab/plabnodehistmetrics.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/plab/plabrenewd.in b/tbsetup/plab/plabrenewd.in
index 74442933a9..de5110e188 100644
--- a/tbsetup/plab/plabrenewd.in
+++ b/tbsetup/plab/plabrenewd.in
@@ -1,9 +1,26 @@
#!/usr/local/bin/python
# -*- python -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/tbsetup/plab/plabrenewonce.in b/tbsetup/plab/plabrenewonce.in
index f44738f4aa..98038db5ab 100644
--- a/tbsetup/plab/plabrenewonce.in
+++ b/tbsetup/plab/plabrenewonce.in
@@ -1,9 +1,26 @@
#!/usr/local/bin/python
# -*- python -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/tbsetup/plab/plabslice.in b/tbsetup/plab/plabslice.in
index c6b12f88d6..b072594fbc 100755
--- a/tbsetup/plab/plabslice.in
+++ b/tbsetup/plab/plabslice.in
@@ -1,9 +1,26 @@
#!/usr/local/bin/python
# -*- python -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/tbsetup/plab/plabstats.in b/tbsetup/plab/plabstats.in
index fdd71faaba..3843444df0 100644
--- a/tbsetup/plab/plabstats.in
+++ b/tbsetup/plab/plabstats.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/plab/procmail.plab b/tbsetup/plab/procmail.plab
index c8de9b7ef0..54358056e5 100644
--- a/tbsetup/plab/procmail.plab
+++ b/tbsetup/plab/procmail.plab
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
LOGFILE=/tmp/procmail-slice-plab.log
VERBOSE=on
diff --git a/tbsetup/plab/sshhttp.py.in b/tbsetup/plab/sshhttp.py.in
index e65e727ae9..3ee75dcc1e 100644
--- a/tbsetup/plab/sshhttp.py.in
+++ b/tbsetup/plab/sshhttp.py.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# Need ssh transport proxy to chat with the new NM. Until PLC deploys the
diff --git a/tbsetup/plab/timer_advisories.py b/tbsetup/plab/timer_advisories.py
index 721fa18b56..62f928c293 100644
--- a/tbsetup/plab/timer_advisories.py
+++ b/tbsetup/plab/timer_advisories.py
@@ -1,8 +1,25 @@
# -*- python -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/tbsetup/plab/webplabstats.in b/tbsetup/plab/webplabstats.in
index ab477dd414..74d5cbc23e 100644
--- a/tbsetup/plab/webplabstats.in
+++ b/tbsetup/plab/webplabstats.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/plabinelab.in b/tbsetup/plabinelab.in
index 545aa2ba6f..ac3e96f21e 100644
--- a/tbsetup/plabinelab.in
+++ b/tbsetup/plabinelab.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/pool_daemon.in b/tbsetup/pool_daemon.in
index 296586f5d1..6c83071013 100644
--- a/tbsetup/pool_daemon.in
+++ b/tbsetup/pool_daemon.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009, 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/portal_daemon.in b/tbsetup/portal_daemon.in
index 11668ff346..b537b8c091 100644
--- a/tbsetup/portal_daemon.in
+++ b/tbsetup/portal_daemon.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/portstats.in b/tbsetup/portstats.in
index 2fe1afc750..ca358efa8a 100644
--- a/tbsetup/portstats.in
+++ b/tbsetup/portstats.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# This now a frontend to run the proper version.
#
diff --git a/tbsetup/power.in b/tbsetup/power.in
index a6b99f203e..27d6056cfc 100755
--- a/tbsetup/power.in
+++ b/tbsetup/power.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/power_apc.pm b/tbsetup/power_apc.pm
index bc413eda28..ca50e9e367 100644
--- a/tbsetup/power_apc.pm
+++ b/tbsetup/power_apc.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/power_icebox.pm b/tbsetup/power_icebox.pm
index e775ff1d3b..4e3dd70f61 100644
--- a/tbsetup/power_icebox.pm
+++ b/tbsetup/power_icebox.pm
@@ -1,9 +1,26 @@
#! /usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/power_ilo.pm.in b/tbsetup/power_ilo.pm.in
index 55d4bbecca..722001582c 100644
--- a/tbsetup/power_ilo.pm.in
+++ b/tbsetup/power_ilo.pm.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008-2010, 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/power_ipmi.pm b/tbsetup/power_ipmi.pm
index df7157dd82..c14d671e65 100644
--- a/tbsetup/power_ipmi.pm
+++ b/tbsetup/power_ipmi.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2006-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/power_mail.pm.in b/tbsetup/power_mail.pm.in
index 2b1b5fd81b..4a25e80f69 100644
--- a/tbsetup/power_mail.pm.in
+++ b/tbsetup/power_mail.pm.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# A perl module to power cycle nodes using email to the operators.
diff --git a/tbsetup/power_rmcp.pm.in b/tbsetup/power_rmcp.pm.in
index a6962edb0f..43eed850de 100644
--- a/tbsetup/power_rmcp.pm.in
+++ b/tbsetup/power_rmcp.pm.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/power_rpc27.pm.in b/tbsetup/power_rpc27.pm.in
index 3e89899ffb..4a065699eb 100644
--- a/tbsetup/power_rpc27.pm.in
+++ b/tbsetup/power_rpc27.pm.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/tbsetup/power_sgmote.pm.in b/tbsetup/power_sgmote.pm.in
index 1232c68948..6619c9d922 100644
--- a/tbsetup/power_sgmote.pm.in
+++ b/tbsetup/power_sgmote.pm.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# A little perl module to power cycle a mote attached to a stargate -
diff --git a/tbsetup/power_whol.pm.in b/tbsetup/power_whol.pm.in
index e22ea82a36..3f19197268 100644
--- a/tbsetup/power_whol.pm.in
+++ b/tbsetup/power_whol.pm.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/ptopgen.in b/tbsetup/ptopgen.in
index 96ecdbb7ed..27e6aff67e 100644
--- a/tbsetup/ptopgen.in
+++ b/tbsetup/ptopgen.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/ptopgen_new.in b/tbsetup/ptopgen_new.in
index 9a60d8f21d..c96dc72024 100644
--- a/tbsetup/ptopgen_new.in
+++ b/tbsetup/ptopgen_new.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/tbsetup/pxe_select.in b/tbsetup/pxe_select.in
index d84492bea3..5518afa0fa 100644
--- a/tbsetup/pxe_select.in
+++ b/tbsetup/pxe_select.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# pxe_select sets the PXE boot program that should be loaded on a node,
diff --git a/tbsetup/regression.in b/tbsetup/regression.in
index 28c317c21f..a7831fd0b6 100644
--- a/tbsetup/regression.in
+++ b/tbsetup/regression.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/reload_daemon.in b/tbsetup/reload_daemon.in
index 7c1418aeea..b93ed60162 100644
--- a/tbsetup/reload_daemon.in
+++ b/tbsetup/reload_daemon.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/repos_daemon.in b/tbsetup/repos_daemon.in
index 2dc4a49b71..de6418326a 100644
--- a/tbsetup/repos_daemon.in
+++ b/tbsetup/repos_daemon.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/resetvlans.in b/tbsetup/resetvlans.in
index 25e44c933c..15032fced1 100755
--- a/tbsetup/resetvlans.in
+++ b/tbsetup/resetvlans.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/tbsetup/rmgroup.in b/tbsetup/rmgroup.in
index ffb53c194c..f207b4d64e 100644
--- a/tbsetup/rmgroup.in
+++ b/tbsetup/rmgroup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/rmproj.in b/tbsetup/rmproj.in
index 01f52122f9..76a95bdf6a 100755
--- a/tbsetup/rmproj.in
+++ b/tbsetup/rmproj.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/rmuser.in b/tbsetup/rmuser.in
index 1516a30bb5..9003106e50 100755
--- a/tbsetup/rmuser.in
+++ b/tbsetup/rmuser.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/routecalc.cc b/tbsetup/routecalc.cc
index 4a88ebde90..f79a3dc81b 100644
--- a/tbsetup/routecalc.cc
+++ b/tbsetup/routecalc.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2002 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/tbsetup/savelogs.in b/tbsetup/savelogs.in
index 8912ae5b5f..88de0eea15 100755
--- a/tbsetup/savelogs.in
+++ b/tbsetup/savelogs.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/savelogs.proxy.in b/tbsetup/savelogs.proxy.in
index 86a903f962..f3698fce35 100644
--- a/tbsetup/savelogs.proxy.in
+++ b/tbsetup/savelogs.proxy.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/sched_reload.in b/tbsetup/sched_reload.in
index e4178d6ab6..bd68c870ca 100755
--- a/tbsetup/sched_reload.in
+++ b/tbsetup/sched_reload.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/sched_reserve.in b/tbsetup/sched_reserve.in
index 7d836a865e..631b6c9698 100644
--- a/tbsetup/sched_reserve.in
+++ b/tbsetup/sched_reserve.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/setgroups.in b/tbsetup/setgroups.in
index 7d3b649499..d60b4211f1 100755
--- a/tbsetup/setgroups.in
+++ b/tbsetup/setgroups.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/sfskey_update.in b/tbsetup/sfskey_update.in
index 5dbc2ddd20..a205dfffb2 100644
--- a/tbsetup/sfskey_update.in
+++ b/tbsetup/sfskey_update.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Fcntl ':flock';
diff --git a/tbsetup/sfskey_update.proxy.in b/tbsetup/sfskey_update.proxy.in
index ff3818f4ae..24368bf43b 100644
--- a/tbsetup/sfskey_update.proxy.in
+++ b/tbsetup/sfskey_update.proxy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/smbpasswd_setup.in b/tbsetup/smbpasswd_setup.in
index 960c7a60d0..4e1967adfc 100644
--- a/tbsetup/smbpasswd_setup.in
+++ b/tbsetup/smbpasswd_setup.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/smbpasswd_setup.proxy.in b/tbsetup/smbpasswd_setup.proxy.in
index b71726d984..6653ce4cba 100644
--- a/tbsetup/smbpasswd_setup.proxy.in
+++ b/tbsetup/smbpasswd_setup.proxy.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/snmpit.in b/tbsetup/snmpit.in
index af3fda84c9..35a43ce4d7 100644
--- a/tbsetup/snmpit.in
+++ b/tbsetup/snmpit.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# This now a frontend to run the proper version.
#
diff --git a/tbsetup/snmpit.proxy.in b/tbsetup/snmpit.proxy.in
index d585220b7c..519652e379 100644
--- a/tbsetup/snmpit.proxy.in
+++ b/tbsetup/snmpit.proxy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/snmpit.proxynew.in b/tbsetup/snmpit.proxynew.in
index f8ee26f8ab..17afec1e8c 100644
--- a/tbsetup/snmpit.proxynew.in
+++ b/tbsetup/snmpit.proxynew.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/snmpit.proxyv2.in b/tbsetup/snmpit.proxyv2.in
index 1628d25f57..aab470cf8a 100644
--- a/tbsetup/snmpit.proxyv2.in
+++ b/tbsetup/snmpit.proxyv2.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/snmpit.proxyv3.in b/tbsetup/snmpit.proxyv3.in
index 003ac8e5b1..12549e2774 100644
--- a/tbsetup/snmpit.proxyv3.in
+++ b/tbsetup/snmpit.proxyv3.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/snmpit_old/GNUmakefile.in b/tbsetup/snmpit_old/GNUmakefile.in
index 4c6d9cd840..70b1da8f97 100644
--- a/tbsetup/snmpit_old/GNUmakefile.in
+++ b/tbsetup/snmpit_old/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tbsetup/snmpit_old/portstats.in b/tbsetup/snmpit_old/portstats.in
index 09c8bdcbf3..aa14e3538c 100755
--- a/tbsetup/snmpit_old/portstats.in
+++ b/tbsetup/snmpit_old/portstats.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -T
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_old/snmpit_ancient.in b/tbsetup/snmpit_old/snmpit_ancient.in
index 3f4adc76d0..36f7de8cad 100755
--- a/tbsetup/snmpit_old/snmpit_ancient.in
+++ b/tbsetup/snmpit_old/snmpit_ancient.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_old/snmpit_apcon.pm b/tbsetup/snmpit_old/snmpit_apcon.pm
index 14dc212507..2b8532b3a0 100644
--- a/tbsetup/snmpit_old/snmpit_apcon.pm
+++ b/tbsetup/snmpit_old/snmpit_apcon.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -W
#
-# EMULAB-LGPL
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_old/snmpit_cisco.pm b/tbsetup/snmpit_old/snmpit_cisco.pm
index baa05132ab..40ee5d7926 100644
--- a/tbsetup/snmpit_old/snmpit_cisco.pm
+++ b/tbsetup/snmpit_old/snmpit_cisco.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2009, 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_old/snmpit_cisco_stack.pm b/tbsetup/snmpit_old/snmpit_cisco_stack.pm
index 3288b3821e..0559224aa6 100644
--- a/tbsetup/snmpit_old/snmpit_cisco_stack.pm
+++ b/tbsetup/snmpit_old/snmpit_cisco_stack.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_old/snmpit_foundry.pm b/tbsetup/snmpit_old/snmpit_foundry.pm
index faa05e703d..f973702e8c 100755
--- a/tbsetup/snmpit_old/snmpit_foundry.pm
+++ b/tbsetup/snmpit_old/snmpit_foundry.pm
@@ -1,9 +1,27 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# Copyright (c) 2004-2009, Regents, University of California.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_old/snmpit_hp.pm b/tbsetup/snmpit_old/snmpit_hp.pm
index 8b7cd1a106..fc586c38c1 100755
--- a/tbsetup/snmpit_old/snmpit_hp.pm
+++ b/tbsetup/snmpit_old/snmpit_hp.pm
@@ -1,10 +1,27 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# Copyright (c) 2004-2010 Regents, University of California.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_old/snmpit_intel.pm b/tbsetup/snmpit_old/snmpit_intel.pm
index 4141b89de1..9bc078448d 100644
--- a/tbsetup/snmpit_old/snmpit_intel.pm
+++ b/tbsetup/snmpit_old/snmpit_intel.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_old/snmpit_intel_stack.pm b/tbsetup/snmpit_old/snmpit_intel_stack.pm
index 7e356352e0..b20bdea80d 100644
--- a/tbsetup/snmpit_old/snmpit_intel_stack.pm
+++ b/tbsetup/snmpit_old/snmpit_intel_stack.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_old/snmpit_lib.pm b/tbsetup/snmpit_old/snmpit_lib.pm
index a0f8ad4362..5c866b7405 100644
--- a/tbsetup/snmpit_old/snmpit_lib.pm
+++ b/tbsetup/snmpit_old/snmpit_lib.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_old/snmpit_nortel.pm b/tbsetup/snmpit_old/snmpit_nortel.pm
index ee53d593ac..2c319d1794 100755
--- a/tbsetup/snmpit_old/snmpit_nortel.pm
+++ b/tbsetup/snmpit_old/snmpit_nortel.pm
@@ -1,10 +1,27 @@
#!/usr/bin/perl -w
#
#
-# EMULAB-LGPL
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# Copyright (c) 2004-2009 Regents, University of California.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# snmpit module for Nortel level 2 switches
diff --git a/tbsetup/snmpit_old/snmpit_old.in b/tbsetup/snmpit_old/snmpit_old.in
index d95554f4e8..51a0b741a4 100755
--- a/tbsetup/snmpit_old/snmpit_old.in
+++ b/tbsetup/snmpit_old/snmpit_old.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_old/snmpit_remote.pm.in b/tbsetup/snmpit_old/snmpit_remote.pm.in
index d6886a2fea..36c1e58299 100644
--- a/tbsetup/snmpit_old/snmpit_remote.pm.in
+++ b/tbsetup/snmpit_old/snmpit_remote.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_old/snmpit_stack.pm b/tbsetup/snmpit_old/snmpit_stack.pm
index f79f590527..4a576ef224 100755
--- a/tbsetup/snmpit_old/snmpit_stack.pm
+++ b/tbsetup/snmpit_old/snmpit_stack.pm
@@ -1,10 +1,27 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2004-2009 Regents, University of California.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package snmpit_stack;
diff --git a/tbsetup/snmpit_test/GNUmakefile.in b/tbsetup/snmpit_test/GNUmakefile.in
index e958c04220..f2eee1a947 100644
--- a/tbsetup/snmpit_test/GNUmakefile.in
+++ b/tbsetup/snmpit_test/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tbsetup/snmpit_test/portstats.in b/tbsetup/snmpit_test/portstats.in
index bcc1803ecf..de24ee2611 100755
--- a/tbsetup/snmpit_test/portstats.in
+++ b/tbsetup/snmpit_test/portstats.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -T
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_test/snmpit_apcon.pm b/tbsetup/snmpit_test/snmpit_apcon.pm
index 7f7054a2c8..bffc6bc5d0 100644
--- a/tbsetup/snmpit_test/snmpit_apcon.pm
+++ b/tbsetup/snmpit_test/snmpit_apcon.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -W
#
-# EMULAB-LGPL
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_test/snmpit_arista.pm.in b/tbsetup/snmpit_test/snmpit_arista.pm.in
index 47d3c0b83b..6331cd51f3 100644
--- a/tbsetup/snmpit_test/snmpit_arista.pm.in
+++ b/tbsetup/snmpit_test/snmpit_arista.pm.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_test/snmpit_arista_switch_daemon.py.in b/tbsetup/snmpit_test/snmpit_arista_switch_daemon.py.in
index 623c4e6fa2..a334bbd0e8 100755
--- a/tbsetup/snmpit_test/snmpit_arista_switch_daemon.py.in
+++ b/tbsetup/snmpit_test/snmpit_arista_switch_daemon.py.in
@@ -1,9 +1,26 @@
#!/usr/bin/python
#
-# EMULAB-LGPL
# Copyright (c) 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_test/snmpit_cisco.pm b/tbsetup/snmpit_test/snmpit_cisco.pm
index a793e23fa4..2fbc210271 100644
--- a/tbsetup/snmpit_test/snmpit_cisco.pm
+++ b/tbsetup/snmpit_test/snmpit_cisco.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_test/snmpit_cisco_stack.pm b/tbsetup/snmpit_test/snmpit_cisco_stack.pm
index 3288b3821e..0559224aa6 100644
--- a/tbsetup/snmpit_test/snmpit_cisco_stack.pm
+++ b/tbsetup/snmpit_test/snmpit_cisco_stack.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_test/snmpit_foundry.pm b/tbsetup/snmpit_test/snmpit_foundry.pm
index 64652cfccb..b4cace1ecd 100755
--- a/tbsetup/snmpit_test/snmpit_foundry.pm
+++ b/tbsetup/snmpit_test/snmpit_foundry.pm
@@ -1,9 +1,27 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# Copyright (c) 2004-2009, Regents, University of California.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_test/snmpit_hp.pm b/tbsetup/snmpit_test/snmpit_hp.pm
index 4eb3f473a4..81545c4c9c 100755
--- a/tbsetup/snmpit_test/snmpit_hp.pm
+++ b/tbsetup/snmpit_test/snmpit_hp.pm
@@ -1,10 +1,27 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# Copyright (c) 2004-2010 Regents, University of California.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_test/snmpit_intel.pm b/tbsetup/snmpit_test/snmpit_intel.pm
index 4141b89de1..9bc078448d 100644
--- a/tbsetup/snmpit_test/snmpit_intel.pm
+++ b/tbsetup/snmpit_test/snmpit_intel.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_test/snmpit_intel_stack.pm b/tbsetup/snmpit_test/snmpit_intel_stack.pm
index 7e356352e0..b20bdea80d 100644
--- a/tbsetup/snmpit_test/snmpit_intel_stack.pm
+++ b/tbsetup/snmpit_test/snmpit_intel_stack.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_test/snmpit_lib.pm b/tbsetup/snmpit_test/snmpit_lib.pm
index 0b8432a829..1a92ee36de 100644
--- a/tbsetup/snmpit_test/snmpit_lib.pm
+++ b/tbsetup/snmpit_test/snmpit_lib.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_test/snmpit_nortel.pm b/tbsetup/snmpit_test/snmpit_nortel.pm
index ee53d593ac..2c319d1794 100755
--- a/tbsetup/snmpit_test/snmpit_nortel.pm
+++ b/tbsetup/snmpit_test/snmpit_nortel.pm
@@ -1,10 +1,27 @@
#!/usr/bin/perl -w
#
#
-# EMULAB-LGPL
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# Copyright (c) 2004-2009 Regents, University of California.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# snmpit module for Nortel level 2 switches
diff --git a/tbsetup/snmpit_test/snmpit_remote.pm.in b/tbsetup/snmpit_test/snmpit_remote.pm.in
index 6aa941b739..0412cfb469 100644
--- a/tbsetup/snmpit_test/snmpit_remote.pm.in
+++ b/tbsetup/snmpit_test/snmpit_remote.pm.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/snmpit_test/snmpit_stack.pm b/tbsetup/snmpit_test/snmpit_stack.pm
index 7cb8ea9665..29efaf20fc 100755
--- a/tbsetup/snmpit_test/snmpit_stack.pm
+++ b/tbsetup/snmpit_test/snmpit_stack.pm
@@ -1,10 +1,27 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# Copyright (c) 2004-2009 Regents, University of California.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package snmpit_stack;
diff --git a/tbsetup/snmpit_test/snmpit_test.in b/tbsetup/snmpit_test/snmpit_test.in
index 452383e0d2..6f1c072482 100755
--- a/tbsetup/snmpit_test/snmpit_test.in
+++ b/tbsetup/snmpit_test/snmpit_test.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-LGPL
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LGPL
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/spewlogfile.in b/tbsetup/spewlogfile.in
index 2cf7876cf2..4bacadb1b1 100644
--- a/tbsetup/spewlogfile.in
+++ b/tbsetup/spewlogfile.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/spewrpmtar.in b/tbsetup/spewrpmtar.in
index 4582d468ec..11657ef03a 100644
--- a/tbsetup/spewrpmtar.in
+++ b/tbsetup/spewrpmtar.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/staticroutes.in b/tbsetup/staticroutes.in
index 562bd3efac..e9ed7a2978 100644
--- a/tbsetup/staticroutes.in
+++ b/tbsetup/staticroutes.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/swapexp.in b/tbsetup/swapexp.in
index 825b38edf5..e76f92b982 100644
--- a/tbsetup/swapexp.in
+++ b/tbsetup/swapexp.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/switchmac.in b/tbsetup/switchmac.in
index 7c911b633f..c1ee6a2559 100644
--- a/tbsetup/switchmac.in
+++ b/tbsetup/switchmac.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/tarfiles_setup.in b/tbsetup/tarfiles_setup.in
index 14f4e6793e..53e063ec0d 100644
--- a/tbsetup/tarfiles_setup.in
+++ b/tbsetup/tarfiles_setup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/tbend.in b/tbsetup/tbend.in
index 433a64d121..59ba3fb2c4 100644
--- a/tbsetup/tbend.in
+++ b/tbsetup/tbend.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/tbprerun.in b/tbsetup/tbprerun.in
index b9395f924d..af0486db3b 100644
--- a/tbsetup/tbprerun.in
+++ b/tbsetup/tbprerun.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/tbsetup/tbreport.in b/tbsetup/tbreport.in
index c23e423190..838fac5152 100644
--- a/tbsetup/tbreport.in
+++ b/tbsetup/tbreport.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/tbsetup/tbrestart.in b/tbsetup/tbrestart.in
index e2e98ffc50..37e00d5d4a 100644
--- a/tbsetup/tbrestart.in
+++ b/tbsetup/tbrestart.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# For restart: event system restart. clear ready bits and startup status,
diff --git a/tbsetup/tbrsync.in b/tbsetup/tbrsync.in
index 665af48556..043ca20f02 100755
--- a/tbsetup/tbrsync.in
+++ b/tbsetup/tbrsync.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tbsetup/tbswap.in b/tbsetup/tbswap.in
index 4527bb1f13..e5ad7a6cde 100644
--- a/tbsetup/tbswap.in
+++ b/tbsetup/tbswap.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/template_analyze.in b/tbsetup/template_analyze.in
index ea647bab81..4a7a23591e 100644
--- a/tbsetup/template_analyze.in
+++ b/tbsetup/template_analyze.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_checkout.in b/tbsetup/template_checkout.in
index 8ac4ea7f69..1d07977f24 100644
--- a/tbsetup/template_checkout.in
+++ b/tbsetup/template_checkout.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_commit.in b/tbsetup/template_commit.in
index e3100a913a..1ac8e9f834 100644
--- a/tbsetup/template_commit.in
+++ b/tbsetup/template_commit.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_control.in b/tbsetup/template_control.in
index df508a414e..b39e73a534 100644
--- a/tbsetup/template_control.in
+++ b/tbsetup/template_control.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_create.in b/tbsetup/template_create.in
index 2b1659a145..7e5bff08ce 100644
--- a/tbsetup/template_create.in
+++ b/tbsetup/template_create.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_cvsroot/GNUmakefile.in b/tbsetup/template_cvsroot/GNUmakefile.in
index c28b53131f..c567647a54 100644
--- a/tbsetup/template_cvsroot/GNUmakefile.in
+++ b/tbsetup/template_cvsroot/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tbsetup/template_cvsroot/commit_finish.in b/tbsetup/template_cvsroot/commit_finish.in
index 6bbecdade0..a68789578f 100755
--- a/tbsetup/template_cvsroot/commit_finish.in
+++ b/tbsetup/template_cvsroot/commit_finish.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_cvsroot/commit_logmsg.in b/tbsetup/template_cvsroot/commit_logmsg.in
index 833299090e..d38969bb3a 100755
--- a/tbsetup/template_cvsroot/commit_logmsg.in
+++ b/tbsetup/template_cvsroot/commit_logmsg.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_cvsroot/commit_prep.in b/tbsetup/template_cvsroot/commit_prep.in
index be15992bb3..e59465a42b 100755
--- a/tbsetup/template_cvsroot/commit_prep.in
+++ b/tbsetup/template_cvsroot/commit_prep.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_cvsroot/logtag.in b/tbsetup/template_cvsroot/logtag.in
index f1050b3166..5347a654b7 100755
--- a/tbsetup/template_cvsroot/logtag.in
+++ b/tbsetup/template_cvsroot/logtag.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_cvsroot/rtag_commit.in b/tbsetup/template_cvsroot/rtag_commit.in
index 606e85ba63..5fbf4b7bc8 100644
--- a/tbsetup/template_cvsroot/rtag_commit.in
+++ b/tbsetup/template_cvsroot/rtag_commit.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_delete.in b/tbsetup/template_delete.in
index 19bd0598de..019525aaa3 100644
--- a/tbsetup/template_delete.in
+++ b/tbsetup/template_delete.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_export.in b/tbsetup/template_export.in
index 28e142e377..e247242a0b 100644
--- a/tbsetup/template_export.in
+++ b/tbsetup/template_export.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_exprun.in b/tbsetup/template_exprun.in
index 453a6cd1b5..0c22285850 100644
--- a/tbsetup/template_exprun.in
+++ b/tbsetup/template_exprun.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_graph.in b/tbsetup/template_graph.in
index 4c8a45fd3a..257ccb9470 100644
--- a/tbsetup/template_graph.in
+++ b/tbsetup/template_graph.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_instantiate.in b/tbsetup/template_instantiate.in
index f64fd7f413..6fa9a5752f 100644
--- a/tbsetup/template_instantiate.in
+++ b/tbsetup/template_instantiate.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_linkgraph.in b/tbsetup/template_linkgraph.in
index f2ee9c47bf..76e687ed5a 100644
--- a/tbsetup/template_linkgraph.in
+++ b/tbsetup/template_linkgraph.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_metadata.in b/tbsetup/template_metadata.in
index b961d1a4e4..3152083dc0 100644
--- a/tbsetup/template_metadata.in
+++ b/tbsetup/template_metadata.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_revise.in b/tbsetup/template_revise.in
index 4b3730f120..013d8d2a17 100644
--- a/tbsetup/template_revise.in
+++ b/tbsetup/template_revise.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_swapin.in b/tbsetup/template_swapin.in
index c348ce6f17..bd651fb51e 100644
--- a/tbsetup/template_swapin.in
+++ b/tbsetup/template_swapin.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/template_swapout.in b/tbsetup/template_swapout.in
index cb8745aec0..d643c8764f 100644
--- a/tbsetup/template_swapout.in
+++ b/tbsetup/template_swapout.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/tbsetup/vnode_setup.in b/tbsetup/vnode_setup.in
index b922fe17a9..3ddb0f8c8b 100644
--- a/tbsetup/vnode_setup.in
+++ b/tbsetup/vnode_setup.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/vtopgen.in b/tbsetup/vtopgen.in
index 1158cc0220..0fb5cf5dfb 100644
--- a/tbsetup/vtopgen.in
+++ b/tbsetup/vtopgen.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/wanassign.in b/tbsetup/wanassign.in
index e7cb787f07..c4c89c594d 100644
--- a/tbsetup/wanassign.in
+++ b/tbsetup/wanassign.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tbsetup/wanlinkinfo.in b/tbsetup/wanlinkinfo.in
index 971437ad59..654c8d9722 100755
--- a/tbsetup/wanlinkinfo.in
+++ b/tbsetup/wanlinkinfo.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tbsetup/wanlinksolve.cc b/tbsetup/wanlinksolve.cc
index 8a7009e35d..9a50c7e9ab 100644
--- a/tbsetup/wanlinksolve.cc
+++ b/tbsetup/wanlinksolve.cc
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/****
diff --git a/tbsetup/webfrisbeekiller.in b/tbsetup/webfrisbeekiller.in
index 46bcd303e3..cb31a6070e 100644
--- a/tbsetup/webfrisbeekiller.in
+++ b/tbsetup/webfrisbeekiller.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/testsuite/assign/common.pm b/testsuite/assign/common.pm
index b57520f2e1..6eb1c48796 100644
--- a/testsuite/assign/common.pm
+++ b/testsuite/assign/common.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/testsuite/assign/gatherstats b/testsuite/assign/gatherstats
index e333d5c7cc..00564bee58 100755
--- a/testsuite/assign/gatherstats
+++ b/testsuite/assign/gatherstats
@@ -1,9 +1,26 @@
#!/usr/bin/perl
+#
+# Copyright (c) 2009 University of Utah and the Flux Group.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
-# EMULAB-COPYRIGHT
-# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+# }}}
#
#
diff --git a/testsuite/assign/mklantop b/testsuite/assign/mklantop
index f93359085c..e65b86afe0 100755
--- a/testsuite/assign/mklantop
+++ b/testsuite/assign/mklantop
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
+#
+# Copyright (c) 2009 University of Utah and the Flux Group.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
-# EMULAB-COPYRIGHT
-# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+# }}}
#
#
diff --git a/testsuite/assign/mkptop b/testsuite/assign/mkptop
index eea529643e..b6a300299c 100755
--- a/testsuite/assign/mkptop
+++ b/testsuite/assign/mkptop
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
+#
+# Copyright (c) 2009 University of Utah and the Flux Group.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
-# EMULAB-COPYRIGHT
-# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+# }}}
#
#
diff --git a/testsuite/assign/runtests b/testsuite/assign/runtests
index 9f683e2182..f2c5a55b97 100755
--- a/testsuite/assign/runtests
+++ b/testsuite/assign/runtests
@@ -1,9 +1,26 @@
#!/usr/bin/perl
+#
+# Copyright (c) 2009 University of Utah and the Flux Group.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
-# EMULAB-COPYRIGHT
-# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+# }}}
#
require common;
diff --git a/testsuite/assign/testfiles/plan-scale.pl b/testsuite/assign/testfiles/plan-scale.pl
index 51bae29d64..15545c4a16 100644
--- a/testsuite/assign/testfiles/plan-scale.pl
+++ b/testsuite/assign/testfiles/plan-scale.pl
@@ -1,7 +1,24 @@
+#
+# Copyright (c) 2009 University of Utah and the Flux Group.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
-# EMULAB-COPYRIGHT
-# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+# }}}
#
@tops = ( "plan-20.top" );
@ptops = &::lsptop("big-*.ptop");
diff --git a/testsuite/assign/testfiles/plan-small-scale.pl b/testsuite/assign/testfiles/plan-small-scale.pl
index f4d3d30201..1ac0491347 100644
--- a/testsuite/assign/testfiles/plan-small-scale.pl
+++ b/testsuite/assign/testfiles/plan-small-scale.pl
@@ -1,7 +1,24 @@
+#
+# Copyright (c) 2009 University of Utah and the Flux Group.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
-# EMULAB-COPYRIGHT
-# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+# }}}
#
@tops = ( "plan-20.top" );
@ptops = &::lsptop("small-*.ptop");
diff --git a/testsuite/dumpdb b/testsuite/dumpdb
index 9a96747841..bf08b318f6 100755
--- a/testsuite/dumpdb
+++ b/testsuite/dumpdb
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/testsuite/mktest b/testsuite/mktest
index c21e089ba6..4e97c650dd 100755
--- a/testsuite/mktest
+++ b/testsuite/mktest
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/testsuite/tbstub b/testsuite/tbstub
index c98f8402d2..2d0c3a161f 100755
--- a/testsuite/tbstub
+++ b/testsuite/tbstub
@@ -1,9 +1,26 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/testsuite/tbtest b/testsuite/tbtest
index 8609762d9c..c3ed02064b 100755
--- a/testsuite/tbtest
+++ b/testsuite/tbtest
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/testsuite/test-defs b/testsuite/test-defs
index 5bd72fc787..f74dc69d3d 100644
--- a/testsuite/test-defs
+++ b/testsuite/test-defs
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/testsuite/testswap/Makefile.PL b/testsuite/testswap/Makefile.PL
index 95c9784500..d8cb2dfaef 100644
--- a/testsuite/testswap/Makefile.PL
+++ b/testsuite/testswap/Makefile.PL
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use inc::Module::Install;
diff --git a/testsuite/testswap/TBConfig.pm.in b/testsuite/testswap/TBConfig.pm.in
index 0ad5bb00c9..97ae9299d8 100644
--- a/testsuite/testswap/TBConfig.pm.in
+++ b/testsuite/testswap/TBConfig.pm.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TBConfig;
diff --git a/testsuite/testswap/devtools/podfailure.pl b/testsuite/testswap/devtools/podfailure.pl
index 7c13062fa5..9bb1342a4e 100644
--- a/testsuite/testswap/devtools/podfailure.pl
+++ b/testsuite/testswap/devtools/podfailure.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Modern::Perl;
use File::Temp;
diff --git a/testsuite/testswap/install_deps_from_cpan b/testsuite/testswap/install_deps_from_cpan
index 0ccc74fc13..4b2eff935e 100755
--- a/testsuite/testswap/install_deps_from_cpan
+++ b/testsuite/testswap/install_deps_from_cpan
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/testsuite/testswap/lib/SemiModern/Perl.pm b/testsuite/testswap/lib/SemiModern/Perl.pm
index d7b21a9c77..2d854ec242 100644
--- a/testsuite/testswap/lib/SemiModern/Perl.pm
+++ b/testsuite/testswap/lib/SemiModern/Perl.pm
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use 5.008_000;
use strict;
diff --git a/testsuite/testswap/lib/TestBed/Daemonize.pm b/testsuite/testswap/lib/TestBed/Daemonize.pm
index e230054774..41c08acf12 100644
--- a/testsuite/testswap/lib/TestBed/Daemonize.pm
+++ b/testsuite/testswap/lib/TestBed/Daemonize.pm
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::Daemonize;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/ForkFramework.pm b/testsuite/testswap/lib/TestBed/ForkFramework.pm
index feff62e267..3c96c9bfc4 100644
--- a/testsuite/testswap/lib/TestBed/ForkFramework.pm
+++ b/testsuite/testswap/lib/TestBed/ForkFramework.pm
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
my $FFDEBUG = 0;
diff --git a/testsuite/testswap/lib/TestBed/Harness.pm b/testsuite/testswap/lib/TestBed/Harness.pm
index a816467b20..2feea7974c 100644
--- a/testsuite/testswap/lib/TestBed/Harness.pm
+++ b/testsuite/testswap/lib/TestBed/Harness.pm
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TAP::Parser::Iterator::StdOutErr;
use strict;
diff --git a/testsuite/testswap/lib/TestBed/ParallelRunner.pm b/testsuite/testswap/lib/TestBed/ParallelRunner.pm
index d687d820f4..dfcabd6860 100644
--- a/testsuite/testswap/lib/TestBed/ParallelRunner.pm
+++ b/testsuite/testswap/lib/TestBed/ParallelRunner.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::ParallelRunner;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/ParallelRunner/ErrorStrategy.pm b/testsuite/testswap/lib/TestBed/ParallelRunner/ErrorStrategy.pm
index 10f4351cae..4bdff61848 100644
--- a/testsuite/testswap/lib/TestBed/ParallelRunner/ErrorStrategy.pm
+++ b/testsuite/testswap/lib/TestBed/ParallelRunner/ErrorStrategy.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::ParallelRunner::ErrorStrategy;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/ParallelRunner/Executor.pm b/testsuite/testswap/lib/TestBed/ParallelRunner/Executor.pm
index 8814c8f6dd..c86ddc0f21 100644
--- a/testsuite/testswap/lib/TestBed/ParallelRunner/Executor.pm
+++ b/testsuite/testswap/lib/TestBed/ParallelRunner/Executor.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::ParallelRunner::Executor::Exception;
use Mouse;
diff --git a/testsuite/testswap/lib/TestBed/TestBuilderWrapper.pm b/testsuite/testswap/lib/TestBed/TestBuilderWrapper.pm
index 161975ea2b..728a899df8 100644
--- a/testsuite/testswap/lib/TestBed/TestBuilderWrapper.pm
+++ b/testsuite/testswap/lib/TestBed/TestBuilderWrapper.pm
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::TestBuilderWrapper;
use Test::Builder;
diff --git a/testsuite/testswap/lib/TestBed/TestSuite.pm b/testsuite/testswap/lib/TestBed/TestSuite.pm
index c59289ac51..5846cdccee 100644
--- a/testsuite/testswap/lib/TestBed/TestSuite.pm
+++ b/testsuite/testswap/lib/TestBed/TestSuite.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::TestSuite;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/TestSuite/Experiment.pm b/testsuite/testswap/lib/TestBed/TestSuite/Experiment.pm
index 53c7e4d476..fc03f71f18 100644
--- a/testsuite/testswap/lib/TestBed/TestSuite/Experiment.pm
+++ b/testsuite/testswap/lib/TestBed/TestSuite/Experiment.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::TestSuite::Experiment;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/TestSuite/Link.pm b/testsuite/testswap/lib/TestBed/TestSuite/Link.pm
index b9398f3557..655d15aa72 100644
--- a/testsuite/testswap/lib/TestBed/TestSuite/Link.pm
+++ b/testsuite/testswap/lib/TestBed/TestSuite/Link.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::TestSuite::Link;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/TestSuite/Node.pm b/testsuite/testswap/lib/TestBed/TestSuite/Node.pm
index a2dd083ffb..15a4663952 100644
--- a/testsuite/testswap/lib/TestBed/TestSuite/Node.pm
+++ b/testsuite/testswap/lib/TestBed/TestSuite/Node.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::TestSuite::Node;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/Wrap/linktest.pm b/testsuite/testswap/lib/TestBed/Wrap/linktest.pm
index ec5b434010..f41365cec9 100644
--- a/testsuite/testswap/lib/TestBed/Wrap/linktest.pm
+++ b/testsuite/testswap/lib/TestBed/Wrap/linktest.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::Wrap::linktest;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/Wrap/loghole.pm b/testsuite/testswap/lib/TestBed/Wrap/loghole.pm
index 6d1ec3ae0e..cabf3092d9 100644
--- a/testsuite/testswap/lib/TestBed/Wrap/loghole.pm
+++ b/testsuite/testswap/lib/TestBed/Wrap/loghole.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::Wrap::loghole;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/Wrap/tevc.pm b/testsuite/testswap/lib/TestBed/Wrap/tevc.pm
index 3490406398..3b291e71a7 100644
--- a/testsuite/testswap/lib/TestBed/Wrap/tevc.pm
+++ b/testsuite/testswap/lib/TestBed/Wrap/tevc.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::Wrap::tevc;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/XMLRPC/Client.pm b/testsuite/testswap/lib/TestBed/XMLRPC/Client.pm
index 6132c1259c..c57d0f3b13 100644
--- a/testsuite/testswap/lib/TestBed/XMLRPC/Client.pm
+++ b/testsuite/testswap/lib/TestBed/XMLRPC/Client.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::XMLRPC::Client;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/XMLRPC/Client/Emulab.pm b/testsuite/testswap/lib/TestBed/XMLRPC/Client/Emulab.pm
index 1d0f3d5be4..9f5468a349 100644
--- a/testsuite/testswap/lib/TestBed/XMLRPC/Client/Emulab.pm
+++ b/testsuite/testswap/lib/TestBed/XMLRPC/Client/Emulab.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::XMLRPC::Client::Emulab;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/XMLRPC/Client/Experiment.pm b/testsuite/testswap/lib/TestBed/XMLRPC/Client/Experiment.pm
index 764625dfac..1a3512673e 100644
--- a/testsuite/testswap/lib/TestBed/XMLRPC/Client/Experiment.pm
+++ b/testsuite/testswap/lib/TestBed/XMLRPC/Client/Experiment.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::XMLRPC::Client::Experiment;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/XMLRPC/Client/Node.pm b/testsuite/testswap/lib/TestBed/XMLRPC/Client/Node.pm
index 48b08d4bda..528e75507b 100644
--- a/testsuite/testswap/lib/TestBed/XMLRPC/Client/Node.pm
+++ b/testsuite/testswap/lib/TestBed/XMLRPC/Client/Node.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::XMLRPC::Client::Node::InsufficientNodes;
use Mouse;
diff --git a/testsuite/testswap/lib/TestBed/XMLRPC/Client/NodeInfo.pm b/testsuite/testswap/lib/TestBed/XMLRPC/Client/NodeInfo.pm
index 61e9963bcc..028353334a 100644
--- a/testsuite/testswap/lib/TestBed/XMLRPC/Client/NodeInfo.pm
+++ b/testsuite/testswap/lib/TestBed/XMLRPC/Client/NodeInfo.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::XMLRPC::Client::NodeInfo;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/XMLRPC/Client/OSID.pm b/testsuite/testswap/lib/TestBed/XMLRPC/Client/OSID.pm
index 0bddf170e0..d25a57e995 100644
--- a/testsuite/testswap/lib/TestBed/XMLRPC/Client/OSID.pm
+++ b/testsuite/testswap/lib/TestBed/XMLRPC/Client/OSID.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::XMLRPC::Client::OSID;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/TestBed/XMLRPC/Client/Pretty.pm b/testsuite/testswap/lib/TestBed/XMLRPC/Client/Pretty.pm
index c6ef49a423..542aab42e3 100644
--- a/testsuite/testswap/lib/TestBed/XMLRPC/Client/Pretty.pm
+++ b/testsuite/testswap/lib/TestBed/XMLRPC/Client/Pretty.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TestBed::XMLRPC::Client::Pretty;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/Tools.pm b/testsuite/testswap/lib/Tools.pm
index 75b7199bec..1f4cc827ca 100644
--- a/testsuite/testswap/lib/Tools.pm
+++ b/testsuite/testswap/lib/Tools.pm
@@ -1,8 +1,25 @@
package Tools;
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use Log::Log4perl qw(get_logger :levels);
diff --git a/testsuite/testswap/lib/Tools/Network.pm b/testsuite/testswap/lib/Tools/Network.pm
index d5dd8d2a56..46335c349a 100644
--- a/testsuite/testswap/lib/Tools/Network.pm
+++ b/testsuite/testswap/lib/Tools/Network.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Tools::Network;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/Tools/PerlSSH.pm b/testsuite/testswap/lib/Tools/PerlSSH.pm
index f4cc33c49a..1cf586eb67 100644
--- a/testsuite/testswap/lib/Tools/PerlSSH.pm
+++ b/testsuite/testswap/lib/Tools/PerlSSH.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Tools::PerlSSH;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/Tools/TBSSH.pm b/testsuite/testswap/lib/Tools/TBSSH.pm
index 1effc4736a..785c93e5ee 100644
--- a/testsuite/testswap/lib/Tools/TBSSH.pm
+++ b/testsuite/testswap/lib/Tools/TBSSH.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Tools::TBSSH;
use SemiModern::Perl;
diff --git a/testsuite/testswap/lib/Tools/WrappedSSH.pm b/testsuite/testswap/lib/Tools/WrappedSSH.pm
index 1f6c7525eb..0f315891f6 100644
--- a/testsuite/testswap/lib/Tools/WrappedSSH.pm
+++ b/testsuite/testswap/lib/Tools/WrappedSSH.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Tools::WrappedSSH;
use SemiModern::Perl;
diff --git a/testsuite/testswap/run_single_test_with_args b/testsuite/testswap/run_single_test_with_args
index 8865cc6eef..427740fde9 100755
--- a/testsuite/testswap/run_single_test_with_args
+++ b/testsuite/testswap/run_single_test_with_args
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
BEGIN {
#add localcpan path to library search path
diff --git a/testsuite/testswap/sc b/testsuite/testswap/sc
index c5fe397c6b..acdec1ed27 100755
--- a/testsuite/testswap/sc
+++ b/testsuite/testswap/sc
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
BEGIN {
#add localcpan path to library search path
diff --git a/testsuite/testswap/t/coding/pod_coverage.t b/testsuite/testswap/t/coding/pod_coverage.t
index 652e6eacb5..326b208300 100644
--- a/testsuite/testswap/t/coding/pod_coverage.t
+++ b/testsuite/testswap/t/coding/pod_coverage.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Test::More;
eval "use Test::Pod::Coverage 1.00";
diff --git a/testsuite/testswap/t/eine/elab_in_elab.t b/testsuite/testswap/t/eine/elab_in_elab.t
index 90e93afc16..2b3cc076e3 100644
--- a/testsuite/testswap/t/eine/elab_in_elab.t
+++ b/testsuite/testswap/t/eine/elab_in_elab.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TBConfig;
diff --git a/testsuite/testswap/t/lib/testbed/forkframework.t b/testsuite/testswap/t/lib/testbed/forkframework.t
index 010f255a97..f143448544 100644
--- a/testsuite/testswap/t/lib/testbed/forkframework.t
+++ b/testsuite/testswap/t/lib/testbed/forkframework.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TestBed::ForkFramework;
diff --git a/testsuite/testswap/t/lib/testbed/testsuite.t b/testsuite/testswap/t/lib/testbed/testsuite.t
index 01cd138908..7f43f082d0 100644
--- a/testsuite/testswap/t/lib/testbed/testsuite.t
+++ b/testsuite/testswap/t/lib/testbed/testsuite.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TBConfig;
diff --git a/testsuite/testswap/t/lib/tools.t b/testsuite/testswap/t/lib/tools.t
index b929741393..f91ac51a3e 100644
--- a/testsuite/testswap/t/lib/tools.t
+++ b/testsuite/testswap/t/lib/tools.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TBConfig;
diff --git a/testsuite/testswap/t/lib/tools/network.t b/testsuite/testswap/t/lib/tools/network.t
index 54501c8054..56624219bf 100644
--- a/testsuite/testswap/t/lib/tools/network.t
+++ b/testsuite/testswap/t/lib/tools/network.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TBConfig;
diff --git a/testsuite/testswap/t/lib/tools/ssh.t b/testsuite/testswap/t/lib/tools/ssh.t
index 3863126ac5..55c0ae979b 100644
--- a/testsuite/testswap/t/lib/tools/ssh.t
+++ b/testsuite/testswap/t/lib/tools/ssh.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TBConfig;
diff --git a/testsuite/testswap/t/livetests/ensure_active.t b/testsuite/testswap/t/livetests/ensure_active.t
index c87d349969..8225ef541e 100644
--- a/testsuite/testswap/t/livetests/ensure_active.t
+++ b/testsuite/testswap/t/livetests/ensure_active.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TestBed::TestSuite;
diff --git a/testsuite/testswap/t/noautorun/tbts_cmdlineargs.t b/testsuite/testswap/t/noautorun/tbts_cmdlineargs.t
index 0e285aace5..5d109a3c39 100644
--- a/testsuite/testswap/t/noautorun/tbts_cmdlineargs.t
+++ b/testsuite/testswap/t/noautorun/tbts_cmdlineargs.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TBConfig;
diff --git a/testsuite/testswap/t/tbts/cmdlineargs.t b/testsuite/testswap/t/tbts/cmdlineargs.t
index 41b055726a..6a166a5546 100644
--- a/testsuite/testswap/t/tbts/cmdlineargs.t
+++ b/testsuite/testswap/t/tbts/cmdlineargs.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TBConfig;
diff --git a/testsuite/testswap/t/xmlrpc/emulab.t b/testsuite/testswap/t/xmlrpc/emulab.t
index 460400e370..caab2ba871 100644
--- a/testsuite/testswap/t/xmlrpc/emulab.t
+++ b/testsuite/testswap/t/xmlrpc/emulab.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
diff --git a/testsuite/testswap/t/xmlrpc/experiment.t b/testsuite/testswap/t/xmlrpc/experiment.t
index 7bb9ac216e..f4fdb23cf4 100644
--- a/testsuite/testswap/t/xmlrpc/experiment.t
+++ b/testsuite/testswap/t/xmlrpc/experiment.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TestBed::TestSuite;
diff --git a/testsuite/testswap/t/xmlrpc/node.t b/testsuite/testswap/t/xmlrpc/node.t
index 7cf55d0c5f..a4f479b2ea 100644
--- a/testsuite/testswap/t/xmlrpc/node.t
+++ b/testsuite/testswap/t/xmlrpc/node.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TestBed::XMLRPC::Client::Node;
diff --git a/testsuite/testswap/t/xmlrpc/osid.t b/testsuite/testswap/t/xmlrpc/osid.t
index aea828e13b..e25156a62d 100644
--- a/testsuite/testswap/t/xmlrpc/osid.t
+++ b/testsuite/testswap/t/xmlrpc/osid.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
diff --git a/testsuite/testswap/tbts b/testsuite/testswap/tbts
index df75388bb7..78d89b68fa 100755
--- a/testsuite/testswap/tbts
+++ b/testsuite/testswap/tbts
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
BEGIN {
#add localcpan path to library search path
diff --git a/testsuite/testswap/tests/BasicNSs.pm b/testsuite/testswap/tests/BasicNSs.pm
index f83c83f480..5017e6cf5f 100644
--- a/testsuite/testswap/tests/BasicNSs.pm
+++ b/testsuite/testswap/tests/BasicNSs.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
package BasicNSs;
diff --git a/testsuite/testswap/tests/BasicTopologies.pm b/testsuite/testswap/tests/BasicTopologies.pm
index 7b293dc7df..c2192ab98d 100644
--- a/testsuite/testswap/tests/BasicTopologies.pm
+++ b/testsuite/testswap/tests/BasicTopologies.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TestBed::TestSuite;
diff --git a/testsuite/testswap/tests/ImageTests.pm b/testsuite/testswap/tests/ImageTests.pm
index a942952622..6ec12a513f 100644
--- a/testsuite/testswap/tests/ImageTests.pm
+++ b/testsuite/testswap/tests/ImageTests.pm
@@ -1,8 +1,25 @@
package ImageTests;
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TestBed::TestSuite;
diff --git a/testsuite/testswap/tests/OldTestSuite.pm b/testsuite/testswap/tests/OldTestSuite.pm
index 95e7716ae3..ee7c7c1604 100644
--- a/testsuite/testswap/tests/OldTestSuite.pm
+++ b/testsuite/testswap/tests/OldTestSuite.pm
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package OldTestSuite;
diff --git a/testsuite/testswap/tests/OldTestSuiteTests.pm b/testsuite/testswap/tests/OldTestSuiteTests.pm
index ca2bd0aae1..4d3081ff65 100644
--- a/testsuite/testswap/tests/OldTestSuiteTests.pm
+++ b/testsuite/testswap/tests/OldTestSuiteTests.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TestBed::TestSuite;
diff --git a/testsuite/testswap/tests/RateLimitParallelExample.pm b/testsuite/testswap/tests/RateLimitParallelExample.pm
index ad6238bddd..097a0227c3 100644
--- a/testsuite/testswap/tests/RateLimitParallelExample.pm
+++ b/testsuite/testswap/tests/RateLimitParallelExample.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package RateLimitParallelExample;
use TestBed::TestSuite;
diff --git a/testsuite/testswap/tests/SyncTests.pm b/testsuite/testswap/tests/SyncTests.pm
index 1f9953ace8..7450ec1754 100644
--- a/testsuite/testswap/tests/SyncTests.pm
+++ b/testsuite/testswap/tests/SyncTests.pm
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package SyncTests;
use SemiModern::Perl;
diff --git a/testsuite/testswap/tests/TooManyLans.pm b/testsuite/testswap/tests/TooManyLans.pm
index b3ce70bd2c..73c3f89bf7 100644
--- a/testsuite/testswap/tests/TooManyLans.pm
+++ b/testsuite/testswap/tests/TooManyLans.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package TooManyLans;
use SemiModern::Perl;
diff --git a/testsuite/testswap/tests/Trafficgen.pm b/testsuite/testswap/tests/Trafficgen.pm
index 16f865014d..a2c5feba1d 100644
--- a/testsuite/testswap/tests/Trafficgen.pm
+++ b/testsuite/testswap/tests/Trafficgen.pm
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package Event;
use SemiModern::Perl;
diff --git a/testsuite/testswap/tests/VNodeTest.pm b/testsuite/testswap/tests/VNodeTest.pm
index 37f66c36fa..cd1478b3d9 100644
--- a/testsuite/testswap/tests/VNodeTest.pm
+++ b/testsuite/testswap/tests/VNodeTest.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package VNodeTest;
use SemiModern::Perl;
diff --git a/testsuite/testswap/tests/features/features.pm b/testsuite/testswap/tests/features/features.pm
index f001c46303..7812765b48 100644
--- a/testsuite/testswap/tests/features/features.pm
+++ b/testsuite/testswap/tests/features/features.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TestBed::TestSuite;
diff --git a/testsuite/testswap/tests/topologies/link_up_link_down.pm b/testsuite/testswap/tests/topologies/link_up_link_down.pm
index 2036b35e75..77fa819920 100644
--- a/testsuite/testswap/tests/topologies/link_up_link_down.pm
+++ b/testsuite/testswap/tests/topologies/link_up_link_down.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TestBed::TestSuite;
diff --git a/testsuite/testswap/tests/topologies/simple_two_node_linktest.pm b/testsuite/testswap/tests/topologies/simple_two_node_linktest.pm
index 0e7a7c6f11..03e76b87d7 100644
--- a/testsuite/testswap/tests/topologies/simple_two_node_linktest.pm
+++ b/testsuite/testswap/tests/topologies/simple_two_node_linktest.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TestBed::TestSuite;
diff --git a/testsuite/testswap/tests/topologies/single_node.pm b/testsuite/testswap/tests/topologies/single_node.pm
index 4ddff2a1b9..e4183ba59e 100644
--- a/testsuite/testswap/tests/topologies/single_node.pm
+++ b/testsuite/testswap/tests/topologies/single_node.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TestBed::TestSuite;
diff --git a/testsuite/testswap/tests/topologies/two_node_lan.pm b/testsuite/testswap/tests/topologies/two_node_lan.pm
index 0177b025d6..6e3a7067fe 100644
--- a/testsuite/testswap/tests/topologies/two_node_lan.pm
+++ b/testsuite/testswap/tests/topologies/two_node_lan.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TestBed::TestSuite;
diff --git a/testsuite/testswap/tests/xen/xen.pm b/testsuite/testswap/tests/xen/xen.pm
index bed0b10f30..2eb0d8bdc6 100644
--- a/testsuite/testswap/tests/xen/xen.pm
+++ b/testsuite/testswap/tests/xen/xen.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
use TestBed::TestSuite;
diff --git a/testsuite/virt/ops/bw-run.pl b/testsuite/virt/ops/bw-run.pl
index 9ce9212910..5e9e306623 100755
--- a/testsuite/virt/ops/bw-run.pl
+++ b/testsuite/virt/ops/bw-run.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
if (scalar(@ARGV) < 6)
diff --git a/testsuite/virt/ops/client.pl b/testsuite/virt/ops/client.pl
index 724a9d0fb8..ba29a39cc9 100755
--- a/testsuite/virt/ops/client.pl
+++ b/testsuite/virt/ops/client.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
sub printLog
diff --git a/testsuite/virt/ops/command.pl b/testsuite/virt/ops/command.pl
index 164a973431..2f9fe183fc 100755
--- a/testsuite/virt/ops/command.pl
+++ b/testsuite/virt/ops/command.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Usage: command.pl <command> <args>
diff --git a/testsuite/virt/ops/copy-delay.pl b/testsuite/virt/ops/copy-delay.pl
index 9425290db8..b4e7bfcf0d 100755
--- a/testsuite/virt/ops/copy-delay.pl
+++ b/testsuite/virt/ops/copy-delay.pl
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
my @pairList = (1, 2, 5, 10, 15, 20, 25, 30, 35);
diff --git a/testsuite/virt/ops/copy-single-delay.pl b/testsuite/virt/ops/copy-single-delay.pl
index 54876b2a16..929823ee4a 100755
--- a/testsuite/virt/ops/copy-single-delay.pl
+++ b/testsuite/virt/ops/copy-single-delay.pl
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
my $pairs = $ARGV[0];
diff --git a/testsuite/virt/ops/kill.pl b/testsuite/virt/ops/kill.pl
index 32f963d299..f4e2a57691 100755
--- a/testsuite/virt/ops/kill.pl
+++ b/testsuite/virt/ops/kill.pl
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
if (scalar(@ARGV) != 3)
{
diff --git a/testsuite/virt/ops/monitor.pl b/testsuite/virt/ops/monitor.pl
index 5fadd47fff..944b9c6f41 100755
--- a/testsuite/virt/ops/monitor.pl
+++ b/testsuite/virt/ops/monitor.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
sub printLog
diff --git a/testsuite/virt/ops/network.pl b/testsuite/virt/ops/network.pl
index 944806a6ce..6dbc0736a6 100755
--- a/testsuite/virt/ops/network.pl
+++ b/testsuite/virt/ops/network.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
if (scalar(@ARGV) != 5)
diff --git a/testsuite/virt/ops/parallel-run.pl b/testsuite/virt/ops/parallel-run.pl
index 05e16feb2f..727a20f563 100755
--- a/testsuite/virt/ops/parallel-run.pl
+++ b/testsuite/virt/ops/parallel-run.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
if (scalar(@ARGV) != 6)
diff --git a/testsuite/virt/ops/process.pl b/testsuite/virt/ops/process.pl
index 50e7a74bbb..d3086efa00 100755
--- a/testsuite/virt/ops/process.pl
+++ b/testsuite/virt/ops/process.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
if (scalar(@ARGV) != 1)
diff --git a/testsuite/virt/ops/reset-syncd.pl b/testsuite/virt/ops/reset-syncd.pl
index d19d5bb1c3..0f2fa4fba1 100755
--- a/testsuite/virt/ops/reset-syncd.pl
+++ b/testsuite/virt/ops/reset-syncd.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
$pid = `cat /var/run/syncd.pid`;
diff --git a/testsuite/virt/ops/run-sync.pl b/testsuite/virt/ops/run-sync.pl
index f4414eb318..a2fedd2092 100755
--- a/testsuite/virt/ops/run-sync.pl
+++ b/testsuite/virt/ops/run-sync.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use POSIX;
diff --git a/testsuite/virt/ops/run.pl b/testsuite/virt/ops/run.pl
index f385e60291..320722cd5c 100755
--- a/testsuite/virt/ops/run.pl
+++ b/testsuite/virt/ops/run.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use POSIX ":sys_wait_h";
diff --git a/testsuite/virt/ops/server.pl b/testsuite/virt/ops/server.pl
index 8efcca19e9..4ea46f3b14 100755
--- a/testsuite/virt/ops/server.pl
+++ b/testsuite/virt/ops/server.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
sub printLog
diff --git a/testsuite/virt/testswap/master-virt.pl b/testsuite/virt/testswap/master-virt.pl
index 397e43b8ef..ffdcdeac34 100644
--- a/testsuite/virt/testswap/master-virt.pl
+++ b/testsuite/virt/testswap/master-virt.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
if (scalar(@ARGV) < 7)
diff --git a/testsuite/virt/testswap/run-virt.t b/testsuite/virt/testswap/run-virt.t
index e92c22b159..7d803f6437 100644
--- a/testsuite/virt/testswap/run-virt.t
+++ b/testsuite/virt/testswap/run-virt.t
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use SemiModern::Perl;
diff --git a/tip/GNUmakefile.in b/tip/GNUmakefile.in
index e0f9c6fe89..03fc239cdd 100644
--- a/tip/GNUmakefile.in
+++ b/tip/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/tip/console.boss.in b/tip/console.boss.in
index 30b2f3a4c6..25c1678194 100644
--- a/tip/console.boss.in
+++ b/tip/console.boss.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tip/console.in b/tip/console.in
index 21ceaeb32e..c713b13f65 100644
--- a/tip/console.in
+++ b/tip/console.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tip/tiptunnel.c b/tip/tiptunnel.c
index 697043d00f..8d83a0a4ed 100644
--- a/tip/tiptunnel.c
+++ b/tip/tiptunnel.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005, 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "config.h"
diff --git a/tmcd/GNUmakefile.in b/tmcd/GNUmakefile.in
index 38a1634f7a..3b6717f0a1 100644
--- a/tmcd/GNUmakefile.in
+++ b/tmcd/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/tmcd/libtmcd.c b/tmcd/libtmcd.c
index 82af6d4003..137d8766ff 100644
--- a/tmcd/libtmcd.c
+++ b/tmcd/libtmcd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "libtmcd.h"
diff --git a/tmcd/libtmcd.h b/tmcd/libtmcd.h
index b3bb251a30..9919474bbf 100644
--- a/tmcd/libtmcd.h
+++ b/tmcd/libtmcd.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2009 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef _LIBTMCD_H_
diff --git a/tmcd/mod_tmcd.c b/tmcd/mod_tmcd.c
index 513a866a54..a29b69337b 100644
--- a/tmcd/mod_tmcd.c
+++ b/tmcd/mod_tmcd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2009 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <arpa/inet.h>
diff --git a/tmcd/newtmcd.c b/tmcd/newtmcd.c
index c469177a6b..54ff03531d 100644
--- a/tmcd/newtmcd.c
+++ b/tmcd/newtmcd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/tmcd/newtmcd/GNUmakefile.in b/tmcd/newtmcd/GNUmakefile.in
index aec6309514..f015cd5d9f 100644
--- a/tmcd/newtmcd/GNUmakefile.in
+++ b/tmcd/newtmcd/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tmcd/newtmcd/bootsubnodes b/tmcd/newtmcd/bootsubnodes
index a30204b9b7..506907003a 100755
--- a/tmcd/newtmcd/bootsubnodes
+++ b/tmcd/newtmcd/bootsubnodes
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use English;
diff --git a/tmcd/newtmcd/bootvnodes b/tmcd/newtmcd/bootvnodes
index ff0930fc63..c80586fa2e 100755
--- a/tmcd/newtmcd/bootvnodes
+++ b/tmcd/newtmcd/bootvnodes
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use English;
diff --git a/tmcd/newtmcd/config/foo b/tmcd/newtmcd/config/foo
index d40503f10f..c517fc7273 100755
--- a/tmcd/newtmcd/config/foo
+++ b/tmcd/newtmcd/config/foo
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/config/rc.accounts b/tmcd/newtmcd/config/rc.accounts
index 80b4b6b8e6..c41b3d1f01 100755
--- a/tmcd/newtmcd/config/rc.accounts
+++ b/tmcd/newtmcd/config/rc.accounts
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/config/rc.fakejail b/tmcd/newtmcd/config/rc.fakejail
index 90098ebde9..574d051dc8 100755
--- a/tmcd/newtmcd/config/rc.fakejail
+++ b/tmcd/newtmcd/config/rc.fakejail
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/config/rc.firewall b/tmcd/newtmcd/config/rc.firewall
index 52d62ef287..04112d12ff 100755
--- a/tmcd/newtmcd/config/rc.firewall
+++ b/tmcd/newtmcd/config/rc.firewall
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/config/rc.hostnames b/tmcd/newtmcd/config/rc.hostnames
index c68ddf394b..33424e2618 100755
--- a/tmcd/newtmcd/config/rc.hostnames
+++ b/tmcd/newtmcd/config/rc.hostnames
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/config/rc.keys b/tmcd/newtmcd/config/rc.keys
index 7a007c6663..258e764eb9 100755
--- a/tmcd/newtmcd/config/rc.keys
+++ b/tmcd/newtmcd/config/rc.keys
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/config/rc.localize b/tmcd/newtmcd/config/rc.localize
index 0cdba0607a..30f050d4f7 100755
--- a/tmcd/newtmcd/config/rc.localize
+++ b/tmcd/newtmcd/config/rc.localize
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/config/rc.misc b/tmcd/newtmcd/config/rc.misc
index 56fcc95537..1b4895522e 100755
--- a/tmcd/newtmcd/config/rc.misc
+++ b/tmcd/newtmcd/config/rc.misc
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/config/rc.mkelab b/tmcd/newtmcd/config/rc.mkelab
index 22977042b0..9e606a041e 100755
--- a/tmcd/newtmcd/config/rc.mkelab
+++ b/tmcd/newtmcd/config/rc.mkelab
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# XXX I hardwire IPs into generated /etc/rc.conf and /etc/rc.resolv.
#
diff --git a/tmcd/newtmcd/config/rc.mounts b/tmcd/newtmcd/config/rc.mounts
index 65e20a2786..ec9abee885 100755
--- a/tmcd/newtmcd/config/rc.mounts
+++ b/tmcd/newtmcd/config/rc.mounts
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/config/rc.progagent b/tmcd/newtmcd/config/rc.progagent
index 0fcdc6d3ab..437703b0ce 100755
--- a/tmcd/newtmcd/config/rc.progagent
+++ b/tmcd/newtmcd/config/rc.progagent
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/config/rc.rpms b/tmcd/newtmcd/config/rc.rpms
index 36b8f1d276..fb2accc6c0 100755
--- a/tmcd/newtmcd/config/rc.rpms
+++ b/tmcd/newtmcd/config/rc.rpms
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/config/rc.simulator b/tmcd/newtmcd/config/rc.simulator
index 604c6c69b0..6e8b6a0993 100755
--- a/tmcd/newtmcd/config/rc.simulator
+++ b/tmcd/newtmcd/config/rc.simulator
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/config/rc.startcmd b/tmcd/newtmcd/config/rc.startcmd
index f1f49a1497..52a6097129 100755
--- a/tmcd/newtmcd/config/rc.startcmd
+++ b/tmcd/newtmcd/config/rc.startcmd
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/config/rc.syncserver b/tmcd/newtmcd/config/rc.syncserver
index ad65bea17e..1323cfe03f 100755
--- a/tmcd/newtmcd/config/rc.syncserver
+++ b/tmcd/newtmcd/config/rc.syncserver
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/config/rc.tarfiles b/tmcd/newtmcd/config/rc.tarfiles
index 9efbfbd511..9e457e26be 100755
--- a/tmcd/newtmcd/config/rc.tarfiles
+++ b/tmcd/newtmcd/config/rc.tarfiles
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/libsetup.pm b/tmcd/newtmcd/libsetup.pm
index bdaf7cc118..6582cb7fad 100644
--- a/tmcd/newtmcd/libsetup.pm
+++ b/tmcd/newtmcd/libsetup.pm
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# TODO: Signal handlers for protecting db files.
diff --git a/tmcd/newtmcd/libtmcc.pm b/tmcd/newtmcd/libtmcc.pm
index cae0ed6c15..e7c98e22f8 100644
--- a/tmcd/newtmcd/libtmcc.pm
+++ b/tmcd/newtmcd/libtmcc.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tmcd/newtmcd/logboot b/tmcd/newtmcd/logboot
index b5b0a1e2ee..aaf75b1c47 100755
--- a/tmcd/newtmcd/logboot
+++ b/tmcd/newtmcd/logboot
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/ntpstart b/tmcd/newtmcd/ntpstart
index fbd94f452d..2915032c68 100755
--- a/tmcd/newtmcd/ntpstart
+++ b/tmcd/newtmcd/ntpstart
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/tmcd/newtmcd/rc.bootsetup b/tmcd/newtmcd/rc.bootsetup
index 55f7cfe863..841f52bf03 100755
--- a/tmcd/newtmcd/rc.bootsetup
+++ b/tmcd/newtmcd/rc.bootsetup
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005, 2006, 2007, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/rc.ctrlnode b/tmcd/newtmcd/rc.ctrlnode
index 4df431ecfd..b2d62f59f8 100755
--- a/tmcd/newtmcd/rc.ctrlnode
+++ b/tmcd/newtmcd/rc.ctrlnode
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/rc.inelab b/tmcd/newtmcd/rc.inelab
index 4c0370a7cc..555092de93 100755
--- a/tmcd/newtmcd/rc.inelab
+++ b/tmcd/newtmcd/rc.inelab
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/tmcc.pl b/tmcd/newtmcd/tmcc.pl
index fefeb78142..b0894ed803 100755
--- a/tmcd/newtmcd/tmcc.pl
+++ b/tmcd/newtmcd/tmcc.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/tmcd/newtmcd/vnodesetup b/tmcd/newtmcd/vnodesetup
index 353b56ccae..ab87263958 100755
--- a/tmcd/newtmcd/vnodesetup
+++ b/tmcd/newtmcd/vnodesetup
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
diff --git a/tmcd/newtmcd/watchdog b/tmcd/newtmcd/watchdog
index 42c94ed157..78d57c0f03 100755
--- a/tmcd/newtmcd/watchdog
+++ b/tmcd/newtmcd/watchdog
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Getopt::Std;
use English;
diff --git a/tmcd/tmcd.c b/tmcd/tmcd.c
index 93ec36ac7b..1e8d2d3b63 100644
--- a/tmcd/tmcd.c
+++ b/tmcd/tmcd.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <sys/types.h>
diff --git a/tmcd/tmcd.restart.in b/tmcd/tmcd.restart.in
index 5184be7c1e..52b6889497 100755
--- a/tmcd/tmcd.restart.in
+++ b/tmcd/tmcd.restart.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2001-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
DIR=@prefix@/sbin
diff --git a/tools/GNUmakefile.in b/tools/GNUmakefile.in
index 4bbfcfe739..8d8154417e 100644
--- a/tools/GNUmakefile.in
+++ b/tools/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tools/binoffset/GNUmakefile.in b/tools/binoffset/GNUmakefile.in
index 1871ae89c4..fc330a1ad1 100644
--- a/tools/binoffset/GNUmakefile.in
+++ b/tools/binoffset/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003, 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tools/git/git-checkout-push b/tools/git/git-checkout-push
index 4bae2a692d..dbdc2155ff 100755
--- a/tools/git/git-checkout-push
+++ b/tools/git/git-checkout-push
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use POSIX qw(strftime);
diff --git a/tools/git/git-multihook b/tools/git/git-multihook
index 785e1dd153..bc5d9fc36b 100755
--- a/tools/git/git-multihook
+++ b/tools/git/git-multihook
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tools/git/gitcodefreeze b/tools/git/gitcodefreeze
index 4068229d97..0b235c289e 100755
--- a/tools/git/gitcodefreeze
+++ b/tools/git/gitcodefreeze
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# To set this script up:
# 1) Copy or link it to .git/hooks/pre-receive in your repository. Make sure
diff --git a/tools/git/gitmail b/tools/git/gitmail
index 85aa57a8d4..ec07418268 100755
--- a/tools/git/gitmail
+++ b/tools/git/gitmail
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# To set this script up:
# 1) Copy or link it to .git/hooks/post-receive in your repository. Make sure
diff --git a/tools/git/rewritegitmoves b/tools/git/rewritegitmoves
index 831b01e438..3c2ccb378c 100644
--- a/tools/git/rewritegitmoves
+++ b/tools/git/rewritegitmoves
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/tools/hg/hgmail b/tools/hg/hgmail
index a4885a7ade..4ddc87f75b 100755
--- a/tools/hg/hgmail
+++ b/tools/hg/hgmail
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# To set this script up:
# 1) Set this script as the changegroup hook in your .hg/hgrc file.
diff --git a/tools/rmanage/GNUmakefile.in b/tools/rmanage/GNUmakefile.in
index 17ea3d54c9..5cf9c0dc70 100644
--- a/tools/rmanage/GNUmakefile.in
+++ b/tools/rmanage/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tools/rmanage/rmanage.c b/tools/rmanage/rmanage.c
index e0ef347187..f480877dfd 100644
--- a/tools/rmanage/rmanage.c
+++ b/tools/rmanage/rmanage.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include "rmcp.h"
diff --git a/tools/rmanage/rmcp.c b/tools/rmanage/rmcp.c
index 6774b82e09..fa8948e1be 100644
--- a/tools/rmanage/rmcp.c
+++ b/tools/rmanage/rmcp.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdlib.h>
diff --git a/tools/rmanage/rmcp.h b/tools/rmanage/rmcp.h
index d1dd130d79..5c6ce62cb8 100644
--- a/tools/rmanage/rmcp.h
+++ b/tools/rmanage/rmcp.h
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#ifndef __RMCP_H__
diff --git a/tools/rmanage/rmcp.i b/tools/rmanage/rmcp.i
index 8d03792bf5..46e2a4ed17 100644
--- a/tools/rmanage/rmcp.i
+++ b/tools/rmanage/rmcp.i
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
*/
%module rmcp
diff --git a/tools/selectapplet/GNUmakefile.in b/tools/selectapplet/GNUmakefile.in
index 48f34d1ea2..ffbee3b1a0 100644
--- a/tools/selectapplet/GNUmakefile.in
+++ b/tools/selectapplet/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tools/selectapplet/NodeSelect.java b/tools/selectapplet/NodeSelect.java
index 71207c0047..3cf7dac27c 100644
--- a/tools/selectapplet/NodeSelect.java
+++ b/tools/selectapplet/NodeSelect.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
diff --git a/tools/svn/GNUmakefile.in b/tools/svn/GNUmakefile.in
index b707430948..d996d9f5a1 100644
--- a/tools/svn/GNUmakefile.in
+++ b/tools/svn/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tools/teachswitch/GNUmakefile.in b/tools/teachswitch/GNUmakefile.in
index 6074f7b5a5..74da99b65f 100644
--- a/tools/teachswitch/GNUmakefile.in
+++ b/tools/teachswitch/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003, 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tools/teachswitch/teachswitch.c b/tools/teachswitch/teachswitch.c
index 4220c4256c..d68e47f60d 100644
--- a/tools/teachswitch/teachswitch.c
+++ b/tools/teachswitch/teachswitch.c
@@ -1,6 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2003-2012 University of Utah and the Flux Group.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* teachswitch.c - Send a packet directly on each interface of a machine, so
* that the switch can learn our MAC
diff --git a/tools/tspitests/doquote.c b/tools/tspitests/doquote.c
index 58b06d8ecc..21d2c71c4a 100644
--- a/tools/tspitests/doquote.c
+++ b/tools/tspitests/doquote.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdlib.h>
diff --git a/tools/tspitests/fail.c b/tools/tspitests/fail.c
index 5f6ebeeec2..22a47e9f1e 100644
--- a/tools/tspitests/fail.c
+++ b/tools/tspitests/fail.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdlib.h>
diff --git a/tools/tspitests/getpub.c b/tools/tspitests/getpub.c
index 38d6cc3113..8161e36346 100644
--- a/tools/tspitests/getpub.c
+++ b/tools/tspitests/getpub.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdlib.h>
diff --git a/tools/tspitests/idkey.c b/tools/tspitests/idkey.c
index 349597d739..f1e17d4b5a 100644
--- a/tools/tspitests/idkey.c
+++ b/tools/tspitests/idkey.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/tools/tspitests/keygen.c b/tools/tspitests/keygen.c
index fafca32307..8410367a3e 100644
--- a/tools/tspitests/keygen.c
+++ b/tools/tspitests/keygen.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/tools/tspitests/loadkey.c b/tools/tspitests/loadkey.c
index 0e51397ad6..c3233a7c78 100644
--- a/tools/tspitests/loadkey.c
+++ b/tools/tspitests/loadkey.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdlib.h>
diff --git a/tools/tspitests/ltpmloadkey.c b/tools/tspitests/ltpmloadkey.c
index 08ea4df529..05b95199aa 100644
--- a/tools/tspitests/ltpmloadkey.c
+++ b/tools/tspitests/ltpmloadkey.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdint.h>
diff --git a/tools/tspitests/pcrcomposite.c b/tools/tspitests/pcrcomposite.c
index 27d2b4309d..277467a13c 100644
--- a/tools/tspitests/pcrcomposite.c
+++ b/tools/tspitests/pcrcomposite.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdio.h>
diff --git a/tools/tspitests/script1.sh b/tools/tspitests/script1.sh
index f8144567b1..30edfb1be3 100644
--- a/tools/tspitests/script1.sh
+++ b/tools/tspitests/script1.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
MP=`which modprobe`
diff --git a/tools/tspitests/script2.sh b/tools/tspitests/script2.sh
index 504e208ad9..31d6761851 100644
--- a/tools/tspitests/script2.sh
+++ b/tools/tspitests/script2.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
KILLALL=`which killall`
diff --git a/tools/tspitests/tpm-signoff.c b/tools/tspitests/tpm-signoff.c
index 9e66b1f27c..c363b69ef7 100644
--- a/tools/tspitests/tpm-signoff.c
+++ b/tools/tspitests/tpm-signoff.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdlib.h>
diff --git a/tools/webcamapplet/GNUmakefile.in b/tools/webcamapplet/GNUmakefile.in
index 85ebea2414..7a62b35066 100644
--- a/tools/webcamapplet/GNUmakefile.in
+++ b/tools/webcamapplet/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tools/webcamapplet/WebCamApplet.java b/tools/webcamapplet/WebCamApplet.java
index 9426608d4c..88f90cb5fb 100644
--- a/tools/webcamapplet/WebCamApplet.java
+++ b/tools/webcamapplet/WebCamApplet.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
diff --git a/tools/whol/GNUmakefile.in b/tools/whol/GNUmakefile.in
index 9eb5643939..5825367b61 100644
--- a/tools/whol/GNUmakefile.in
+++ b/tools/whol/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/tools/whol/whol.c b/tools/whol/whol.c
index ec297e75ce..81b3dbb532 100644
--- a/tools/whol/whol.c
+++ b/tools/whol/whol.c
@@ -1,6 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*
* whol.c - Send a 'Whack-on-LAN' packet to node
*/
diff --git a/utils/GNUmakefile.in b/utils/GNUmakefile.in
index 9ac8e88a77..f6aa39bd6f 100644
--- a/utils/GNUmakefile.in
+++ b/utils/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/utils/addblob.in b/utils/addblob.in
index 3ee838d931..ea1bc9fa5d 100644
--- a/utils/addblob.in
+++ b/utils/addblob.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/utils/addspecialdevice.in b/utils/addspecialdevice.in
index fc1d3e0d58..6e9520bd8a 100644
--- a/utils/addspecialdevice.in
+++ b/utils/addspecialdevice.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/addspecialiface.in b/utils/addspecialiface.in
index a0ae10206a..30a2fd784e 100644
--- a/utils/addspecialiface.in
+++ b/utils/addspecialiface.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/addvpubaddr.in b/utils/addvpubaddr.in
index 233015ae95..2486099f80 100755
--- a/utils/addvpubaddr.in
+++ b/utils/addvpubaddr.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/utils/anonsendmail.in b/utils/anonsendmail.in
index 799a6ff52a..2897508984 100644
--- a/utils/anonsendmail.in
+++ b/utils/anonsendmail.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/utils/archive_list.in b/utils/archive_list.in
index ab1379e64d..eea121f94b 100755
--- a/utils/archive_list.in
+++ b/utils/archive_list.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/backupswitches.in b/utils/backupswitches.in
index 19ca1736c7..8396af1bf3 100644
--- a/utils/backupswitches.in
+++ b/utils/backupswitches.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
my $BACKUPDIR = '@prefix@/backup/switch-config';
diff --git a/utils/biosgrabber.pl b/utils/biosgrabber.pl
index 9e376791d4..a67dd2fb38 100755
--- a/utils/biosgrabber.pl
+++ b/utils/biosgrabber.pl
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/utils/check-shared-bw.in b/utils/check-shared-bw.in
index 1a46bf351f..ac8e6272d3 100644
--- a/utils/check-shared-bw.in
+++ b/utils/check-shared-bw.in
@@ -1,8 +1,31 @@
#!/usr/bin/perl -w
#
-# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{GENIPUBLIC-LICENSE
+#
+# GENI Public License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/checkquota.in b/utils/checkquota.in
index c9915a96c3..8917861529 100644
--- a/utils/checkquota.in
+++ b/utils/checkquota.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/clone_image.in b/utils/clone_image.in
index ea2f6238d0..f7cd825fb2 100644
--- a/utils/clone_image.in
+++ b/utils/clone_image.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/utils/create_image.in b/utils/create_image.in
index e3d4a57a62..362eb64609 100755
--- a/utils/create_image.in
+++ b/utils/create_image.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/ctrladdr.in b/utils/ctrladdr.in
index 188ded7fdb..b5c8d82040 100755
--- a/utils/ctrladdr.in
+++ b/utils/ctrladdr.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/cvsinit.in b/utils/cvsinit.in
index 2eecf6a47c..bf90a302dd 100755
--- a/utils/cvsinit.in
+++ b/utils/cvsinit.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/utils/cvsupd.pl.in b/utils/cvsupd.pl.in
index 68a8b4a496..71d12b0b05 100755
--- a/utils/cvsupd.pl.in
+++ b/utils/cvsupd.pl.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/utils/daemon_wrapper.in b/utils/daemon_wrapper.in
index 456f5812b2..7e0c581221 100644
--- a/utils/daemon_wrapper.in
+++ b/utils/daemon_wrapper.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/delay_config.in b/utils/delay_config.in
index a86aec2c69..3120d193ec 100644
--- a/utils/delay_config.in
+++ b/utils/delay_config.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/utils/deletenode.in b/utils/deletenode.in
index 98ce41ff71..730779a0d3 100644
--- a/utils/deletenode.in
+++ b/utils/deletenode.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# deletenode - a script for deleting a node from the database
#
diff --git a/utils/dumpdescriptor.in b/utils/dumpdescriptor.in
index f6df4b9dd0..bae6bbeca1 100644
--- a/utils/dumpdescriptor.in
+++ b/utils/dumpdescriptor.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/utils/elabplab_dongleconfig.py b/utils/elabplab_dongleconfig.py
index e099e33cec..4d864a0c27 100755
--- a/utils/elabplab_dongleconfig.py
+++ b/utils/elabplab_dongleconfig.py
@@ -1,8 +1,25 @@
#!/usr/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
diff --git a/utils/emulabfeature.in b/utils/emulabfeature.in
index 0a0527a06c..8008db737f 100644
--- a/utils/emulabfeature.in
+++ b/utils/emulabfeature.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/epmodeset.in b/utils/epmodeset.in
index 4eab4fae74..0289f31530 100644
--- a/utils/epmodeset.in
+++ b/utils/epmodeset.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Simple script to move nodes between "elab mode" and "plab mode"...
#
diff --git a/utils/eventping.in b/utils/eventping.in
index f924843e4a..63d29c607f 100644
--- a/utils/eventping.in
+++ b/utils/eventping.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# eventping - ping a node until it is reachable, then send ISUP event
diff --git a/utils/export_tables.in b/utils/export_tables.in
index 5136c8ab0b..bdcedecce3 100755
--- a/utils/export_tables.in
+++ b/utils/export_tables.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/fillwires.pl b/utils/fillwires.pl
index a4228b709f..2ad27d5a1b 100755
--- a/utils/fillwires.pl
+++ b/utils/fillwires.pl
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/utils/firstuser.in b/utils/firstuser.in
index 52aa2c9206..d2a34febef 100755
--- a/utils/firstuser.in
+++ b/utils/firstuser.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# WARNING: See db/genelists.in for clause testing for protouser names.
diff --git a/utils/fixexpinfo.in b/utils/fixexpinfo.in
index 91d20bee2a..ce26391850 100644
--- a/utils/fixexpinfo.in
+++ b/utils/fixexpinfo.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/getimages.in b/utils/getimages.in
index 0f3bba93eb..1a40f6a22d 100644
--- a/utils/getimages.in
+++ b/utils/getimages.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/gettimezone.pl b/utils/gettimezone.pl
index 9eb9fd642b..760ec51a50 100755
--- a/utils/gettimezone.pl
+++ b/utils/gettimezone.pl
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/grabswitchconfig.in b/utils/grabswitchconfig.in
index 996019f1cf..371311ffab 100644
--- a/utils/grabswitchconfig.in
+++ b/utils/grabswitchconfig.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use lib '@prefix@/lib';
diff --git a/utils/grabwebcams.in b/utils/grabwebcams.in
index a850d134fa..dd66e266fd 100755
--- a/utils/grabwebcams.in
+++ b/utils/grabwebcams.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/grantfeature.in b/utils/grantfeature.in
index a6d1647fef..c1407732cd 100644
--- a/utils/grantfeature.in
+++ b/utils/grantfeature.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/grantimage.in b/utils/grantimage.in
index 8030bc6553..9af57da1ce 100644
--- a/utils/grantimage.in
+++ b/utils/grantimage.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/grantnodetype.in b/utils/grantnodetype.in
index 9277e5faf5..efa53f2623 100644
--- a/utils/grantnodetype.in
+++ b/utils/grantnodetype.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/utils/image_import.in b/utils/image_import.in
index d791f7b797..3aefda5c7c 100644
--- a/utils/image_import.in
+++ b/utils/image_import.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/utils/imagehash.in b/utils/imagehash.in
index 88d2b2c23a..d15222e00c 100644
--- a/utils/imagehash.in
+++ b/utils/imagehash.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/utils/imageinfo.in b/utils/imageinfo.in
index b0d0c9fceb..68bcbf2031 100644
--- a/utils/imageinfo.in
+++ b/utils/imageinfo.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/utils/import_commitlog.in b/utils/import_commitlog.in
index 7d3037e55a..21601e5d20 100644
--- a/utils/import_commitlog.in
+++ b/utils/import_commitlog.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/link_config.in b/utils/link_config.in
index 76d685a945..983ea010ea 100644
--- a/utils/link_config.in
+++ b/utils/link_config.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/linkmon_ctl.in b/utils/linkmon_ctl.in
index eb8ec3251d..55371b4d82 100644
--- a/utils/linkmon_ctl.in
+++ b/utils/linkmon_ctl.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/utils/localize_mfs.in b/utils/localize_mfs.in
index 6057f50c6c..f10ab04c22 100644
--- a/utils/localize_mfs.in
+++ b/utils/localize_mfs.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use strict;
diff --git a/utils/loghole.1 b/utils/loghole.1
index dc19cab23e..791e594abe 100644
--- a/utils/loghole.1
+++ b/utils/loghole.1
@@ -1,7 +1,24 @@
.\"
-.\" EMULAB-COPYRIGHT
.\" Copyright (c) 2004, 2005, 2006, 2007 University of Utah and the Flux Group.
-.\" All rights reserved.
+.\"
+.\" {{{EMULAB-LICENSE
+.\"
+.\" This file is part of the Emulab network testbed software.
+.\"
+.\" This file is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU Affero General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or (at
+.\" your option) any later version.
+.\"
+.\" This file is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU Affero General Public License
+.\" along with this file. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" }}}
.\"
.TH LOGHOLE 1 "June 16, 2005" "Emulab" "Emulab Commands Manual"
.OS
diff --git a/utils/loghole.in b/utils/loghole.in
index 5a189966a0..b16804089a 100644
--- a/utils/loghole.in
+++ b/utils/loghole.in
@@ -1,9 +1,26 @@
#! /usr/bin/env python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import re
diff --git a/utils/logparse/checkrecords.pl b/utils/logparse/checkrecords.pl
index 835a8a7844..e8e5cb94df 100755
--- a/utils/logparse/checkrecords.pl
+++ b/utils/logparse/checkrecords.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/logparse/extractmail.pl b/utils/logparse/extractmail.pl
index 485ecbfd2a..234b2a024f 100755
--- a/utils/logparse/extractmail.pl
+++ b/utils/logparse/extractmail.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/logparse/parsemail.pl b/utils/logparse/parsemail.pl
index b1be6cde6a..70c3a657f2 100755
--- a/utils/logparse/parsemail.pl
+++ b/utils/logparse/parsemail.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/logparse/regen b/utils/logparse/regen
index 24d3523ad9..189415a8d0 100755
--- a/utils/logparse/regen
+++ b/utils/logparse/regen
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
timeit=/usr/bin/time
diff --git a/utils/logparse/summarize.pl b/utils/logparse/summarize.pl
index db97fcd5e0..9b564a1056 100755
--- a/utils/logparse/summarize.pl
+++ b/utils/logparse/summarize.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/logparse/tbmail.pm b/utils/logparse/tbmail.pm
index cc1825a1d6..37c4e42738 100644
--- a/utils/logparse/tbmail.pm
+++ b/utils/logparse/tbmail.pm
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
package tbmail;
diff --git a/utils/macgrabber.pl b/utils/macgrabber.pl
index 06bdb0b800..b9b7ede61a 100755
--- a/utils/macgrabber.pl
+++ b/utils/macgrabber.pl
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/utils/management_iface.in b/utils/management_iface.in
index 763848553c..3c0ee14a27 100644
--- a/utils/management_iface.in
+++ b/utils/management_iface.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/mkblob.in b/utils/mkblob.in
index 4e1cf03714..b47b9eeb93 100755
--- a/utils/mkblob.in
+++ b/utils/mkblob.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/utils/newnode.in b/utils/newnode.in
index ca5fce66f9..eebe4f481c 100644
--- a/utils/newnode.in
+++ b/utils/newnode.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/node_admin.in b/utils/node_admin.in
index a3f9f9b109..1d3a8af122 100755
--- a/utils/node_admin.in
+++ b/utils/node_admin.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/node_statewait.in b/utils/node_statewait.in
index 97da5bfbfd..4d6c221467 100644
--- a/utils/node_statewait.in
+++ b/utils/node_statewait.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/node_testsuite b/utils/node_testsuite
index c0f78cae5b..49aaf69dee 100755
--- a/utils/node_testsuite
+++ b/utils/node_testsuite
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
diff --git a/utils/node_traffic.in b/utils/node_traffic.in
index 94a02c121b..2c0fffefe7 100755
--- a/utils/node_traffic.in
+++ b/utils/node_traffic.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/nsgen/GNUmakefile.in b/utils/nsgen/GNUmakefile.in
index 67203014e6..c840c05e7a 100644
--- a/utils/nsgen/GNUmakefile.in
+++ b/utils/nsgen/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/utils/nsgen/nsgen b/utils/nsgen/nsgen
index 3d5907302f..b9455feac6 100755
--- a/utils/nsgen/nsgen
+++ b/utils/nsgen/nsgen
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003,2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/nsgen/nstemplate.dtd b/utils/nsgen/nstemplate.dtd
index ce2ac17ce7..124f0256c3 100644
--- a/utils/nsgen/nstemplate.dtd
+++ b/utils/nsgen/nstemplate.dtd
@@ -1,8 +1,25 @@
<!--
-EMULAB-COPYRIGHT
Copyright (c) 2006 University of Utah and the Flux Group.
-All rights reserved.
+
+{{{EMULAB-LICENSE
+
+This file is part of the Emulab network testbed software.
+
+This file is free software: you can redistribute it and/or modify it
+under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
+
+This file is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+}}}
A DTD for Emulab NS template files
-->
diff --git a/utils/nsgen/webnsgen.in b/utils/nsgen/webnsgen.in
index 909322a208..58cdf555ce 100644
--- a/utils/nsgen/webnsgen.in
+++ b/utils/nsgen/webnsgen.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/utils/opsdb_control.in b/utils/opsdb_control.in
index 61ae07d8f3..47220b96da 100644
--- a/utils/opsdb_control.in
+++ b/utils/opsdb_control.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/opsdb_control.proxy.in b/utils/opsdb_control.proxy.in
index 748af9413b..60309d7364 100644
--- a/utils/opsdb_control.proxy.in
+++ b/utils/opsdb_control.proxy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/opsreboot.in b/utils/opsreboot.in
index 8eb2fcc3d5..d0c65bcb0d 100644
--- a/utils/opsreboot.in
+++ b/utils/opsreboot.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/osstuff.sh b/utils/osstuff.sh
index b9bd761b92..4d21162b0b 100755
--- a/utils/osstuff.sh
+++ b/utils/osstuff.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/plabmsrenew.pl.in b/utils/plabmsrenew.pl.in
index 21ccbacd32..25d5020439 100644
--- a/utils/plabmsrenew.pl.in
+++ b/utils/plabmsrenew.pl.in
@@ -1,8 +1,25 @@
#!/usr/local/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# This is a simple little script that renews "meta" slices listed either in a
diff --git a/utils/prereserve.in b/utils/prereserve.in
index 2491e73d21..959257d385 100644
--- a/utils/prereserve.in
+++ b/utils/prereserve.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/prereserve_check.in b/utils/prereserve_check.in
index 78a643cabd..17733ffc29 100644
--- a/utils/prereserve_check.in
+++ b/utils/prereserve_check.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/process-acl b/utils/process-acl
index b02e68ccec..60e48c13ab 100755
--- a/utils/process-acl
+++ b/utils/process-acl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/readblob.in b/utils/readblob.in
index 4fbc07c7ac..b42d1d52a1 100644
--- a/utils/readblob.in
+++ b/utils/readblob.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Cwd;
diff --git a/utils/remove_old_www.in b/utils/remove_old_www.in
index 5406b6b407..0628f2ee64 100755
--- a/utils/remove_old_www.in
+++ b/utils/remove_old_www.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
rm -f @prefix@/www/auth.html
diff --git a/utils/rmblob.in b/utils/rmblob.in
index e2be1b4001..a2ffb40872 100755
--- a/utils/rmblob.in
+++ b/utils/rmblob.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/utils/rpcgrab.sh b/utils/rpcgrab.sh
index 36708d6979..07eff2063e 100644
--- a/utils/rpcgrab.sh
+++ b/utils/rpcgrab.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/schemadiff b/utils/schemadiff
index bd274e6199..f17e47a235 100755
--- a/utils/schemadiff
+++ b/utils/schemadiff
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/utils/setbuildinfo.in b/utils/setbuildinfo.in
index 02e3297894..ca7e9fb5bf 100644
--- a/utils/setbuildinfo.in
+++ b/utils/setbuildinfo.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Set the version and build info into the DB, at a toplevel install.
#
diff --git a/utils/setdest.in b/utils/setdest.in
index 3690d1dff9..bf344b5965 100644
--- a/utils/setdest.in
+++ b/utils/setdest.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/sharevlan.in b/utils/sharevlan.in
index 5b06740c78..f6ee2d118c 100644
--- a/utils/sharevlan.in
+++ b/utils/sharevlan.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/sitevarsdiff b/utils/sitevarsdiff
index f2b88cd2f1..54d9ab509c 100755
--- a/utils/sitevarsdiff
+++ b/utils/sitevarsdiff
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2006, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
diff --git a/utils/snmp-if-deref.sh b/utils/snmp-if-deref.sh
index 13012bbc6e..45c62077b6 100755
--- a/utils/snmp-if-deref.sh
+++ b/utils/snmp-if-deref.sh
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SNMPGET="/usr/local/bin/snmpget -m CISCO-STACK-MIB:CISCO-PAGP-MIB -Ovq"
diff --git a/utils/spewconlog.in b/utils/spewconlog.in
index 58d8327ed8..bd5d0c0488 100644
--- a/utils/spewconlog.in
+++ b/utils/spewconlog.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/spewevents.in b/utils/spewevents.in
index becc0718dc..f56d941041 100644
--- a/utils/spewevents.in
+++ b/utils/spewevents.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/spewimage.in b/utils/spewimage.in
index c2f66774b2..a2aea8a32a 100644
--- a/utils/spewimage.in
+++ b/utils/spewimage.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/spewleds.in b/utils/spewleds.in
index b1bc3fff66..601e4a976a 100755
--- a/utils/spewleds.in
+++ b/utils/spewleds.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/spewsource.in b/utils/spewsource.in
index 90043e535b..42d4369fa6 100644
--- a/utils/spewsource.in
+++ b/utils/spewsource.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/sshtb.in b/utils/sshtb.in
index 00c9d02a6c..1509f88bc7 100755
--- a/utils/sshtb.in
+++ b/utils/sshtb.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/utils/subboss_tftpboot_sync.in b/utils/subboss_tftpboot_sync.in
index 13840fc992..4dd7529155 100644
--- a/utils/subboss_tftpboot_sync.in
+++ b/utils/subboss_tftpboot_sync.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# un-taint path
diff --git a/utils/suchown.in b/utils/suchown.in
index 48f00838c5..1bdb684db3 100644
--- a/utils/suchown.in
+++ b/utils/suchown.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use File::Basename;
diff --git a/utils/tbbuildkernels b/utils/tbbuildkernels
index a4473eef9d..39d498f40b 100755
--- a/utils/tbbuildkernels
+++ b/utils/tbbuildkernels
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/template_record.in b/utils/template_record.in
index 89b2fe1358..015ba91f14 100755
--- a/utils/template_record.in
+++ b/utils/template_record.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/utils/testbed-control.in b/utils/testbed-control.in
index 2d7869928b..295e3cd491 100644
--- a/utils/testbed-control.in
+++ b/utils/testbed-control.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/unelvin.pl b/utils/unelvin.pl
index 8ce0053cff..6e625d90c1 100755
--- a/utils/unelvin.pl
+++ b/utils/unelvin.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/utils/vlandiff.in b/utils/vlandiff.in
index d560dd4ef2..b7ea3141c4 100644
--- a/utils/vlandiff.in
+++ b/utils/vlandiff.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use Getopt::Std;
diff --git a/utils/vlansync.in b/utils/vlansync.in
index 12e13b0391..462bff450f 100644
--- a/utils/vlansync.in
+++ b/utils/vlansync.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/wanodecheckin.in b/utils/wanodecheckin.in
index b35bbc17a0..8deeba4b60 100644
--- a/utils/wanodecheckin.in
+++ b/utils/wanodecheckin.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/wanodecreate.in b/utils/wanodecreate.in
index 709e029ced..a0e7c5893d 100644
--- a/utils/wanodecreate.in
+++ b/utils/wanodecreate.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use strict;
use English;
diff --git a/utils/wbts_dump.in b/utils/wbts_dump.in
index 6ded12bb94..975a64f4c5 100644
--- a/utils/wbts_dump.in
+++ b/utils/wbts_dump.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use lib "@prefix@/lib";
diff --git a/utils/webcopy.in b/utils/webcopy.in
index cc53320c6c..a1cc90d3be 100644
--- a/utils/webcopy.in
+++ b/utils/webcopy.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/utils/webcvsweb.in b/utils/webcvsweb.in
index e37bc6dad8..36e5bfd27c 100644
--- a/utils/webcvsweb.in
+++ b/utils/webcvsweb.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/utils/withadminprivs b/utils/withadminprivs
index 844763aafc..feed6d4183 100644
--- a/utils/withadminprivs
+++ b/utils/withadminprivs
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/utils/xlogin.in b/utils/xlogin.in
index 75f9b5a057..f3ed906a2d 100644
--- a/utils/xlogin.in
+++ b/utils/xlogin.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/vis/GNUmakefile.in b/vis/GNUmakefile.in
index 5132d7399e..93ad2dac87 100644
--- a/vis/GNUmakefile.in
+++ b/vis/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/vis/dbvistopology.in b/vis/dbvistopology.in
index ff8286bc29..c744ccd087 100755
--- a/vis/dbvistopology.in
+++ b/vis/dbvistopology.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/vis/floormap.in b/vis/floormap.in
index 9f1c6bae0f..c99fbe879c 100755
--- a/vis/floormap.in
+++ b/vis/floormap.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/vis/prerender.in b/vis/prerender.in
index 96a2301873..d13fb33046 100644
--- a/vis/prerender.in
+++ b/vis/prerender.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/vis/prerender_all.in b/vis/prerender_all.in
index 7a74099c41..47b1ede704 100644
--- a/vis/prerender_all.in
+++ b/vis/prerender_all.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/vis/render.in b/vis/render.in
index 652658ab10..61acb64806 100755
--- a/vis/render.in
+++ b/vis/render.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/vis/webfloormap.in b/vis/webfloormap.in
index c20ec17750..dc44405ab3 100644
--- a/vis/webfloormap.in
+++ b/vis/webfloormap.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/vis/webvistopology.in b/vis/webvistopology.in
index 26af585f9c..5be1e5467a 100644
--- a/vis/webvistopology.in
+++ b/vis/webvistopology.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/wiki/GNUmakefile.in b/wiki/GNUmakefile.in
index 8ab4e53a3e..f63653548b 100644
--- a/wiki/GNUmakefile.in
+++ b/wiki/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/wiki/addwikiproj.in b/wiki/addwikiproj.in
index b15b03c5df..73120093ce 100644
--- a/wiki/addwikiproj.in
+++ b/wiki/addwikiproj.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/wiki/addwikiuser.in b/wiki/addwikiuser.in
index 9faff13f28..25fcb19bae 100644
--- a/wiki/addwikiuser.in
+++ b/wiki/addwikiuser.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/wiki/delwikiuser.in b/wiki/delwikiuser.in
index a3c14601a7..9c976b3ed5 100644
--- a/wiki/delwikiuser.in
+++ b/wiki/delwikiuser.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/wiki/setwikigroups.in b/wiki/setwikigroups.in
index 6a7f382afc..569146dcba 100644
--- a/wiki/setwikigroups.in
+++ b/wiki/setwikigroups.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/wiki/wikiproxy.in b/wiki/wikiproxy.in
index 34332df382..e8ee6e5a4b 100644
--- a/wiki/wikiproxy.in
+++ b/wiki/wikiproxy.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/wiki/wikisetup.in b/wiki/wikisetup.in
index 74b4e8ed67..31336eff83 100644
--- a/wiki/wikisetup.in
+++ b/wiki/wikisetup.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/wiki/wikixlogin.in b/wiki/wikixlogin.in
index fc79e7382b..a620ae0a76 100644
--- a/wiki/wikixlogin.in
+++ b/wiki/wikixlogin.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/www/BlinkenLichten.java b/www/BlinkenLichten.java
index aa1dbc646c..c1f3679661 100644
--- a/www/BlinkenLichten.java
+++ b/www/BlinkenLichten.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004, 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.Color;
diff --git a/www/GNUmakefile.in b/www/GNUmakefile.in
index 162cf9eb41..a06bc9b38b 100644
--- a/www/GNUmakefile.in
+++ b/www/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/www/adminlogin.php b/www/adminlogin.php
index 5309b8bc7a..bd94f324b2 100644
--- a/www/adminlogin.php
+++ b/www/adminlogin.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# This is just a convenience; redirect to the real login page.
#
diff --git a/www/approveproject.php3 b/www/approveproject.php3
index 3207f52d7c..ecea0edff4 100644
--- a/www/approveproject.php3
+++ b/www/approveproject.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/approveproject_form.php3 b/www/approveproject_form.php3
index aa0f45f297..f8bd2de967 100755
--- a/www/approveproject_form.php3
+++ b/www/approveproject_form.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/approveproject_list.php3 b/www/approveproject_list.php3
index 55060b7986..eecf3257c1 100755
--- a/www/approveproject_list.php3
+++ b/www/approveproject_list.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/approveuser.php3 b/www/approveuser.php3
index e062a0053b..521f77e89f 100644
--- a/www/approveuser.php3
+++ b/www/approveuser.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2005, 2006, 2007, 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/approveuser_form.php3 b/www/approveuser_form.php3
index 43c8fd5ccb..5262f7f600 100755
--- a/www/approveuser_form.php3
+++ b/www/approveuser_form.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/archive_control.php3 b/www/archive_control.php3
index a6aa168fd8..66a8840544 100644
--- a/www/archive_control.php3
+++ b/www/archive_control.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/archive_list.php b/www/archive_list.php
index ee5c73148b..d2c95cbc53 100644
--- a/www/archive_list.php
+++ b/www/archive_list.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/archive_missing.php3 b/www/archive_missing.php3
index c785124a6b..1482f56a62 100644
--- a/www/archive_missing.php3
+++ b/www/archive_missing.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/archive_tag.php3 b/www/archive_tag.php3
index 084497a176..2b4ccb0450 100644
--- a/www/archive_tag.php3
+++ b/www/archive_tag.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/archive_tags.php3 b/www/archive_tags.php3
index 971c2edb21..e91967ebaa 100644
--- a/www/archive_tags.php3
+++ b/www/archive_tags.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/archive_view.php3 b/www/archive_view.php3
index 4e31e028ee..546e038d2d 100644
--- a/www/archive_view.php3
+++ b/www/archive_view.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/beginexp.php b/www/beginexp.php
index 2d37ab46ac..a61e9c2b49 100644
--- a/www/beginexp.php
+++ b/www/beginexp.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007, 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/beginexp_form.php3 b/www/beginexp_form.php3
index 9abf97c86a..fe947b88cb 100644
--- a/www/beginexp_form.php3
+++ b/www/beginexp_form.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/www/boot.php3 b/www/boot.php3
index e8afc25993..409ff0a70e 100644
--- a/www/boot.php3
+++ b/www/boot.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/bootlog.php3 b/www/bootlog.php3
index 7b8b9baaa4..7fcc57e2ed 100644
--- a/www/bootlog.php3
+++ b/www/bootlog.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/buildui/Expando.java b/www/buildui/Expando.java
index 6d146291f3..d2f801bda6 100644
--- a/www/buildui/Expando.java
+++ b/www/buildui/Expando.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
import java.awt.event.*;
diff --git a/www/buildui/FlatButton.java b/www/buildui/FlatButton.java
index f0eb38378e..e37a8d26e6 100644
--- a/www/buildui/FlatButton.java
+++ b/www/buildui/FlatButton.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
import java.awt.event.*;
diff --git a/www/buildui/IFacePropertiesArea.java b/www/buildui/IFacePropertiesArea.java
index 1dcb4d57c3..9aff8ae592 100644
--- a/www/buildui/IFacePropertiesArea.java
+++ b/www/buildui/IFacePropertiesArea.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public class IFacePropertiesArea extends PropertiesArea
{
diff --git a/www/buildui/IFaceThingee.java b/www/buildui/IFaceThingee.java
index ec7bd50b6f..0f1e7b7603 100644
--- a/www/buildui/IFaceThingee.java
+++ b/www/buildui/IFaceThingee.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
import java.lang.*;
diff --git a/www/buildui/IconThingee.java b/www/buildui/IconThingee.java
index 5066c24235..53cbcaa54d 100644
--- a/www/buildui/IconThingee.java
+++ b/www/buildui/IconThingee.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
import java.awt.image.*;
diff --git a/www/buildui/LanLinkPropertiesArea.java b/www/buildui/LanLinkPropertiesArea.java
index 84f1a6efe9..b20f6af0e9 100644
--- a/www/buildui/LanLinkPropertiesArea.java
+++ b/www/buildui/LanLinkPropertiesArea.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public class LanLinkPropertiesArea extends PropertiesArea
{
diff --git a/www/buildui/LanLinkThingee.java b/www/buildui/LanLinkThingee.java
index 635d89eeaa..11a4a5298e 100644
--- a/www/buildui/LanLinkThingee.java
+++ b/www/buildui/LanLinkThingee.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
diff --git a/www/buildui/LanPropertiesArea.java b/www/buildui/LanPropertiesArea.java
index 36dfb8f22c..62cb38a1cf 100644
--- a/www/buildui/LanPropertiesArea.java
+++ b/www/buildui/LanPropertiesArea.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public class LanPropertiesArea extends PropertiesArea
{
diff --git a/www/buildui/LanThingee.java b/www/buildui/LanThingee.java
index 0951705107..92c6d9e198 100644
--- a/www/buildui/LanThingee.java
+++ b/www/buildui/LanThingee.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
diff --git a/www/buildui/LinkPropertiesArea.java b/www/buildui/LinkPropertiesArea.java
index 77b9bc862e..6ccf3b85bb 100644
--- a/www/buildui/LinkPropertiesArea.java
+++ b/www/buildui/LinkPropertiesArea.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public class LinkPropertiesArea extends PropertiesArea
{
diff --git a/www/buildui/LinkThingee.java b/www/buildui/LinkThingee.java
index e8ea95d5ef..15f707f53e 100644
--- a/www/buildui/LinkThingee.java
+++ b/www/buildui/LinkThingee.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
diff --git a/www/buildui/MagicTextField.java b/www/buildui/MagicTextField.java
index 4ce7ea8d30..de855d5e1b 100644
--- a/www/buildui/MagicTextField.java
+++ b/www/buildui/MagicTextField.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
import java.awt.event.*;
diff --git a/www/buildui/Netbuild.java b/www/buildui/Netbuild.java
index 10df744466..fd5c570032 100644
--- a/www/buildui/Netbuild.java
+++ b/www/buildui/Netbuild.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/********
* TODO:
diff --git a/www/buildui/NodePropertiesArea.java b/www/buildui/NodePropertiesArea.java
index e92b3eb898..e84c8bfc29 100644
--- a/www/buildui/NodePropertiesArea.java
+++ b/www/buildui/NodePropertiesArea.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public class NodePropertiesArea extends PropertiesArea
diff --git a/www/buildui/NodeThingee.java b/www/buildui/NodeThingee.java
index e01f4e2449..72d2255c94 100644
--- a/www/buildui/NodeThingee.java
+++ b/www/buildui/NodeThingee.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
diff --git a/www/buildui/Palette.java b/www/buildui/Palette.java
index 3275f2d331..110479a785 100644
--- a/www/buildui/Palette.java
+++ b/www/buildui/Palette.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.Graphics;
import java.awt.Color;
diff --git a/www/buildui/PropertiesArea.java b/www/buildui/PropertiesArea.java
index 70d50ecfdd..7745fc9a9d 100644
--- a/www/buildui/PropertiesArea.java
+++ b/www/buildui/PropertiesArea.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
import java.awt.event.*;
diff --git a/www/buildui/Thingee.java b/www/buildui/Thingee.java
index a0ed35d967..433647df1e 100644
--- a/www/buildui/Thingee.java
+++ b/www/buildui/Thingee.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
import java.lang.Math;
diff --git a/www/buildui/TrashThingee.java b/www/buildui/TrashThingee.java
index d4b1ab7db5..5f40c823d7 100644
--- a/www/buildui/TrashThingee.java
+++ b/www/buildui/TrashThingee.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
diff --git a/www/buildui/WorkArea.java b/www/buildui/WorkArea.java
index 4a3ec961ab..553732a72f 100644
--- a/www/buildui/WorkArea.java
+++ b/www/buildui/WorkArea.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2002-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
import java.util.*;
diff --git a/www/buildui/bui.php3 b/www/buildui/bui.php3
index c0a6fb2b53..1c5972b8bd 100644
--- a/www/buildui/bui.php3
+++ b/www/buildui/bui.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007, 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
require("defs.php3");
diff --git a/www/buildui/netbuild.html b/www/buildui/netbuild.html
index 6cdaf1e71c..c16ced8de0 100644
--- a/www/buildui/netbuild.html
+++ b/www/buildui/netbuild.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2002 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<html>
<head>
diff --git a/www/buildui/nssave.php3 b/www/buildui/nssave.php3
index 2fd1fd3110..75beaee97b 100644
--- a/www/buildui/nssave.php3
+++ b/www/buildui/nssave.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
diff --git a/www/cdromcheckin.php3 b/www/cdromcheckin.php3
index d9bc4dd297..17e6d0fd99 100644
--- a/www/cdromcheckin.php3
+++ b/www/cdromcheckin.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
include_once("node_defs.php");
diff --git a/www/changeuid.php b/www/changeuid.php
index 4da5757225..992430f063 100644
--- a/www/changeuid.php
+++ b/www/changeuid.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007, 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/chpasswd.php3 b/www/chpasswd.php3
index 97ed43d609..c5dfa91aa9 100644
--- a/www/chpasswd.php3
+++ b/www/chpasswd.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007, 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/clientui.php3 b/www/clientui.php3
index c935896b5e..b4cc05c6d0 100644
--- a/www/clientui.php3
+++ b/www/clientui.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/common-style.css b/www/common-style.css
index 5378d830de..599f4c1764 100644
--- a/www/common-style.css
+++ b/www/common-style.css
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
h1,h2,h3,h4 { font-weight: bold; }
diff --git a/www/copyright-local.txt b/www/copyright-local.txt
index 2c6064c46a..cbf9a95ab3 100644
--- a/www/copyright-local.txt
+++ b/www/copyright-local.txt
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2010 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<br>
Copyright © @SITEDATES@, @SITECOPYRIGHT@
diff --git a/www/copyright-standard.html b/www/copyright-standard.html
index 96c7439b41..263166a1b8 100644
--- a/www/copyright-standard.html
+++ b/www/copyright-standard.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2010 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
Copyright © 2000-2010, University of Utah and the Flux Research
Group. ALL RIGHTS RESERVED.
diff --git a/www/copyright.html b/www/copyright.html
index 826a90d122..847622c0c6 100644
--- a/www/copyright.html
+++ b/www/copyright.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2010 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<!--- This exists to redirect to the PHP script -->
<html>
diff --git a/www/copyright.php b/www/copyright.php
index 752da65e27..91e8c8a95d 100644
--- a/www/copyright.php
+++ b/www/copyright.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/currentusage.php3 b/www/currentusage.php3
index b418401155..00d0dc0717 100644
--- a/www/currentusage.php3
+++ b/www/currentusage.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
#
diff --git a/www/cvsweb/cvsweb.php3 b/www/cvsweb/cvsweb.php3
index 97d7bc6ed2..4a21f4e658 100644
--- a/www/cvsweb/cvsweb.php3
+++ b/www/cvsweb/cvsweb.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/www/cvsweb/cvswebwrap.php3 b/www/cvsweb/cvswebwrap.php3
index 2ac0b27c25..c45647c5ca 100644
--- a/www/cvsweb/cvswebwrap.php3
+++ b/www/cvsweb/cvswebwrap.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/www/dbcheck.php3 b/www/dbcheck.php3
index a06643ad88..315bfa7933 100644
--- a/www/dbcheck.php3
+++ b/www/dbcheck.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Stuff to support checking field data before we insert it into the DB.
#
diff --git a/www/dbdefs.php3.in b/www/dbdefs.php3.in
index da78c54ed1..562ec3b5e8 100644
--- a/www/dbdefs.php3.in
+++ b/www/dbdefs.php3.in
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Database Constants
#
diff --git a/www/defs.php3.in b/www/defs.php3.in
index ecffce29a8..167e997b4c 100644
--- a/www/defs.php3.in
+++ b/www/defs.php3.in
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Lets emulate register_globals=off for a while.
include("unregister_globals.php");
diff --git a/www/delaycontrol.php3 b/www/delaycontrol.php3
index 072d803840..26361e726a 100644
--- a/www/delaycontrol.php3
+++ b/www/delaycontrol.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/deleted_pubs.php b/www/deleted_pubs.php
index 8a2ca0dde1..ffc10bcb29 100644
--- a/www/deleted_pubs.php
+++ b/www/deleted_pubs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("pub_defs.php");
diff --git a/www/deletegroup.php3 b/www/deletegroup.php3
index 4c2ff4a75c..bdef06a171 100644
--- a/www/deletegroup.php3
+++ b/www/deletegroup.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/deleteimageid.php3 b/www/deleteimageid.php3
index f549a92b5d..6d1a740635 100644
--- a/www/deleteimageid.php3
+++ b/www/deleteimageid.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include("imageid_defs.php");
diff --git a/www/deletenodelog.php3 b/www/deletenodelog.php3
index 3b0b370fc2..4f641faee7 100644
--- a/www/deletenodelog.php3
+++ b/www/deletenodelog.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/deleteosid.php3 b/www/deleteosid.php3
index c165d91840..f1c4c9af3f 100644
--- a/www/deleteosid.php3
+++ b/www/deleteosid.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2006, 2007, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("osinfo_defs.php");
diff --git a/www/deleteproject.php3 b/www/deleteproject.php3
index 6a7980d6f7..c7753f5ce4 100644
--- a/www/deleteproject.php3
+++ b/www/deleteproject.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/deletepubkey.php3 b/www/deletepubkey.php3
index a635e400f3..0a4d502ec1 100644
--- a/www/deletepubkey.php3
+++ b/www/deletepubkey.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/deleteuser.php3 b/www/deleteuser.php3
index 93f9ac3488..d176f9b5ca 100644
--- a/www/deleteuser.php3
+++ b/www/deleteuser.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/delmmlist.php3 b/www/delmmlist.php3
index ac783bffec..c986411301 100644
--- a/www/delmmlist.php3
+++ b/www/delmmlist.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/doc.php3 b/www/doc.php3
index 66f0da9c1e..8e87aa265f 100644
--- a/www/doc.php3
+++ b/www/doc.php3
@@ -1,8 +1,25 @@
<?
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/doc/arch-small.html b/www/doc/arch-small.html
index d920869585..1e89d64bcf 100644
--- a/www/doc/arch-small.html
+++ b/www/doc/arch-small.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2003 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<b><a href="docwrapper.php3?docname=internals.html">
Back to Emulab Internals</a></b>
diff --git a/www/doc/arch.html b/www/doc/arch.html
index 65e2889607..e845f823ed 100644
--- a/www/doc/arch.html
+++ b/www/doc/arch.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2003 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<b><a href="docwrapper.php3?docname=internals.html">
Back to Emulab Internals</a></b>
diff --git a/www/doc/changelog.php3 b/www/doc/changelog.php3
index bc4b8c7175..081a084e69 100644
--- a/www/doc/changelog.php3
+++ b/www/doc/changelog.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
require("defs.php3");
diff --git a/www/doc/docwrapper.php3 b/www/doc/docwrapper.php3
index ed06dd7935..86975453ca 100644
--- a/www/doc/docwrapper.php3
+++ b/www/doc/docwrapper.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
require("defs.php3");
diff --git a/www/doc/expubs.html b/www/doc/expubs.html
index 3a8ae68b7e..1d3063b982 100644
--- a/www/doc/expubs.html
+++ b/www/doc/expubs.html
@@ -1,8 +1,25 @@
<html>
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2008 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<p>
Moved to <a href="http://www.emulab.net/expubs.php">http://www.emulab.net/expubs.php</a>.
diff --git a/www/doc/internals.html b/www/doc/internals.html
index f51d9292c7..7a3e7e2884 100644
--- a/www/doc/internals.html
+++ b/www/doc/internals.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2003 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<center>
<h1>Emulab Internals</h1>
diff --git a/www/doc/mobilewireless.html b/www/doc/mobilewireless.html
index 8dcd6db770..71c5f1ebb9 100644
--- a/www/doc/mobilewireless.html
+++ b/www/doc/mobilewireless.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2005 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<center>
<h1>Mobile Wireless Testbed Reference</h1>
diff --git a/www/doc/sfs.html b/www/doc/sfs.html
index 8e5b80a41d..c77b369a9f 100644
--- a/www/doc/sfs.html
+++ b/www/doc/sfs.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2002 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<center>
<h2>SFS</h2>
diff --git a/www/doc/stargatenotes.html b/www/doc/stargatenotes.html
index ca686ac48a..885550b15a 100644
--- a/www/doc/stargatenotes.html
+++ b/www/doc/stargatenotes.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2005 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<center>
<h1>Notes on Stargate Testbed Nodes</h1>
diff --git a/www/doc/states.html b/www/doc/states.html
index 61567b9536..ae677771d2 100644
--- a/www/doc/states.html
+++ b/www/doc/states.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2003 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<b><a href="docwrapper.php3?docname=internals.html">
Back to Emulab Internals</a></b>
diff --git a/www/doc/tmcd.html b/www/doc/tmcd.html
index a1d5502506..53eccd8e42 100644
--- a/www/doc/tmcd.html
+++ b/www/doc/tmcd.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2003 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<center>
<h1>Testbed Master Control Daemon/Client Reference</h1>
diff --git a/www/doc/topo.html b/www/doc/topo.html
index 3c996133f0..f3b8372c30 100644
--- a/www/doc/topo.html
+++ b/www/doc/topo.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2005-2012 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<center>
<h3>Emulab's arrangement of switches and PCs</h3>
diff --git a/www/doc/users.html b/www/doc/users.html
index 15e2560414..8006fea7f8 100644
--- a/www/doc/users.html
+++ b/www/doc/users.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2003-2009 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<ul>
diff --git a/www/docwrapper.php3 b/www/docwrapper.php3
index ff6cbf95d2..3a22ea6a5b 100644
--- a/www/docwrapper.php3
+++ b/www/docwrapper.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/dynselect.js b/www/dynselect.js
index 44ba0f10d5..2695310bb0 100644
--- a/www/dynselect.js
+++ b/www/dynselect.js
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/www/editexp.php3 b/www/editexp.php3
index 6e1cfafd08..e36a2a4811 100644
--- a/www/editexp.php3
+++ b/www/editexp.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/editgroup.php3 b/www/editgroup.php3
index 0b45018035..18588768e2 100644
--- a/www/editgroup.php3
+++ b/www/editgroup.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/editimageid.php3 b/www/editimageid.php3
index baad039e37..1d036d26c5 100644
--- a/www/editimageid.php3
+++ b/www/editimageid.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("osiddefs.php3");
diff --git a/www/editnodetype.php3 b/www/editnodetype.php3
index b9346e93da..5b42d98063 100644
--- a/www/editnodetype.php3
+++ b/www/editnodetype.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("imageid_defs.php");
diff --git a/www/editsitevars.php3 b/www/editsitevars.php3
index cab7a07343..0731c67e46 100644
--- a/www/editsitevars.php3
+++ b/www/editsitevars.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/emailus.php3 b/www/emailus.php3
index aa206414a2..d0ce5138dc 100644
--- a/www/emailus.php3
+++ b/www/emailus.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/emulab_sup.js b/www/emulab_sup.js
index 08ccdf36d7..8d15e06854 100644
--- a/www/emulab_sup.js
+++ b/www/emulab_sup.js
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
* Some utility stuff.
diff --git a/www/endexp.php3 b/www/endexp.php3
index 88b4697588..809a682810 100644
--- a/www/endexp.php3
+++ b/www/endexp.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/error.php3 b/www/error.php3
index de1621aa0f..8a19e8f152 100644
--- a/www/error.php3
+++ b/www/error.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/error.shtml b/www/error.shtml
index 6034a1cc6f..390191cefc 100644
--- a/www/error.shtml
+++ b/www/error.shtml
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2001-2003 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<!--- This exists to redirect to the PHP script -->
<html>
diff --git a/www/experiment_defs.php b/www/experiment_defs.php
index e62ceafd51..0f91b4b27f 100644
--- a/www/experiment_defs.php
+++ b/www/experiment_defs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
include_once("template_defs.php");
diff --git a/www/experimentrun_show.php b/www/experimentrun_show.php
index f5b60f70e0..03a1582b56 100644
--- a/www/experimentrun_show.php
+++ b/www/experimentrun_show.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/explist.php3 b/www/explist.php3
index 37631c5ebe..0d6bfe04f6 100644
--- a/www/explist.php3
+++ b/www/explist.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/expubs.php b/www/expubs.php
index 22a8eb5841..7ae98bc275 100644
--- a/www/expubs.php
+++ b/www/expubs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
include("pub_defs.php");
diff --git a/www/faq.html b/www/faq.html
index 3ec67ce21e..b2a2c0d6df 100644
--- a/www/faq.html
+++ b/www/faq.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2005 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<!--- This exists to redirect to the PHP script -->
<html>
diff --git a/www/faq.php3 b/www/faq.php3
index 8c038393ff..4ad8c44279 100644
--- a/www/faq.php3
+++ b/www/faq.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005, 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/feedback.php3 b/www/feedback.php3
index 24a7bd9b2a..0262470ea0 100644
--- a/www/feedback.php3
+++ b/www/feedback.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/floormap.php3 b/www/floormap.php3
index e02249fdda..d4560b1029 100755
--- a/www/floormap.php3
+++ b/www/floormap.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/floormap_aux.php3 b/www/floormap_aux.php3
index ac77b8d8c9..d68fe1a3fc 100755
--- a/www/floormap_aux.php3
+++ b/www/floormap_aux.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/form_defs.php b/www/form_defs.php
index e5ad42e836..6d3dab48d5 100644
--- a/www/form_defs.php
+++ b/www/form_defs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
$footnotes = null;
diff --git a/www/form_example.php b/www/form_example.php
index 28c14ba94c..8e5722fe16 100644
--- a/www/form_example.php
+++ b/www/form_example.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include("form_defs.php");
diff --git a/www/freenode.php3 b/www/freenode.php3
index d0a27ccf50..8ba9de2274 100644
--- a/www/freenode.php3
+++ b/www/freenode.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/freezeuser.php3 b/www/freezeuser.php3
index e81745da56..abbc44e251 100644
--- a/www/freezeuser.php3
+++ b/www/freezeuser.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/garcia-telemetry/GNUmakefile.in b/www/garcia-telemetry/GNUmakefile.in
index be65273222..833e0b3321 100644
--- a/www/garcia-telemetry/GNUmakefile.in
+++ b/www/garcia-telemetry/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/www/garcia-telemetry/GarciaTelemetry.java b/www/garcia-telemetry/GarciaTelemetry.java
index b31ab1e5cb..d935fbadfb 100644
--- a/www/garcia-telemetry/GarciaTelemetry.java
+++ b/www/garcia-telemetry/GarciaTelemetry.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.Date;
diff --git a/www/garcia-telemetry/UpdateThread.java b/www/garcia-telemetry/UpdateThread.java
index 39799a2c03..8f124cae9c 100644
--- a/www/garcia-telemetry/UpdateThread.java
+++ b/www/garcia-telemetry/UpdateThread.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.io.IOException;
diff --git a/www/garcia-telemetry/main.xml b/www/garcia-telemetry/main.xml
index 9a8a7de0ff..35401030c2 100644
--- a/www/garcia-telemetry/main.xml
+++ b/www/garcia-telemetry/main.xml
@@ -1,8 +1,25 @@
<?xml version="1.0"?>
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2005 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<panel columns="1" background="#ffffff" gap="4">
diff --git a/www/geni_defs.php b/www/geni_defs.php
index 7bb2135e23..89c8550d96 100644
--- a/www/geni_defs.php
+++ b/www/geni_defs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
function GetDBLink($authority)
diff --git a/www/genihistory.php b/www/genihistory.php
index 6a0f9d5d33..1ed5cd7bd8 100644
--- a/www/genihistory.php
+++ b/www/genihistory.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("geni_defs.php");
diff --git a/www/genislices.php b/www/genislices.php
index 5a9ff8d6b4..ebbca07e76 100644
--- a/www/genislices.php
+++ b/www/genislices.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("geni_defs.php");
diff --git a/www/gensslcert.php3 b/www/gensslcert.php3
index 15ceb312d2..3eb0ad4ee8 100644
--- a/www/gensslcert.php3
+++ b/www/gensslcert.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/getsslcert.php3 b/www/getsslcert.php3
index 860e373c34..a0cab4ca7e 100644
--- a/www/getsslcert.php3
+++ b/www/getsslcert.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/gotobugdb.php3 b/www/gotobugdb.php3
index 224c7dbf68..f61c31f6a6 100644
--- a/www/gotobugdb.php3
+++ b/www/gotobugdb.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/gotochat.php3 b/www/gotochat.php3
index 875678a11c..8e36f53181 100644
--- a/www/gotochat.php3
+++ b/www/gotochat.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/gotommlist.php3 b/www/gotommlist.php3
index 738dbcf7c3..4a53f1b6fb 100644
--- a/www/gotommlist.php3
+++ b/www/gotommlist.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/gotopeer.php b/www/gotopeer.php
index 56a1f6a491..827b7e257f 100644
--- a/www/gotopeer.php
+++ b/www/gotopeer.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/gototrac.php3 b/www/gototrac.php3
index 2436bdb1c3..33287f5e55 100644
--- a/www/gototrac.php3
+++ b/www/gototrac.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/gotowiki.php3 b/www/gotowiki.php3
index 9ef6f232f8..043198eb31 100644
--- a/www/gotowiki.php3
+++ b/www/gotowiki.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/group_defs.php b/www/group_defs.php
index 1233552866..915358e2b2 100644
--- a/www/group_defs.php
+++ b/www/group_defs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# A cache of groups to avoid lookups. Indexed by gid_idx;
diff --git a/www/hardware-cmuemlab.html b/www/hardware-cmuemlab.html
index 6ca85fc1cb..5331eaeb9b 100644
--- a/www/hardware-cmuemlab.html
+++ b/www/hardware-cmuemlab.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2008 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<center>
<h1>
diff --git a/www/hardware.php b/www/hardware.php
index c4515d715e..482271828a 100644
--- a/www/hardware.php
+++ b/www/hardware.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/htmlinstall.in b/www/htmlinstall.in
index a6933b7f84..9d1f053576 100644
--- a/www/htmlinstall.in
+++ b/www/htmlinstall.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/www/hyperviewer/docwrapper.php3 b/www/hyperviewer/docwrapper.php3
index 0bb4726833..6587037d79 100644
--- a/www/hyperviewer/docwrapper.php3
+++ b/www/hyperviewer/docwrapper.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
require("defs.php3");
diff --git a/www/hyperviewer/hyperviewer.php3 b/www/hyperviewer/hyperviewer.php3
index 9ae202f340..ceea552cea 100644
--- a/www/hyperviewer/hyperviewer.php3
+++ b/www/hyperviewer/hyperviewer.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
require("defs.php3");
diff --git a/www/image_metadata.php b/www/image_metadata.php
index a13e6f66fb..241b0a000a 100644
--- a/www/image_metadata.php
+++ b/www/image_metadata.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("imageid_defs.php");
diff --git a/www/imageid_defs.php b/www/imageid_defs.php
index 4860844e68..60c075e2c3 100644
--- a/www/imageid_defs.php
+++ b/www/imageid_defs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include_once("osinfo_defs.php"); # For SpitOSIDLink() below.
diff --git a/www/index-cmuemulab.html b/www/index-cmuemulab.html
index f91a25bb4c..2073fab6fb 100644
--- a/www/index-cmuemulab.html
+++ b/www/index-cmuemulab.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2008 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<p><em>CMUlab</em> is a network testbed facility at Carnegie Mellon
diff --git a/www/index-mainsite.html b/www/index-mainsite.html
index f78bf24104..2adc7a8a6e 100644
--- a/www/index-mainsite.html
+++ b/www/index-mainsite.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2010 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<!-- Note - this stuff is fairly Utah-specific, so it's only displayed there
diff --git a/www/index-nonmain.html b/www/index-nonmain.html
index 58a9e3f45a..7da2325f7d 100644
--- a/www/index-nonmain.html
+++ b/www/index-nonmain.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2008 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<p>Emulab is a universally available
diff --git a/www/index.html b/www/index.html
index b25e0d7786..81caa5116b 100644
--- a/www/index.html
+++ b/www/index.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2004 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<!--- This exists to redirect to the PHP script -->
<html>
diff --git a/www/index.php3 b/www/index.php3
index af06b94675..acadb58c32 100755
--- a/www/index.php3
+++ b/www/index.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/installwikidocs.in b/www/installwikidocs.in
index e8d1261f92..dd8c94efbc 100755
--- a/www/installwikidocs.in
+++ b/www/installwikidocs.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/www/instance_show.php b/www/instance_show.php
index b98cfe8a95..088da2618b 100644
--- a/www/instance_show.php
+++ b/www/instance_show.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/jabber/jeti.php b/www/jabber/jeti.php
index 22588b442a..cd5c15be50 100644
--- a/www/jabber/jeti.php
+++ b/www/jabber/jeti.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
$user = $_GET['user'];
diff --git a/www/java.html b/www/java.html
index cfe3dce880..86bd919067 100644
--- a/www/java.html
+++ b/www/java.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2002 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<script language="JavaScript">
<!--
diff --git a/www/jay.php b/www/jay.php
index a9180cff2d..43b3c0b6c5 100644
--- a/www/jay.php
+++ b/www/jay.php
@@ -1,8 +1,25 @@
<?
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/joinproject.php3 b/www/joinproject.php3
index 85177bddd8..f51363263c 100644
--- a/www/joinproject.php3
+++ b/www/joinproject.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/kb-browse.php3 b/www/kb-browse.php3
index b6ff015e42..60f9c586b6 100644
--- a/www/kb-browse.php3
+++ b/www/kb-browse.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/kb-faq.php3 b/www/kb-faq.php3
index 02ed3d58a2..a93107fd45 100644
--- a/www/kb-faq.php3
+++ b/www/kb-faq.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/kb-show.php3 b/www/kb-show.php3
index b8f3520d95..c1cfc91c95 100644
--- a/www/kb-show.php3
+++ b/www/kb-show.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/ledpipe.php3 b/www/ledpipe.php3
index daa84141a5..778e3364da 100644
--- a/www/ledpipe.php3
+++ b/www/ledpipe.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/linkgraph_image.php b/www/linkgraph_image.php
index 9d1f2966d2..bab77b52cc 100644
--- a/www/linkgraph_image.php
+++ b/www/linkgraph_image.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/linkmon_ctl.php3 b/www/linkmon_ctl.php3
index feb1816e21..f1416013f3 100644
--- a/www/linkmon_ctl.php3
+++ b/www/linkmon_ctl.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/linkmon_list.php3 b/www/linkmon_list.php3
index 73c89bc1d1..ece44b7e47 100644
--- a/www/linkmon_list.php3
+++ b/www/linkmon_list.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/linkmon_mon.php3 b/www/linkmon_mon.php3
index 48367f7d52..e17674e12f 100644
--- a/www/linkmon_mon.php3
+++ b/www/linkmon_mon.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/linktest.php3 b/www/linktest.php3
index 27754e3f3c..526dc33f57 100644
--- a/www/linktest.php3
+++ b/www/linktest.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/listrepos.php3 b/www/listrepos.php3
index 37bd59c59c..a4b4a94598 100644
--- a/www/listrepos.php3
+++ b/www/listrepos.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/loadimage.php3 b/www/loadimage.php3
index 2111746a42..86575f8c36 100644
--- a/www/loadimage.php3
+++ b/www/loadimage.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("imageid_defs.php");
diff --git a/www/login.php3 b/www/login.php3
index f7c3456174..6a50fdbd45 100644
--- a/www/login.php3
+++ b/www/login.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/login_plab.php3 b/www/login_plab.php3
index 0b6796422a..adce563773 100644
--- a/www/login_plab.php3
+++ b/www/login_plab.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/www/login_redirect.php b/www/login_redirect.php
index 084c823fa4..ec2369cc57 100644
--- a/www/login_redirect.php
+++ b/www/login_redirect.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/logout.php3 b/www/logout.php3
index 3d78b8b4ed..8df2d23863 100644
--- a/www/logout.php3
+++ b/www/logout.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/menu.php3 b/www/menu.php3
index c6b2dc730a..ba1d626968 100644
--- a/www/menu.php3
+++ b/www/menu.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
$login_user = null;
diff --git a/www/modifyexp.php3 b/www/modifyexp.php3
index 917c069c7c..c0d0c8448c 100644
--- a/www/modifyexp.php3
+++ b/www/modifyexp.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/modnodeattributes.php3 b/www/modnodeattributes.php3
index 309e5c1ef7..d1122bdb6c 100644
--- a/www/modnodeattributes.php3
+++ b/www/modnodeattributes.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/modnodeattributes_form.php3 b/www/modnodeattributes_form.php3
index 27a5be7e1f..3906dc4566 100644
--- a/www/modnodeattributes_form.php3
+++ b/www/modnodeattributes_form.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/moduserinfo.php3 b/www/moduserinfo.php3
index 1c287d608b..8770b010db 100644
--- a/www/moduserinfo.php3
+++ b/www/moduserinfo.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/moteleds.php3 b/www/moteleds.php3
index a688159b55..8337ea09a1 100644
--- a/www/moteleds.php3
+++ b/www/moteleds.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/mungelog.js b/www/mungelog.js
index ded51bf44f..d8e16c42ad 100644
--- a/www/mungelog.js
+++ b/www/mungelog.js
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2008, 2010 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
var LOG_STATE_LOADING = 1;
var LOG_STATE_LOADED = 2;
diff --git a/www/mychat.php3 b/www/mychat.php3
index d3dbbedc21..13fa708a10 100644
--- a/www/mychat.php3
+++ b/www/mychat.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/netemu.php3 b/www/netemu.php3
index de68c0c2c2..8f370c347a 100644
--- a/www/netemu.php3
+++ b/www/netemu.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/netlab/client.php3 b/www/netlab/client.php3
index 5346ff63e9..3583103528 100644
--- a/www/netlab/client.php3
+++ b/www/netlab/client.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
require("defs.php3");
diff --git a/www/newgroup.php3 b/www/newgroup.php3
index a20de37190..69d605651b 100644
--- a/www/newgroup.php3
+++ b/www/newgroup.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/newimageid.php3 b/www/newimageid.php3
index 47cba24def..c101f0bff2 100644
--- a/www/newimageid.php3
+++ b/www/newimageid.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("imageid_defs.php");
diff --git a/www/newimageid_ez.php3 b/www/newimageid_ez.php3
index fd42231370..dbbfa2b136 100644
--- a/www/newimageid_ez.php3
+++ b/www/newimageid_ez.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("imageid_defs.php");
diff --git a/www/newmmlist.php3 b/www/newmmlist.php3
index fe203e203d..6fa8d2f2da 100644
--- a/www/newmmlist.php3
+++ b/www/newmmlist.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/newnode-defs.php3 b/www/newnode-defs.php3
index 3c40d6e942..2a49851c5e 100644
--- a/www/newnode-defs.php3
+++ b/www/newnode-defs.php3
@@ -1,8 +1,25 @@
<?PHP
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003, 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/www/newnode_edit.php3 b/www/newnode_edit.php3
index dfffcc2e48..69877ce260 100644
--- a/www/newnode_edit.php3
+++ b/www/newnode_edit.php3
@@ -1,8 +1,25 @@
<?PHP
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/newnodecheckin.php b/www/newnodecheckin.php
index 369206abc3..7ec7c0ea78 100644
--- a/www/newnodecheckin.php
+++ b/www/newnodecheckin.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003, 2005, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
require("newnode-defs.php3");
diff --git a/www/newnodelog.php3 b/www/newnodelog.php3
index 68c993cb4b..0ad89bd7c9 100644
--- a/www/newnodelog.php3
+++ b/www/newnodelog.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/newnodelog_form.php3 b/www/newnodelog_form.php3
index fbe4fce8fb..948133767a 100644
--- a/www/newnodelog_form.php3
+++ b/www/newnodelog_form.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/newnodes_list.php3 b/www/newnodes_list.php3
index 815fc783e7..60668f44a0 100644
--- a/www/newnodes_list.php3
+++ b/www/newnodes_list.php3
@@ -1,8 +1,25 @@
<?PHP
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
require("newnode-defs.php3");
diff --git a/www/newosid.php3 b/www/newosid.php3
index f3058cf907..dd8c230ffc 100644
--- a/www/newosid.php3
+++ b/www/newosid.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008, 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("osinfo_defs.php");
diff --git a/www/newproject.php3 b/www/newproject.php3
index b09a8add76..b00181d5c8 100755
--- a/www/newproject.php3
+++ b/www/newproject.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/news-rss.php3 b/www/news-rss.php3
index 0d63582931..6e1b746635 100644
--- a/www/news-rss.php3
+++ b/www/news-rss.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/news.php3 b/www/news.php3
index c7d9d247a9..dd28489217 100644
--- a/www/news.php3
+++ b/www/news.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/node_defs.php b/www/node_defs.php
index 05a4f13f1d..8bfe3b04ba 100644
--- a/www/node_defs.php
+++ b/www/node_defs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include_once("osinfo_defs.php");
diff --git a/www/nodecontrol.php3 b/www/nodecontrol.php3
index 50870854e8..8fe4f661bb 100644
--- a/www/nodecontrol.php3
+++ b/www/nodecontrol.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/nodecontrol_form.php3 b/www/nodecontrol_form.php3
index 4f274908eb..7f59080504 100644
--- a/www/nodecontrol_form.php3
+++ b/www/nodecontrol_form.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/nodecontrol_list.php3 b/www/nodecontrol_list.php3
index 76270af5bf..6ac3173840 100644
--- a/www/nodecontrol_list.php3
+++ b/www/nodecontrol_list.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/noderdp.php3 b/www/noderdp.php3
index 09fc73422c..53d4247345 100644
--- a/www/noderdp.php3
+++ b/www/noderdp.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/nodessh.php3 b/www/nodessh.php3
index 13ae56d21e..fc8793a16d 100644
--- a/www/nodessh.php3
+++ b/www/nodessh.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/nodetipacl.php3 b/www/nodetipacl.php3
index cccc2b4262..23ba214667 100644
--- a/www/nodetipacl.php3
+++ b/www/nodetipacl.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/nodeutilization.php b/www/nodeutilization.php
index 0e166bca2b..642072251b 100644
--- a/www/nodeutilization.php
+++ b/www/nodeutilization.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/nologins.php3 b/www/nologins.php3
index 684e8742e4..33878662b5 100644
--- a/www/nologins.php3
+++ b/www/nologins.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/nscheck.php3 b/www/nscheck.php3
index ee7a12fec7..3213a09e69 100644
--- a/www/nscheck.php3
+++ b/www/nscheck.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007, 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/nscheck_form.php3 b/www/nscheck_form.php3
index 1c56a4ac6c..cff9b63809 100644
--- a/www/nscheck_form.php3
+++ b/www/nscheck_form.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/obstacle_list.php3 b/www/obstacle_list.php3
index e991e59e4c..c09f503601 100644
--- a/www/obstacle_list.php3
+++ b/www/obstacle_list.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/onload.js b/www/onload.js
index c7b7cda2a3..df427500fb 100644
--- a/www/onload.js
+++ b/www/onload.js
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2009 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/www/osconfig_dump.php b/www/osconfig_dump.php
index f25cd6a58b..b267b13643 100644
--- a/www/osconfig_dump.php
+++ b/www/osconfig_dump.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
require("node_defs.php");
diff --git a/www/osiddefs.php3 b/www/osiddefs.php3
index fe992951f5..e23db9652f 100644
--- a/www/osiddefs.php3
+++ b/www/osiddefs.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Stuff for OSIDs. All this stuff should come from the DB instead!
#
diff --git a/www/osinfo_defs.php b/www/osinfo_defs.php
index 98db985938..ff28945f4e 100644
--- a/www/osinfo_defs.php
+++ b/www/osinfo_defs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
class OSinfo
diff --git a/www/pagenotworking.php b/www/pagenotworking.php
index 238d6a2553..7b66b01946 100644
--- a/www/pagenotworking.php
+++ b/www/pagenotworking.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/panicbutton.php3 b/www/panicbutton.php3
index 4325f96325..37268496e0 100644
--- a/www/panicbutton.php3
+++ b/www/panicbutton.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/password.php3 b/www/password.php3
index e8afc7e21d..49429ff304 100644
--- a/www/password.php3
+++ b/www/password.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/peer_login.php b/www/peer_login.php
index 4db1f794f0..a53f730581 100644
--- a/www/peer_login.php
+++ b/www/peer_login.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/people.php3 b/www/people.php3
index d705d1c445..ef4b83190c 100644
--- a/www/people.php3
+++ b/www/people.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/powertime.php3 b/www/powertime.php3
index 0f611ed4aa..083515571d 100644
--- a/www/powertime.php3
+++ b/www/powertime.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/prereserve_node.php3 b/www/prereserve_node.php3
index ea72e787aa..97532ae85e 100644
--- a/www/prereserve_node.php3
+++ b/www/prereserve_node.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/profile.php b/www/profile.php
index bd184203e4..c6d89cc86f 100644
--- a/www/profile.php
+++ b/www/profile.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/project_defs.php b/www/project_defs.php
index ab6b2605f6..c1214583fd 100644
--- a/www/project_defs.php
+++ b/www/project_defs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# A cache of groups to avoid lookups. Indexed by pid_idx;
#
diff --git a/www/projectlist.php3 b/www/projectlist.php3
index 6663dfbc80..0a3ffb010b 100644
--- a/www/projectlist.php3
+++ b/www/projectlist.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/protogeni/getsslcert.php3 b/www/protogeni/getsslcert.php3
index d6b031caaf..8515371001 100644
--- a/www/protogeni/getsslcert.php3
+++ b/www/protogeni/getsslcert.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
require("getsslcert.php3");
diff --git a/www/protogeni/register_ca.php b/www/protogeni/register_ca.php
index 8a76f64ea4..40d70fc856 100644
--- a/www/protogeni/register_ca.php
+++ b/www/protogeni/register_ca.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
require("defs.php3");
diff --git a/www/pub_defs.php b/www/pub_defs.php
index c2af13a28f..26dda89e03 100644
--- a/www/pub_defs.php
+++ b/www/pub_defs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include_once("defs.php3");
diff --git a/www/pubs.html b/www/pubs.html
index 7204c0e66a..c14fcc9cae 100644
--- a/www/pubs.html
+++ b/www/pubs.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2012 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<!-- Nothing here is published by ACM et al; no need to include this yet.
<p>
diff --git a/www/pubs.php3 b/www/pubs.php3
index d30a541d07..ffda3cb9ca 100644
--- a/www/pubs.php3
+++ b/www/pubs.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/rdp-mime-winxp.c b/www/rdp-mime-winxp.c
index 9360640ddd..64b71ff1ef 100755
--- a/www/rdp-mime-winxp.c
+++ b/www/rdp-mime-winxp.c
@@ -3,9 +3,26 @@
*
* Compile with gcc -o rdp-mime-winxp.{exe,c}
*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdlib.h>
#include <stdio.h>
diff --git a/www/rdp-mime-winxp.pl b/www/rdp-mime-winxp.pl
index 46f4b3e036..551758c2ff 100755
--- a/www/rdp-mime-winxp.pl
+++ b/www/rdp-mime-winxp.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/www/rdp-mime.pl b/www/rdp-mime.pl
index 474364eeed..e466d75b63 100755
--- a/www/rdp-mime.pl
+++ b/www/rdp-mime.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/www/record_revise.php b/www/record_revise.php
index 014e0a7c15..c8e73f1745 100644
--- a/www/record_revise.php
+++ b/www/record_revise.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/remapexp.php3 b/www/remapexp.php3
index fdf87292f6..c1715284b9 100644
--- a/www/remapexp.php3
+++ b/www/remapexp.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/replayexp.php3 b/www/replayexp.php3
index 9fe4a31343..24e8e0ecb9 100644
--- a/www/replayexp.php3
+++ b/www/replayexp.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/reqaccount.php3 b/www/reqaccount.php3
index 5e3e04cc5a..8602283213 100644
--- a/www/reqaccount.php3
+++ b/www/reqaccount.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/request_idleinfo.php3 b/www/request_idleinfo.php3
index 40711b880e..29bb683754 100644
--- a/www/request_idleinfo.php3
+++ b/www/request_idleinfo.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2009 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/request_swapexp.php3 b/www/request_swapexp.php3
index 3ce31b771c..d20d11da23 100644
--- a/www/request_swapexp.php3
+++ b/www/request_swapexp.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/resendapproval.php b/www/resendapproval.php
index 2f9edc733f..374df2a9a0 100644
--- a/www/resendapproval.php
+++ b/www/resendapproval.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/resendkey.php3 b/www/resendkey.php3
index 9d4df20262..191f52ea4a 100644
--- a/www/resendkey.php3
+++ b/www/resendkey.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/robotrack/assignnodes.php3 b/www/robotrack/assignnodes.php3
index 85737d17ea..fe5f894ff5 100644
--- a/www/robotrack/assignnodes.php3
+++ b/www/robotrack/assignnodes.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
include("defs.php3");
diff --git a/www/robotrack/cameras.php3 b/www/robotrack/cameras.php3
index 50128b0a69..e2360434a7 100644
--- a/www/robotrack/cameras.php3
+++ b/www/robotrack/cameras.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
include("defs.php3");
diff --git a/www/robotrack/flooricon.php3 b/www/robotrack/flooricon.php3
index b8b9086418..b15a2a59dc 100644
--- a/www/robotrack/flooricon.php3
+++ b/www/robotrack/flooricon.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
include("defs.php3");
diff --git a/www/robotrack/nodeinfo.php3 b/www/robotrack/nodeinfo.php3
index 8f0de4e946..500100ed2a 100644
--- a/www/robotrack/nodeinfo.php3
+++ b/www/robotrack/nodeinfo.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
include("defs.php3");
diff --git a/www/robotrack/obstacles.php3 b/www/robotrack/obstacles.php3
index 70a67ed854..2356647730 100644
--- a/www/robotrack/obstacles.php3
+++ b/www/robotrack/obstacles.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
include("defs.php3");
diff --git a/www/robotrack/robopipe.php3 b/www/robotrack/robopipe.php3
index bbf4b5a1ef..9b5e29ae92 100644
--- a/www/robotrack/robopipe.php3
+++ b/www/robotrack/robopipe.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
include("defs.php3");
diff --git a/www/robotrack/robotrack.php3 b/www/robotrack/robotrack.php3
index f7ba7d1fb5..34a0c786c1 100644
--- a/www/robotrack/robotrack.php3
+++ b/www/robotrack/robotrack.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
include("defs.php3");
diff --git a/www/robotrack/selector.php3 b/www/robotrack/selector.php3
index 99ef347d9a..1b49c9ba04 100644
--- a/www/robotrack/selector.php3
+++ b/www/robotrack/selector.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
include("defs.php3");
diff --git a/www/robotrack/setdest.php3 b/www/robotrack/setdest.php3
index 950d873940..2a2fe261a3 100644
--- a/www/robotrack/setdest.php3
+++ b/www/robotrack/setdest.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
include("defs.php3");
diff --git a/www/robotrack/virtinfo.php3 b/www/robotrack/virtinfo.php3
index 6550e28f4e..71d655be74 100644
--- a/www/robotrack/virtinfo.php3
+++ b/www/robotrack/virtinfo.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
include("defs.php3");
diff --git a/www/rusage_viz.css b/www/rusage_viz.css
index c4444d9ac7..1f29989fb0 100644
--- a/www/rusage_viz.css
+++ b/www/rusage_viz.css
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2008 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#rviz {
diff --git a/www/rusage_viz.php b/www/rusage_viz.php
index 814b7a0e96..2f74b11bd2 100644
--- a/www/rusage_viz.php
+++ b/www/rusage_viz.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/sc2002tut.php3 b/www/sc2002tut.php3
index 46871305b6..b4434d4a7b 100644
--- a/www/sc2002tut.php3
+++ b/www/sc2002tut.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/sdr/docwrapper.php3 b/www/sdr/docwrapper.php3
index 9e3f0ffe07..8be97d626c 100644
--- a/www/sdr/docwrapper.php3
+++ b/www/sdr/docwrapper.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("usrpdefs.php3");
diff --git a/www/sdr/faq.html b/www/sdr/faq.html
index 9544ea9457..4f42913bdd 100644
--- a/www/sdr/faq.html
+++ b/www/sdr/faq.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2005 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<center>
<h2>Frequently Asked Questions</h2>
diff --git a/www/sdr/index.php3 b/www/sdr/index.php3
index 398844fa85..c1d3c84e61 100755
--- a/www/sdr/index.php3
+++ b/www/sdr/index.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("usrpdefs.php3");
diff --git a/www/sdr/news.html b/www/sdr/news.html
index 26e9be3053..d1c4d75f9d 100644
--- a/www/sdr/news.html
+++ b/www/sdr/news.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2005 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<center>
<h2>Recent News</h2>
diff --git a/www/sdr/preorder_list.php b/www/sdr/preorder_list.php
index 7811d18118..e1de2f5a95 100644
--- a/www/sdr/preorder_list.php
+++ b/www/sdr/preorder_list.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
include("defs.php3");
diff --git a/www/sdr/users.html b/www/sdr/users.html
index 241141ce4e..95bfc63493 100644
--- a/www/sdr/users.html
+++ b/www/sdr/users.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2005 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<center>
<h2>GNU Radio and USRP Users</h2>
diff --git a/www/search.php3 b/www/search.php3
index 5d359d9b07..d582e5b1c1 100644
--- a/www/search.php3
+++ b/www/search.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/search_cse.php b/www/search_cse.php
index 85c6a54db1..92d4c11e2e 100644
--- a/www/search_cse.php
+++ b/www/search_cse.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/sec-check/GNUmakefile.in b/www/sec-check/GNUmakefile.in
index b22d0b7034..5acf34df9f 100644
--- a/www/sec-check/GNUmakefile.in
+++ b/www/sec-check/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Top-level targets:
diff --git a/www/sec-check/README-FIRST.txt b/www/sec-check/README-FIRST.txt
index 4c41eb515c..22c7c57f60 100644
--- a/www/sec-check/README-FIRST.txt
+++ b/www/sec-check/README-FIRST.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
sec-check/README-FIRST.txt - Sec-check documentation outline.
diff --git a/www/sec-check/README-background.txt b/www/sec-check/README-background.txt
index 7aa79007c0..c100b28c22 100644
--- a/www/sec-check/README-background.txt
+++ b/www/sec-check/README-background.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
sec-check/README-background.txt
diff --git a/www/sec-check/README-concepts.txt b/www/sec-check/README-concepts.txt
index d747314120..5c15f1f7e4 100644
--- a/www/sec-check/README-concepts.txt
+++ b/www/sec-check/README-concepts.txt
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
sec-check/README-concepts.txt - Design and methods employed in sec-check.
diff --git a/www/sec-check/README-howto.txt b/www/sec-check/README-howto.txt
index daec1dbd53..35c49b0d0f 100644
--- a/www/sec-check/README-howto.txt
+++ b/www/sec-check/README-howto.txt
@@ -1,8 +1,25 @@
# -*- mode: text; indent-tabs-mode: nil -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
sec-check/README-howto.txt - Details of running and incremental development.
diff --git a/www/sec-check/form-input.gawk b/www/sec-check/form-input.gawk
index b8e8c36c9b..fcf547768f 100644
--- a/www/sec-check/form-input.gawk
+++ b/www/sec-check/form-input.gawk
@@ -1,8 +1,25 @@
#! /usr/bin/gawk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# form-input.gawk - Scan a lot of spidered HTML files, extracting forms.
#
diff --git a/www/sec-check/forms-to-urls.gawk b/www/sec-check/forms-to-urls.gawk
index 730d14742c..28bff4a239 100644
--- a/www/sec-check/forms-to-urls.gawk
+++ b/www/sec-check/forms-to-urls.gawk
@@ -1,8 +1,25 @@
#! /usr/bin/gawk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# forms-to-urls.gawk - Generate URL's for accessing the site.
#
diff --git a/www/sec-check/sep-urls.gawk b/www/sec-check/sep-urls.gawk
index b8076fcc23..4de9c2403b 100644
--- a/www/sec-check/sep-urls.gawk
+++ b/www/sec-check/sep-urls.gawk
@@ -1,8 +1,25 @@
#! /usr/bin/gawk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# sep-urls - Separate out the setup and teardown URL's.
#
diff --git a/www/sec-check/undo-probe.pl b/www/sec-check/undo-probe.pl
index e125800ff5..38df67f3df 100755
--- a/www/sec-check/undo-probe.pl
+++ b/www/sec-check/undo-probe.pl
@@ -1,9 +1,26 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# undo-probe.pl - Common code to undo probes to setup/teardown pages.
diff --git a/www/sec-check/urls-to-wget.gawk b/www/sec-check/urls-to-wget.gawk
index c8c3bf8554..dddc6cf7ed 100644
--- a/www/sec-check/urls-to-wget.gawk
+++ b/www/sec-check/urls-to-wget.gawk
@@ -1,8 +1,25 @@
#! /usr/bin/gawk -f
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# urls-to-wget - Generate a wget script for a set of URL's. The script
# assumes you are already logged in to Emulab, with a valid cookies.txt file.
diff --git a/www/sec-check/waitexp b/www/sec-check/waitexp
index 5c7fdfa46b..aa200516de 100755
--- a/www/sec-check/waitexp
+++ b/www/sec-check/waitexp
@@ -1,8 +1,25 @@
#! /bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# waitexp - Wait for an experiment to be in the "active" state.
diff --git a/www/sendemail.php3 b/www/sendemail.php3
index 141e2d4b7d..12e9052a9e 100644
--- a/www/sendemail.php3
+++ b/www/sendemail.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/sendtestmsg.php3 b/www/sendtestmsg.php3
index b0e794a6c7..dc98e9d759 100644
--- a/www/sendtestmsg.php3
+++ b/www/sendtestmsg.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/servicepipe.php3 b/www/servicepipe.php3
index f525fe4161..8d9366044a 100644
--- a/www/servicepipe.php3
+++ b/www/servicepipe.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/setnodeloc.php3 b/www/setnodeloc.php3
index 1010e5bba0..9a1785e3de 100644
--- a/www/setnodeloc.php3
+++ b/www/setnodeloc.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/showconlog.php3 b/www/showconlog.php3
index ca4b8ad71d..88ad21825d 100644
--- a/www/showconlog.php3
+++ b/www/showconlog.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/showevents.php b/www/showevents.php
index 332973ff2c..26f02feac3 100644
--- a/www/showevents.php
+++ b/www/showevents.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showexp.js b/www/showexp.js
index 1ab3fd6a08..ce703d9520 100644
--- a/www/showexp.js
+++ b/www/showexp.js
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
* State change handling code for show experiment page.
diff --git a/www/showexp.php3 b/www/showexp.php3
index e3b9f299f5..907ca2834e 100644
--- a/www/showexp.php3
+++ b/www/showexp.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
require("Sajax.php");
diff --git a/www/showexp_list.php3 b/www/showexp_list.php3
index ed39eca8a6..2f321acdc5 100644
--- a/www/showexp_list.php3
+++ b/www/showexp_list.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showexpstats.php3 b/www/showexpstats.php3
index bae1f7627a..e0c4f1154d 100644
--- a/www/showexpstats.php3
+++ b/www/showexpstats.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showgroup.php3 b/www/showgroup.php3
index 9d10146728..64c96eef88 100644
--- a/www/showgroup.php3
+++ b/www/showgroup.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/showimageid.php3 b/www/showimageid.php3
index 6b81856847..0d0c81ad4a 100644
--- a/www/showimageid.php3
+++ b/www/showimageid.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include("imageid_defs.php");
diff --git a/www/showimageid_list.php3 b/www/showimageid_list.php3
index c0d390095e..4f31151958 100644
--- a/www/showimageid_list.php3
+++ b/www/showimageid_list.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showlasterror.php3 b/www/showlasterror.php3
index 3e0e8f44ef..775275e875 100644
--- a/www/showlasterror.php3
+++ b/www/showlasterror.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showlogfile.php3 b/www/showlogfile.php3
index 94487d893d..6f432ffea8 100644
--- a/www/showlogfile.php3
+++ b/www/showlogfile.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showlogfile_sup.php3 b/www/showlogfile_sup.php3
index e1232ee530..ac58913afb 100644
--- a/www/showlogfile_sup.php3
+++ b/www/showlogfile_sup.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require_once("Sajax.php");
sajax_init();
diff --git a/www/showmmlists.php3 b/www/showmmlists.php3
index 9a10682488..2dce504316 100644
--- a/www/showmmlists.php3
+++ b/www/showmmlists.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007, 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/shownode.php3 b/www/shownode.php3
index e47730a73d..73ea4aec0b 100644
--- a/www/shownode.php3
+++ b/www/shownode.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/shownodehistory.php3 b/www/shownodehistory.php3
index d5f98be155..268f32d9aa 100644
--- a/www/shownodehistory.php3
+++ b/www/shownodehistory.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/shownodelog.php3 b/www/shownodelog.php3
index bf3cc65c31..44a5b4defb 100644
--- a/www/shownodelog.php3
+++ b/www/shownodelog.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include("node_defs.php");
diff --git a/www/shownodetype.php3 b/www/shownodetype.php3
index 22d933a7a2..45f3da45a5 100644
--- a/www/shownodetype.php3
+++ b/www/shownodetype.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include("imageid_defs.php");
diff --git a/www/shownodetype_list.php b/www/shownodetype_list.php
index 81bd990dc3..188c210668 100644
--- a/www/shownodetype_list.php
+++ b/www/shownodetype_list.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include("table_defs.php");
diff --git a/www/shownsfile.php3 b/www/shownsfile.php3
index 2a326f9298..4c37fa9522 100644
--- a/www/shownsfile.php3
+++ b/www/shownsfile.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showobstacle.php3 b/www/showobstacle.php3
index ee2df4d559..d1ac670fd3 100644
--- a/www/showobstacle.php3
+++ b/www/showobstacle.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showosid_list.php3 b/www/showosid_list.php3
index 8a73aa8305..c97ff8cde8 100644
--- a/www/showosid_list.php3
+++ b/www/showosid_list.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showosinfo.php3 b/www/showosinfo.php3
index 5e2e50d200..97fc8cae92 100644
--- a/www/showosinfo.php3
+++ b/www/showosinfo.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("osinfo_defs.php");
diff --git a/www/showpolicies.php3 b/www/showpolicies.php3
index 33182a2289..16861838fa 100644
--- a/www/showpolicies.php3
+++ b/www/showpolicies.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showpool.php b/www/showpool.php
index af80620961..4967b2ba15 100644
--- a/www/showpool.php
+++ b/www/showpool.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2009-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showproject.php3 b/www/showproject.php3
index 34c4c7f673..e02553cbe5 100644
--- a/www/showproject.php3
+++ b/www/showproject.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/showproject_list.php3 b/www/showproject_list.php3
index a777be6cf5..e6052773a8 100644
--- a/www/showproject_list.php3
+++ b/www/showproject_list.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showpubkeys.php3 b/www/showpubkeys.php3
index 851c4cdf39..8de921f1f2 100644
--- a/www/showpubkeys.php3
+++ b/www/showpubkeys.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showslice.php b/www/showslice.php
index bb2ff721e6..75b18d2844 100644
--- a/www/showslice.php
+++ b/www/showslice.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("geni_defs.php");
diff --git a/www/showstats.php3 b/www/showstats.php3
index 5ecb0a6597..198fbd0382 100644
--- a/www/showstats.php3
+++ b/www/showstats.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showstuff.php3 b/www/showstuff.php3
index 8212e5c378..ea87d75cd9 100644
--- a/www/showstuff.php3
+++ b/www/showstuff.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# This is an included file. No headers or footers.
diff --git a/www/showsumstats.php3 b/www/showsumstats.php3
index 8bce3bf0c1..4804797d28 100644
--- a/www/showsumstats.php3
+++ b/www/showsumstats.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showthumb.php3 b/www/showthumb.php3
index b1e864dbae..f3101c5e34 100644
--- a/www/showthumb.php3
+++ b/www/showthumb.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showuser.php3 b/www/showuser.php3
index aee96a88fc..57ef2713b3 100644
--- a/www/showuser.php3
+++ b/www/showuser.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include("showstuff.php3");
diff --git a/www/showuser_list.php3 b/www/showuser_list.php3
index f96bf7162e..331aa160ae 100644
--- a/www/showuser_list.php3
+++ b/www/showuser_list.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/showvlantaghistory.php b/www/showvlantaghistory.php
index 1322436cad..0479e7b64e 100644
--- a/www/showvlantaghistory.php
+++ b/www/showvlantaghistory.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/software.php3 b/www/software.php3
index 3d552e8837..6fe74f9910 100644
--- a/www/software.php3
+++ b/www/software.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/spewconlog.php3 b/www/spewconlog.php3
index 74aac64e2d..e9dffc1395 100644
--- a/www/spewconlog.php3
+++ b/www/spewconlog.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/spewevents.php b/www/spewevents.php
index 82f815114a..4d2e99091f 100644
--- a/www/spewevents.php
+++ b/www/spewevents.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/spewimage.php b/www/spewimage.php
index cd77c936bc..62a1fc9759 100644
--- a/www/spewimage.php
+++ b/www/spewimage.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("imageid_defs.php");
diff --git a/www/spewlogfile.php3 b/www/spewlogfile.php3
index acefe491f6..623fb17188 100644
--- a/www/spewlogfile.php3
+++ b/www/spewlogfile.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/spewrpmtar.php3 b/www/spewrpmtar.php3
index 24aeb1a5a4..c2eab31e24 100644
--- a/www/spewrpmtar.php3
+++ b/www/spewrpmtar.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/spitnsdata.php3 b/www/spitnsdata.php3
index 7d19f741db..245fdda3ea 100644
--- a/www/spitnsdata.php3
+++ b/www/spitnsdata.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/spitreport.php b/www/spitreport.php
index e81717d839..3367a94b0d 100644
--- a/www/spitreport.php
+++ b/www/spitreport.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/sponsors.html b/www/sponsors.html
index 87d6a59498..413ddfd22f 100644
--- a/www/sponsors.html
+++ b/www/sponsors.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2002 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<center>
<h1>
diff --git a/www/ssh-mime-windows.pl b/www/ssh-mime-windows.pl
index 8654141aa2..7a5efdb4dd 100644
--- a/www/ssh-mime-windows.pl
+++ b/www/ssh-mime-windows.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#use English;
#use Getopt::Std;
diff --git a/www/ssh-mime-winxp.c b/www/ssh-mime-winxp.c
index 296972810f..5dfeefbe63 100755
--- a/www/ssh-mime-winxp.c
+++ b/www/ssh-mime-winxp.c
@@ -3,9 +3,26 @@
*
* Compile with gcc -o ssh-mime-winxp.{exe,c}
*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2003 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
#include <stdlib.h>
#include <stdio.h>
diff --git a/www/ssh-mime-winxp.pl b/www/ssh-mime-winxp.pl
index 5ddb9c7977..442e6237cc 100755
--- a/www/ssh-mime-winxp.pl
+++ b/www/ssh-mime-winxp.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#use English;
#use Getopt::Std;
diff --git a/www/ssh-mime.c b/www/ssh-mime.c
index d70e3bb100..ce194da7c1 100644
--- a/www/ssh-mime.c
+++ b/www/ssh-mime.c
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2004 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* Compile on cygwin with gcc -mwindows -mno-cygwin -o ssh-mime ssh-mime.c */
diff --git a/www/ssh-mime.pl b/www/ssh-mime.pl
index f901cf018b..ffa19c8d2d 100755
--- a/www/ssh-mime.pl
+++ b/www/ssh-mime.pl
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/www/start.php3 b/www/start.php3
index 3045ac05c3..06ed87aa06 100644
--- a/www/start.php3
+++ b/www/start.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# This page used to be the front script, but it now just redirects to
# index.php3.
diff --git a/www/statechange.php b/www/statechange.php
index b8e0dea976..1b5c09e837 100644
--- a/www/statechange.php
+++ b/www/statechange.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/style-doc.css b/www/style-doc.css
index d5aa6ca13f..f888fbb5f7 100644
--- a/www/style-doc.css
+++ b/www/style-doc.css
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
diff --git a/www/style-new.css b/www/style-new.css
index 0f4768d889..9fc927796f 100644
--- a/www/style-new.css
+++ b/www/style-new.css
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2003, 2005-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
body {
diff --git a/www/style.css b/www/style.css
index 3a725cc0c5..e1790db112 100644
--- a/www/style.css
+++ b/www/style.css
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
body {
diff --git a/www/submitpub.php b/www/submitpub.php
index ecd79dbd87..23e81a5c30 100644
--- a/www/submitpub.php
+++ b/www/submitpub.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("pub_defs.php");
diff --git a/www/suuser.php b/www/suuser.php
index 0ad0365482..c18eb5c892 100644
--- a/www/suuser.php
+++ b/www/suuser.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/swapexp.php3 b/www/swapexp.php3
index 0c3d6ff425..ae8867bed0 100644
--- a/www/swapexp.php3
+++ b/www/swapexp.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/table_defs.php b/www/table_defs.php
index 51a83633d7..5aa4c3f570 100644
--- a/www/table_defs.php
+++ b/www/table_defs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
$footnotes = null;
diff --git a/www/tbauth.php3 b/www/tbauth.php3
index aa306a1357..7aa2e8fe12 100644
--- a/www/tbauth.php3
+++ b/www/tbauth.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# Login support: Beware empty spaces (cookies)!
diff --git a/www/telemetry.php3 b/www/telemetry.php3
index 11ac4ec5ab..7ce4ae3d7a 100644
--- a/www/telemetry.php3
+++ b/www/telemetry.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/template_analyze.php b/www/template_analyze.php
index cf3851fb3f..3c21fe063e 100644
--- a/www/template_analyze.php
+++ b/www/template_analyze.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/template_commit.php b/www/template_commit.php
index 8ddca704d2..0372c83233 100644
--- a/www/template_commit.php
+++ b/www/template_commit.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/template_create.php b/www/template_create.php
index 0b6fc081d7..baf3fe39fe 100644
--- a/www/template_create.php
+++ b/www/template_create.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/template_defs.php b/www/template_defs.php
index 7b7ef6461b..4eac069097 100644
--- a/www/template_defs.php
+++ b/www/template_defs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
# The template class is really just a wrapper around the DB data, plus
diff --git a/www/template_editevents.php b/www/template_editevents.php
index 3df638ae0c..7efc982161 100644
--- a/www/template_editevents.php
+++ b/www/template_editevents.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/template_export.php b/www/template_export.php
index 1f4eda66d2..64844274c7 100644
--- a/www/template_export.php
+++ b/www/template_export.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/template_exprun.php b/www/template_exprun.php
index aca5224df0..af92b41492 100644
--- a/www/template_exprun.php
+++ b/www/template_exprun.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/template_graph.php b/www/template_graph.php
index 4707bb7786..3b316f331e 100644
--- a/www/template_graph.php
+++ b/www/template_graph.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/template_history.php b/www/template_history.php
index d7eb11db72..1822e67634 100644
--- a/www/template_history.php
+++ b/www/template_history.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/template_metadata.php b/www/template_metadata.php
index 02524e531c..f245793508 100644
--- a/www/template_metadata.php
+++ b/www/template_metadata.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/template_modify.php b/www/template_modify.php
index 5ec0ab976d..91b17f252b 100644
--- a/www/template_modify.php
+++ b/www/template_modify.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/template_search.php b/www/template_search.php
index 218903d912..1f05a23918 100644
--- a/www/template_search.php
+++ b/www/template_search.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/template_show.php b/www/template_show.php
index 516f9c9bf2..f1701e3ba6 100644
--- a/www/template_show.php
+++ b/www/template_show.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/template_sup.js b/www/template_sup.js
index d0184855cc..d7d64cc38c 100644
--- a/www/template_sup.js
+++ b/www/template_sup.js
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/*
* Some utility stuff.
diff --git a/www/template_swapin.php b/www/template_swapin.php
index 53dae52f31..59ed8e1fad 100644
--- a/www/template_swapin.php
+++ b/www/template_swapin.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("template_defs.php");
diff --git a/www/textbox.js b/www/textbox.js
index de76772c3d..c8df3bf9a0 100644
--- a/www/textbox.js
+++ b/www/textbox.js
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
function focus_text(textInput, defval) {
if (textInput.value == defval) {
diff --git a/www/timetree/timetree.css b/www/timetree/timetree.css
index cf247ac6f2..3fa0e92876 100644
--- a/www/timetree/timetree.css
+++ b/www/timetree/timetree.css
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/* Filler lines. */
diff --git a/www/timetree/timetree.js b/www/timetree/timetree.js
index 68f1527807..1798d287f5 100644
--- a/www/timetree/timetree.js
+++ b/www/timetree/timetree.js
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
/**
diff --git a/www/toggle.php b/www/toggle.php
index ac24e8f12d..b00c968ec3 100644
--- a/www/toggle.php
+++ b/www/toggle.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/top2image.php3 b/www/top2image.php3
index a434e33696..af6ab19c1d 100644
--- a/www/top2image.php3
+++ b/www/top2image.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/tutorial/GNUmakefile.in b/www/tutorial/GNUmakefile.in
index 7c4b8fe249..7e8266b979 100644
--- a/www/tutorial/GNUmakefile.in
+++ b/www/tutorial/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
diff --git a/www/tutorial/docwrapper.php3 b/www/tutorial/docwrapper.php3
index 3bd40a4c8b..140e3233d4 100644
--- a/www/tutorial/docwrapper.php3
+++ b/www/tutorial/docwrapper.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
require("defs.php3");
diff --git a/www/tutorial/loghole.html b/www/tutorial/loghole.html
index c88d1a7185..c38e3c74f4 100644
--- a/www/tutorial/loghole.html
+++ b/www/tutorial/loghole.html
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2005 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<center>
<h1>Loghole - Emulab Log Management Utility</h1>
diff --git a/www/tutorial/loghole.html.head b/www/tutorial/loghole.html.head
index 3f6408ee73..4795681349 100644
--- a/www/tutorial/loghole.html.head
+++ b/www/tutorial/loghole.html.head
@@ -1,7 +1,24 @@
<!--
- EMULAB-COPYRIGHT
Copyright (c) 2000-2005 University of Utah and the Flux Group.
- All rights reserved.
+
+ {{{EMULAB-LICENSE
+
+ This file is part of the Emulab network testbed software.
+
+ This file is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This file is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this file. If not, see <http://www.gnu.org/licenses/>.
+
+ }}}
-->
<center>
<h1>Loghole - Emulab Log Management Utility</h1>
diff --git a/www/tutorial/mobilewireless.php3 b/www/tutorial/mobilewireless.php3
index 5090b9b0f6..020b55a97e 100644
--- a/www/tutorial/mobilewireless.php3
+++ b/www/tutorial/mobilewireless.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
require("defs.php3");
diff --git a/www/tutorial/tb_compat.tcl b/www/tutorial/tb_compat.tcl
index c5ca336596..5611d95f80 100644
--- a/www/tutorial/tb_compat.tcl
+++ b/www/tutorial/tb_compat.tcl
@@ -1,8 +1,25 @@
# -*- tcl -*-
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# This is a nop tb_compact.tcl file that should be used when running scripts
diff --git a/www/tutorial/tutorial.php3 b/www/tutorial/tutorial.php3
index eab60f5339..efe6222197 100644
--- a/www/tutorial/tutorial.php3
+++ b/www/tutorial/tutorial.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
diff --git a/www/unregister_globals.php b/www/unregister_globals.php
index d65b6bc611..3b799c1089 100644
--- a/www/unregister_globals.php
+++ b/www/unregister_globals.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# Emulate register_globals off on the fly.
#
diff --git a/www/updateaccounts.php3 b/www/updateaccounts.php3
index 6da73c6ad0..bf32e2a7fb 100644
--- a/www/updateaccounts.php3
+++ b/www/updateaccounts.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
include_once("node_defs.php");
diff --git a/www/updown.php3 b/www/updown.php3
index a577ddbe4e..870d47029f 100644
--- a/www/updown.php3
+++ b/www/updown.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/url_defs.php b/www/url_defs.php
index 46ab3c4e7c..318b52cba1 100644
--- a/www/url_defs.php
+++ b/www/url_defs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/www/user_defs.php b/www/user_defs.php
index 81c5609aa1..61775bbdaf 100644
--- a/www/user_defs.php
+++ b/www/user_defs.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/www/usermap/index.php b/www/usermap/index.php
index 7500425005..c0959ad504 100644
--- a/www/usermap/index.php
+++ b/www/usermap/index.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
-# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+# Copyright (c) 2009 University of Utah and the Flux Group.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("../defs.php3");
diff --git a/www/usermap/usermap.js b/www/usermap/usermap.js
index 6e3ae0a2b4..4656de423b 100644
--- a/www/usermap/usermap.js
+++ b/www/usermap/usermap.js
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2009 University of Utah and the Flux Group.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
+ */
+
var map = null;
var markers = [];
var counts = [];
diff --git a/www/usermap/usermap.php b/www/usermap/usermap.php
index 8e49717ea7..ae4e8f977d 100644
--- a/www/usermap/usermap.php
+++ b/www/usermap/usermap.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
-# Copyright (c) 2009 University of Utah and the Flux Group.
-# All rights reserved.
+# Copyright (c) 2009 University of Utah and the Flux Group.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include_once("../defs.php3");
diff --git a/www/verifyusr.php3 b/www/verifyusr.php3
index 87fbb3e4e4..925f916ad8 100644
--- a/www/verifyusr.php3
+++ b/www/verifyusr.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/verifyusr_form.php3 b/www/verifyusr_form.php3
index b270d75890..9ef1afff65 100644
--- a/www/verifyusr_form.php3
+++ b/www/verifyusr_form.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2005, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/wanodecheckin.php b/www/wanodecheckin.php
index e84e271d7c..5ac8ae9dbe 100644
--- a/www/wanodecheckin.php
+++ b/www/wanodecheckin.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2007, 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/webcam.php3 b/www/webcam.php3
index 505a4d3e91..b8b50614e0 100644
--- a/www/webcam.php3
+++ b/www/webcam.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/webcamimg.php3 b/www/webcamimg.php3
index 535fe922ed..9953027297 100644
--- a/www/webcamimg.php3
+++ b/www/webcamimg.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/webdb/webdb.php3 b/www/webdb/webdb.php3
index b72e362add..52df8cc5d0 100644
--- a/www/webdb/webdb.php3
+++ b/www/webdb/webdb.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
diff --git a/www/websearch.in b/www/websearch.in
index 78f592bd0d..f350932c09 100644
--- a/www/websearch.in
+++ b/www/websearch.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
use Getopt::Std;
diff --git a/www/widearea_info.php3 b/www/widearea_info.php3
index b361e748b7..f20e000637 100644
--- a/www/widearea_info.php3
+++ b/www/widearea_info.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/widearea_nodeinfo.php3 b/www/widearea_nodeinfo.php3
index 6fa5b41411..dc890f0362 100644
--- a/www/widearea_nodeinfo.php3
+++ b/www/widearea_nodeinfo.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/widearea_redirect.php b/www/widearea_redirect.php
index b83df515a5..0180ebdc51 100644
--- a/www/widearea_redirect.php
+++ b/www/widearea_redirect.php
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/www/wideareakeys.php3 b/www/wideareakeys.php3
index 86ac9fcdcd..c5e3742928 100644
--- a/www/wideareakeys.php3
+++ b/www/wideareakeys.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2006, 2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
include("defs.php3");
diff --git a/www/wikiregister.php3 b/www/wikiregister.php3
index 34d42fab79..62d7502cb5 100644
--- a/www/wikiregister.php3
+++ b/www/wikiregister.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003, 2005 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
$forwikionly = True;
diff --git a/www/wireless-stats/getdata.php3 b/www/wireless-stats/getdata.php3
index 51095dee83..7ec57115af 100644
--- a/www/wireless-stats/getdata.php3
+++ b/www/wireless-stats/getdata.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
include("defs.php3");
diff --git a/www/wireless-stats/src/CollapsablePanel.java b/www/wireless-stats/src/CollapsablePanel.java
index cd6a5b8e7f..e06b54b697 100644
--- a/www/wireless-stats/src/CollapsablePanel.java
+++ b/www/wireless-stats/src/CollapsablePanel.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public class CollapsablePanel extends javax.swing.JPanel {
diff --git a/www/wireless-stats/src/CollapsablePanelContainer.java b/www/wireless-stats/src/CollapsablePanelContainer.java
index 0492249ae5..47e29a9836 100644
--- a/www/wireless-stats/src/CollapsablePanelContainer.java
+++ b/www/wireless-stats/src/CollapsablePanelContainer.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import javax.swing.*;
diff --git a/www/wireless-stats/src/ControlPanel.java b/www/wireless-stats/src/ControlPanel.java
index a0da42dc00..ca479892dd 100644
--- a/www/wireless-stats/src/ControlPanel.java
+++ b/www/wireless-stats/src/ControlPanel.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/www/wireless-stats/src/DataCache.java b/www/wireless-stats/src/DataCache.java
index 07927e8ccb..95033fab14 100644
--- a/www/wireless-stats/src/DataCache.java
+++ b/www/wireless-stats/src/DataCache.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/www/wireless-stats/src/DataCacheEvent.java b/www/wireless-stats/src/DataCacheEvent.java
index 181af291f0..48bef8b7d8 100644
--- a/www/wireless-stats/src/DataCacheEvent.java
+++ b/www/wireless-stats/src/DataCacheEvent.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2005-2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public class DataCacheEvent {
diff --git a/www/wireless-stats/src/DataCacheListener.java b/www/wireless-stats/src/DataCacheListener.java
index d89ed58bdd..eee3432eda 100644
--- a/www/wireless-stats/src/DataCacheListener.java
+++ b/www/wireless-stats/src/DataCacheListener.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public interface DataCacheListener {
diff --git a/www/wireless-stats/src/DataCacheObject.java b/www/wireless-stats/src/DataCacheObject.java
index 5ec9741ef3..4068389372 100644
--- a/www/wireless-stats/src/DataCacheObject.java
+++ b/www/wireless-stats/src/DataCacheObject.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.net.URL;
diff --git a/www/wireless-stats/src/DataSource.java b/www/wireless-stats/src/DataSource.java
index 2fcde6084b..7f851001e3 100644
--- a/www/wireless-stats/src/DataSource.java
+++ b/www/wireless-stats/src/DataSource.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.Vector;
diff --git a/www/wireless-stats/src/DataSourceListener.java b/www/wireless-stats/src/DataSourceListener.java
index dfe6a6b0a9..e21dded84f 100644
--- a/www/wireless-stats/src/DataSourceListener.java
+++ b/www/wireless-stats/src/DataSourceListener.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public interface DataSourceListener {
diff --git a/www/wireless-stats/src/Dataset.java b/www/wireless-stats/src/Dataset.java
index 623d1b9827..dd84d4eab4 100644
--- a/www/wireless-stats/src/Dataset.java
+++ b/www/wireless-stats/src/Dataset.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/www/wireless-stats/src/DatasetModel.java b/www/wireless-stats/src/DatasetModel.java
index b343c886fe..905fa8e1c8 100644
--- a/www/wireless-stats/src/DatasetModel.java
+++ b/www/wireless-stats/src/DatasetModel.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/www/wireless-stats/src/DatasetModelListener.java b/www/wireless-stats/src/DatasetModelListener.java
index 358c7d4b8a..254160ad60 100644
--- a/www/wireless-stats/src/DatasetModelListener.java
+++ b/www/wireless-stats/src/DatasetModelListener.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public interface DatasetModelListener {
diff --git a/www/wireless-stats/src/EmulabURLDataSource.java b/www/wireless-stats/src/EmulabURLDataSource.java
index b5ecb73b7b..2d245fc0bf 100644
--- a/www/wireless-stats/src/EmulabURLDataSource.java
+++ b/www/wireless-stats/src/EmulabURLDataSource.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/www/wireless-stats/src/GenericLinkStats.java b/www/wireless-stats/src/GenericLinkStats.java
index 4fa04a05ce..ad807f0da1 100644
--- a/www/wireless-stats/src/GenericLinkStats.java
+++ b/www/wireless-stats/src/GenericLinkStats.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/www/wireless-stats/src/GenericStats.java b/www/wireless-stats/src/GenericStats.java
index e4e1255f23..e2aa47faad 100644
--- a/www/wireless-stats/src/GenericStats.java
+++ b/www/wireless-stats/src/GenericStats.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/www/wireless-stats/src/GenericWirelessData.java b/www/wireless-stats/src/GenericWirelessData.java
index ee2998b920..85540719ca 100644
--- a/www/wireless-stats/src/GenericWirelessData.java
+++ b/www/wireless-stats/src/GenericWirelessData.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/www/wireless-stats/src/ILEStats.java b/www/wireless-stats/src/ILEStats.java
index 7a1bb78fe3..aced5eb040 100644
--- a/www/wireless-stats/src/ILEStats.java
+++ b/www/wireless-stats/src/ILEStats.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/www/wireless-stats/src/LinkStats.java b/www/wireless-stats/src/LinkStats.java
index d5d210918c..c9745b0076 100644
--- a/www/wireless-stats/src/LinkStats.java
+++ b/www/wireless-stats/src/LinkStats.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public class LinkStats {
diff --git a/www/wireless-stats/src/LinkWidget.java b/www/wireless-stats/src/LinkWidget.java
index ee29497528..e6b9e714b7 100644
--- a/www/wireless-stats/src/LinkWidget.java
+++ b/www/wireless-stats/src/LinkWidget.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.awt.*;
diff --git a/www/wireless-stats/src/MapDataModel.java b/www/wireless-stats/src/MapDataModel.java
index 5c93f74861..9bcd54763b 100644
--- a/www/wireless-stats/src/MapDataModel.java
+++ b/www/wireless-stats/src/MapDataModel.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/www/wireless-stats/src/MinHeap.java b/www/wireless-stats/src/MinHeap.java
index e3a8e41f2d..aab89e2364 100644
--- a/www/wireless-stats/src/MinHeap.java
+++ b/www/wireless-stats/src/MinHeap.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
// Don't forget: heap is from heap[1] to heap[initSize]
diff --git a/www/wireless-stats/src/MoteLinkViewer.java b/www/wireless-stats/src/MoteLinkViewer.java
index 6992c3b2ce..185a95c506 100644
--- a/www/wireless-stats/src/MoteLinkViewer.java
+++ b/www/wireless-stats/src/MoteLinkViewer.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import javax.swing.*;
diff --git a/www/wireless-stats/src/NodeLinkModel.java b/www/wireless-stats/src/NodeLinkModel.java
index e1b24151a3..b83d031c87 100644
--- a/www/wireless-stats/src/NodeLinkModel.java
+++ b/www/wireless-stats/src/NodeLinkModel.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public class NodeLinkModel {
diff --git a/www/wireless-stats/src/NodeMapPanel.java b/www/wireless-stats/src/NodeMapPanel.java
index 5bd6d90886..f62acb3cbf 100644
--- a/www/wireless-stats/src/NodeMapPanel.java
+++ b/www/wireless-stats/src/NodeMapPanel.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import javax.swing.*;
diff --git a/www/wireless-stats/src/NodePosition.java b/www/wireless-stats/src/NodePosition.java
index 4bfff09ce8..a9cd9b793a 100644
--- a/www/wireless-stats/src/NodePosition.java
+++ b/www/wireless-stats/src/NodePosition.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public interface NodePosition {
diff --git a/www/wireless-stats/src/NodePositions.java b/www/wireless-stats/src/NodePositions.java
index 7de8c47784..3326804aff 100644
--- a/www/wireless-stats/src/NodePositions.java
+++ b/www/wireless-stats/src/NodePositions.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.io.*;
diff --git a/www/wireless-stats/src/NodeWidget.java b/www/wireless-stats/src/NodeWidget.java
index 7a8d3d7d19..6fab46a17e 100644
--- a/www/wireless-stats/src/NodeWidget.java
+++ b/www/wireless-stats/src/NodeWidget.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public class NodeWidget extends Widget {
diff --git a/www/wireless-stats/src/Position.java b/www/wireless-stats/src/Position.java
index cff084e1c5..ecf62c5bd5 100644
--- a/www/wireless-stats/src/Position.java
+++ b/www/wireless-stats/src/Position.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public class Position {
diff --git a/www/wireless-stats/src/Widget.java b/www/wireless-stats/src/Widget.java
index 1b5d67f7e4..beaf658cf6 100644
--- a/www/wireless-stats/src/Widget.java
+++ b/www/wireless-stats/src/Widget.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import java.util.*;
diff --git a/www/wireless-stats/src/WifiLinkViewer.java b/www/wireless-stats/src/WifiLinkViewer.java
index c7544f170d..c5dea39f4b 100644
--- a/www/wireless-stats/src/WifiLinkViewer.java
+++ b/www/wireless-stats/src/WifiLinkViewer.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import javax.swing.*;
diff --git a/www/wireless-stats/src/WirelessData.java b/www/wireless-stats/src/WirelessData.java
index 7c31a18621..83a0774e7c 100644
--- a/www/wireless-stats/src/WirelessData.java
+++ b/www/wireless-stats/src/WirelessData.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
public interface WirelessData {
diff --git a/www/wireless-stats/src/WirelessMapApplet.java b/www/wireless-stats/src/WirelessMapApplet.java
index 04ab68e882..0952c443ab 100644
--- a/www/wireless-stats/src/WirelessMapApplet.java
+++ b/www/wireless-stats/src/WirelessMapApplet.java
@@ -1,7 +1,24 @@
/*
- * EMULAB-COPYRIGHT
* Copyright (c) 2006-2007 University of Utah and the Flux Group.
- * All rights reserved.
+ *
+ * {{{EMULAB-LICENSE
+ *
+ * This file is part of the Emulab network testbed software.
+ *
+ * This file is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * }}}
*/
import javax.swing.*;
diff --git a/www/wireless-stats/statsapp.php3 b/www/wireless-stats/statsapp.php3
index e87c987636..c1ba84f82e 100644
--- a/www/wireless-stats/statsapp.php3
+++ b/www/wireless-stats/statsapp.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
chdir("..");
include("defs.php3");
diff --git a/www/wireless-stats/wifi_test.awk b/www/wireless-stats/wifi_test.awk
index 4fffb64339..b6284602e6 100644
--- a/www/wireless-stats/wifi_test.awk
+++ b/www/wireless-stats/wifi_test.awk
@@ -1,9 +1,26 @@
#/bin/nawk
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# wifi_test.awk
diff --git a/www/xmlrpc.php3.in b/www/xmlrpc.php3.in
index 984fa091b4..8756c28a92 100644
--- a/www/xmlrpc.php3.in
+++ b/www/xmlrpc.php3.in
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# This is an included file. No headers or footers.
#
diff --git a/www/xmlrpcpipe.php3.in b/www/xmlrpcpipe.php3.in
index 7fe9c6b916..331c7664e3 100644
--- a/www/xmlrpcpipe.php3.in
+++ b/www/xmlrpcpipe.php3.in
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
# This is an included file. No headers or footers.
#
diff --git a/xmlrpc/BasicXMLRPCServers.py.in b/xmlrpc/BasicXMLRPCServers.py.in
index 58b88a05d0..bbd0f1e740 100644
--- a/xmlrpc/BasicXMLRPCServers.py.in
+++ b/xmlrpc/BasicXMLRPCServers.py.in
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/xmlrpc/GNUmakefile.in b/xmlrpc/GNUmakefile.in
index 2f886d0d9c..f20d61fed9 100644
--- a/xmlrpc/GNUmakefile.in
+++ b/xmlrpc/GNUmakefile.in
@@ -1,7 +1,24 @@
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2007 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
SRCDIR = @srcdir@
diff --git a/xmlrpc/emulab.in b/xmlrpc/emulab.in
index ff90c9b5a2..c942831d4f 100644
--- a/xmlrpc/emulab.in
+++ b/xmlrpc/emulab.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
DIR=@prefix@/sbin/
diff --git a/xmlrpc/emulabclient.py.in b/xmlrpc/emulabclient.py.in
index ba8099ddf1..44fc036290 100644
--- a/xmlrpc/emulabclient.py.in
+++ b/xmlrpc/emulabclient.py.in
@@ -1,17 +1,25 @@
#! /usr/bin/env python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
-#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import re
import sys
diff --git a/xmlrpc/emulabserver.py.in b/xmlrpc/emulabserver.py.in
index 31faed6249..bbea7cd6e5 100755
--- a/xmlrpc/emulabserver.py.in
+++ b/xmlrpc/emulabserver.py.in
@@ -1,8 +1,25 @@
#! /usr/bin/env python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
import socket
diff --git a/xmlrpc/experiment.in b/xmlrpc/experiment.in
index 3217d7d92d..d191c77c42 100755
--- a/xmlrpc/experiment.in
+++ b/xmlrpc/experiment.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
DIR=@prefix@/sbin/
diff --git a/xmlrpc/fs.in b/xmlrpc/fs.in
index f3cceb5e45..99a75b7c9f 100644
--- a/xmlrpc/fs.in
+++ b/xmlrpc/fs.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
DIR=@prefix@/sbin/
diff --git a/xmlrpc/imageid.in b/xmlrpc/imageid.in
index ac7d8531b9..51c974ffd1 100644
--- a/xmlrpc/imageid.in
+++ b/xmlrpc/imageid.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
DIR=@prefix@/sbin/
diff --git a/xmlrpc/libxmlrpc.pm.in b/xmlrpc/libxmlrpc.pm.in
index b66892faeb..c6c8a2fb1b 100644
--- a/xmlrpc/libxmlrpc.pm.in
+++ b/xmlrpc/libxmlrpc.pm.in
@@ -1,9 +1,26 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
#
diff --git a/xmlrpc/node.in b/xmlrpc/node.in
index 9a99c43aca..ac4e91a7fe 100755
--- a/xmlrpc/node.in
+++ b/xmlrpc/node.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
DIR=@prefix@/sbin/
diff --git a/xmlrpc/osid.in b/xmlrpc/osid.in
index ccd604ace2..ed4e0635bd 100644
--- a/xmlrpc/osid.in
+++ b/xmlrpc/osid.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
DIR=@prefix@/sbin/
diff --git a/xmlrpc/script_wrapper.py.in b/xmlrpc/script_wrapper.py.in
index 2684c896d0..5e9c893a7c 100755
--- a/xmlrpc/script_wrapper.py.in
+++ b/xmlrpc/script_wrapper.py.in
@@ -1,18 +1,26 @@
#! /usr/bin/env python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
+#
#
# Wrapper to convert select commands into XMLRPC calls to boss. The point
diff --git a/xmlrpc/server.in b/xmlrpc/server.in
index e2eda43e04..4182347413 100644
--- a/xmlrpc/server.in
+++ b/xmlrpc/server.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
DIR=@prefix@/sbin/
diff --git a/xmlrpc/sshxmlrpc.py b/xmlrpc/sshxmlrpc.py
index 2668915b61..df64aa5db1 100644
--- a/xmlrpc/sshxmlrpc.py
+++ b/xmlrpc/sshxmlrpc.py
@@ -1,18 +1,26 @@
#! /usr/bin/env python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
-#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
##########################################################################
# Some bits of this file are from xmlrpclib.py, which is:
diff --git a/xmlrpc/sshxmlrpc_client.py.in b/xmlrpc/sshxmlrpc_client.py.in
index c89deac6dc..02557e9e20 100755
--- a/xmlrpc/sshxmlrpc_client.py.in
+++ b/xmlrpc/sshxmlrpc_client.py.in
@@ -1,18 +1,26 @@
#! /usr/bin/env python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
+#
import sys
sys.path.append("@prefix@/lib")
diff --git a/xmlrpc/sshxmlrpc_server.py.in b/xmlrpc/sshxmlrpc_server.py.in
index fc8b829326..29bf151b61 100755
--- a/xmlrpc/sshxmlrpc_server.py.in
+++ b/xmlrpc/sshxmlrpc_server.py.in
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
import getopt
diff --git a/xmlrpc/sslxmlrpc_client.py.in b/xmlrpc/sslxmlrpc_client.py.in
index 1677db0d8b..6dc6ce6950 100755
--- a/xmlrpc/sslxmlrpc_client.py.in
+++ b/xmlrpc/sslxmlrpc_client.py.in
@@ -1,18 +1,26 @@
#! /usr/bin/env python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2012 University of Utah and the Flux Group.
-# All rights reserved.
#
-# Permission to use, copy, modify and distribute this software is hereby
-# granted provided that (1) source code retains these copyright, permission,
-# and disclaimer notices, and (2) redistributions including binaries
-# reproduce the notices in supporting documentation.
-#
-# THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-# CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
-# FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
+#
import sys
import getopt
diff --git a/xmlrpc/sslxmlrpc_server.py.in b/xmlrpc/sslxmlrpc_server.py.in
index b65730b395..c27e9a2a58 100755
--- a/xmlrpc/sslxmlrpc_server.py.in
+++ b/xmlrpc/sslxmlrpc_server.py.in
@@ -1,8 +1,25 @@
#!/usr/local/bin/python
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2005-2010, 2012 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
import sys
import getopt
diff --git a/xmlrpc/user.in b/xmlrpc/user.in
index 6b4a4a8a87..f08aa0ee9a 100644
--- a/xmlrpc/user.in
+++ b/xmlrpc/user.in
@@ -1,8 +1,25 @@
#!/bin/sh
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
DIR=@prefix@/sbin/
diff --git a/xmlrpc/webxmlrpc.in b/xmlrpc/webxmlrpc.in
index 0b18310d63..443c0cbe06 100644
--- a/xmlrpc/webxmlrpc.in
+++ b/xmlrpc/webxmlrpc.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -w
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use English;
diff --git a/xmlrpc/xmlrpcapi.php3 b/xmlrpc/xmlrpcapi.php3
index 67172a0403..7dfee28b53 100644
--- a/xmlrpc/xmlrpcapi.php3
+++ b/xmlrpc/xmlrpcapi.php3
@@ -1,8 +1,25 @@
<?php
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
require("defs.php3");
diff --git a/xmlrpc/xmlrpcbag.in b/xmlrpc/xmlrpcbag.in
index 235d66eed2..4294a18860 100755
--- a/xmlrpc/xmlrpcbag.in
+++ b/xmlrpc/xmlrpcbag.in
@@ -1,8 +1,25 @@
#!/usr/bin/perl -wT
#
-# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
-# All rights reserved.
+#
+# {{{EMULAB-LICENSE
+#
+# This file is part of the Emulab network testbed software.
+#
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this file. If not, see <http://www.gnu.org/licenses/>.
+#
+# }}}
#
use Sys::Syslog;
use BSD::Resource;
--
GitLab