From f0d86932947ccbba85e6fb3a8a56dd2d580688f8 Mon Sep 17 00:00:00 2001 From: Fabian Hueske Date: Wed, 20 Apr 2011 16:17:45 +0200 Subject: [PATCH] - added reference to Apache Hadoop licence to code that originated from Hadoop --- .../apache/hadoop/hdfs/MiniDFSCluster.java | 30 +++++++++++-------- .../server/datanode/SimulatedFSDataset.java | 19 +++--------- .../org/apache/hadoop/net/StaticMapping.java | 19 +++--------- 3 files changed, 25 insertions(+), 43 deletions(-) diff --git a/pact/pact-tests/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java b/pact/pact-tests/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java index 386770958fb..be457259d61 100644 --- a/pact/pact-tests/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java +++ b/pact/pact-tests/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java @@ -1,20 +1,24 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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 +/*********************************************************************************************************************** + * + * Copyright (C) 2010 by the Stratosphere project (http://stratosphere.eu) + * + * 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. + * 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 file is based on source code from the Hadoop Project (http://hadoop.apache.org/), licensed by the Apache + * Software Foundation (ASF) under the Apache License, Version 2.0. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. */ + package org.apache.hadoop.hdfs; import java.io.File; diff --git a/pact/pact-tests/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java b/pact/pact-tests/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java index a813afdf3ee..c93e3f08209 100644 --- a/pact/pact-tests/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java +++ b/pact/pact-tests/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java @@ -14,22 +14,11 @@ **********************************************************************************************************************/ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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. + * This file is based on source code from the Hadoop Project (http://hadoop.apache.org/), licensed by the Apache + * Software Foundation (ASF) under the Apache License, Version 2.0. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. */ + package org.apache.hadoop.hdfs.server.datanode; import java.io.IOException; diff --git a/pact/pact-tests/src/test/java/org/apache/hadoop/net/StaticMapping.java b/pact/pact-tests/src/test/java/org/apache/hadoop/net/StaticMapping.java index 72c2e685950..d9cf9aefb6c 100644 --- a/pact/pact-tests/src/test/java/org/apache/hadoop/net/StaticMapping.java +++ b/pact/pact-tests/src/test/java/org/apache/hadoop/net/StaticMapping.java @@ -14,22 +14,11 @@ **********************************************************************************************************************/ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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. + * This file is based on source code from the Hadoop Project (http://hadoop.apache.org/), licensed by the Apache + * Software Foundation (ASF) under the Apache License, Version 2.0. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. */ + package org.apache.hadoop.net; import java.util.*; -- GitLab