Renaming part 9 (first part of distribution project)

deepfield · Jul 9, 2014 · e762152 · e762152
1 parent 76273ec
commit e762152
Show file tree

Hide file tree

Showing 33 changed files with 56 additions and 59 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -1,5 +1,5 @@
 #
-# Contributers to the Stratosphere project
+# Contributers to the Flink project
 #
 
 Alexander Alexandrov

diff --git a/NOTICE b/NOTICE
@@ -1,4 +1,4 @@
-Copyright 2010-2014 Stratosphere
+Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ limitations under the License.
 
 =======================================================================
 
-Stratosphere contains subcomponents with separate copyright notices and
+Flink contains subcomponents with separate copyright notices and
 license terms. Your use of the source code for the these subcomponents
 is subject to the terms and conditions of their respective licenses.
 

diff --git a/deploysettings.xml b/deploysettings.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+ Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 
  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

diff --git a/stratosphere-dist/src/deb/bin/jobmanager b/stratosphere-dist/src/deb/bin/jobmanager
@@ -1,6 +1,6 @@
 #! /bin/sh
 ########################################################################################################################
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2014 by the Apache Flink project (https://flink.incubator.apache.org)
 #
 # 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

diff --git a/stratosphere-dist/src/deb/bin/taskmanager b/stratosphere-dist/src/deb/bin/taskmanager
@@ -1,6 +1,6 @@
 #! /bin/sh
 ########################################################################################################################
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2014 by the Apache Flink project (https://flink.incubator.apache.org)
 #
 # 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

diff --git a/stratosphere-dist/src/deb/bin/webclient b/stratosphere-dist/src/deb/bin/webclient
@@ -1,6 +1,6 @@
 #! /bin/sh
 ########################################################################################################################
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2014 by the Apache Flink project (https://flink.incubator.apache.org)
 #
 # 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

diff --git a/stratosphere-dist/src/deb/control/control b/stratosphere-dist/src/deb/control/control
@@ -1,5 +1,5 @@
 ########################################################################################################################
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2014 by the Apache Flink project (https://flink.incubator.apache.org)
 #
 # 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
@@ -17,5 +17,5 @@ Section: misc
 Depends: default-jre
 Priority: low
 Architecture: all
-Description: Stratosphere is a distributed parallel data processing system
-Maintainer: Stratosphere team <contact@getstratosphere.org>
+Description: Flink is a distributed parallel data processing system
+Maintainer: Flink team <[email protected].org>
diff --git a/stratosphere-dist/src/deb/control/postinst b/stratosphere-dist/src/deb/control/postinst
@@ -1,6 +1,6 @@
 #!/bin/sh
 ########################################################################################################################
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2014 by the Apache Flink project (https://flink.incubator.apache.org)
 #
 # 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
@@ -30,29 +30,29 @@ set -e
 
 case "$1" in
  configure)
- if ! getent group stratosphere >/dev/null; then
- addgroup --system stratosphere
+ if ! getent group flink >/dev/null; then
+ addgroup --system flink
  fi
 
- if ! getent passwd stratosphere >/dev/null; then
+ if ! getent passwd flink >/dev/null; then
  adduser --quiet \
  --system \
- --ingroup stratosphere \
+ --ingroup flink \
  --quiet \
  --disabled-login \
  --disabled-password \
- --home /usr/share/stratosphere-dist \
+ --home /usr/share/flink-dist \
  --no-create-home \
- -gecos "Stratosphere User" \
- stratosphere
+ -gecos "Flink User" \
+ flink
  fi
 
  if [ -z "$2" ]; then
- chown -R stratosphere:stratosphere /var/log/stratosphere-dist
+ chown -R flink:flink /var/log/flink-dist
  fi
- sed -i s'#./resources/web-docs#/usr/share/stratosphere-dist/resources/web-docs#' /usr/share/stratosphere-dist/conf/stratosphere-conf.yaml
+ sed -i s'#./resources/web-docs#/usr/share/flink-dist/resources/web-docs#' /usr/share/flink-dist/conf/flink-conf.yaml
  # append infoserver configuration
- echo "jobmanager.web.rootpath: /usr/share/stratosphere-dist/resources/web-docs-infoserver" >> /usr/share/stratosphere-dist/conf/stratosphere-conf.yaml
+ echo "jobmanager.web.rootpath: /usr/share/flink-dist/resources/web-docs-infoserver" >> /usr/share/flink-dist/conf/flink-conf.yaml
  ;;
 
  abort-upgrade|abort-remove|abort-deconfigure)

diff --git a/stratosphere-dist/src/main/assemblies/bin.xml b/stratosphere-dist/src/main/assemblies/bin.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+ Copyright (C) 2010-2014 by the Apache Flink project (https://flink.incubator.apache.org)
 
  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
@@ -43,9 +43,6 @@
  <exclude>**/*javadoc*</exclude>
  <exclude>**/*sources*</exclude>
  -->
- <!--
- <exclude>eu.stratosphere:pact-clients:**</exclude> 
- -->
  <!--
  This is a hardcoded exclude-list containing all libraries that are exclusively used in pact-clients.
  The previous command did not work because it also excludes libraries that should be in lib, such as commons-io.

diff --git a/stratosphere-dist/src/main/assemblies/yarn-uberjar.xml b/stratosphere-dist/src/main/assemblies/yarn-uberjar.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+ Copyright (C) 2010-2014 by the Apache Flink project (https://flink.incubator.apache.org)
 
  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

diff --git a/stratosphere-dist/src/main/assemblies/yarn.xml b/stratosphere-dist/src/main/assemblies/yarn.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+ Copyright (C) 2010-2014 by the Apache Flink project (https://flink.incubator.apache.org)
 
  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

diff --git a/stratosphere-dist/src/main/stratosphere-bin/LICENSE b/stratosphere-dist/src/main/stratosphere-bin/LICENSE
@@ -202,7 +202,7 @@
 
 =======================================================================
 
-Stratosphere contains subcomponents with separate copyright notices and
+Flink contains subcomponents with separate copyright notices and
 license terms. Your use of the source code for the these subcomponents
 is subject to the terms and conditions of their respective licenses.
 

diff --git a/stratosphere-dist/src/main/stratosphere-bin/NOTICE b/stratosphere-dist/src/main/stratosphere-bin/NOTICE
@@ -1,4 +1,4 @@
-Copyright 2010-2014 Stratosphere
+Copyright 2010-2014 Apache Flink Project
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/stratosphere-dist/src/main/stratosphere-bin/README.txt b/stratosphere-dist/src/main/stratosphere-bin/README.txt
@@ -1,14 +1,14 @@
-For the latest information about Stratosphere, please visit our website at:
+For the latest information about Flink, please visit our website at:
 
- https://www.stratosphere.eu/
+ https://flink.incubator.apache.org
 
 and our GitHub Account 
 
- https://github.com/stratosphere/stratosphere
+ https://github.com/apache/incubator-flink
 
 If you have any questions, ask on our Mailing list
 
- https://groups.google.com/forum/#!forum/stratosphere-dev
+ [email protected]
 
 This distribution includes cryptographic software. The country in 
 which you currently reside may have restrictions on the import, 

diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/config.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/config.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################################################################
 # 
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 # 
 # 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

diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/jobmanager.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/jobmanager.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################################################################
 # 
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 # 
 # 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
@@ -72,7 +72,7 @@ case $STARTSTOP in
  rotateLogFile $out
 
  echo Starting job manager
- $JAVA_RUN $JVM_ARGS ${STRATOSPHERE_ENV_JAVA_OPTS} "${log_setting[@]}" -classpath "$STRATOSPHERE_JM_CLASSPATH" eu.stratosphere.nephele.jobmanager.JobManager -executionMode $EXECUTIONMODE -configDir "$STRATOSPHERE_CONF_DIR" > "$out" 2>&1 < /dev/null &
+ $JAVA_RUN $JVM_ARGS ${STRATOSPHERE_ENV_JAVA_OPTS} "${log_setting[@]}" -classpath "$STRATOSPHERE_JM_CLASSPATH" org.apache.flink.runtime.jobmanager.JobManager -executionMode $EXECUTIONMODE -configDir "$STRATOSPHERE_CONF_DIR" > "$out" 2>&1 < /dev/null &
  echo $! > $pid
  ;;
 

diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/start-cluster.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/start-cluster.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################################################################
 # 
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 # 
 # 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

diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/start-local.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/start-local.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################################################################
 # 
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 # 
 # 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

diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/start-webclient.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/start-webclient.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################################################################
 # 
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 # 
 # 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

diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/stop-cluster.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/stop-cluster.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################################################################
 # 
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 # 
 # 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

diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/stop-local.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/stop-local.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################################################################
 # 
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 # 
 # 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

diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/stop-webclient.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/stop-webclient.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################################################################
 # 
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 # 
 # 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

diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/taskmanager.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/taskmanager.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################################################################
 # 
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 # 
 # 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
@@ -69,7 +69,7 @@ case $STARTSTOP in
  rotateLogFile $out
 
  echo Starting task manager on host $HOSTNAME
- $JAVA_RUN $JVM_ARGS ${STRATOSPHERE_ENV_JAVA_OPTS} "${log_setting[@]}" -classpath "$STRATOSPHERE_TM_CLASSPATH" eu.stratosphere.nephele.taskmanager.TaskManager -configDir "$STRATOSPHERE_CONF_DIR" > "$out" 2>&1 < /dev/null &
+ $JAVA_RUN $JVM_ARGS ${STRATOSPHERE_ENV_JAVA_OPTS} "${log_setting[@]}" -classpath "$STRATOSPHERE_TM_CLASSPATH" org.apache.flink.runtime.taskmanager.TaskManager -configDir "$STRATOSPHERE_CONF_DIR" > "$out" 2>&1 < /dev/null &
  echo $! > $pid
  ;;
 

diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/webclient.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/webclient.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################################################################
 # 
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 # 
 # 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
@@ -66,7 +66,7 @@ case $STARTSTOP in
  fi
  fi
  echo Starting Stratosphere webclient
- $JAVA_RUN $JVM_ARGS "${log_setting[@]}" -classpath "$STRATOSPHERE_WEBCLIENT_CLASSPATH" eu.stratosphere.client.WebFrontend -configDir "$STRATOSPHERE_CONF_DIR" > "$out" 2>&1 < /dev/null &
+ $JAVA_RUN $JVM_ARGS "${log_setting[@]}" -classpath "$STRATOSPHERE_WEBCLIENT_CLASSPATH" org.apache.flink.client.WebFrontend -configDir "$STRATOSPHERE_CONF_DIR" > "$out" 2>&1 < /dev/null &
  echo $! > $pid
  ;;
 

diff --git a/stratosphere-dist/src/main/stratosphere-bin/conf/log4j.properties b/stratosphere-dist/src/main/stratosphere-bin/conf/log4j.properties
@@ -1,6 +1,6 @@
 ########################################################################################################################
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
-
+# Copyright (C) 2010-2014 by the Apache Flink project (https://flink.incubator.apache.org)
+#
 # 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
 #

diff --git a/stratosphere-dist/src/main/stratosphere-bin/conf/log4jconsole.properties b/stratosphere-dist/src/main/stratosphere-bin/conf/log4jconsole.properties
@@ -1,6 +1,6 @@
 ########################################################################################################################
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
-
+# Copyright (C) 2010-2014 by the Apache Flink project (https://flink.incubator.apache.org)
+#
 # 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
 #

diff --git a/stratosphere-dist/src/main/stratosphere-bin/conf/stratosphere-conf.yaml b/stratosphere-dist/src/main/stratosphere-bin/conf/stratosphere-conf.yaml
@@ -1,6 +1,6 @@
 ########################################################################################################################
 # 
-# Copyright (C) 2010-2014 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2014 by the Apache Flink project (https://flink.incubator.apache.org)
 # 
 # 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

diff --git a/stratosphere-dist/src/main/stratosphere-bin/tools/planVisualizer.html b/stratosphere-dist/src/main/stratosphere-bin/tools/planVisualizer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+ Copyright (C) 2010-2014 by the Apache Flink project (https://flink.incubator.apache.org)
 
  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
@@ -14,7 +14,7 @@
 -->
 <html>
 <head>
- <title>Stratosphere Plan Visualizer</title>
+ <title>Flink Plan Visualizer</title>
  <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
  <link rel="stylesheet" type="text/css" href="../resources/web-docs/css/nephelefrontend.css" />
  <link rel="stylesheet" type="text/css" href="../resources/web-docs/css/pactgraphs.css" />
@@ -30,7 +30,7 @@
 
 <body>
  <div class="mainHeading">
- <h1 style="margin-top:0"><img src="../resources/web-docs/img/StratosphereLogo.png" width="326" height="100" alt="Stratosphere Logo" align="middle"/>Stratosphere Plan Visualizer</h1>
+ <h1 style="margin-top:0"><img src="../resources/web-docs/img/FlinkLogo.png" width="326" height="100" alt="Flink Logo" align="middle"/>Flink Plan Visualizer</h1>
  </div>
  <div>
  <div id="mainCanvas" class="canvas boxed">

diff --git a/stratosphere-dist/src/main/stratosphere-bin/yarn-bin/yarn-session.sh b/stratosphere-dist/src/main/stratosphere-bin/yarn-bin/yarn-session.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################################################################
 # 
-# Copyright (C) 2014 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2014 by the Apache Flink project (https://flink.incubator.apache.org)
 # 
 # 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

diff --git a/tools/change-version b/tools/change-version
@@ -1,6 +1,6 @@
 #!/bin/bash
 ########################################################################################################################
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 #
 # 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

diff --git a/tools/deploy_to_maven.sh b/tools/deploy_to_maven.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 ########################################################################################################################
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 #
 # 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

diff --git a/tools/generate_specific_pom.sh b/tools/generate_specific_pom.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 ########################################################################################################################
-# Copyright (C) 2010-2013 by the Stratosphere project (https://stratosphere.eu)
+# Copyright (C) 2010-2013 by the Apache Flink project (https://flink.incubator.apache.org)
 #
 # 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