added proper LICENSE and AUTHORS files

lmn · Oct 1, 2012 · 4f8922a · 4f8922a
1 parent 4d80432
commit 4f8922a
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 13 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1,4 @@
+# This source file refers to The gocql Authors for copyright purposes.
+
+Christoph Hack <christoph@tux21b.org>
+Jonathan Rudenberg <jonathan@titanous.com>
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2012 The gocql Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
@@ -44,5 +44,6 @@ Features
 License
 -------
 
-> Copyright (c) 2012 by Christoph Hack <christoph@tux21b.org>  
-> All rights reserved. Distributed under the Simplified BSD License.
+> Copyright (c) 2012 The gocql Authors. All rights reserved.
+> Use of this source code is governed by a BSD-style
+> license that can be found in the LICENSE file.
diff --git a/convert.go b/convert.go
@@ -1,5 +1,6 @@
-// Copyright (c) 2012 by Christoph Hack <christoph@tux21b.org>
-// All rights reserved. Distributed under the Simplified BSD License.
+// Copyright (c) 2012 The gocql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
 
 package gocql
 
@@ -45,7 +46,7 @@ func decode(b []byte, t uint16) driver.Value {
 	case typeBlob:
 		return b
 	case typeVarchar, typeText, typeAscii:
-		return string(b)
+		return b
 	case typeInt:
 		return int64(int32(binary.BigEndian.Uint32(b)))
 	case typeBigInt:

diff --git a/gocql.go b/gocql.go
@@ -1,5 +1,6 @@
-// Copyright (c) 2012 by Christoph Hack <christoph@tux21b.org>
-// All rights reserved. Distributed under the Simplified BSD License.
+// Copyright (c) 2012 The gocql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
 
 // The gocql package provides a database/sql driver for CQL, the Cassandra
 // query language.

diff --git a/gocql_test.go b/gocql_test.go
@@ -1,5 +1,6 @@
-// Copyright (c) 2012 by Christoph Hack <christoph@tux21b.org>
-// All rights reserved. Distributed under the Simplified BSD License.
+// Copyright (c) 2012 The gocql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
 
 package gocql
 

diff --git a/uuid/uuid.go b/uuid/uuid.go
@@ -1,5 +1,6 @@
-// Copyright (c) 2012 by Christoph Hack <christoph@tux21b.org>
-// All rights reserved. Distributed under the Simplified BSD License.
+// Copyright (c) 2012 The gocql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
 
 // The uuid package can be used to generate and parse universally unique
 // identifiers, a standardized format in the form of a 128 bit number.

diff --git a/uuid/uuid_test.go b/uuid/uuid_test.go
@@ -1,5 +1,6 @@
-// Copyright (c) 2012 by Christoph Hack <christoph@tux21b.org>
-// All rights reserved. Distributed under the Simplified BSD License.
+// Copyright (c) 2012 The gocql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
 
 package uuid