You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@crail.apache.org by ps...@apache.org on 2018/01/22 14:21:08 UTC

[24/29] incubator-crail git commit: Adjusting license and configuration (Apache)

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/core/CoreStream.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/core/CoreStream.java b/client/src/main/java/org/apache/crail/core/CoreStream.java
index 9b502e1..2f437de 100644
--- a/client/src/main/java/org/apache/crail/core/CoreStream.java
+++ b/client/src/main/java/org/apache/crail/core/CoreStream.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.core;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/core/CoreStreamStatistics.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/core/CoreStreamStatistics.java b/client/src/main/java/org/apache/crail/core/CoreStreamStatistics.java
index 3955e29..55f970c 100644
--- a/client/src/main/java/org/apache/crail/core/CoreStreamStatistics.java
+++ b/client/src/main/java/org/apache/crail/core/CoreStreamStatistics.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.core;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/core/CoreSubOperation.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/core/CoreSubOperation.java b/client/src/main/java/org/apache/crail/core/CoreSubOperation.java
index 97f95bc..bbfc0a2 100644
--- a/client/src/main/java/org/apache/crail/core/CoreSubOperation.java
+++ b/client/src/main/java/org/apache/crail/core/CoreSubOperation.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.core;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/core/CoreSyncOperation.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/core/CoreSyncOperation.java b/client/src/main/java/org/apache/crail/core/CoreSyncOperation.java
index e31e47c..c2544ef 100644
--- a/client/src/main/java/org/apache/crail/core/CoreSyncOperation.java
+++ b/client/src/main/java/org/apache/crail/core/CoreSyncOperation.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.core;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/core/DirectoryInputStream.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/core/DirectoryInputStream.java b/client/src/main/java/org/apache/crail/core/DirectoryInputStream.java
index 2317d0d..6e3a0ce 100644
--- a/client/src/main/java/org/apache/crail/core/DirectoryInputStream.java
+++ b/client/src/main/java/org/apache/crail/core/DirectoryInputStream.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.core;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/core/DirectoryOutputStream.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/core/DirectoryOutputStream.java b/client/src/main/java/org/apache/crail/core/DirectoryOutputStream.java
index a25930d..4dd1b64 100644
--- a/client/src/main/java/org/apache/crail/core/DirectoryOutputStream.java
+++ b/client/src/main/java/org/apache/crail/core/DirectoryOutputStream.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.core;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/core/DirectoryRecord.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/core/DirectoryRecord.java b/client/src/main/java/org/apache/crail/core/DirectoryRecord.java
index 0963186..e9a8ac4 100644
--- a/client/src/main/java/org/apache/crail/core/DirectoryRecord.java
+++ b/client/src/main/java/org/apache/crail/core/DirectoryRecord.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.core;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/memory/BufferCache.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/memory/BufferCache.java b/client/src/main/java/org/apache/crail/memory/BufferCache.java
index 9ae0a7f..59f3dc9 100644
--- a/client/src/main/java/org/apache/crail/memory/BufferCache.java
+++ b/client/src/main/java/org/apache/crail/memory/BufferCache.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.memory;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/memory/MappedBufferCache.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/memory/MappedBufferCache.java b/client/src/main/java/org/apache/crail/memory/MappedBufferCache.java
index ca184e2..f2816cb 100644
--- a/client/src/main/java/org/apache/crail/memory/MappedBufferCache.java
+++ b/client/src/main/java/org/apache/crail/memory/MappedBufferCache.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.memory;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/memory/OffHeapBuffer.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/memory/OffHeapBuffer.java b/client/src/main/java/org/apache/crail/memory/OffHeapBuffer.java
index 6932800..e617393 100644
--- a/client/src/main/java/org/apache/crail/memory/OffHeapBuffer.java
+++ b/client/src/main/java/org/apache/crail/memory/OffHeapBuffer.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.memory;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/metadata/BlockInfo.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/metadata/BlockInfo.java b/client/src/main/java/org/apache/crail/metadata/BlockInfo.java
index 3a35212..a4876d8 100644
--- a/client/src/main/java/org/apache/crail/metadata/BlockInfo.java
+++ b/client/src/main/java/org/apache/crail/metadata/BlockInfo.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.metadata;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/metadata/DataNodeInfo.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/metadata/DataNodeInfo.java b/client/src/main/java/org/apache/crail/metadata/DataNodeInfo.java
index 01a22ef..0574ec7 100644
--- a/client/src/main/java/org/apache/crail/metadata/DataNodeInfo.java
+++ b/client/src/main/java/org/apache/crail/metadata/DataNodeInfo.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.metadata;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/metadata/DataNodeStatistics.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/metadata/DataNodeStatistics.java b/client/src/main/java/org/apache/crail/metadata/DataNodeStatistics.java
index 93936e6..39a32c0 100644
--- a/client/src/main/java/org/apache/crail/metadata/DataNodeStatistics.java
+++ b/client/src/main/java/org/apache/crail/metadata/DataNodeStatistics.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.metadata;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/metadata/FileInfo.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/metadata/FileInfo.java b/client/src/main/java/org/apache/crail/metadata/FileInfo.java
index d8c3e84..ca54811 100644
--- a/client/src/main/java/org/apache/crail/metadata/FileInfo.java
+++ b/client/src/main/java/org/apache/crail/metadata/FileInfo.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.metadata;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/metadata/FileName.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/metadata/FileName.java b/client/src/main/java/org/apache/crail/metadata/FileName.java
index 8aec49b..4986be7 100644
--- a/client/src/main/java/org/apache/crail/metadata/FileName.java
+++ b/client/src/main/java/org/apache/crail/metadata/FileName.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.metadata;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcClient.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcClient.java b/client/src/main/java/org/apache/crail/rpc/RpcClient.java
index df640a9..b8339e5 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcClient.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcClient.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.rpc;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcConnection.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcConnection.java b/client/src/main/java/org/apache/crail/rpc/RpcConnection.java
index 5b266e2..268cab9 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcConnection.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcConnection.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.rpc;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcCreateFile.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcCreateFile.java b/client/src/main/java/org/apache/crail/rpc/RpcCreateFile.java
index 98a19b4..062f4d0 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcCreateFile.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcCreateFile.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.rpc;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcDeleteFile.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcDeleteFile.java b/client/src/main/java/org/apache/crail/rpc/RpcDeleteFile.java
index 2c1909a..3cbb431 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcDeleteFile.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcDeleteFile.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.rpc;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcDispatcher.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcDispatcher.java b/client/src/main/java/org/apache/crail/rpc/RpcDispatcher.java
index e1da0d0..48a6fc3 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcDispatcher.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcDispatcher.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2015-2018, IBM Corporation
+ *
+ * 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.
+ */
+
 package org.apache.crail.rpc;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcErrors.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcErrors.java b/client/src/main/java/org/apache/crail/rpc/RpcErrors.java
