Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixing licenses for Spark code.

  • Loading branch information...
commit 0753548d6d38c121931c17e50fa1db976c2ce812 1 parent 2c7cbdc
@vjovanov vjovanov authored
View
4 backend-api/src/main/scala/scala/collection/distributed/api/io/JavaSerializer.scala
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * Taken from Spark project (www.spark-project.org) for quick benchmarking. Thanks Matei.
+ * This is the outdated snapshot of the source taken from the Spark project (www.spark-project.org). It is used only for benchmarking purposes.
*/
package scala.collection.distributed.api.io
@@ -77,4 +77,4 @@ class JavaSerializerInstance extends SerializerInstance {
class JavaSerializer extends Serializer {
def newInstance(): SerializerInstance = new JavaSerializerInstance
-}
+}
View
4 backend-api/src/main/scala/scala/collection/distributed/api/io/Serializer.scala
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * Taken from Spark project (www.spark-project.org) for quick benchmarking. Thanks Matei.
+ * This is the outdated snapshot of the source taken from the Spark project (www.spark-project.org). It is used only for benchmarking purposes.
*/
package scala.collection.distributed.api.io
@@ -74,4 +74,4 @@ trait DeserializationStream {
def readObject[T](): T
def close(): Unit
-}
+}
View
36 hadoop-backend/src/main/scala/io/KryoSerializer.scala
@@ -1,12 +1,36 @@
/**
- * Taken from Spark project (www.spark-project.org) for quick benchmarking. Thanks Matei.
+ * Copyright (c) 2010, Regents of the University of California.
+ * 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 the University of California, Berkeley 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
+ * HOLDER 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.
+ *
+ * This is the outdated snapshot of the source taken from the Spark project (www.spark-project.org). It is used only for benchmarking purposes.
*/
package io
-/**
- * @author Vojin Jovanovic
- */
-
import java.io._
import java.nio.ByteBuffer
import java.nio.channels.Channels
@@ -200,4 +224,4 @@ class KryoSerializer extends Serializer {
}
def newInstance(): SerializerInstance = new KryoSerializerInstance(this)
-}
+}
View
27 hadoop-backend/src/main/scala/io/LICENSE
@@ -1,27 +0,0 @@
-Copyright (c) 2010, Regents of the University of California.
-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 the University of California, Berkeley 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
-HOLDER 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.
Please sign in to comment.
Something went wrong with that request. Please try again.