couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fdman...@apache.org
Subject svn commit: r1089181 - in /couchdb/trunk: LICENSE NOTICE src/ejson/decode.c src/ejson/ejson.erl src/ejson/encode.c src/ejson/erl_nif_compat.h
Date Tue, 05 Apr 2011 19:46:56 GMT
Author: fdmanana
Date: Tue Apr  5 19:46:56 2011
New Revision: 1089181

URL: http://svn.apache.org/viewvc?rev=1089181&view=rev
Log:
Added missing headers for some ejson source files

Thanks to Paul Davis for noticing this.

Modified:
    couchdb/trunk/LICENSE
    couchdb/trunk/NOTICE
    couchdb/trunk/src/ejson/decode.c
    couchdb/trunk/src/ejson/ejson.erl
    couchdb/trunk/src/ejson/encode.c
    couchdb/trunk/src/ejson/erl_nif_compat.h

Modified: couchdb/trunk/LICENSE
URL: http://svn.apache.org/viewvc/couchdb/trunk/LICENSE?rev=1089181&r1=1089180&r2=1089181&view=diff
==============================================================================
--- couchdb/trunk/LICENSE (original)
+++ couchdb/trunk/LICENSE Tue Apr  5 19:46:56 2011
@@ -401,3 +401,21 @@ STRICT LIABILITY, OR TORT (INCLUDING NEG
 IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
  
+For the src/ejson/erl_nif_compat.h file
+
+  Copyright (c) 2010-2011 Basho Technologies, Inc.
+  With some minor modifications for Apache CouchDB.
+
+  This file is provided to you 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.

Modified: couchdb/trunk/NOTICE
URL: http://svn.apache.org/viewvc/couchdb/trunk/NOTICE?rev=1089181&r1=1089180&r2=1089181&view=diff
==============================================================================
--- couchdb/trunk/NOTICE (original)
+++ couchdb/trunk/NOTICE Tue Apr  5 19:46:56 2011
@@ -53,9 +53,3 @@ This product also includes the following
  * yajl (http://lloyd.github.com/yajl/)
 
   Copyright 2010, Lloyd Hilaiel
-
- * ejson
-
-  Based on Paul Davis' eep0018 implementation (https://github.com/davisp/eep0018/),
-  with some modifications from Damien Katz, Filipe Manana and Benoît Chesneau.
-  This application uses yajl.
\ No newline at end of file

Modified: couchdb/trunk/src/ejson/decode.c
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/ejson/decode.c?rev=1089181&r1=1089180&r2=1089181&view=diff
==============================================================================
--- couchdb/trunk/src/ejson/decode.c (original)
+++ couchdb/trunk/src/ejson/decode.c Tue Apr  5 19:46:56 2011
@@ -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.
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

Modified: couchdb/trunk/src/ejson/ejson.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/ejson/ejson.erl?rev=1089181&r1=1089180&r2=1089181&view=diff
==============================================================================
--- couchdb/trunk/src/ejson/ejson.erl (original)
+++ couchdb/trunk/src/ejson/ejson.erl Tue Apr  5 19:46:56 2011
@@ -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(ejson).
 -export([encode/1, decode/1]).
 -on_load(init/0).

Modified: couchdb/trunk/src/ejson/encode.c
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/ejson/encode.c?rev=1089181&r1=1089180&r2=1089181&view=diff
==============================================================================
--- couchdb/trunk/src/ejson/encode.c (original)
+++ couchdb/trunk/src/ejson/encode.c Tue Apr  5 19:46:56 2011
@@ -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.
+
 #include <stdio.h>
 #include <string.h>
 #include <math.h>

Modified: couchdb/trunk/src/ejson/erl_nif_compat.h
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/ejson/erl_nif_compat.h?rev=1089181&r1=1089180&r2=1089181&view=diff
==============================================================================
--- couchdb/trunk/src/ejson/erl_nif_compat.h (original)
+++ couchdb/trunk/src/ejson/erl_nif_compat.h Tue Apr  5 19:46:56 2011
@@ -1,3 +1,21 @@
+/* Copyright (c) 2010-2011 Basho Technologies, Inc.
+ * With some minor modifications for Apache CouchDB.
+ *
+ * This file is provided to you 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.
+*/
+
 #ifndef ERL_NIF_COMPAT_H_
 #define ERL_NIF_COMPAT_H_
 



Mime
View raw message