index ebaafd9..986a259 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcErrors.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcErrors.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.rpc;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcFuture.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcFuture.java b/client/src/main/java/org/apache/crail/rpc/RpcFuture.java
index 42a9687..ac7585d 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcFuture.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcFuture.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.rpc;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcGetBlock.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcGetBlock.java b/client/src/main/java/org/apache/crail/rpc/RpcGetBlock.java
index f1795ac..c0af592 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcGetBlock.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcGetBlock.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.rpc;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcGetDataNode.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcGetDataNode.java b/client/src/main/java/org/apache/crail/rpc/RpcGetDataNode.java
index 2f91ce3..5994a26 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcGetDataNode.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcGetDataNode.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.rpc;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcGetFile.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcGetFile.java b/client/src/main/java/org/apache/crail/rpc/RpcGetFile.java
index 073381d..2a58d4e 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcGetFile.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcGetFile.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.rpc;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcGetLocation.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcGetLocation.java b/client/src/main/java/org/apache/crail/rpc/RpcGetLocation.java
index 9c09636..fe75117 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcGetLocation.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcGetLocation.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.rpc;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcPing.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcPing.java b/client/src/main/java/org/apache/crail/rpc/RpcPing.java
index 50dc4f2..fb7c1be 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcPing.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcPing.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.rpc;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcRenameFile.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcRenameFile.java b/client/src/main/java/org/apache/crail/rpc/RpcRenameFile.java
index 8ebce9d..4dba406 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcRenameFile.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcRenameFile.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.rpc;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcResponse.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcResponse.java b/client/src/main/java/org/apache/crail/rpc/RpcResponse.java
index e86d3f2..58a266b 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcResponse.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcResponse.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.rpc;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/rpc/RpcVoid.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/rpc/RpcVoid.java b/client/src/main/java/org/apache/crail/rpc/RpcVoid.java
index 289591d..912a981 100644
--- a/client/src/main/java/org/apache/crail/rpc/RpcVoid.java
+++ b/client/src/main/java/org/apache/crail/rpc/RpcVoid.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.rpc;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/storage/StorageClient.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/storage/StorageClient.java b/client/src/main/java/org/apache/crail/storage/StorageClient.java
index fcae21c..d66cb60 100644
--- a/client/src/main/java/org/apache/crail/storage/StorageClient.java
+++ b/client/src/main/java/org/apache/crail/storage/StorageClient.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.storage;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/storage/StorageEndpoint.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/storage/StorageEndpoint.java b/client/src/main/java/org/apache/crail/storage/StorageEndpoint.java
index 70713ad..d8019a4 100644
--- a/client/src/main/java/org/apache/crail/storage/StorageEndpoint.java
+++ b/client/src/main/java/org/apache/crail/storage/StorageEndpoint.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.storage;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/storage/StorageFuture.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/storage/StorageFuture.java b/client/src/main/java/org/apache/crail/storage/StorageFuture.java
index dbefd2a..19e1c69 100644
--- a/client/src/main/java/org/apache/crail/storage/StorageFuture.java
+++ b/client/src/main/java/org/apache/crail/storage/StorageFuture.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.storage;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/storage/StorageResult.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/storage/StorageResult.java b/client/src/main/java/org/apache/crail/storage/StorageResult.java
index f780456..d3b4e4e 100644
--- a/client/src/main/java/org/apache/crail/storage/StorageResult.java
+++ b/client/src/main/java/org/apache/crail/storage/StorageResult.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.storage;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/tools/CrailBenchmark.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/tools/CrailBenchmark.java b/client/src/main/java/org/apache/crail/tools/CrailBenchmark.java
index 5a27a49..7d173ff 100644
--- a/client/src/main/java/org/apache/crail/tools/CrailBenchmark.java
+++ b/client/src/main/java/org/apache/crail/tools/CrailBenchmark.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.tools;
@@ -41,7 +39,7 @@ import org.apache.commons.cli.Options;
 import org.apache.crail.CrailBuffer;
 import org.apache.crail.CrailBufferedInputStream;
 import org.apache.crail.CrailBufferedOutputStream;
