added licence check, and licence.skip

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@794030 13f79535-47bb-0310-9956-ffa450edef68

33 files changed, 398 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index 2ba55310..5a81a6c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,6 +69,11 @@ local-clean: maintainer-clean
 	rm -fr $(top_srcdir)/tmp
 	find $(top_srcdir) -name Makefile.in -exec rm {} \;
 
+distcheck-hook:
+	grep -rL 'http://www.apache.org/licenses/LICENSE-2.0' * \
+            | grep -vf licence.skip; \
+        test "$$?" -eq 1
+
 .PHONY: distsign
 distsign: distcheck
 	gpg --armor --detach-sig \
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index ed1c2f6e..56d4e595 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
@@ -1,14 +1,14 @@
 #! /bin/sh -e
 
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License.  You may obtain a copy of
+# use this file except in compliance with the License. You may obtain a copy of
 # the License at
 #
 #   http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under
 # the License.
 
diff --git a/licence.skip b/licence.skip
new file mode 100644
index 00000000..c1328374
--- /dev/null
+++ b/licence.skip
@@ -0,0 +1,50 @@
+aclocal.m4
+AUTHORS
+autom4te.cache/*
+bin/couchdb.1
+bin/couchjs.1
+BUGS
+build-aux/*
+CHANGES
+check.except
+config.*
+configure
+etc/couchdb/default*
+etc/couchdb/local*
+etc/default/couchdb
+etc/launchd/org.apache.couchdb.plist.*
+etc/logrotate.d/couchdb*
+libtool
+m4/ac_check_curl.m4*
+m4/ac_check_icu.m4*
+Makefile
+Makefile.in
+NEWS
+NOTICE
+README
+share/Makefile
+share/Makefile.in
+share/www/favicon.ico
+share/www/image/*
+share/www/script/jquery.*
+share/www/script/json2.js
+share/www/script/test/lorem.txt
+src/couchdb/*.beam
+src/couchdb/couch.app.tpl.in
+src/couchdb/.deps/*
+src/couchdb/.libs/*
+src/couchdb/Makefile
+src/couchdb/Makefile.in
+src/couchdb/*.o
+src/ibrowse/*
+src/mochiweb/*
+stamp-h1
+test/etap/081-config-override.1.ini
+test/etap/081-config-override.2.ini
+test/Makefile
+test/Makefile.in
+THANKS
+utils/Makefile
+utils/Makefile.in
+var/Makefile
+var/Makefile.in
diff --git a/share/www/_sidebar.html b/share/www/_sidebar.html
index 670a8e54..97843f88 100644
--- a/share/www/_sidebar.html
+++ b/share/www/_sidebar.html
@@ -1,3 +1,17 @@
+<!--
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+
+-->
 <div id="sidebar">
   <a href="index.html">
     <img id="logo" src="image/logo.png" width="175" height="150" alt="Apache CouchDB: Relax">
diff --git a/share/www/index.html b/share/www/index.html
index ae10dac6..a4d61dad 100644
--- a/share/www/index.html
+++ b/share/www/index.html
@@ -2,14 +2,14 @@
 <!--
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License.  You may obtain a copy of the
+this file except in compliance with the License. You may obtain a copy of the
 License at
 
    http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software distributed
 under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 
 -->
diff --git a/src/couchdb/couch_db.erl b/src/couchdb/couch_db.erl
index 522df808..9cb887ea 100644
--- a/src/couchdb/couch_db.erl
+++ b/src/couchdb/couch_db.erl
@@ -1,12 +1,12 @@
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
-% use this file except in compliance with the License.  You may obtain a copy of
+% use this file except in compliance with the License. You may obtain a copy of
 % the License at
 %
 %   http://www.apache.org/licenses/LICENSE-2.0
 %
 % Unless required by applicable law or agreed to in writing, software
 % distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 % License for the specific language governing permissions and limitations under
 % the License.
 
diff --git a/test/couch_config_test.erl b/test/couch_config_test.erl
index a02affc1..096ce53d 100644
--- a/test/couch_config_test.erl
+++ b/test/couch_config_test.erl
@@ -1,4 +1,16 @@
-% couch_config module test suote
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+% couch_config module test suite
 
 % Set up test suite
 % ?MODULE_test() returns a list of functions
@@ -8,7 +20,6 @@ couch_config_test() ->
         fun() -> store_strings() end
     ].
 
-
 % test functions
 
 store_strings() ->
@@ -30,4 +41,4 @@ store_strings() ->
     % clean up
     file:delete(Filename),
 
-    Value = Result.
\ No newline at end of file
+    Value = Result.
diff --git a/test/couch_config_writer_test.erl b/test/couch_config_writer_test.erl
index 6fa87078..ba17a946 100644
--- a/test/couch_config_writer_test.erl
+++ b/test/couch_config_writer_test.erl
@@ -1,3 +1,15 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 % couch_config_writer module test suote
 
 % Set up test suite
diff --git a/test/etap/001-load.t b/test/etap/001-load.t
index ef941867..983c2ae8 100755
--- a/test/etap/001-load.t
+++ b/test/etap/001-load.t
@@ -2,6 +2,18 @@
 %% -*- erlang -*-
 %%! -pa src/couchdb -sasl errlog_type error -boot start_sasl -noshell
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 % Test that we can load each module.
 
 main(_) ->
diff --git a/test/etap/010-file-basics.t b/test/etap/010-file-basics.t
index 055c9780..e74b55dc 100755
--- a/test/etap/010-file-basics.t
+++ b/test/etap/010-file-basics.t
@@ -2,6 +2,18 @@
 %% -*- erlang -*-
 %%! -pa ./src/couchdb -sasl errlog_type error -boot start_sasl -noshell
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 filename() -> "./test/etap/temp.010".
 
 main(_) ->
diff --git a/test/etap/011-file-headers.t b/test/etap/011-file-headers.t
index 4ad3d21f..7316cee2 100755
--- a/test/etap/011-file-headers.t
+++ b/test/etap/011-file-headers.t
@@ -2,6 +2,18 @@
 %% -*- erlang -*-
 %%! -pa ./src/couchdb -sasl errlog_type error -boot start_sasl -noshell
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 filename() -> "./test/etap/temp.011".
 sizeblock() -> 4096. % Need to keep this in sync with couch_file.erl
 
diff --git a/test/etap/020-btree-basics.t b/test/etap/020-btree-basics.t
index 1b985a4a..9187b606 100755
--- a/test/etap/020-btree-basics.t
+++ b/test/etap/020-btree-basics.t
@@ -2,6 +2,18 @@
 %% -*- erlang -*-
 %%! -pa ./src/couchdb -sasl errlog_type error -boot start_sasl -noshell
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 filename() -> "./test/etap/temp.020".
 rows() -> 250.
 
diff --git a/test/etap/021-btree-reductions.t b/test/etap/021-btree-reductions.t
index d2de4c92..e4bc7a88 100755
--- a/test/etap/021-btree-reductions.t
+++ b/test/etap/021-btree-reductions.t
@@ -2,6 +2,18 @@
 %% -*- erlang -*-
 %%! -pa ./src/couchdb -sasl errlog_type error -boot start_sasl -noshell
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 filename() -> "./test/etap/temp.021".
 rows() -> 1000.
 
diff --git a/test/etap/030-doc-from-json.t b/test/etap/030-doc-from-json.t
index 431aa7ed..2bfdfdc5 100755
--- a/test/etap/030-doc-from-json.t
+++ b/test/etap/030-doc-from-json.t
@@ -2,6 +2,17 @@
 %% -*- erlang -*-
 %%! -pa ./src/couchdb -pa ./src/mochiweb -sasl errlog_type false -noshell
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
 
 %% XXX: Figure out how to -include("couch_db.hrl")
 -record(doc, {id= <<"">>, revs={0, []}, body={[]},
diff --git a/test/etap/031-doc-to-json.t b/test/etap/031-doc-to-json.t
index 9bb5747e..1bf49d6b 100755
--- a/test/etap/031-doc-to-json.t
+++ b/test/etap/031-doc-to-json.t
@@ -2,6 +2,17 @@
 %% -*- erlang -*-
 %%! -pa ./src/couchdb -pa ./src/mochiweb -sasl errlog_type false -noshell
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
 
 %% XXX: Figure out how to -include("couch_db.hrl")
 -record(doc, {id= <<"">>, revs={0, []}, body={[]},
diff --git a/test/etap/040-util.t b/test/etap/040-util.t
index 94db4534..c23dc97f 100755
--- a/test/etap/040-util.t
+++ b/test/etap/040-util.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 main(_) ->
     code:add_pathz("src/couchdb"),
     application:start(crypto),
@@ -26,13 +38,13 @@ test() ->
     % terminate_linked
     Self = self(),
     spawn(fun() ->
-		  ChildPid = spawn_link(fun() -> receive shutdown -> ok end end),
-		  couch_util:terminate_linked(normal),
-		  Self ! {pid, ChildPid}
-	  end),
+                  ChildPid = spawn_link(fun() -> receive shutdown -> ok end end),
+                  couch_util:terminate_linked(normal),
+                  Self ! {pid, ChildPid}
+          end),
     receive
         {pid, Pid} ->
-	    etap:ok(not is_process_alive(Pid), "why wont this work?")
+            etap:ok(not is_process_alive(Pid), "why wont this work?")
     end,
 
     % new_uuid
diff --git a/test/etap/050-stream.t b/test/etap/050-stream.t
index bb28a96b..aa4c839a 100755
--- a/test/etap/050-stream.t
+++ b/test/etap/050-stream.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 main(_) ->
     code:add_pathz("src/couchdb"),
     etap:plan(13),
diff --git a/test/etap/060-kt-merging.t b/test/etap/060-kt-merging.t
index f5d9fbe7..0ad73245 100755
--- a/test/etap/060-kt-merging.t
+++ b/test/etap/060-kt-merging.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 main(_) ->
     code:add_pathz("src/couchdb"),
     etap:plan(16),
diff --git a/test/etap/061-kt-missing-leaves.t b/test/etap/061-kt-missing-leaves.t
index 85fac0b6..051eb45d 100755
--- a/test/etap/061-kt-missing-leaves.t
+++ b/test/etap/061-kt-missing-leaves.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 main(_) ->
     code:add_pathz("src/couchdb"),
     etap:plan(4),
diff --git a/test/etap/062-kt-remove-leaves.t b/test/etap/062-kt-remove-leaves.t
index e560c6a9..dc163ffe 100755
--- a/test/etap/062-kt-remove-leaves.t
+++ b/test/etap/062-kt-remove-leaves.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 main(_) ->
     code:add_pathz("src/couchdb"),
     etap:plan(6),
diff --git a/test/etap/063-kt-get-leaves.t b/test/etap/063-kt-get-leaves.t
index 342657bf..f86ddde6 100755
--- a/test/etap/063-kt-get-leaves.t
+++ b/test/etap/063-kt-get-leaves.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 main(_) ->
     code:add_pathz("src/couchdb"),
     etap:plan(11),
diff --git a/test/etap/064-kt-counting.t b/test/etap/064-kt-counting.t
index aa42fec6..b44ec9cc 100755
--- a/test/etap/064-kt-counting.t
+++ b/test/etap/064-kt-counting.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 main(_) ->
     code:add_pathz("src/couchdb"),
     etap:plan(4),
diff --git a/test/etap/065-kt-stemming.t b/test/etap/065-kt-stemming.t
index 0de69482..c7883c16 100755
--- a/test/etap/065-kt-stemming.t
+++ b/test/etap/065-kt-stemming.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 main(_) ->
     code:add_pathz("src/couchdb"),
     etap:plan(3),
diff --git a/test/etap/070-couch-db.t b/test/etap/070-couch-db.t
index d0ae0a52..2bc365d9 100755
--- a/test/etap/070-couch-db.t
+++ b/test/etap/070-couch-db.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 main(_) ->
     code:add_pathz("src/couchdb"),
     code:add_pathz("src/mochiweb"),
diff --git a/test/etap/080-config-get-set.t b/test/etap/080-config-get-set.t
index 7abd8a0a..9507cf05 100755
--- a/test/etap/080-config-get-set.t
+++ b/test/etap/080-config-get-set.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 default_config() ->
     "etc/couchdb/default_dev.ini".
 
diff --git a/test/etap/081-config-override.2.ini b/test/etap/081-config-override.2.ini
index bb67b629..243a67f1 100644
--- a/test/etap/081-config-override.2.ini
+++ b/test/etap/081-config-override.2.ini
@@ -2,4 +2,4 @@
 port = 80
 
 [fizbang]
-unicode = normalized
\ No newline at end of file
+unicode = normalized
diff --git a/test/etap/081-config-override.t b/test/etap/081-config-override.t
index abb88854..7813702c 100755
--- a/test/etap/081-config-override.t
+++ b/test/etap/081-config-override.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 default_config() ->
     "etc/couchdb/default_dev.ini".
 
diff --git a/test/etap/082-config-register.t b/test/etap/082-config-register.t
index 09972c9e..a35d96aa 100755
--- a/test/etap/082-config-register.t
+++ b/test/etap/082-config-register.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 default_config() ->
     "etc/couchdb/default_dev.ini".
 
diff --git a/test/etap/083-config-no-files.t b/test/etap/083-config-no-files.t
index 61ad9517..3efe41ed 100755
--- a/test/etap/083-config-no-files.t
+++ b/test/etap/083-config-no-files.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 default_config() ->
     "etc/couchdb/default_dev.ini".
 
diff --git a/test/etap/090-task-status.t b/test/etap/090-task-status.t
index bc4c20ca..e681e056 100755
--- a/test/etap/090-task-status.t
+++ b/test/etap/090-task-status.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 main(_) ->
     code:add_pathz("src/couchdb"),
     etap:plan(16),
diff --git a/test/etap/100-ref-counter.t b/test/etap/100-ref-counter.t
index 144a95b8..a186076a 100755
--- a/test/etap/100-ref-counter.t
+++ b/test/etap/100-ref-counter.t
@@ -1,6 +1,18 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 main(_) ->
     code:add_pathz("src/couchdb"),
     etap:plan(8),
diff --git a/test/runner.erl b/test/runner.erl
index 5cf559f3..f2522d2d 100644
--- a/test/runner.erl
+++ b/test/runner.erl
@@ -1,3 +1,15 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
 -module(runner).
 
 -export([run/0]).
diff --git a/test/runner.sh b/test/runner.sh
index 6715f5f9..7890a259 100755
--- a/test/runner.sh
+++ b/test/runner.sh
@@ -1,7 +1,23 @@
 #!/bin/sh -e
 
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
 erlc runner.erl
 
 erl -noshell -pa ../src/couchdb -pa ../src/mochiweb -eval "runner:run()"
 
-cat ../share/www/script/couch.js ../share/www/script/couch_test_runner.js ../share/www/script/couch_tests.js ../share/www/script/test/* test.js  | ../src/couchdb/couchjs -
+cat ../share/www/script/couch.js \
+    ../share/www/script/couch_test_runner.js \
+    ../share/www/script/couch_tests.js \
+    ../share/www/script/test/* test.js \
+    | ../src/couchdb/couchjs -