summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Branca <chewbranca@gmail.com>2013-03-19 16:10:17 -0700
committerRussell Branca <chewbranca@gmail.com>2013-03-19 16:10:17 -0700
commit28c8973bf19cd141ab19803f79e8df4821a0aaf7 (patch)
tree5707d66cde36651988ae8e1af54e0055072c2799
parentf0b351022d60ae2d5753fa6c38ffb604c2701c46 (diff)
downloadcouchdb-28c8973bf19cd141ab19803f79e8df4821a0aaf7.tar.gz
Fauxton license updates for make distcheckarchive/fauxtonfauxton
-rw-r--r--.gitignore16
-rw-r--r--license.skip13
-rw-r--r--src/fauxton/.gitignore11
-rw-r--r--src/fauxton/Gruntfile.js14
-rw-r--r--src/fauxton/app/addons/contribute/base.js12
-rw-r--r--src/fauxton/app/addons/stats/assets/less/stats.less13
-rw-r--r--src/fauxton/app/load_addons.js.underscore13
-rw-r--r--src/fauxton/index.html15
-rw-r--r--src/fauxton/tasks/couchserver.js12
-rw-r--r--src/fauxton/tasks/helper.js12
10 files changed, 119 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index e60aeddca..29019420e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,3 +118,19 @@ couchdb.stdout
cover/*
INSTALL
+
+# for fauxton
+
+src/fauxton/node_modules
+src/fauxton/dist
+src/fauxton/build
+src/fauxton/app/load_addons.js
+!src/fauxton/app/addons/
+src/fauxton/app/addons/*
+!src/fauxton/app/addons/config
+!src/fauxton/app/addons/logs
+!src/fauxton/app/addons/stats
+!src/fauxton/app/addons/contribute
+src/fauxton/settings.json*
+!src/fauxton/settings.json.default
+share/www/fauxton
diff --git a/license.skip b/license.skip
index 8ee890f5a..35b1dab67 100644
--- a/license.skip
+++ b/license.skip
@@ -96,6 +96,19 @@
^src/erlang-oauth/*
^src/ejson/*
^src/etap/*
+^src/fauxton/app/app.js
+^src/fauxton/app/config.js
+^src/fauxton/app/main.js
+^src/fauxton/app/modules/pouchdb/*
+^src/fauxton/assets/*
+^src/fauxton/couchapp.js
+^src/fauxton/favicon.ico
+^src/fauxton/package.json
+^src/fauxton/readme.md
+^src/fauxton/writing_addons.md
+^src/fauxton/TODO.md
+^src/fauxton/settings.json.*
+^src/fauxton/test/*
^src/ibrowse/*
^src/mochiweb/*
^src/snappy/*
diff --git a/src/fauxton/.gitignore b/src/fauxton/.gitignore
deleted file mode 100644
index 56d0703ae..000000000
--- a/src/fauxton/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-node_modules
-dist
-build
-app/load_addons.js
-!app/addons/
-app/addons/*
-!app/addons/config
-!app/addons/logs
-!app/addons/contribute
-settings.json*
-!settings.json.default \ No newline at end of file
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js
index 9de08d596..814279ae5 100644
--- a/src/fauxton/Gruntfile.js
+++ b/src/fauxton/Gruntfile.js
@@ -1,8 +1,20 @@
+// 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.
+
+
// This is the main application configuration file. It is a Grunt
// configuration file, which you can learn more about here:
// https://github.com/cowboy/grunt/blob/master/docs/configuring.md
-
module.exports = function(grunt) {
var helper = require('./tasks/helper').init(grunt),
path = require('path');
diff --git a/src/fauxton/app/addons/contribute/base.js b/src/fauxton/app/addons/contribute/base.js
index 1bc9fd3b0..8f622feda 100644
--- a/src/fauxton/app/addons/contribute/base.js
+++ b/src/fauxton/app/addons/contribute/base.js
@@ -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.
+
define([
// Libraries.
"jquery",
diff --git a/src/fauxton/app/addons/stats/assets/less/stats.less b/src/fauxton/app/addons/stats/assets/less/stats.less
index e7992cb4e..8c81f86f2 100644
--- a/src/fauxton/app/addons/stats/assets/less/stats.less
+++ b/src/fauxton/app/addons/stats/assets/less/stats.less
@@ -1,3 +1,16 @@
+/* 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.
+ */
+
.datatypes {
border: #d3d3d3 1px solid;
-webkit-border-radius: 5px;
diff --git a/src/fauxton/app/load_addons.js.underscore b/src/fauxton/app/load_addons.js.underscore
index 9cb7df5bb..9686ad76b 100644
--- a/src/fauxton/app/load_addons.js.underscore
+++ b/src/fauxton/app/load_addons.js.underscore
@@ -1,3 +1,16 @@
+// 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.
+
+
/*
* ::WARNING::
* THIS IS A GENERATED FILE. DO NOT EDIT.
diff --git a/src/fauxton/index.html b/src/fauxton/index.html
index 4a924e865..892f49919 100644
--- a/src/fauxton/index.html
+++ b/src/fauxton/index.html
@@ -1,4 +1,19 @@
<!doctype html>
+
+<!--
+// 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.
+-->
+
<html lang="en">
<head>
<meta charset="utf-8">
diff --git a/src/fauxton/tasks/couchserver.js b/src/fauxton/tasks/couchserver.js
index 2d36afa73..a3f620ffc 100644
--- a/src/fauxton/tasks/couchserver.js
+++ b/src/fauxton/tasks/couchserver.js
@@ -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.exports = function (grunt) {
var log = grunt.log;
diff --git a/src/fauxton/tasks/helper.js b/src/fauxton/tasks/helper.js
index 869782aa0..5178ee2e4 100644
--- a/src/fauxton/tasks/helper.js
+++ b/src/fauxton/tasks/helper.js
@@ -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.
+
var fs = require('fs');
exports.init = function(grunt) {