-import org.apache.crail.CrailFS;
+import org.apache.crail.CrailStore;
 import org.apache.crail.CrailFile;
 import org.apache.crail.CrailInputStream;
 import org.apache.crail.CrailLocationClass;
@@ -59,7 +57,7 @@ import org.apache.crail.utils.RingBuffer;
 public class CrailBenchmark {
 	private int warmup;
 	private CrailConfiguration conf;
-	private CrailFS fs;
+	private CrailStore fs;
 	
 	public CrailBenchmark(int warmup) throws Exception {
 		this.warmup = warmup;
@@ -69,7 +67,7 @@ public class CrailBenchmark {
 	
 	private void open() throws Exception{
 		if (fs == null){
-			this.fs = CrailFS.newInstance(conf);
+			this.fs = CrailStore.newInstance(conf);
 		}
 	}
 	

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/tools/CrailFsck.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/tools/CrailFsck.java b/client/src/main/java/org/apache/crail/tools/CrailFsck.java
index 7ad540e..9b3c4e3 100644
--- a/client/src/main/java/org/apache/crail/tools/CrailFsck.java
+++ b/client/src/main/java/org/apache/crail/tools/CrailFsck.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.tools;
@@ -34,7 +32,7 @@ import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.crail.CrailBlockLocation;
 import org.apache.crail.CrailDirectory;
-import org.apache.crail.CrailFS;
+import org.apache.crail.CrailStore;
 import org.apache.crail.CrailFile;
 import org.apache.crail.CrailLocationClass;
 import org.apache.crail.CrailMultiFile;
@@ -58,7 +56,7 @@ public class CrailFsck {
 	public void getLocations(String filename, long offset, long length) throws Exception {
 		System.out.println("getLocations, filename " + filename + ", offset " + offset + ", len " + length);
 		CrailConfiguration conf = new CrailConfiguration();
-		CrailFS fs = CrailFS.newInstance(conf);
+		CrailStore fs = CrailStore.newInstance(conf);
 		
 		CrailBlockLocation locations[] = fs.lookup(filename).get().getBlockLocations(offset, length);
 		for (int i = 0; i < locations.length; i++){
@@ -70,7 +68,7 @@ public class CrailFsck {
 	public void blockStatistics(String filename) throws Exception {
 		HashMap<String, AtomicInteger> stats = new HashMap<String, AtomicInteger>();
 		CrailConfiguration conf = new CrailConfiguration();
-		CrailFS fs = CrailFS.newInstance(conf);
+		CrailStore fs = CrailStore.newInstance(conf);
 		CrailNode node = fs.lookup(filename).get();
 		
 		if (node.getType() == CrailNodeType.DIRECTORY){
@@ -134,7 +132,7 @@ public class CrailFsck {
 	public void createDirectory(String filename, int storageClass, int locationClass) throws Exception {
 		System.out.println("createDirectory, filename " + filename + ", storageClass " + storageClass + ", locationClass " + locationClass);
 		CrailConfiguration conf = new CrailConfiguration();
-		CrailFS fs = CrailFS.newInstance(conf);
+		CrailStore fs = CrailStore.newInstance(conf);
 		fs.create(filename, CrailNodeType.DIRECTORY, CrailStorageClass.get(storageClass), CrailLocationClass.get(locationClass)).get().syncDir();
 		fs.close();
 	}	
@@ -152,7 +150,7 @@ public class CrailFsck {
 		}
 	}
 
-	private void walkBlocks(HashMap<String, AtomicInteger> stats, CrailFS fs, String filePath, long offset, long len) throws Exception {
+	private void walkBlocks(HashMap<String, AtomicInteger> stats, CrailStore fs, String filePath, long offset, long len) throws Exception {
 //		System.out.println("printing locations for path " + filePath);
 		CrailBlockLocation locations[] = fs.lookup(filePath).get().asFile().getBlockLocations(offset, len);
 		for (int i = 0; i < locations.length; i++){

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/utils/AtomicIntegerModulo.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/utils/AtomicIntegerModulo.java b/client/src/main/java/org/apache/crail/utils/AtomicIntegerModulo.java
index 09916b0..3b17ea7 100644
--- a/client/src/main/java/org/apache/crail/utils/AtomicIntegerModulo.java
+++ b/client/src/main/java/org/apache/crail/utils/AtomicIntegerModulo.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.utils;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/utils/BlockCache.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/utils/BlockCache.java b/client/src/main/java/org/apache/crail/utils/BlockCache.java
index dc77192..5bfcb20 100644
--- a/client/src/main/java/org/apache/crail/utils/BlockCache.java
+++ b/client/src/main/java/org/apache/crail/utils/BlockCache.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.utils;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/utils/BufferCheckpoint.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/utils/BufferCheckpoint.java b/client/src/main/java/org/apache/crail/utils/BufferCheckpoint.java
index d9a917c..c649945 100644
--- a/client/src/main/java/org/apache/crail/utils/BufferCheckpoint.java
+++ b/client/src/main/java/org/apache/crail/utils/BufferCheckpoint.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.utils;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/utils/CrailImmediateOperation.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/utils/CrailImmediateOperation.java b/client/src/main/java/org/apache/crail/utils/CrailImmediateOperation.java
index c639a67..bde9044 100644
--- a/client/src/main/java/org/apache/crail/utils/CrailImmediateOperation.java
+++ b/client/src/main/java/org/apache/crail/utils/CrailImmediateOperation.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.utils;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/utils/CrailUtils.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/utils/CrailUtils.java b/client/src/main/java/org/apache/crail/utils/CrailUtils.java
index d702f3a..de49d1a 100644
--- a/client/src/main/java/org/apache/crail/utils/CrailUtils.java
+++ b/client/src/main/java/org/apache/crail/utils/CrailUtils.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.utils;
@@ -45,7 +43,7 @@ public class CrailUtils {
 	
 	public static synchronized Logger getLogger(){
 		if (LOG == null){
-			LOG = LoggerFactory.getLogger("com.ibm.crail");
+			LOG = LoggerFactory.getLogger("org.apache.crail");
 		}
 		return LOG;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/utils/EndpointCache.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/utils/EndpointCache.java b/client/src/main/java/org/apache/crail/utils/EndpointCache.java
index 1321bd9..c691610 100644
--- a/client/src/main/java/org/apache/crail/utils/EndpointCache.java
+++ b/client/src/main/java/org/apache/crail/utils/EndpointCache.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.utils;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/utils/MultiFuture.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/utils/MultiFuture.java b/client/src/main/java/org/apache/crail/utils/MultiFuture.java
index b554217..42624b8 100644
--- a/client/src/main/java/org/apache/crail/utils/MultiFuture.java
+++ b/client/src/main/java/org/apache/crail/utils/MultiFuture.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.utils;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/utils/NextBlockCache.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/utils/NextBlockCache.java b/client/src/main/java/org/apache/crail/utils/NextBlockCache.java
index ef4307a..f38a191 100644
--- a/client/src/main/java/org/apache/crail/utils/NextBlockCache.java
+++ b/client/src/main/java/org/apache/crail/utils/NextBlockCache.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.utils;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/main/java/org/apache/crail/utils/RingBuffer.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/utils/RingBuffer.java b/client/src/main/java/org/apache/crail/utils/RingBuffer.java
index 134aecb..547ffa9 100644
--- a/client/src/main/java/org/apache/crail/utils/RingBuffer.java
+++ b/client/src/main/java/org/apache/crail/utils/RingBuffer.java
@@ -1,22 +1,20 @@
 /*
- * Crail: A Multi-tiered Distributed Direct Access File System
+ * Copyright (C) 2015-2018, IBM Corporation
  *
- * Author: Patrick Stuedi <st...@zurich.ibm.com>
+ * 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) 2016, IBM Corporation
- *
- * 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
+ *    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.
- *
  */
 
 package org.apache.crail.utils;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/client/src/test/java/org/apache/crail/ClientTest.java
----------------------------------------------------------------------
diff --git a/client/src/test/java/org/apache/crail/ClientTest.java b/client/src/test/java/org/apache/crail/ClientTest.java
index 90d25dd..e490985 100644
--- a/client/src/test/java/org/apache/crail/ClientTest.java
+++ b/client/src/test/java/org/apache/crail/ClientTest.java
@@ -1,7 +1,26 @@
+/*
+ * Copyright (C) 2015-2018, IBM Corporation
+ *
+ * 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.
+ */
+
 package org.apache.crail;
 
 import org.apache.crail.CrailBuffer;
-import org.apache.crail.CrailFS;
+import org.apache.crail.CrailStore;
 import org.apache.crail.CrailFile;
 import org.apache.crail.CrailInputStream;
 import org.apache.crail.CrailLocationClass;
@@ -22,14 +41,14 @@ import java.nio.ByteBuffer;
 
 public class ClientTest {
 
-	CrailFS fs;
+	CrailStore fs;
 	final String basePath = "/test";
 	Random rand = new Random();
 
 	@Before
 	public void init() throws Exception {
 		CrailConfiguration conf = new CrailConfiguration();
-		fs = CrailFS.newInstance(conf);
+		fs = CrailStore.newInstance(conf);
 		fs.create(basePath, CrailNodeType.DIRECTORY, CrailStorageClass.DEFAULT, CrailLocationClass.DEFAULT).get();
 	}
 

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/conf/core-site.xml.template
----------------------------------------------------------------------
diff --git a/conf/core-site.xml.template b/conf/core-site.xml.template
index 303a69f..1126e57 100644
--- a/conf/core-site.xml.template
+++ b/conf/core-site.xml.template
@@ -19,7 +19,7 @@
 <configuration>
   <property>
    <name>fs.crail.impl</name>
-   <value>com.ibm.crail.hdfs.CrailHadoopFileSystem</value>
+   <value>org.apache.crail.hdfs.CrailHadoopFileSystem</value>
   </property>
   <property>
     <name>fs.defaultFS</name>
@@ -27,7 +27,7 @@
   </property>
   <property>
     <name>fs.AbstractFileSystem.crail.impl</name>
-    <value>com.ibm.crail.hdfs.CrailHDFS</value>
+    <value>org.apache.crail.hdfs.CrailHDFS</value>
   </property>
   <property>
     <name>io.file.buffer.size</name>

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/be19cd49/conf/crail-site.conf.template
----------------------------------------------------------------------
diff --git a/conf/crail-site.conf.template b/conf/crail-site.conf.template
index 60ba5cb..1159dc0 100644
--- a/conf/crail-site.conf.template
+++ b/conf/crail-site.conf.template
@@ -3,19 +3,12 @@ crail.buffersize			1048576
 crail.slicesize				524288
 crail.regionsize			1073741824
 crail.cachelimit			1073741824
-crail.cachepath				<path, should be huge page mountpoint>
+crail.cachepath				/dev/hugepages/cache	
 crail.singleton				true
 crail.statistics 			true
-crail.namenode.address			crail://<hostname>:9060
+crail.namenode.address			crail://localhost:9060
 crail.namenode.blockselection		roundrobin
 crail.namenode.darpc.queuesize		64
 crail.namenode.darpc.polling		false
-crail.storage.types 			com.ibm.crail.storage.rdma.RdmaStorageTier
-crail.storage.rdma.interface            eth0
-crail.storage.rdma.port                 50040
-crail.storage.rdma.allocationsize       1073741824
-crail.storage.rdma.storagelimit         10737418240
-crail.storage.rdma.datapath             <path, should be huge page mountpoint>
-crail.storage.rdma.indexpath            <path, cannot be huge page mountpoint>
-crail.storage.rdma.localmap             true
+crail.storage.types 			org.apache.crail.storage.tcp.TcpStorageTier