From 8563d511da8ab8ac0e1362775f11aef7b67375be Mon Sep 17 00:00:00 2001 From: Robert Metzger Date: Thu, 10 Jul 2014 12:05:50 +0200 Subject: [PATCH] Rename POMs, scripts, quickstarts and other minor renames --- LICENSE | 12 +-- docs/cluster_execution.md | 8 +- docs/java_api_guide.md | 8 +- docs/local_execution.md | 4 +- docs/scala_api_guide.md | 8 +- docs/spargel_guide.md | 2 +- .../avro/pom.xml | 16 ++-- .../apache/flink/api/avro/AvroBaseValue.java | 0 .../flink/api/avro/DataInputDecoder.java | 0 .../flink/api/avro/DataOutputEncoder.java | 0 .../api/avro/FSDataInputStreamWrapper.java | 0 .../flink/api/java/io/AvroInputFormat.java | 0 .../flink/api/java/io/AvroOutputFormat.java | 0 .../java/record/io/avro/AvroInputFormat.java | 0 .../record/io/avro/AvroRecordInputFormat.java | 0 .../example/ReflectiveAvroTypeExample.java | 0 .../java/record/io/avro/example/SUser.java | 0 .../api/java/record/io/avro/example/User.java | 0 .../avro/src/test/assembly/test-assembly.xml | 0 .../avro/AvroExternalJarProgramITCase.java | 0 .../flink/api/avro/AvroOutputFormatTest.java | 0 .../api/avro/AvroWithEmptyArrayITCase.java | 0 .../flink/api/avro/EncoderDecoderTest.java | 0 .../avro/testjar/AvroExternalJarProgram.java | 0 .../io/AvroInputFormatTypeExtractionTest.java | 0 .../io/avro/AvroRecordInputFormatTest.java | 0 .../java/record/io/avro/generated/Colors.java | 0 .../java/record/io/avro/generated/User.java | 0 .../avro/src/test/resources/avro/user.avsc | 0 .../avro/src/test/resources/testdata.avro | Bin .../hadoop-compatibility/pom.xml | 20 ++-- .../mapred/HadoopInputFormat.java | 0 .../mapred/HadoopOutputFormat.java | 0 .../mapred/example/WordCount.java | 0 .../mapred/record/HadoopDataSink.java | 0 .../mapred/record/HadoopDataSource.java | 0 .../record/HadoopRecordInputFormat.java | 0 .../record/HadoopRecordOutputFormat.java | 0 .../datatypes/DefaultFlinkTypeConverter.java | 0 .../datatypes/DefaultHadoopTypeConverter.java | 0 .../record/datatypes/FlinkTypeConverter.java | 0 .../datatypes/HadoopFileOutputCommitter.java | 0 .../record/datatypes/HadoopTypeConverter.java | 0 .../datatypes/WritableComparableWrapper.java | 0 .../record/datatypes/WritableWrapper.java | 0 .../datatypes/WritableWrapperConverter.java | 0 .../mapred/record/example/WordCount.java | 0 .../example/WordCountWithOutputFormat.java | 0 .../mapred/utils/HadoopUtils.java | 0 .../wrapper/HadoopDummyProgressable.java | 0 .../mapred/wrapper/HadoopDummyReporter.java | 0 .../mapred/wrapper/HadoopInputSplit.java | 0 .../mapreduce/HadoopInputFormat.java | 0 .../mapreduce/HadoopOutputFormat.java | 0 .../mapreduce/example/WordCount.java | 0 .../mapreduce/utils/HadoopUtils.java | 0 .../mapreduce/wrapper/HadoopInputSplit.java | 0 .../mapred/HadoopInputOutputITCase.java | 0 .../record/HadoopRecordInputOutputITCase.java | 0 .../mapreduce/HadoopInputOutputITCase.java | 0 .../hbase/pom.xml | 12 +-- .../hbase/GenericTableOutputFormat.java | 0 .../flink/addons/hbase/HBaseDataSink.java | 0 .../flink/addons/hbase/TableInputFormat.java | 0 .../flink/addons/hbase/TableInputSplit.java | 0 .../flink/addons/hbase/common/HBaseKey.java | 0 .../addons/hbase/common/HBaseResult.java | 0 .../flink/addons/hbase/common/HBaseUtil.java | 0 .../hbase/example/HBaseReadExample.java | 0 .../jdbc/pom.xml | 16 ++-- .../api/java/io/jdbc/JDBCInputFormat.java | 0 .../api/java/io/jdbc/JDBCOutputFormat.java | 0 .../api/java/io/jdbc/example/JDBCExample.java | 0 .../java/record/io/jdbc/JDBCInputFormat.java | 0 .../java/record/io/jdbc/JDBCOutputFormat.java | 0 .../record/io/jdbc/example/JDBCExample.java | 0 .../api/java/io/jdbc/JDBCInputFormatTest.java | 0 .../java/io/jdbc/JDBCOutputFormatTest.java | 0 .../java/record/io/jdbc/DevNullLogStream.java | 0 .../record/io/jdbc/JDBCInputFormatTest.java | 0 .../record/io/jdbc/JDBCOutputFormatTest.java | 0 {stratosphere-addons => flink-addons}/pom.xml | 8 +- .../spargel/pom.xml | 20 ++-- .../flink/spargel/java/MessageIterator.java | 0 .../flink/spargel/java/MessagingFunction.java | 0 .../flink/spargel/java/OutgoingEdge.java | 0 .../spargel/java/VertexCentricIteration.java | 0 .../spargel/java/VertexUpdateFunction.java | 0 .../examples/SpargelConnectedComponents.java | 0 .../java/examples/SpargelPageRank.java | 0 .../SpargelPageRankCountingVertices.java | 0 .../flink/spargel/java/record/Edge.java | 0 .../spargel/java/record/MessageIterator.java | 0 .../java/record/MessagingFunction.java | 0 .../spargel/java/record/SpargelIteration.java | 0 .../java/record/VertexUpdateFunction.java | 0 .../spargel/java/SpargelCompilerTest.java | 0 .../spargel/java/SpargelTranslationTest.java | 0 .../SpargelConnectedComponentsITCase.java | 0 .../yarn/pom.xml | 12 +-- .../apache/flink/yarn/ApplicationMaster.java | 0 .../java/org/apache/flink/yarn/Client.java | 0 .../java/org/apache/flink/yarn/Utils.java | 0 .../flink/yarn/YarnTaskManagerRunner.java | 0 .../pom.xml | 26 ++--- .../resources/web-docs/css/bootstrap.css | 0 .../resources/web-docs/css/graph.css | 0 .../web-docs/css/nephelefrontend.css | 0 .../resources/web-docs/css/overlay.css | 0 .../resources/web-docs/css/pactgraphs.css | 0 .../resources/web-docs/img/FlinkLogo.png | Bin .../resources/web-docs/img/GradientBoxes.png | Bin .../web-docs/img/StratosphereLogo.png | Bin .../resources/web-docs/img/arrows/arr.gif | Bin .../resources/web-docs/img/arrows/arr2.gif | Bin .../resources/web-docs/img/arrows/arr2_d.gif | Bin .../resources/web-docs/img/arrows/arr2_l.gif | Bin .../resources/web-docs/img/arrows/arr2_r.gif | Bin .../resources/web-docs/img/arrows/arr2_u.gif | Bin .../resources/web-docs/img/arrows/arr_d.gif | Bin .../resources/web-docs/img/arrows/arr_l.gif | Bin .../resources/web-docs/img/arrows/arr_r.gif | Bin .../resources/web-docs/img/arrows/arr_u.gif | Bin .../resources/web-docs/img/arrows/arrow.gif | Bin .../resources/web-docs/img/arrows/arrow_d.gif | Bin .../resources/web-docs/img/arrows/arrow_l.gif | Bin .../resources/web-docs/img/arrows/arrow_r.gif | Bin .../resources/web-docs/img/arrows/arrow_u.gif | Bin .../resources/web-docs/img/delete-icon.png | Bin .../resources/web-docs/img/gradient.jpg | Bin .../resources/web-docs/img/overlay/close.png | Bin .../resources/web-docs/index.html | 0 .../resources/web-docs/js/bootstrap.min.js | 0 .../resources/web-docs/js/d3.js | 0 .../resources/web-docs/js/dagre-d3.js | 0 .../resources/web-docs/js/graphCreator.js | 0 .../resources/web-docs/js/jquery-2.1.0.js | 0 .../resources/web-docs/js/jquery.tools.min.js | 0 .../resources/web-docs/js/program.js | 0 .../resources/web-docs/launch.html | 0 .../src/main/assembly/test-assembly.xml | 0 .../org/apache/flink/client/CliFrontend.java | 0 .../apache/flink/client/LocalExecutor.java | 0 .../apache/flink/client/RemoteExecutor.java | 0 .../org/apache/flink/client/WebFrontend.java | 0 .../minicluster/NepheleMiniCluster.java | 0 .../apache/flink/client/program/Client.java | 0 .../client/program/ContextEnvironment.java | 0 .../flink/client/program/JobWithJars.java | 0 .../flink/client/program/PackagedProgram.java | 0 .../program/ProgramInvocationException.java | 0 .../flink/client/web/GUIServletStub.java | 0 .../client/web/JobSubmissionServlet.java | 0 .../flink/client/web/JobsInfoServlet.java | 0 .../apache/flink/client/web/JobsServlet.java | 0 .../flink/client/web/PactJobJSONServlet.java | 0 .../flink/client/web/PlanDisplayServlet.java | 0 .../flink/client/web/WebInterfaceServer.java | 0 .../flink/client/CliFrontendInfoTest.java | 0 .../CliFrontendJobManagerConnectionTest.java | 0 .../client/CliFrontendListCancelTest.java | 0 .../client/CliFrontendPackageProgramTest.java | 0 .../flink/client/CliFrontendRunTest.java | 0 .../flink/client/CliFrontendTestUtils.java | 0 .../flink/client/program/ClientTest.java | 0 .../client/program/PackagedProgramTest.java | 0 .../testjar/JobWithExternalDependency.java | 0 .../flink/client/testjar/WordCount.java | 0 .../invalidtestconfig/flink-conf.yaml | 0 .../test/resources/testconfig/flink-conf.yaml | 0 .../.yarn-jobmanager | 0 .../testconfigwithinvalidyarn/flink-conf.yaml | 0 .../testconfigwithyarn/.yarn-jobmanager | 0 .../testconfigwithyarn/flink-conf.yaml | 0 .../pom.xml | 20 ++-- .../flink/compiler/CompilerException.java | 0 .../compiler/CompilerPostPassException.java | 0 .../apache/flink/compiler/DataStatistics.java | 0 .../compiler/NonCachingDataStatistics.java | 0 .../apache/flink/compiler/PactCompiler.java | 0 .../compiler/contextcheck/ContextChecker.java | 0 .../contextcheck/MissingChildException.java | 0 .../compiler/contextcheck/Validatable.java | 0 .../flink/compiler/costs/CostEstimator.java | 0 .../apache/flink/compiler/costs/Costs.java | 0 .../compiler/costs/DefaultCostEstimator.java | 0 .../dag/AbstractPartialSolutionNode.java | 0 .../flink/compiler/dag/BinaryUnionNode.java | 0 .../flink/compiler/dag/BulkIterationNode.java | 0 .../compiler/dag/BulkPartialSolutionNode.java | 0 .../flink/compiler/dag/CoGroupNode.java | 0 .../flink/compiler/dag/CollectorMapNode.java | 0 .../apache/flink/compiler/dag/CrossNode.java | 0 .../flink/compiler/dag/DataSinkNode.java | 0 .../flink/compiler/dag/DataSourceNode.java | 0 .../flink/compiler/dag/EstimateProvider.java | 0 .../apache/flink/compiler/dag/FilterNode.java | 0 .../flink/compiler/dag/FlatMapNode.java | 0 .../flink/compiler/dag/GroupReduceNode.java | 0 .../dag/InterestingPropertiesClearer.java | 0 .../flink/compiler/dag/IterationNode.java | 0 .../apache/flink/compiler/dag/MapNode.java | 0 .../apache/flink/compiler/dag/MatchNode.java | 0 .../apache/flink/compiler/dag/NoOpNode.java | 0 .../flink/compiler/dag/OptimizerNode.java | 0 .../flink/compiler/dag/PactConnection.java | 0 .../flink/compiler/dag/PlanCacheCleaner.java | 0 .../apache/flink/compiler/dag/ReduceNode.java | 0 .../flink/compiler/dag/SingleInputNode.java | 0 .../apache/flink/compiler/dag/SinkJoiner.java | 0 .../flink/compiler/dag/SolutionSetNode.java | 0 .../apache/flink/compiler/dag/TempMode.java | 0 .../flink/compiler/dag/TwoInputNode.java | 0 .../flink/compiler/dag/UnaryOperatorNode.java | 0 .../compiler/dag/WorksetIterationNode.java | 0 .../flink/compiler/dag/WorksetNode.java | 0 .../dataproperties/GlobalProperties.java | 0 .../dataproperties/InterestingProperties.java | 0 .../dataproperties/LocalProperties.java | 0 .../dataproperties/PartitioningProperty.java | 0 .../RequestedGlobalProperties.java | 0 .../RequestedLocalProperties.java | 0 .../compiler/deadlockdetect/DeadlockEdge.java | 0 .../deadlockdetect/DeadlockGraph.java | 0 .../deadlockdetect/DeadlockPreventer.java | 0 .../deadlockdetect/DeadlockVertex.java | 0 .../operators/AbstractJoinDescriptor.java | 0 .../operators/AbstractOperatorDescriptor.java | 0 .../operators/AllGroupReduceProperties.java | 0 ...AllGroupWithPartialPreGroupProperties.java | 0 .../operators/AllReduceProperties.java | 0 .../operators/BinaryUnionOpDescriptor.java | 0 .../operators/CartesianProductDescriptor.java | 0 .../compiler/operators/CoGroupDescriptor.java | 0 ...CoGroupWithSolutionSetFirstDescriptor.java | 0 ...oGroupWithSolutionSetSecondDescriptor.java | 0 .../operators/CollectorMapDescriptor.java | 0 .../CrossBlockOuterFirstDescriptor.java | 0 .../CrossBlockOuterSecondDescriptor.java | 0 .../CrossStreamOuterFirstDescriptor.java | 0 .../CrossStreamOuterSecondDescriptor.java | 0 .../compiler/operators/FilterDescriptor.java | 0 .../compiler/operators/FlatMapDescriptor.java | 0 .../operators/GroupReduceProperties.java | 0 .../GroupReduceWithCombineProperties.java | 0 .../HashJoinBuildFirstProperties.java | 0 .../HashJoinBuildSecondProperties.java | 0 .../compiler/operators/MapDescriptor.java | 0 .../compiler/operators/NoOpDescriptor.java | 0 .../operators/OperatorDescriptorDual.java | 0 .../operators/OperatorDescriptorSingle.java | 0 .../operators/PartialGroupProperties.java | 0 .../compiler/operators/ReduceProperties.java | 0 .../operators/SolutionSetDeltaOperator.java | 0 .../operators/SortMergeJoinDescriptor.java | 0 .../operators/UtilSinkJoinOpDescriptor.java | 0 .../compiler/plan/BinaryUnionPlanNode.java | 0 .../compiler/plan/BulkIterationPlanNode.java | 0 .../plan/BulkPartialSolutionPlanNode.java | 0 .../apache/flink/compiler/plan/Channel.java | 0 .../compiler/plan/DualInputPlanNode.java | 0 .../compiler/plan/IterationPlanNode.java | 0 .../compiler/plan/NAryUnionPlanNode.java | 0 .../flink/compiler/plan/NamedChannel.java | 0 .../flink/compiler/plan/OptimizedPlan.java | 0 .../apache/flink/compiler/plan/PlanNode.java | 0 .../compiler/plan/SingleInputPlanNode.java | 0 .../compiler/plan/SinkJoinerPlanNode.java | 0 .../flink/compiler/plan/SinkPlanNode.java | 0 .../compiler/plan/SolutionSetPlanNode.java | 0 .../flink/compiler/plan/SourcePlanNode.java | 0 .../plan/WorksetIterationPlanNode.java | 0 .../flink/compiler/plan/WorksetPlanNode.java | 0 .../compiler/plandump/DumpableConnection.java | 0 .../flink/compiler/plandump/DumpableNode.java | 0 .../plandump/PlanJSONDumpGenerator.java | 0 .../NepheleJobGraphGenerator.java | 0 .../compiler/postpass/AbstractSchema.java | 0 .../ConflictingFieldTypeInfoException.java | 0 .../compiler/postpass/DenseValueSchema.java | 0 .../postpass/GenericFlatTypePostPass.java | 0 .../compiler/postpass/JavaApiPostPass.java | 0 .../MissingFieldTypeInfoException.java | 0 .../compiler/postpass/OptimizerPostPass.java | 0 .../compiler/postpass/PostPassUtils.java | 0 .../postpass/RecordModelPostPass.java | 0 .../compiler/postpass/SparseKeySchema.java | 0 .../flink/compiler/util/NoOpBinaryUdfOp.java | 0 .../flink/compiler/util/NoOpFunction.java | 0 .../flink/compiler/util/NoOpUnaryUdfOp.java | 0 .../org/apache/flink/compiler/util/Utils.java | 0 .../compiler/AdditionalOperatorsTest.java | 0 .../compiler/BranchingPlansCompilerTest.java | 0 .../BroadcastVariablePipelinebreakerTest.java | 0 .../CachedMatchStrategyCompilerTest.java | 0 .../compiler/CoGroupSolutionSetFirstTest.java | 0 .../flink/compiler/CompilerTestBase.java | 0 .../apache/flink/compiler/DOPChangeTest.java | 0 .../compiler/FeedbackPropertiesMatchTest.java | 0 .../apache/flink/compiler/GroupOrderTest.java | 0 .../compiler/GroupReduceCompilationTest.java | 0 .../compiler/HardPlansCompilationTest.java | 0 .../compiler/IterationsCompilerTest.java | 0 .../apache/flink/compiler/ReduceAllTest.java | 0 .../flink/compiler/ReduceCompilationTest.java | 0 .../UnionPropertyPropagationTest.java | 0 .../flink/compiler/UnionReplacementTest.java | 0 .../WorksetIterationsJavaApiCompilerTest.java | 0 ...orksetIterationsRecordApiCompilerTest.java | 0 .../costs/DefaultCostEstimatorTest.java | 0 .../flink/compiler/plan/ChannelTest.java | 0 .../plandump/NumberFormattingTest.java | 0 .../testfunctions/DummyJoinFunction.java | 0 .../testfunctions/IdentityGroupReducer.java | 0 .../testfunctions/IdentityKeyExtractor.java | 0 .../testfunctions/IdentityMapper.java | 0 .../testfunctions/Top1GroupReducer.java | 0 .../flink/compiler/util/DummyCoGroupStub.java | 0 .../flink/compiler/util/DummyCrossStub.java | 0 .../flink/compiler/util/DummyInputFormat.java | 0 .../flink/compiler/util/DummyMatchStub.java | 0 .../util/DummyNonPreservingMatchStub.java | 0 .../compiler/util/DummyOutputFormat.java | 0 .../flink/compiler/util/IdentityMap.java | 0 .../flink/compiler/util/IdentityReduce.java | 0 {stratosphere-core => flink-core}/pom.xml | 8 +- .../api/common/InvalidProgramException.java | 0 .../flink/api/common/JobExecutionResult.java | 0 .../NonSerializableUserCodeException.java | 0 .../org/apache/flink/api/common/Plan.java | 0 .../apache/flink/api/common/PlanExecutor.java | 0 .../org/apache/flink/api/common/Program.java | 0 .../flink/api/common/ProgramDescription.java | 0 .../api/common/accumulators/Accumulator.java | 0 .../accumulators/AccumulatorHelper.java | 0 .../common/accumulators/DoubleCounter.java | 0 .../api/common/accumulators/Histogram.java | 0 .../api/common/accumulators/IntCounter.java | 0 .../api/common/accumulators/LongCounter.java | 0 .../accumulators/SimpleAccumulator.java | 0 .../api/common/aggregators/Aggregator.java | 0 .../aggregators/AggregatorRegistry.java | 0 .../aggregators/AggregatorWithName.java | 0 .../aggregators/ConvergenceCriterion.java | 0 .../aggregators/DoubleSumAggregator.java | 0 .../aggregators/DoubleZeroConvergence.java | 0 .../common/aggregators/LongSumAggregator.java | 0 .../aggregators/LongZeroConvergence.java | 0 .../api/common/cache/DistributedCache.java | 0 .../distributions/DataDistribution.java | 0 .../distributions/SimpleDistribution.java | 0 .../SimpleIntegerDistribution.java | 0 .../UniformDoubleDistribution.java | 0 .../UniformIntegerDistribution.java | 0 .../common/functions/AbstractFunction.java | 0 .../common/functions/ExecutionContext.java | 0 .../flink/api/common/functions/Function.java | 0 .../common/functions/GenericCoGrouper.java | 0 .../common/functions/GenericCollectorMap.java | 0 .../api/common/functions/GenericCombine.java | 0 .../api/common/functions/GenericCrosser.java | 0 .../api/common/functions/GenericFilter.java | 0 .../api/common/functions/GenericFlatMap.java | 0 .../common/functions/GenericGroupReduce.java | 0 .../api/common/functions/GenericJoiner.java | 0 .../api/common/functions/GenericMap.java | 0 .../api/common/functions/GenericReduce.java | 0 .../functions/IterationRuntimeContext.java | 0 .../api/common/functions/RuntimeContext.java | 0 .../api/common/io/BinaryInputFormat.java | 0 .../api/common/io/BinaryOutputFormat.java | 0 .../apache/flink/api/common/io/BlockInfo.java | 0 .../api/common/io/DelimitedInputFormat.java | 0 .../flink/api/common/io/FileInputFormat.java | 0 .../flink/api/common/io/FileOutputFormat.java | 0 .../flink/api/common/io/FormatUtil.java | 0 .../api/common/io/GenericCsvInputFormat.java | 0 .../api/common/io/GenericInputFormat.java | 0 .../io/InflaterInputStreamFSInputWrapper.java | 0 .../api/common/io/InitializeOnMaster.java | 0 .../flink/api/common/io/InputFormat.java | 0 .../flink/api/common/io/NonParallelInput.java | 0 .../flink/api/common/io/OutputFormat.java | 0 .../flink/api/common/io/ParseException.java | 0 .../api/common/io/SerializedInputFormat.java | 0 .../api/common/io/SerializedOutputFormat.java | 0 .../common/io/statistics/BaseStatistics.java | 0 .../common/operators/AbstractUdfOperator.java | 0 .../operators/BinaryOperatorInformation.java | 0 .../api/common/operators/CompilerHints.java | 0 .../common/operators/DualInputOperator.java | 0 .../DualInputSemanticProperties.java | 0 .../common/operators/IterationOperator.java | 0 .../flink/api/common/operators/Operator.java | 0 .../common/operators/OperatorInformation.java | 0 .../flink/api/common/operators/Order.java | 0 .../flink/api/common/operators/Ordering.java | 0 .../api/common/operators/RecordOperator.java | 0 .../common/operators/SemanticProperties.java | 0 .../common/operators/SingleInputOperator.java | 0 .../SingleInputSemanticProperties.java | 0 .../operators/UnaryOperatorInformation.java | 0 .../flink/api/common/operators/Union.java | 0 .../operators/base/BulkIterationBase.java | 0 .../operators/base/CoGroupOperatorBase.java | 0 .../base/CollectorMapOperatorBase.java | 0 .../operators/base/CrossOperatorBase.java | 0 .../operators/base/DeltaIterationBase.java | 0 .../operators/base/FileDataSinkBase.java | 0 .../operators/base/FileDataSourceBase.java | 0 .../operators/base/FilterOperatorBase.java | 0 .../operators/base/FlatMapOperatorBase.java | 0 .../operators/base/GenericDataSinkBase.java | 0 .../operators/base/GenericDataSourceBase.java | 0 .../base/GroupReduceOperatorBase.java | 0 .../operators/base/JoinOperatorBase.java | 0 .../operators/base/MapOperatorBase.java | 0 .../operators/base/ReduceOperatorBase.java | 0 .../api/common/operators/util/FieldList.java | 0 .../api/common/operators/util/FieldSet.java | 0 .../common/operators/util/OperatorUtil.java | 0 .../operators/util/UserCodeClassWrapper.java | 0 .../operators/util/UserCodeObjectWrapper.java | 0 .../operators/util/UserCodeWrapper.java | 0 .../api/common/typeutils/TypeComparator.java | 0 .../typeutils/TypeComparatorFactory.java | 0 .../common/typeutils/TypePairComparator.java | 0 .../typeutils/TypePairComparatorFactory.java | 0 .../api/common/typeutils/TypeSerializer.java | 0 .../typeutils/TypeSerializerFactory.java | 0 .../typeutils/base/BasicTypeComparator.java | 0 .../typeutils/base/BooleanComparator.java | 0 .../typeutils/base/BooleanSerializer.java | 0 .../base/BooleanValueSerializer.java | 0 .../common/typeutils/base/ByteComparator.java | 0 .../common/typeutils/base/ByteSerializer.java | 0 .../typeutils/base/ByteValueSerializer.java | 0 .../common/typeutils/base/CharComparator.java | 0 .../common/typeutils/base/CharSerializer.java | 0 .../typeutils/base/CharValueSerializer.java | 0 .../typeutils/base/DoubleComparator.java | 0 .../typeutils/base/DoubleSerializer.java | 0 .../typeutils/base/DoubleValueSerializer.java | 0 .../typeutils/base/FloatComparator.java | 0 .../typeutils/base/FloatSerializer.java | 0 .../typeutils/base/FloatValueSerializer.java | 0 .../common/typeutils/base/IntComparator.java | 0 .../common/typeutils/base/IntSerializer.java | 0 .../typeutils/base/IntValueSerializer.java | 0 .../common/typeutils/base/LongComparator.java | 0 .../common/typeutils/base/LongSerializer.java | 0 .../typeutils/base/LongValueSerializer.java | 0 .../typeutils/base/ShortComparator.java | 0 .../typeutils/base/ShortSerializer.java | 0 .../typeutils/base/ShortValueSerializer.java | 0 .../typeutils/base/StringComparator.java | 0 .../typeutils/base/StringSerializer.java | 0 .../typeutils/base/StringValueSerializer.java | 0 .../BooleanPrimitiveArraySerializer.java | 0 .../array/BytePrimitiveArraySerializer.java | 0 .../array/CharPrimitiveArraySerializer.java | 0 .../array/DoublePrimitiveArraySerializer.java | 0 .../array/FloatPrimitiveArraySerializer.java | 0 .../array/IntPrimitiveArraySerializer.java | 0 .../array/LongPrimitiveArraySerializer.java | 0 .../array/ShortPrimitiveArraySerializer.java | 0 .../base/array/StringArraySerializer.java | 0 .../flink/configuration/ConfigConstants.java | 0 .../flink/configuration/Configuration.java | 0 .../configuration/GlobalConfiguration.java | 0 .../IllegalConfigurationException.java | 0 .../apache/flink/core/fs/BlockLocation.java | 0 .../flink/core/fs/FSDataInputStream.java | 0 .../flink/core/fs/FSDataOutputStream.java | 0 .../flink/core/fs/FileChannelWrapper.java | 0 .../apache/flink/core/fs/FileInputSplit.java | 0 .../org/apache/flink/core/fs/FileStatus.java | 0 .../org/apache/flink/core/fs/FileSystem.java | 0 .../java/org/apache/flink/core/fs/Path.java | 0 .../core/fs/local/LocalBlockLocation.java | 0 .../core/fs/local/LocalDataInputStream.java | 0 .../core/fs/local/LocalDataOutputStream.java | 0 .../flink/core/fs/local/LocalFileStatus.java | 0 .../flink/core/fs/local/LocalFileSystem.java | 0 .../flink/core/io/GenericInputSplit.java | 0 .../flink/core/io/IOReadableWritable.java | 0 .../org/apache/flink/core/io/InputSplit.java | 0 .../flink/core/io/LocatableInputSplit.java | 0 .../apache/flink/core/io/StringRecord.java | 0 .../flink/core/memory/DataInputView.java | 0 .../flink/core/memory/DataOutputView.java | 0 .../InputViewDataInputStreamWrapper.java | 0 .../InputViewObjectInputStreamWrapper.java | 0 .../flink/core/memory/MemorySegment.java | 0 .../core/memory/MemorySegmentSource.java | 0 .../apache/flink/core/memory/MemoryUtils.java | 0 .../OutputViewDataOutputStreamWrapper.java | 0 .../OutputViewObjectOutputStreamWrapper.java | 0 .../core/memory/SeekableDataInputView.java | 0 .../core/memory/SeekableDataOutputView.java | 0 .../core/protocols/VersionedProtocol.java | 0 .../org/apache/flink/types/BooleanValue.java | 0 .../org/apache/flink/types/ByteValue.java | 0 .../org/apache/flink/types/CharValue.java | 0 .../org/apache/flink/types/CopyableValue.java | 0 .../flink/types/DeserializationException.java | 0 .../org/apache/flink/types/DoubleValue.java | 0 .../org/apache/flink/types/FloatValue.java | 0 .../java/org/apache/flink/types/IntValue.java | 0 .../main/java/org/apache/flink/types/Key.java | 0 .../types/KeyFieldOutOfBoundsException.java | 0 .../org/apache/flink/types/ListValue.java | 0 .../org/apache/flink/types/LongValue.java | 0 .../java/org/apache/flink/types/MapValue.java | 0 .../apache/flink/types/NormalizableKey.java | 0 .../java/org/apache/flink/types/Nothing.java | 0 .../apache/flink/types/NothingTypeInfo.java | 0 .../flink/types/NullKeyFieldException.java | 0 .../org/apache/flink/types/NullValue.java | 0 .../java/org/apache/flink/types/Pair.java | 0 .../java/org/apache/flink/types/Record.java | 0 .../apache/flink/types/ResettableValue.java | 0 .../org/apache/flink/types/ShortValue.java | 0 .../org/apache/flink/types/StringValue.java | 0 .../apache/flink/types/TypeInformation.java | 0 .../java/org/apache/flink/types/Value.java | 0 .../org/apache/flink/types/ValueUtil.java | 0 .../apache/flink/types/parser/ByteParser.java | 0 .../flink/types/parser/ByteValueParser.java | 0 .../flink/types/parser/DoubleParser.java | 0 .../flink/types/parser/DoubleValueParser.java | 0 .../flink/types/parser/FieldParser.java | 0 .../flink/types/parser/FloatParser.java | 0 .../flink/types/parser/FloatValueParser.java | 0 .../apache/flink/types/parser/IntParser.java | 0 .../flink/types/parser/IntValueParser.java | 0 .../apache/flink/types/parser/LongParser.java | 0 .../flink/types/parser/LongValueParser.java | 0 .../flink/types/parser/ShortParser.java | 0 .../flink/types/parser/ShortValueParser.java | 0 .../flink/types/parser/StringParser.java | 0 .../flink/types/parser/StringValueParser.java | 0 .../org/apache/flink/util/ClassUtils.java | 0 .../java/org/apache/flink/util/Collector.java | 0 .../apache/flink/util/InstantiationUtil.java | 0 .../apache/flink/util/IterableIterator.java | 0 .../java/org/apache/flink/util/LogUtils.java | 0 .../flink/util/MutableObjectIterator.java | 0 .../flink/util/NumberSequenceIterator.java | 0 .../apache/flink/util/OperatingSystem.java | 0 .../org/apache/flink/util/ReflectionUtil.java | 0 .../apache/flink/util/SimpleStringUtils.java | 0 .../apache/flink/util/SplittableIterator.java | 0 .../org/apache/flink/util/StringUtils.java | 0 .../java/org/apache/flink/util/Visitable.java | 0 .../java/org/apache/flink/util/Visitor.java | 0 .../api/common/io/BinaryInputFormatTest.java | 0 .../io/DelimitedInputFormatSamplingTest.java | 0 .../common/io/DelimitedInputFormatTest.java | 0 .../api/common/io/FileInputFormatTest.java | 0 .../api/common/io/FileOutputFormatTest.java | 0 .../common/io/GenericCsvInputFormatTest.java | 0 .../api/common/io/SequentialFormatTest.java | 0 .../common/operators/util/FieldListTest.java | 0 .../common/operators/util/FieldSetTest.java | 0 .../operators/util/OperatorUtilTest.java | 0 .../common/typeutils/ComparatorTestBase.java | 0 .../common/typeutils/SerializerTestBase.java | 0 .../typeutils/SerializerTestInstance.java | 0 .../typeutils/base/BooleanComparatorTest.java | 0 .../typeutils/base/BooleanSerializerTest.java | 0 .../typeutils/base/ByteComparatorTest.java | 0 .../typeutils/base/ByteSerializerTest.java | 0 .../typeutils/base/CharComparatorTest.java | 0 .../typeutils/base/CharSerializerTest.java | 0 .../typeutils/base/DoubleComparatorTest.java | 0 .../typeutils/base/DoubleSerializerTest.java | 0 .../typeutils/base/FloatComparatorTest.java | 0 .../typeutils/base/FloatSerializerTest.java | 0 .../typeutils/base/IntComparatorTest.java | 0 .../typeutils/base/IntSerializerTest.java | 0 .../typeutils/base/LongComparatorTest.java | 0 .../typeutils/base/LongSerializerTest.java | 0 .../typeutils/base/ShortComparatorTest.java | 0 .../typeutils/base/ShortSerializerTest.java | 0 .../typeutils/base/StringComparatorTest.java | 0 .../typeutils/base/StringSerializerTest.java | 0 .../BooleanPrimitiveArraySerializerTest.java | 0 .../BytePrimitiveArraySerializerTest.java | 0 .../CharPrimitiveArraySerializerTest.java | 0 .../DoublePrimitiveArraySerializerTest.java | 0 .../FloatPrimitiveArraySerializerTest.java | 0 .../IntPrimitiveArraySerializerTest.java | 0 .../LongPrimitiveArraySerializerTest.java | 0 .../ShortPrimitiveArraySerializerTest.java | 0 .../base/array/StringArraySerializerTest.java | 0 .../SimpleDataDistributionTest.java | 0 .../configuration/ConfigurationTest.java | 0 .../GlobalConfigurationTest.java | 0 .../core/fs/local/LocalFileSystemTest.java | 0 .../flink/core/testutils/CommonTestUtils.java | 0 .../flink/testutils/TestConfigUtils.java | 0 .../flink/testutils/TestFileSystem.java | 0 .../apache/flink/testutils/TestFileUtils.java | 0 .../flink/types/CollectionsDataTypeTest.java | 0 .../flink/types/NormalizableKeyTest.java | 0 .../flink/types/PrimitiveDataTypeTest.java | 0 .../org/apache/flink/types/RecordITCase.java | 0 .../org/apache/flink/types/RecordTest.java | 0 .../flink/types/StringSerializationTest.java | 0 .../flink/types/parser/ByteParserTest.java | 0 .../types/parser/ByteValueParserTest.java | 0 .../flink/types/parser/DoubleParserTest.java | 0 .../types/parser/DoubleValueParserTest.java | 0 .../flink/types/parser/FloatParserTest.java | 0 .../types/parser/FloatValueParserTest.java | 0 .../flink/types/parser/IntParserTest.java | 0 .../types/parser/IntValueParserTest.java | 0 .../flink/types/parser/LongParserTest.java | 0 .../types/parser/LongValueParserTest.java | 0 .../flink/types/parser/ParserTestBase.java | 0 .../flink/types/parser/ShortParserTest.java | 0 .../types/parser/ShortValueParserTest.java | 0 .../flink/types/parser/StringParserTest.java | 0 .../types/parser/StringValueParserTest.java | 0 .../parser/VarLengthStringParserTest.java | 0 .../flink/util/InstantiationUtilsTest.java | 0 .../util/NumberSequenceIteratorTest.java | 0 .../flink/util/SimpleStringUtilsTest.java | 0 .../apache/flink/util/StringUtilsTest.java | 0 {stratosphere-dist => flink-dist}/pom.xml | 64 ++++++------- .../src/deb/bin/jobmanager | 68 ++++++------- .../src/deb/bin/taskmanager | 66 ++++++------- .../src/deb/bin/webclient | 66 ++++++------- .../src/deb/control/control | 0 .../src/deb/control/postinst | 0 .../src/main/assemblies/bin.xml | 40 ++++---- .../src/main/assemblies/yarn-uberjar.xml | 8 +- .../src/main/assemblies/yarn.xml | 35 ++++--- flink-dist/src/main/flink-bin/DISCLAIMER | 11 +++ .../src/main/flink-bin}/LICENSE | 0 flink-dist/src/main/flink-bin/NOTICE | 6 ++ .../src/main/flink-bin}/README.txt | 0 .../src/main/flink-bin}/bin/config.sh | 54 +++++------ .../src/main/flink-bin/bin/flink | 24 ++--- .../src/main/flink-bin/bin/flink.bat | 9 +- .../src/main/flink-bin}/bin/jobmanager.sh | 34 +++---- .../src/main/flink-bin}/bin/start-cluster.sh | 8 +- .../src/main/flink-bin}/bin/start-local.bat | 11 ++- .../src/main/flink-bin}/bin/start-local.sh | 2 +- .../main/flink-bin}/bin/start-webclient.sh | 2 +- .../src/main/flink-bin}/bin/stop-cluster.sh | 8 +- .../src/main/flink-bin}/bin/stop-local.sh | 2 +- .../src/main/flink-bin}/bin/stop-webclient.sh | 2 +- .../src/main/flink-bin}/bin/taskmanager.sh | 34 +++---- .../src/main/flink-bin}/bin/webclient.sh | 44 ++++----- .../src/main/flink-bin/conf/flink-conf.yaml | 0 .../src/main/flink-bin}/conf/log4j.properties | 0 .../flink-bin}/conf/log4jconsole.properties | 0 .../src/main/flink-bin}/conf/slaves | 0 .../main/flink-bin}/tools/planVisualizer.html | 0 .../main/flink-bin}/yarn-bin/yarn-session.sh | 17 ++-- .../flink-java-examples}/pom.xml | 12 +-- .../flink/example/java/clustering/KMeans.java | 0 .../java/clustering/util/KMeansData.java | 0 .../clustering/util/KMeansDataGenerator.java | 0 .../java/graph/ConnectedComponents.java | 0 .../java/graph/EnumTrianglesBasic.java | 0 .../example/java/graph/EnumTrianglesOpt.java | 0 .../example/java/graph/PageRankBasic.java | 0 .../java/graph/TransitiveClosureNaive.java | 0 .../graph/util/ConnectedComponentsData.java | 0 .../java/graph/util/EnumTrianglesData.java | 0 .../graph/util/EnumTrianglesDataTypes.java | 0 .../example/java/graph/util/PageRankData.java | 0 .../example/java/ml/LinearRegression.java | 0 .../java/ml/util/LinearRegressionData.java | 0 .../util/LinearRegressionDataGenerator.java | 0 .../java/relational/RelationalQuery.java | 0 .../example/java/relational/TPCHQuery10.java | 0 .../example/java/relational/TPCHQuery3.java | 0 .../java/relational/WebLogAnalysis.java | 0 .../java/relational/util/WebLogData.java | 0 .../relational/util/WebLogDataGenerator.java | 0 .../example/java/wordcount/WordCount.java | 0 .../example/java/wordcount/WordCountPOJO.java | 0 .../java/wordcount/util/WordCountData.java | 0 .../flink-scala-examples}/pom.xml | 12 +-- .../apache/flink/examples/scala/Dummy.java | 0 .../datamining/BatchGradientDescent.scala | 0 .../examples/scala/datamining/KMeans.scala | 0 .../scala/graph/ComputeEdgeDegrees.scala | 0 .../scala/graph/ConnectedComponents.scala | 0 .../EnumTrianglesOnEdgesWithDegrees.scala | 0 .../flink/examples/scala/graph/LineRank.scala | 0 .../flink/examples/scala/graph/PageRank.scala | 0 .../scala/graph/PageRankWithWeight.scala | 0 .../scala/graph/TransitiveClosureNaive.scala | 0 .../iterative/TerminationCriterion.scala | 0 .../scala/relational/RelationalQuery.scala | 0 .../scala/relational/WebLogAnalysis.scala | 0 .../scala/testing/KMeansForTest.scala | 0 .../examples/scala/wordcount/WordCount.scala | 0 .../scala/wordcount/WordCountWithCount.scala | 0 .../WordCountWithUserDefinedType.scala | 0 .../pom.xml | 20 ++-- {stratosphere-java => flink-java}/pom.xml | 16 ++-- .../api/java/BulkIterationResultSet.java | 0 .../org/apache/flink/api/java/DataSet.java | 0 .../apache/flink/api/java/DeltaIteration.java | 0 .../api/java/DeltaIterationResultSet.java | 0 .../flink/api/java/ExecutionEnvironment.java | 0 .../flink/api/java/IterativeDataSet.java | 0 .../flink/api/java/LocalEnvironment.java | 0 .../flink/api/java/RemoteEnvironment.java | 0 .../java/aggregation/AggregationFunction.java | 0 .../AggregationFunctionFactory.java | 0 .../api/java/aggregation/Aggregations.java | 0 .../aggregation/AvgAggregationFunction.java | 0 .../aggregation/MaxAggregationFunction.java | 0 .../aggregation/MinAggregationFunction.java | 0 .../aggregation/SumAggregationFunction.java | 0 .../UnsupportedAggregationTypeException.java | 0 .../api/java/functions/CoGroupFunction.java | 0 .../api/java/functions/CrossFunction.java | 0 .../api/java/functions/FilterFunction.java | 0 .../api/java/functions/FlatMapFunction.java | 0 .../api/java/functions/FlatMapIterator.java | 0 .../java/functions/FunctionAnnotation.java | 0 .../java/functions/GroupReduceFunction.java | 0 .../java/functions/GroupReduceIterator.java | 0 .../java/functions/InvalidTypesException.java | 0 .../api/java/functions/JoinFunction.java | 0 .../flink/api/java/functions/KeySelector.java | 0 .../flink/api/java/functions/MapFunction.java | 0 .../api/java/functions/ReduceFunction.java | 0 .../api/java/functions/SemanticPropUtil.java | 0 .../api/java/io/CollectionInputFormat.java | 0 .../flink/api/java/io/CsvInputFormat.java | 0 .../flink/api/java/io/CsvOutputFormat.java | 0 .../apache/flink/api/java/io/CsvReader.java | 0 .../api/java/io/DiscardingOuputFormat.java | 0 .../api/java/io/DiscardingOutputFormat.java | 0 .../api/java/io/IteratorInputFormat.java | 0 .../java/io/LocalCollectionOutputFormat.java | 0 .../java/io/ParallelIteratorInputFormat.java | 0 .../api/java/io/PrintingOutputFormat.java | 0 .../flink/api/java/io/TextInputFormat.java | 0 .../flink/api/java/io/TextOutputFormat.java | 0 .../api/java/io/TextValueInputFormat.java | 0 .../api/java/operators/AggregateOperator.java | 0 .../api/java/operators/CoGroupOperator.java | 0 .../api/java/operators/CrossOperator.java | 0 .../java/operators/CustomUnaryOperation.java | 0 .../flink/api/java/operators/DataSink.java | 0 .../flink/api/java/operators/DataSource.java | 0 .../api/java/operators/DistinctOperator.java | 0 .../api/java/operators/FilterOperator.java | 0 .../api/java/operators/FlatMapOperator.java | 0 .../flink/api/java/operators/Grouping.java | 0 .../api/java/operators/JoinOperator.java | 0 .../apache/flink/api/java/operators/Keys.java | 0 .../flink/api/java/operators/MapOperator.java | 0 .../flink/api/java/operators/Operator.java | 0 .../java/operators/OperatorTranslation.java | 0 .../api/java/operators/ProjectOperator.java | 0 .../java/operators/ReduceGroupOperator.java | 0 .../api/java/operators/ReduceOperator.java | 0 .../java/operators/SingleInputOperator.java | 0 .../operators/SingleInputUdfOperator.java | 0 .../api/java/operators/SortedGrouping.java | 0 .../api/java/operators/TwoInputOperator.java | 0 .../java/operators/TwoInputUdfOperator.java | 0 .../flink/api/java/operators/UdfOperator.java | 0 .../api/java/operators/UnionOperator.java | 0 .../api/java/operators/UnsortedGrouping.java | 0 .../java/operators/translation/JavaPlan.java | 0 .../translation/KeyExtractingMapper.java | 0 .../translation/KeyRemovingMapper.java | 0 .../translation/PlanFilterOperator.java | 0 .../translation/PlanProjectOperator.java | 0 .../PlanUnwrappingCoGroupOperator.java | 0 .../PlanUnwrappingJoinOperator.java | 0 .../PlanUnwrappingReduceGroupOperator.java | 0 .../PlanUnwrappingReduceOperator.java | 0 .../translation/TupleKeyExtractingMapper.java | 0 .../translation/TupleUnwrappingIterator.java | 0 .../translation/TupleWrappingCollector.java | 0 .../translation/WrappingFunction.java | 0 .../record/functions/CoGroupFunction.java | 0 .../java/record/functions/CrossFunction.java | 0 .../record/functions/FunctionAnnotation.java | 0 .../java/record/functions/JoinFunction.java | 0 .../java/record/functions/MapFunction.java | 0 .../java/record/functions/ReduceFunction.java | 0 .../java/record/io/CollectionInputFormat.java | 0 .../api/java/record/io/CsvInputFormat.java | 0 .../api/java/record/io/CsvOutputFormat.java | 0 .../java/record/io/DelimitedInputFormat.java | 0 .../java/record/io/DelimitedOutputFormat.java | 0 ...ExternalProcessFixedLengthInputFormat.java | 0 .../record/io/ExternalProcessInputFormat.java | 0 .../record/io/ExternalProcessInputSplit.java | 0 .../api/java/record/io/FileInputFormat.java | 0 .../api/java/record/io/FileOutputFormat.java | 0 .../record/io/FixedLengthInputFormat.java | 0 .../java/record/io/GenericInputFormat.java | 0 .../api/java/record/io/TextInputFormat.java | 0 .../java/record/operators/BulkIteration.java | 0 .../record/operators/CoGroupOperator.java | 0 .../operators/CollectionDataSource.java | 0 .../java/record/operators/CrossOperator.java | 0 .../operators/CrossWithLargeOperator.java | 0 .../operators/CrossWithSmallOperator.java | 0 .../java/record/operators/DeltaIteration.java | 0 .../java/record/operators/FileDataSink.java | 0 .../java/record/operators/FileDataSource.java | 0 .../record/operators/GenericDataSink.java | 0 .../record/operators/GenericDataSource.java | 0 .../java/record/operators/JoinOperator.java | 0 .../java/record/operators/MapOperator.java | 0 .../record/operators/OperatorInfoHelper.java | 0 .../java/record/operators/ReduceOperator.java | 0 .../apache/flink/api/java/tuple/Tuple.java | 0 .../apache/flink/api/java/tuple/Tuple1.java | 0 .../apache/flink/api/java/tuple/Tuple10.java | 0 .../apache/flink/api/java/tuple/Tuple11.java | 0 .../apache/flink/api/java/tuple/Tuple12.java | 0 .../apache/flink/api/java/tuple/Tuple13.java | 0 .../apache/flink/api/java/tuple/Tuple14.java | 0 .../apache/flink/api/java/tuple/Tuple15.java | 0 .../apache/flink/api/java/tuple/Tuple16.java | 0 .../apache/flink/api/java/tuple/Tuple17.java | 0 .../apache/flink/api/java/tuple/Tuple18.java | 0 .../apache/flink/api/java/tuple/Tuple19.java | 0 .../apache/flink/api/java/tuple/Tuple2.java | 0 .../apache/flink/api/java/tuple/Tuple20.java | 0 .../apache/flink/api/java/tuple/Tuple21.java | 0 .../apache/flink/api/java/tuple/Tuple22.java | 0 .../apache/flink/api/java/tuple/Tuple23.java | 0 .../apache/flink/api/java/tuple/Tuple24.java | 0 .../apache/flink/api/java/tuple/Tuple25.java | 0 .../apache/flink/api/java/tuple/Tuple3.java | 0 .../apache/flink/api/java/tuple/Tuple4.java | 0 .../apache/flink/api/java/tuple/Tuple5.java | 0 .../apache/flink/api/java/tuple/Tuple6.java | 0 .../apache/flink/api/java/tuple/Tuple7.java | 0 .../apache/flink/api/java/tuple/Tuple8.java | 0 .../apache/flink/api/java/tuple/Tuple9.java | 0 .../flink/api/java/tuple/TupleGenerator.java | 0 .../java/tuple/builder/Tuple10Builder.java | 0 .../java/tuple/builder/Tuple11Builder.java | 0 .../java/tuple/builder/Tuple12Builder.java | 0 .../java/tuple/builder/Tuple13Builder.java | 0 .../java/tuple/builder/Tuple14Builder.java | 0 .../java/tuple/builder/Tuple15Builder.java | 0 .../java/tuple/builder/Tuple16Builder.java | 0 .../java/tuple/builder/Tuple17Builder.java | 0 .../java/tuple/builder/Tuple18Builder.java | 0 .../java/tuple/builder/Tuple19Builder.java | 0 .../api/java/tuple/builder/Tuple1Builder.java | 0 .../java/tuple/builder/Tuple20Builder.java | 0 .../java/tuple/builder/Tuple21Builder.java | 0 .../java/tuple/builder/Tuple22Builder.java | 0 .../java/tuple/builder/Tuple23Builder.java | 0 .../java/tuple/builder/Tuple24Builder.java | 0 .../java/tuple/builder/Tuple25Builder.java | 0 .../api/java/tuple/builder/Tuple2Builder.java | 0 .../api/java/tuple/builder/Tuple3Builder.java | 0 .../api/java/tuple/builder/Tuple4Builder.java | 0 .../api/java/tuple/builder/Tuple5Builder.java | 0 .../api/java/tuple/builder/Tuple6Builder.java | 0 .../api/java/tuple/builder/Tuple7Builder.java | 0 .../api/java/tuple/builder/Tuple8Builder.java | 0 .../api/java/tuple/builder/Tuple9Builder.java | 0 .../flink/api/java/typeutils/AtomicType.java | 0 .../java/typeutils/BasicArrayTypeInfo.java | 0 .../api/java/typeutils/BasicTypeInfo.java | 0 .../api/java/typeutils/CompositeType.java | 0 .../api/java/typeutils/GenericTypeInfo.java | 0 .../java/typeutils/InputTypeConfigurable.java | 0 .../java/typeutils/ObjectArrayTypeInfo.java | 0 .../flink/api/java/typeutils/PojoField.java | 0 .../api/java/typeutils/PojoTypeInfo.java | 0 .../typeutils/PrimitiveArrayTypeInfo.java | 0 .../api/java/typeutils/RecordTypeInfo.java | 0 .../java/typeutils/ResultTypeQueryable.java | 0 .../api/java/typeutils/TupleTypeInfo.java | 0 .../api/java/typeutils/TypeExtractor.java | 0 .../api/java/typeutils/TypeInfoParser.java | 0 .../api/java/typeutils/ValueTypeInfo.java | 0 .../api/java/typeutils/WritableTypeInfo.java | 0 .../typeutils/runtime/AvroSerializer.java | 0 .../runtime/CopyableValueComparator.java | 0 .../runtime/CopyableValueSerializer.java | 0 .../typeutils/runtime/DataInputDecoder.java | 0 .../typeutils/runtime/DataOutputEncoder.java | 0 .../runtime/GenericArraySerializer.java | 0 .../runtime/GenericTypeComparator.java | 0 .../typeutils/runtime/PojoComparator.java | 0 .../typeutils/runtime/PojoPairComparator.java | 0 .../typeutils/runtime/PojoSerializer.java | 0 .../runtime/RuntimeComparatorFactory.java | 0 .../runtime/RuntimePairComparatorFactory.java | 0 .../RuntimeStatefulSerializerFactory.java | 0 .../RuntimeStatelessSerializerFactory.java | 0 .../typeutils/runtime/TupleComparator.java | 0 .../runtime/TupleLeadingFieldComparator.java | 0 .../TupleLeadingFieldPairComparator.java | 0 .../runtime/TuplePairComparator.java | 0 .../typeutils/runtime/TupleSerializer.java | 0 .../typeutils/runtime/ValueComparator.java | 0 .../typeutils/runtime/ValueSerializer.java | 0 .../typeutils/runtime/WritableComparator.java | 0 .../typeutils/runtime/WritableSerializer.java | 0 .../runtime/record/RecordComparator.java | 0 .../record/RecordComparatorFactory.java | 0 .../runtime/record/RecordPairComparator.java | 0 .../record/RecordPairComparatorFactory.java | 0 .../runtime/record/RecordSerializer.java | 0 .../record/RecordSerializerFactory.java | 0 .../java/org/apache/hadoop/io/Writable.java | 0 .../api/java/MultipleInvokationsTest.java | 0 .../java/functions/SemanticPropUtilTest.java | 0 .../SemanticPropertiesProjectionTest.java | 0 .../SemanticPropertiesTranslationTest.java | 0 .../flink/api/java/io/CSVReaderTest.java | 0 .../java/io/CollectionInputFormatTest.java | 0 .../flink/api/java/io/CsvInputFormatTest.java | 0 .../api/java/io/TextInputFormatTest.java | 0 .../java/operator/AggregateOperatorTest.java | 0 .../java/operator/CoGroupOperatorTest.java | 0 .../api/java/operator/CrossOperatorTest.java | 0 .../java/operator/DistinctOperatorTest.java | 0 .../flink/api/java/operator/GroupingTest.java | 0 .../api/java/operator/JoinOperatorTest.java | 0 .../java/operator/ProjectionOperatorTest.java | 0 .../translation/AggregateTranslationTest.java | 0 .../DeltaIterationTranslationTest.java | 0 .../translation/ReduceTranslationTests.java | 0 .../java/record/io/CsvInputFormatTest.java | 0 .../java/record/io/CsvOutputFormatTest.java | 0 ...rnalProcessFixedLengthInputFormatTest.java | 0 .../io/ExternalProcessInputFormatTest.java | 0 .../record/io/FixedLenghtInputFormatTest.java | 0 .../java/record/io/TextInputFormatTest.java | 0 .../flink/api/java/tuple/Tuple2Test.java | 0 .../extractor/PojoTypeInformationTest.java | 0 .../TypeExtractorInputFormatsTest.java | 0 .../type/extractor/TypeExtractorTest.java | 0 .../java/typeutils/TypeInfoParserTest.java | 0 .../runtime/CopyableValueComparatorTest.java | 0 .../runtime/GenericArraySerializerTest.java | 0 .../runtime/GenericTypeComparatorTest.java | 0 .../runtime/GenericTypeSerializerTest.java | 0 .../typeutils/runtime/PojoSerializerTest.java | 0 .../runtime/StringArrayWritable.java | 0 .../runtime/TupleComparatorILD2Test.java | 0 .../runtime/TupleComparatorILD3Test.java | 0 .../runtime/TupleComparatorILDC3Test.java | 0 .../runtime/TupleComparatorILDX1Test.java | 0 .../runtime/TupleComparatorILDXC2Test.java | 0 .../runtime/TupleComparatorISD1Test.java | 0 .../runtime/TupleComparatorISD2Test.java | 0 .../runtime/TupleComparatorISD3Test.java | 0 .../TupleLeadingFieldComparatorTest.java | 0 .../TupleLeadingFieldPairComparatorTest.java | 0 .../runtime/TuplePairComparatorTest.java | 0 .../runtime/TupleSerializerTest.java | 0 .../runtime/TupleSerializerTestInstance.java | 0 .../runtime/ValueComparatorTest.java | 0 .../runtime/WritableComparatorTest.java | 0 .../runtime/WritableSerializerTest.java | 0 .../tuple/base/TupleComparatorTestBase.java | 0 .../base/TuplePairComparatorTestBase.java | 0 flink-quickstart/README.md | 27 ++++++ .../pom.xml | 34 +------ flink-quickstart/quickstart-SNAPSHOT.sh | 52 ++++++++++ .../quickstart-java/pom.xml | 4 +- .../org/apache/flink}/quickstart/Dummy.java | 2 +- .../resources/META-INF/maven/archetype.xml | 2 +- .../resources/archetype-resources/pom.xml | 12 +-- .../src/main/java/Job.java | 40 ++++---- .../src/main/java/WordCountJob.java | 40 ++++---- flink-quickstart/quickstart-scala-SNAPSHOT.sh | 52 ++++++++++ .../quickstart-scala.sh | 22 +++-- .../quickstart-scala/pom.xml | 4 +- .../org/apache/flink}/quickstart/Dummy.java | 2 +- .../META-INF/maven/archetype-metadata.xml | 0 .../resources/META-INF/maven/archetype.xml | 2 +- .../resources/archetype-resources/pom.xml | 14 +-- .../src/main/scala/Job.scala | 38 ++++---- .../quickstart.sh | 22 +++-- .../pom.xml | 16 ++-- .../web-docs-infoserver/analyze.html | 0 .../web-docs-infoserver/blank-page.html | 0 .../web-docs-infoserver/configuration.html | 0 .../web-docs-infoserver/css/bootstrap.css | 0 .../web-docs-infoserver/css/bootstrap.min.css | 0 .../css/nephelefrontend.css | 0 .../web-docs-infoserver/css/sb-admin.css | 0 .../web-docs-infoserver/css/timeline.css | 0 .../font-awesome/css/font-awesome.css | 0 .../font-awesome/css/font-awesome.min.css | 0 .../font-awesome/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../font-awesome/less/bordered-pulled.less | 0 .../font-awesome/less/core.less | 0 .../font-awesome/less/fixed-width.less | 0 .../font-awesome/less/font-awesome.less | 0 .../font-awesome/less/icons.less | 0 .../font-awesome/less/larger.less | 0 .../font-awesome/less/list.less | 0 .../font-awesome/less/mixins.less | 0 .../font-awesome/less/path.less | 0 .../font-awesome/less/rotated-flipped.less | 0 .../font-awesome/less/spinning.less | 0 .../font-awesome/less/stacked.less | 0 .../font-awesome/less/variables.less | 0 .../font-awesome/scss/_bordered-pulled.scss | 0 .../font-awesome/scss/_core.scss | 0 .../font-awesome/scss/_fixed-width.scss | 0 .../font-awesome/scss/_icons.scss | 0 .../font-awesome/scss/_larger.scss | 0 .../font-awesome/scss/_list.scss | 0 .../font-awesome/scss/_mixins.scss | 0 .../font-awesome/scss/_path.scss | 0 .../font-awesome/scss/_rotated-flipped.scss | 0 .../font-awesome/scss/_spinning.scss | 0 .../font-awesome/scss/_stacked.scss | 0 .../font-awesome/scss/_variables.scss | 0 .../font-awesome/scss/font-awesome.scss | 0 .../web-docs-infoserver/history.html | 0 .../img/StratosphereLogo.png | Bin .../resources/web-docs-infoserver/index.html | 0 .../web-docs-infoserver/js/analyzer.js | 0 .../web-docs-infoserver/js/bootstrap.js | 0 .../web-docs-infoserver/js/bootstrap.min.js | 0 .../web-docs-infoserver/js/configuration.js | 0 .../js/flot/chart-data-flot.js | 0 .../js/flot/excanvas.min.js | 0 .../js/flot/jquery.flot.js | 0 .../js/flot/jquery.flot.pie.js | 0 .../js/flot/jquery.flot.resize.js | 0 .../js/flot/jquery.flot.tooltip.min.js | 0 .../web-docs-infoserver/js/googlejsapi.js | 0 .../web-docs-infoserver/js/helpers.js | 0 .../web-docs-infoserver/js/jcanvas.min.js | 0 .../js/jobmanagerFrontend.js | 0 .../web-docs-infoserver/js/jquery-1.10.2.js | 0 .../js/jquery.flot.categories.min.js | 0 .../web-docs-infoserver/js/jquery.flot.min.js | 0 .../js/jquery.flot.stack.js | 0 .../js/jquery.flot.time.min.js | 0 .../web-docs-infoserver/js/jquery.js | 0 .../web-docs-infoserver/js/taskmanager.js | 0 .../web-docs-infoserver/js/timeline.js | 0 .../web-docs-infoserver/taskmanagers.html | 0 .../org/apache/flink/runtime/AbstractID.java | 0 .../apache/flink/runtime/ExecutionMode.java | 0 .../flink/runtime/JobSubmissionException.java | 0 .../accumulators/AccumulatorEvent.java | 0 .../runtime/client/AbstractJobResult.java | 0 .../flink/runtime/client/JobCancelResult.java | 0 .../flink/runtime/client/JobClient.java | 0 .../runtime/client/JobExecutionException.java | 0 .../runtime/client/JobProgressResult.java | 0 .../runtime/client/JobSubmissionResult.java | 0 .../ChannelDeploymentDescriptor.java | 0 .../deployment/GateDeploymentDescriptor.java | 0 .../deployment/TaskDeploymentDescriptor.java | 0 .../runtime/event/job/AbstractEvent.java | 0 .../event/job/ExecutionStateChangeEvent.java | 0 .../flink/runtime/event/job/JobEvent.java | 0 .../runtime/event/job/ManagementEvent.java | 0 .../runtime/event/job/RecentJobEvent.java | 0 .../event/job/VertexAssignmentEvent.java | 0 .../flink/runtime/event/job/VertexEvent.java | 0 .../runtime/event/task/AbstractEvent.java | 0 .../runtime/event/task/AbstractTaskEvent.java | 0 .../flink/runtime/event/task/EventList.java | 0 .../runtime/event/task/EventListener.java | 0 .../event/task/EventNotificationManager.java | 0 .../runtime/event/task/IntegerTaskEvent.java | 0 .../runtime/event/task/StringTaskEvent.java | 0 .../execution/CancelTaskException.java | 0 .../flink/runtime/execution/Environment.java | 0 .../runtime/execution/ExecutionListener.java | 0 .../runtime/execution/ExecutionObserver.java | 0 .../runtime/execution/ExecutionState.java | 0 .../execution/ExecutionStateTransition.java | 0 .../runtime/execution/RuntimeEnvironment.java | 0 .../librarycache/LibraryCacheManager.java | 0 .../LibraryCacheProfileRequest.java | 0 .../LibraryCacheProfileResponse.java | 0 .../librarycache/LibraryCacheUpdate.java | 0 .../DistributionPatternProvider.java | 0 .../runtime/executiongraph/ExecutionEdge.java | 0 .../runtime/executiongraph/ExecutionGate.java | 0 .../executiongraph/ExecutionGraph.java | 0 .../ExecutionGraphIterator.java | 0 .../executiongraph/ExecutionGroupEdge.java | 0 .../executiongraph/ExecutionGroupVertex.java | 0 .../ExecutionGroupVertexIterator.java | 0 .../executiongraph/ExecutionPipeline.java | 0 .../executiongraph/ExecutionSignature.java | 0 .../executiongraph/ExecutionStage.java | 0 .../ExecutionStageListener.java | 0 .../executiongraph/ExecutionVertex.java | 0 .../executiongraph/ExecutionVertexID.java | 0 .../GraphConversionException.java | 0 .../executiongraph/InternalJobStatus.java | 0 .../executiongraph/JobStatusListener.java | 0 .../ManagementGraphFactory.java | 0 .../VertexAssignmentListener.java | 0 .../flink/runtime/filecache/FileCache.java | 0 .../fs/hdfs/DistributedBlockLocation.java | 0 .../fs/hdfs/DistributedDataInputStream.java | 0 .../fs/hdfs/DistributedDataOutputStream.java | 0 .../fs/hdfs/DistributedFileStatus.java | 0 .../fs/hdfs/DistributedFileSystem.java | 0 .../flink/runtime/fs/s3/S3BlockLocation.java | 0 .../runtime/fs/s3/S3BucketObjectPair.java | 0 .../runtime/fs/s3/S3DataInputStream.java | 0 .../runtime/fs/s3/S3DataOutputStream.java | 0 .../runtime/fs/s3/S3DirectoryStructure.java | 0 .../flink/runtime/fs/s3/S3FileStatus.java | 0 .../flink/runtime/fs/s3/S3FileSystem.java | 0 .../runtime/instance/AllocatedResource.java | 0 .../flink/runtime/instance/AllocatedSlot.java | 0 .../flink/runtime/instance/AllocationID.java | 0 .../instance/DefaultInstanceManager.java | 0 .../flink/runtime/instance/DummyInstance.java | 0 .../flink/runtime/instance/Hardware.java | 0 .../runtime/instance/HardwareDescription.java | 0 .../instance/HardwareDescriptionFactory.java | 0 .../flink/runtime/instance/Instance.java | 0 .../instance/InstanceConnectionInfo.java | 0 .../runtime/instance/InstanceException.java | 0 .../flink/runtime/instance/InstanceID.java | 0 .../runtime/instance/InstanceListener.java | 0 .../runtime/instance/InstanceManager.java | 0 .../runtime/instance/InstanceNotifier.java | 0 .../instance/LocalInstanceManager.java | 0 .../disk/ChannelReaderInputViewIterator.java | 0 .../runtime/io/disk/InputViewIterator.java | 0 .../io/disk/RandomAccessInputView.java | 0 .../io/disk/RandomAccessOutputView.java | 0 .../io/disk/SimpleCollectingOutputView.java | 0 .../flink/runtime/io/disk/SpillingBuffer.java | 0 .../io/disk/iomanager/BlockChannelAccess.java | 0 .../io/disk/iomanager/BlockChannelReader.java | 0 .../io/disk/iomanager/BlockChannelWriter.java | 0 .../iomanager/BulkBlockChannelReader.java | 0 .../runtime/io/disk/iomanager/Channel.java | 0 .../io/disk/iomanager/ChannelAccess.java | 0 .../iomanager/ChannelReaderInputView.java | 0 .../iomanager/ChannelWriterOutputView.java | 0 .../io/disk/iomanager/Deserializer.java | 0 .../HeaderlessChannelReaderInputView.java | 0 .../runtime/io/disk/iomanager/IOManager.java | 0 .../runtime/io/disk/iomanager/IORequest.java | 0 .../io/disk/iomanager/RequestQueue.java | 0 .../flink/runtime/io/network/Buffer.java | 0 .../runtime/io/network/BufferRecycler.java | 0 .../runtime/io/network/ChannelManager.java | 0 .../network/ConnectionInfoLookupResponse.java | 0 .../flink/runtime/io/network/Envelope.java | 0 .../io/network/EnvelopeDispatcher.java | 0 .../io/network/EnvelopeReceiverList.java | 0 .../InsufficientResourcesException.java | 0 .../io/network/LocalConnectionManager.java | 0 .../LocalReceiverCancelledException.java | 0 .../io/network/NetworkConnectionManager.java | 0 .../runtime/io/network/RemoteReceiver.java | 0 .../runtime/io/network/SenderHintEvent.java | 0 .../io/network/api/AbstractRecordReader.java | 0 .../api/AbstractSingleGateRecordReader.java | 0 .../api/AbstractUnionRecordReader.java | 0 .../runtime/io/network/api/BufferWriter.java | 0 .../io/network/api/ChannelSelector.java | 0 .../runtime/io/network/api/MutableReader.java | 0 .../io/network/api/MutableRecordReader.java | 0 .../network/api/MutableUnionRecordReader.java | 0 .../flink/runtime/io/network/api/Reader.java | 0 .../runtime/io/network/api/ReaderBase.java | 0 .../runtime/io/network/api/RecordReader.java | 0 .../runtime/io/network/api/RecordWriter.java | 0 .../api/RoundRobinChannelSelector.java | 0 .../io/network/api/UnionRecordReader.java | 0 .../BufferAvailabilityListener.java | 0 .../bufferprovider/BufferProvider.java | 0 .../bufferprovider/BufferProviderBroker.java | 0 .../bufferprovider/DiscardBufferPool.java | 0 .../bufferprovider/GlobalBufferPool.java | 0 .../bufferprovider/LocalBufferPool.java | 0 .../bufferprovider/LocalBufferPoolOwner.java | 0 .../io/network/channels/BufferOrEvent.java | 0 .../runtime/io/network/channels/Channel.java | 0 .../network/channels/ChannelCloseEvent.java | 0 .../io/network/channels/ChannelID.java | 0 .../io/network/channels/ChannelType.java | 0 .../network/channels/EndOfSuperstepEvent.java | 0 .../io/network/channels/InputChannel.java | 0 .../io/network/channels/OutputChannel.java | 0 .../ReceiverAlreadyClosedException.java | 0 .../flink/runtime/io/network/gates/Gate.java | 0 .../runtime/io/network/gates/GateID.java | 0 .../io/network/gates/InputChannelResult.java | 0 .../runtime/io/network/gates/InputGate.java | 0 .../runtime/io/network/gates/OutputGate.java | 0 .../gates/RecordAvailabilityListener.java | 0 .../network/netty/InboundEnvelopeDecoder.java | 0 .../netty/InboundEnvelopeDispatcher.java | 0 .../network/netty/NettyConnectionManager.java | 0 .../netty/OutboundConnectionQueue.java | 0 .../netty/OutboundEnvelopeEncoder.java | 0 .../AdaptiveSpanningRecordDeserializer.java | 0 .../serialization/DataInputDeserializer.java | 0 .../serialization/DataOutputSerializer.java | 0 .../serialization/RecordDeserializer.java | 0 .../serialization/RecordSerializer.java | 0 .../SpanningRecordSerializer.java | 0 .../org/apache/flink/runtime/ipc/Client.java | 0 .../flink/runtime/ipc/ConnectionHeader.java | 0 .../org/apache/flink/runtime/ipc/RPC.java | 0 .../flink/runtime/ipc/RemoteException.java | 0 .../org/apache/flink/runtime/ipc/Server.java | 0 .../org/apache/flink/runtime/ipc/Status.java | 0 .../concurrent/BlockingBackChannel.java | 0 .../concurrent/BlockingBackChannelBroker.java | 0 .../runtime/iterative/concurrent/Broker.java | 0 .../concurrent/IterationAggregatorBroker.java | 0 .../concurrent/SolutionSetBroker.java | 0 .../concurrent/SolutionSetUpdateBarrier.java | 0 .../SolutionSetUpdateBarrierBroker.java | 0 .../concurrent/SuperstepBarrier.java | 0 .../WorksetEmptyConvergenceCriterion.java | 0 .../iterative/event/AllWorkersDoneEvent.java | 0 .../event/IterationEventWithAggregators.java | 0 .../iterative/event/TerminationEvent.java | 0 .../iterative/event/WorkerDoneEvent.java | 0 .../runtime/iterative/io/FakeOutputTask.java | 0 .../iterative/io/HashPartitionIterator.java | 0 .../iterative/io/SerializedUpdateBuffer.java | 0 .../SolutionSetFastUpdateOutputCollector.java | 0 .../io/SolutionSetUpdateOutputCollector.java | 0 .../io/WorksetUpdateOutputCollector.java | 0 .../task/AbstractIterativePactTask.java | 0 .../iterative/task/IterationHeadPactTask.java | 0 .../task/IterationIntermediatePactTask.java | 0 .../IterationSynchronizationSinkTask.java | 0 .../iterative/task/IterationTailPactTask.java | 0 .../task/RuntimeAggregatorRegistry.java | 0 .../iterative/task/SyncEventHandler.java | 0 .../runtime/iterative/task/Terminable.java | 0 .../jobgraph/AbstractJobInputVertex.java | 0 .../jobgraph/AbstractJobOutputVertex.java | 0 .../runtime/jobgraph/AbstractJobVertex.java | 0 .../runtime/jobgraph/DistributionPattern.java | 0 .../flink/runtime/jobgraph/JobEdge.java | 0 .../flink/runtime/jobgraph/JobGraph.java | 0 .../jobgraph/JobGraphDefinitionException.java | 0 .../apache/flink/runtime/jobgraph/JobID.java | 0 .../runtime/jobgraph/JobInputVertex.java | 0 .../runtime/jobgraph/JobOutputVertex.java | 0 .../flink/runtime/jobgraph/JobStatus.java | 0 .../flink/runtime/jobgraph/JobTaskVertex.java | 0 .../flink/runtime/jobgraph/JobVertexID.java | 0 .../jobgraph/tasks/AbstractInvokable.java | 0 .../jobgraph/tasks/InputSplitIterator.java | 0 .../jobgraph/tasks/InputSplitProvider.java | 0 .../runtime/jobmanager/DeploymentManager.java | 0 .../runtime/jobmanager/EventCollector.java | 0 .../flink/runtime/jobmanager/JobManager.java | 0 .../runtime/jobmanager/JobManagerUtils.java | 0 .../accumulators/AccumulatorManager.java | 0 .../accumulators/JobAccumulators.java | 0 .../jobmanager/archive/ArchiveListener.java | 0 .../jobmanager/archive/MemoryArchivist.java | 0 .../scheduler/DefaultExecutionListener.java | 0 .../scheduler/DefaultScheduler.java | 0 .../scheduler/SchedulingException.java | 0 .../DefaultInputSplitAssigner.java | 0 .../splitassigner/InputSplitAssigner.java | 0 .../splitassigner/InputSplitManager.java | 0 .../splitassigner/InputSplitTracker.java | 0 .../splitassigner/InputSplitWrapper.java | 0 .../LocatableInputSplitAssigner.java | 0 .../LocatableInputSplitList.java | 0 .../file/FileInputSplitAssigner.java | 0 .../file/FileInputSplitList.java | 0 .../jobmanager/web/JobmanagerInfoServlet.java | 0 .../jobmanager/web/LogfileInfoServlet.java | 0 .../runtime/jobmanager/web/MenuServlet.java | 0 .../jobmanager/web/SetupInfoServlet.java | 0 .../runtime/jobmanager/web/WebInfoServer.java | 0 .../managementgraph/ManagementAttachment.java | 0 .../managementgraph/ManagementEdge.java | 0 .../managementgraph/ManagementEdgeID.java | 0 .../managementgraph/ManagementGate.java | 0 .../managementgraph/ManagementGateID.java | 0 .../managementgraph/ManagementGraph.java | 0 .../ManagementGraphIterator.java | 0 .../managementgraph/ManagementGroupEdge.java | 0 .../ManagementGroupVertex.java | 0 .../ManagementGroupVertexID.java | 0 .../ManagementGroupVertexIterator.java | 0 .../managementgraph/ManagementStage.java | 0 .../managementgraph/ManagementVertex.java | 0 .../managementgraph/ManagementVertexID.java | 0 .../memorymanager/AbstractPagedInputView.java | 0 .../AbstractPagedOutputView.java | 0 .../memorymanager/CheckedMemorySegment.java | 0 .../memorymanager/DefaultMemoryManager.java | 0 .../ListMemorySegmentSource.java | 0 .../MemoryAllocationException.java | 0 .../runtime/memorymanager/MemoryManager.java | 0 .../memorymanager/SimpleMemorySegment.java | 0 .../memorymanager/UnsafeMemorySegment.java | 0 .../apache/flink/runtime/net/NetUtils.java | 0 .../runtime/net/SocketIOWithTimeout.java | 0 .../flink/runtime/net/SocketInputStream.java | 0 .../flink/runtime/net/SocketOutputStream.java | 0 .../AbstractCachedBuildSideMatchDriver.java | 0 .../operators/AllGroupReduceDriver.java | 0 .../runtime/operators/AllReduceDriver.java | 0 .../BuildFirstCachedMatchDriver.java | 0 .../BuildSecondCachedMatchDriver.java | 0 .../runtime/operators/CoGroupDriver.java | 0 .../CoGroupWithSolutionSetFirstDriver.java | 0 .../CoGroupWithSolutionSetSecondDriver.java | 0 .../runtime/operators/CollectorMapDriver.java | 0 .../flink/runtime/operators/CrossDriver.java | 0 .../flink/runtime/operators/DamBehavior.java | 0 .../flink/runtime/operators/DataSinkTask.java | 0 .../runtime/operators/DataSourceTask.java | 0 .../runtime/operators/DriverStrategy.java | 0 .../runtime/operators/FlatMapDriver.java | 0 .../operators/GroupReduceCombineDriver.java | 0 .../runtime/operators/GroupReduceDriver.java | 0 .../JoinWithSolutionSetFirstDriver.java | 0 .../JoinWithSolutionSetSecondDriver.java | 0 .../flink/runtime/operators/MapDriver.java | 0 .../flink/runtime/operators/MatchDriver.java | 0 .../flink/runtime/operators/NoOpDriver.java | 0 .../flink/runtime/operators/PactDriver.java | 0 .../runtime/operators/PactTaskContext.java | 0 .../operators/ReduceCombineDriver.java | 0 .../flink/runtime/operators/ReduceDriver.java | 0 .../runtime/operators/RegularPactTask.java | 0 .../operators/ResettablePactDriver.java | 0 .../operators/RuntimeExecutionContext.java | 0 .../flink/runtime/operators/TempBarrier.java | 0 .../operators/UnionWithTempOperator.java | 0 .../chaining/ChainedCollectorMapDriver.java | 0 .../operators/chaining/ChainedDriver.java | 0 .../chaining/ChainedFlatMapDriver.java | 0 .../operators/chaining/ChainedMapDriver.java | 0 .../ChainedTerminationCriterionDriver.java | 0 .../ExceptionInChainedStubException.java | 0 .../SynchronousChainedCombineDriver.java | 0 .../hash/AbstractHashTableProber.java | 0 .../hash/AbstractMutableHashTable.java | 0 .../hash/BuildFirstHashMatchIterator.java | 0 ...BuildFirstReOpenableHashMatchIterator.java | 0 .../hash/BuildSecondHashMatchIterator.java | 0 ...uildSecondReOpenableHashMatchIterator.java | 0 .../operators/hash/CompactingHashTable.java | 0 .../runtime/operators/hash/HashPartition.java | 0 .../operators/hash/InMemoryPartition.java | 0 .../operators/hash/MutableHashTable.java | 0 .../hash/ReOpenableHashPartition.java | 0 .../hash/ReOpenableMutableHashTable.java | 0 .../AbstractBlockResettableIterator.java | 0 .../resettable/BlockResettableIterator.java | 0 .../BlockResettableMutableObjectIterator.java | 0 .../SpillingResettableIterator.java | 0 ...illingResettableMutableObjectIterator.java | 0 .../shipping/HistogramPartitionFunction.java | 0 .../operators/shipping/OutputCollector.java | 0 .../operators/shipping/OutputEmitter.java | 0 .../operators/shipping/PartitionFunction.java | 0 .../shipping/RecordOutputCollector.java | 0 .../shipping/RecordOutputEmitter.java | 0 .../operators/shipping/ShipStrategyType.java | 0 .../sort/AsynchronousPartialSorter.java | 0 .../AsynchronousPartialSorterCollector.java | 0 .../sort/CombiningUnilateralSortMerger.java | 0 .../operators/sort/ExceptionHandler.java | 0 .../sort/FixedLengthRecordSorter.java | 0 .../runtime/operators/sort/HeapSort.java | 0 .../operators/sort/InMemorySorter.java | 0 .../operators/sort/IndexedSortable.java | 0 .../runtime/operators/sort/IndexedSorter.java | 0 .../runtime/operators/sort/MergeIterator.java | 0 .../operators/sort/MergeMatchIterator.java | 0 .../operators/sort/NormalizedKeySorter.java | 0 .../sort/PartialOrderPriorityQueue.java | 0 .../runtime/operators/sort/QuickSort.java | 0 .../sort/SortMergeCoGroupIterator.java | 0 .../flink/runtime/operators/sort/Sorter.java | 0 .../operators/sort/UnilateralSortMerger.java | 0 .../operators/udf/RuntimeUDFContext.java | 0 .../util/CloseableInputProvider.java | 0 .../operators/util/CoGroupTaskIterator.java | 0 .../util/CorruptConfigurationException.java | 0 .../operators/util/JoinTaskIterator.java | 0 .../runtime/operators/util/LocalStrategy.java | 0 .../operators/util/ReaderIterator.java | 0 .../operators/util/RecordReaderIterator.java | 0 .../util/SimpleCloseableInputProvider.java | 0 .../runtime/operators/util/TaskConfig.java | 0 .../plugable/DeserializationDelegate.java | 0 .../plugable/SerializationDelegate.java | 0 .../runtime/profiling/JobManagerProfiler.java | 0 .../runtime/profiling/ProfilingException.java | 0 .../runtime/profiling/ProfilingListener.java | 0 .../runtime/profiling/ProfilingUtils.java | 0 .../profiling/TaskManagerProfiler.java | 0 .../impl/EnvironmentListenerImpl.java | 0 .../profiling/impl/EnvironmentThreadSet.java | 0 .../profiling/impl/InstanceProfiler.java | 0 .../impl/JobManagerProfilerImpl.java | 0 .../profiling/impl/JobProfilingData.java | 0 .../profiling/impl/ProfilerImplProtocol.java | 0 .../impl/TaskManagerProfilerImpl.java | 0 .../InternalExecutionVertexProfilingData.java | 0 ...nalExecutionVertexThreadProfilingData.java | 0 .../types/InternalInputGateProfilingData.java | 0 .../types/InternalInstanceProfilingData.java | 0 .../InternalOutputGateProfilingData.java | 0 .../impl/types/InternalProfilingData.java | 0 .../impl/types/ProfilingDataContainer.java | 0 .../types/InputGateProfilingEvent.java | 0 .../types/InstanceProfilingEvent.java | 0 .../types/InstanceSummaryProfilingEvent.java | 0 .../types/OutputGateProfilingEvent.java | 0 .../profiling/types/ProfilingEvent.java | 0 .../types/SingleInstanceProfilingEvent.java | 0 .../profiling/types/ThreadProfilingEvent.java | 0 .../profiling/types/VertexProfilingEvent.java | 0 .../protocols/AccumulatorProtocol.java | 0 .../protocols/ChannelLookupProtocol.java | 0 .../protocols/ExtendedManagementProtocol.java | 0 .../protocols/InputSplitProviderProtocol.java | 0 .../protocols/JobManagementProtocol.java | 0 .../runtime/protocols/JobManagerProtocol.java | 0 .../protocols/TaskOperationProtocol.java | 0 .../taskmanager/AbstractTaskResult.java | 0 .../taskmanager/ExecutorThreadFactory.java | 0 .../flink/runtime/taskmanager/Task.java | 0 .../runtime/taskmanager/TaskCancelResult.java | 0 .../taskmanager/TaskExecutionState.java | 0 .../taskmanager/TaskInputSplitProvider.java | 0 .../runtime/taskmanager/TaskKillResult.java | 0 .../runtime/taskmanager/TaskManager.java | 0 .../taskmanager/TaskSubmissionResult.java | 0 .../runtime/ExecutorThreadFactory.java | 0 .../RegisterTaskManagerResult.java | 0 .../flink/runtime/topology/NetworkNode.java | 0 .../runtime/topology/NetworkTopology.java | 0 .../topology/NetworkTopologyIterator.java | 0 .../flink/runtime/types/FileRecord.java | 0 .../flink/runtime/types/IntegerRecord.java | 0 .../apache/flink/runtime/util/AtomicEnum.java | 0 .../flink/runtime/util/AtomicEnumerator.java | 0 .../runtime/util/BufferPoolConnector.java | 0 .../flink/runtime/util/EmptyIterator.java | 0 .../util/EmptyMutableObjectIterator.java | 0 .../apache/flink/runtime/util/EnumUtils.java | 0 .../runtime/util/EnvironmentInformation.java | 0 .../apache/flink/runtime/util/FileUtils.java | 0 .../apache/flink/runtime/util/IOUtils.java | 0 .../flink/runtime/util/JarFileCreator.java | 0 .../runtime/util/KeyGroupedIterator.java | 0 .../util/KeyGroupedMutableObjectIterator.java | 0 .../apache/flink/runtime/util/MathUtils.java | 0 .../runtime/util/MemoryBlockIterator.java | 0 .../util/MutableToRegularIteratorWrapper.java | 0 .../flink/runtime/util/NativeCodeLoader.java | 0 .../util/RegularToMutableObjectIterator.java | 0 .../runtime/util/ResettableIterator.java | 0 .../util/ResettableMutableObjectIterator.java | 0 .../runtime/util/SerializableArrayList.java | 0 .../runtime/util/SerializableHashMap.java | 0 .../runtime/util/SerializableHashSet.java | 0 .../runtime/util/SingleElementIterator.java | 0 .../runtime/util/UnmodifiableIterator.java | 0 .../apache/flink/runtime/AbstractIDTest.java | 0 .../flink/runtime/client/JobResultTest.java | 0 .../ChannelDeploymentDescriptorTest.java | 0 .../GateDeploymentDescriptorTest.java | 0 .../TaskDeploymentDescriptorTest.java | 0 .../flink/runtime/event/job/JobEventTest.java | 0 .../event/job/ManagementEventTest.java | 0 .../task/EventNotificationManagerTest.java | 0 .../runtime/event/task/TaskEventTest.java | 0 .../executiongraph/ExecutionGraphTest.java | 0 .../ForwardTask1Input1Output.java | 0 .../ForwardTask1Input2Outputs.java | 0 .../ForwardTask2Inputs1Output.java | 0 .../executiongraph/SelfCrossForwardTask.java | 0 .../FileCacheDeleteValidationTest.java | 0 .../apache/flink/runtime/fs/LineReader.java | 0 .../flink/runtime/fs/LineReaderTest.java | 0 .../flink/runtime/fs/s3/S3FileSystemTest.java | 0 .../instance/DefaultInstanceManagerTest.java | 0 .../DefaultInstanceManagerTestUtils.java | 0 .../runtime/instance/HostInClusterTest.java | 0 .../instance/TestInstanceListener.java | 0 .../local/LocalInstanceManagerTest.java | 0 .../instance/local/TestInstanceListener.java | 0 .../runtime/io/disk/ChannelViewsTest.java | 0 .../runtime/io/disk/SpillingBufferTest.java | 0 .../io/disk/iomanager/IOManagerITCase.java | 0 .../IOManagerPerformanceBenchmark.java | 0 .../io/disk/iomanager/IOManagerTest.java | 0 .../network/DefaultChannelSelectorTest.java | 0 .../bufferprovider/LocalBufferPoolTest.java | 0 .../netty/InboundEnvelopeDecoderTest.java | 0 .../netty/NettyConnectionManagerTest.java | 0 .../netty/OutboundEnvelopeEncoderTest.java | 0 .../DataInputOutputSerializerTest.java | 0 .../network/serialization/PagedViewsTest.java | 0 .../SpanningRecordSerializationTest.java | 0 .../SpanningRecordSerializerTest.java | 0 .../serialization/types/AsciiStringType.java | 0 .../serialization/types/BooleanType.java | 0 .../serialization/types/ByteArrayType.java | 0 .../serialization/types/ByteSubArrayType.java | 0 .../network/serialization/types/ByteType.java | 0 .../network/serialization/types/CharType.java | 0 .../serialization/types/DoubleType.java | 0 .../serialization/types/FloatType.java | 0 .../network/serialization/types/IntType.java | 0 .../network/serialization/types/LongType.java | 0 .../types/SerializationTestType.java | 0 .../types/SerializationTestTypeFactory.java | 0 .../serialization/types/ShortType.java | 0 .../serialization/types/UnsignedByteType.java | 0 .../types/UnsignedShortType.java | 0 .../io/network/serialization/types/Util.java | 0 .../concurrent/BlockingBackChannelTest.java | 0 .../iterative/concurrent/BrokerTest.java | 0 .../iterative/concurrent/StringPair.java | 0 .../concurrent/SuperstepBarrierTest.java | 0 .../event/EventWithAggregatorsTest.java | 0 .../flink/runtime/jobgraph/JobGraphTest.java | 0 .../runtime/jobmanager/DoubleSourceTask.java | 0 .../runtime/jobmanager/DoubleTargetTask.java | 0 .../jobmanager/ExceptionOutputFormat.java | 0 .../runtime/jobmanager/ExceptionTask.java | 0 .../flink/runtime/jobmanager/ForwardTask.java | 0 .../runtime/jobmanager/JobManagerITCase.java | 0 .../jobmanager/RuntimeExceptionTask.java | 0 .../flink/runtime/jobmanager/UnionTask.java | 0 .../scheduler/DefaultSchedulerTest.java | 0 .../scheduler/TestDeploymentManager.java | 0 .../scheduler/TestInstanceManager.java | 0 .../managementgraph/ManagementGraphTest.java | 0 .../memory/DefaultMemoryManagerTest.java | 0 .../memory/MemorySegmentSpeedBenchmark.java | 0 .../runtime/memory/MemorySegmentTest.java | 0 .../operators/CachedMatchTaskTest.java | 0 .../operators/CoGroupTaskExternalITCase.java | 0 .../runtime/operators/CoGroupTaskTest.java | 0 .../operators/CombineTaskExternalITCase.java | 0 .../runtime/operators/CombineTaskTest.java | 0 .../operators/CrossTaskExternalITCase.java | 0 .../runtime/operators/CrossTaskTest.java | 0 .../runtime/operators/DataSinkTaskTest.java | 0 .../runtime/operators/DataSourceTaskTest.java | 0 .../flink/runtime/operators/MapTaskTest.java | 0 .../operators/MatchTaskExternalITCase.java | 0 .../runtime/operators/MatchTaskTest.java | 0 .../operators/ReduceTaskExternalITCase.java | 0 .../runtime/operators/ReduceTaskTest.java | 0 .../operators/chaining/ChainTaskTest.java | 0 .../drivers/AllGroupReduceDriverTest.java | 0 .../drivers/AllReduceDriverTest.java | 0 .../operators/drivers/DriverTestData.java | 0 .../operators/drivers/GatheringCollector.java | 0 .../drivers/GroupReduceDriverTest.java | 0 .../drivers/ReduceCombineDriverTest.java | 0 .../operators/drivers/ReduceDriverTest.java | 0 .../operators/drivers/TestTaskContext.java | 0 .../hash/HashFunctionCollisionBenchmark.java | 0 .../hash/HashMatchIteratorITCase.java | 0 .../operators/hash/HashTableITCase.java | 0 .../hash/HashTablePerformanceComparison.java | 0 .../operators/hash/MemoryHashTableTest.java | 0 .../hash/ReOpenableHashTableITCase.java | 0 .../operators/hash/util/LastBitsToRange.java | 0 .../operators/hash/util/RandomIterator.java | 0 .../operators/hash/util/RangeCalculator.java | 0 .../operators/hash/util/RangeIterator.java | 0 .../hash/util/StepRangeIterator.java | 0 .../BlockResettableIteratorTest.java | 0 ...ckResettableMutableObjectIteratorTest.java | 0 .../SpillingResettableIteratorTest.java | 0 ...ngResettableMutableObjectIteratorTest.java | 0 .../sort/AsynchonousPartialSorterITCase.java | 0 .../CombiningUnilateralSortMergerITCase.java | 0 .../operators/sort/ExternalSortITCase.java | 0 .../sort/FixedLengthRecordSorterTest.java | 0 .../sort/MassiveStringSortingITCase.java | 0 .../operators/sort/MergeIteratorTest.java | 0 .../operators/sort/MockRecordReader.java | 0 .../sort/NormalizedKeySorterTest.java | 0 .../sort/SortMergeCoGroupIteratorITCase.java | 0 .../sort/SortMergeMatchIteratorITCase.java | 0 .../DelayingInfinitiveInputIterator.java | 0 .../testutils/DiscardingOutputCollector.java | 0 .../operators/testutils/DriverTestBase.java | 0 .../operators/testutils/DummyInvokable.java | 0 .../testutils/ExpectedTestException.java | 0 .../testutils/InfiniteInputIterator.java | 0 .../operators/testutils/MockEnvironment.java | 0 .../testutils/MockInputSplitProvider.java | 0 .../MutableObjectIteratorWrapper.java | 0 .../testutils/NirvanaOutputList.java | 0 .../testutils/RandomIntPairGenerator.java | 0 .../operators/testutils/TaskCancelThread.java | 0 .../operators/testutils/TaskTestBase.java | 0 .../runtime/operators/testutils/TestData.java | 0 .../testutils/UniformIntPairGenerator.java | 0 .../testutils/UniformRecordGenerator.java | 0 .../testutils/UniformStringPairGenerator.java | 0 .../operators/testutils/UnionIterator.java | 0 .../operators/testutils/types/IntList.java | 0 .../testutils/types/IntListComparator.java | 0 .../types/IntListPairComparator.java | 0 .../testutils/types/IntListSerializer.java | 0 .../operators/testutils/types/IntPair.java | 0 .../testutils/types/IntPairComparator.java | 0 .../types/IntPairListPairComparator.java | 0 .../types/IntPairPairComparator.java | 0 .../testutils/types/IntPairSerializer.java | 0 .../testutils/types/IntValueSerializer.java | 0 .../operators/testutils/types/StringPair.java | 0 .../testutils/types/StringPairComparator.java | 0 .../types/StringPairPairComparator.java | 0 .../testutils/types/StringPairSerializer.java | 0 .../util/HashVsSortMiniBenchmark.java | 0 .../operators/util/OutputEmitterTest.java | 0 .../util/RecordOutputEmitterTest.java | 0 .../profiling/impl/InstanceProfilerTest.java | 0 .../profiling/types/ProfilingTypesTest.java | 0 .../runtime/testutils/CommonTestUtils.java | 0 .../runtime/testutils/DiscardingRecycler.java | 0 .../testutils/InterruptibleByteChannel.java | 0 .../testutils/ManagementTestUtils.java | 0 .../runtime/testutils/ServerTestUtils.java | 0 .../runtime/testutils/TestBufferProvider.java | 0 .../testutils/tasks/DoubleSourceTask.java | 0 .../testutils/tasks/FileLineReader.java | 0 .../testutils/tasks/FileLineWriter.java | 0 .../testutils/tasks/JobFileInputVertex.java | 0 .../testutils/tasks/JobFileOutputVertex.java | 0 .../runtime/topology/NetworkTopologyTest.java | 0 .../flink/runtime/types/StringRecordTest.java | 0 .../apache/flink/runtime/types/TypeTest.java | 0 .../runtime/util/KeyGroupedIteratorTest.java | 0 .../flink/runtime/util/MathUtilTest.java | 0 .../util/TestDelegatingConfiguration.java | 0 .../src/test/resources/topology.txt | 0 {stratosphere-scala => flink-scala}/pom.xml | 20 ++-- .../api/scala/operators/Annotations.java | 0 .../flink/api/scala/AnnotationUtil.scala | 0 .../flink/api/scala/CompilerHints.scala | 0 .../org/apache/flink/api/scala/DataSet.scala | 0 .../org/apache/flink/api/scala/DataSink.scala | 0 .../apache/flink/api/scala/DataSource.scala | 0 .../flink/api/scala/ScalaOperator.scala | 0 .../apache/flink/api/scala/ScalaPlan.scala | 0 .../flink/api/scala/analysis/Extractors.scala | 0 .../api/scala/analysis/FieldSelector.scala | 0 .../scala/analysis/GlobalSchemaFields.scala | 0 .../analysis/GlobalSchemaGenerator.scala | 0 .../scala/analysis/GlobalSchemaPrinter.scala | 0 .../scala/analysis/UserDefinedFunction.scala | 0 .../api/scala/analysis/UserDefinedType.scala | 0 .../postPass/AmbientFieldDetector.scala | 0 .../postPass/EdgeDependencySets.scala | 0 .../scala/analysis/postPass/Extractors.scala | 0 .../postPass/GlobalSchemaCompactor.scala | 0 .../postPass/GlobalSchemaOptimizer.scala | 0 .../postPass/GlobalSchemaPrinter.scala | 0 .../scala/analysis/postPass/OutputSets.scala | 0 .../flink/api/scala/codegen/Counter.scala | 0 .../scala/codegen/DeserializeMethodGen.scala | 0 .../flink/api/scala/codegen/Logger.scala | 0 .../scala/codegen/MacroContextHolder.scala | 0 .../scala/codegen/SelectionExtractor.scala | 0 .../scala/codegen/SerializeMethodGen.scala | 0 .../api/scala/codegen/SerializerGen.scala | 0 .../flink/api/scala/codegen/TreeGen.scala | 0 .../flink/api/scala/codegen/UDTAnalyzer.scala | 0 .../api/scala/codegen/UDTDescriptors.scala | 0 .../flink/api/scala/codegen/UDTGen.scala | 0 .../apache/flink/api/scala/codegen/Util.scala | 0 .../api/scala/functions/CoGroupFunction.scala | 0 .../api/scala/functions/CrossFunction.scala | 0 .../functions/DeserializingIterator.scala | 0 .../api/scala/functions/JoinFunction.scala | 0 .../api/scala/functions/MapFunction.scala | 0 .../api/scala/functions/ReduceFunction.scala | 0 .../api/scala/operators/ClosureCleaner.scala | 0 .../api/scala/operators/CoGroupOperator.scala | 0 .../api/scala/operators/CopyOperator.scala | 0 .../api/scala/operators/CrossOperator.scala | 0 .../api/scala/operators/DataSinkMacros.scala | 0 .../scala/operators/DataSourceMacros.scala | 0 .../scala/operators/IterateOperators.scala | 0 .../api/scala/operators/JoinOperator.scala | 0 .../api/scala/operators/MapOperator.scala | 0 .../api/scala/operators/ReduceOperator.scala | 0 .../api/scala/operators/UnionOperator.scala | 0 .../flink/api/scala/operators/package.scala | 0 .../api/scala/CollectionDataSourceTest.scala | 0 .../pom.xml | 28 +++--- .../test/compiler/util/CompilerTestBase.java | 0 .../test/compiler/util/OperatorResolver.java | 0 .../testdata/ConnectedComponentsData.java | 0 .../flink/test/testdata/EnumTriangleData.java | 0 .../flink/test/testdata/KMeansData.java | 0 .../flink/test/testdata/PageRankData.java | 0 .../test/testdata/TransitiveClosureData.java | 0 .../flink/test/testdata/WordCountData.java | 0 .../flink/test/util/AbstractTestBase.java | 0 .../flink/test/util/JavaProgramTestBase.java | 0 .../flink/test/util/RecordAPITestBase.java | 0 {stratosphere-tests => flink-tests}/pom.xml | 44 ++++----- .../src/test/assembly/test-assembly.xml | 0 .../test/accumulators/AccumulatorITCase.java | 0 .../AccumulatorIterativeITCase.java | 0 .../BroadcastBranchingITCase.java | 0 .../BroadcastVarsNepheleITCase.java | 0 .../KMeansIterativeNepheleITCase.java | 0 .../test/cancelling/CancellingTestBase.java | 0 .../test/cancelling/MapCancelingITCase.java | 0 .../cancelling/MatchJoinCancelingITCase.java | 0 .../clients/examples/LocalExecutorITCase.java | 0 .../examples/KMeansSingleStepTest.java | 0 .../examples/RelationalQueryCompilerTest.java | 0 .../examples/WordCountCompilerTest.java | 0 .../ConnectedComponentsCoGroupTest.java | 0 .../iterations/ConnectedComponentsTest.java | 0 .../iterations/IterativeKMeansTest.java | 0 ...tipleJoinsWithSolutionSetCompilerTest.java | 0 .../iterations/PageRankCompilerTest.java | 0 .../plandump/DumpCompiledPlanTest.java | 0 .../plandump/PreviewPlanDumpTest.java | 0 .../DistributedCacheTest.java | 0 .../ConnectedComponentsITCase.java | 0 .../EnumTriangleBasicITCase.java | 0 .../EnumTriangleOptITCase.java | 0 .../exampleJavaPrograms/PageRankITCase.java | 0 .../TransitiveClosureITCase.java | 0 .../WebLogAnalysisITCase.java | 0 .../exampleJavaPrograms/WordCountITCase.java | 0 .../WordCountPOJOITCase.java | 0 .../WordCountWithCollectionITCase.java | 0 .../ComputeEdgeDegreesITCase.java | 0 .../ConnectedComponentsITCase.java | 0 ...EnumTrianglesOnEdgesWithDegreesITCase.java | 0 .../IterativeKMeansITCase.java | 0 .../RelationalQueryITCase.java | 0 .../TransitiveClosureNaiveITCase.java | 0 .../WebLogAnalysisITCase.java | 0 .../exampleScalaPrograms/WordCountITCase.java | 0 .../WordCountPactValueITCase.java | 0 .../WordCountWithCountFunctionITCase.java | 0 .../failingPrograms/TaskFailureITCase.java | 0 .../BulkIterationWithAllReducerITCase.java | 0 .../CoGroupConnectedComponentsITCase.java | 0 ...oGroupConnectedComponentsSecondITCase.java | 0 .../iterative/ConnectedComponentsITCase.java | 0 ...tedComponentsWithDeferredUpdateITCase.java | 0 ...dComponentsWithSolutionSetFirstITCase.java | 0 .../iterative/DanglingPageRankITCase.java | 0 .../test/iterative/DeltaPageRankITCase.java | 0 .../DependencyConnectedComponentsITCase.java | 0 ...erationTerminationWithTerminationTail.java | 0 .../IterationTerminationWithTwoTails.java | 0 .../IterationWithAllReducerITCase.java | 0 .../IterationWithChainingITCase.java | 0 .../iterative/IterationWithUnionITCase.java | 0 .../test/iterative/IterativeKMeansITCase.java | 0 .../flink/test/iterative/KMeansITCase.java | 0 .../flink/test/iterative/LineRankITCase.java | 0 .../MultipleSolutionSetJoinsITCase.java | 0 .../flink/test/iterative/PageRankITCase.java | 0 .../aggregators/AggregatorsITCase.java | 0 ...ntsWithParametrizableAggregatorITCase.java | 0 ...tsWithParametrizableConvergenceITCase.java | 0 .../test/iterative/nephele/ConfigUtils.java | 0 .../ConnectedComponentsNepheleITCase.java | 0 .../DanglingPageRankNepheleITCase.java | 0 ...lingPageRankWithCombinerNepheleITCase.java | 0 .../IterationWithChainingNepheleITCase.java | 0 .../test/iterative/nephele/JobGraphUtils.java | 0 .../CustomCompensatableDanglingPageRank.java | 0 ...ensatableDanglingPageRankWithCombiner.java | 0 .../CustomCompensatableDotProductCoGroup.java | 0 .../CustomCompensatableDotProductMatch.java | 0 .../CustomCompensatingMap.java | 0 ...ustomImprovedAdjacencyListInputFormat.java | 0 ...omImprovedDanglingPageRankInputFormat.java | 0 .../CustomPageWithRankOutFormat.java | 0 .../CustomRankCombiner.java | 0 .../types/VertexWithAdjacencyList.java | 0 .../VertexWithAdjacencyListComparator.java | 0 ...texWithAdjacencyListComparatorFactory.java | 0 .../VertexWithAdjacencyListSerializer.java | 0 ...texWithAdjacencyListSerializerFactory.java | 0 .../types/VertexWithRank.java | 0 .../types/VertexWithRankAndDangling.java | 0 .../VertexWithRankAndDanglingComparator.java | 0 ...xWithRankAndDanglingComparatorFactory.java | 0 .../VertexWithRankAndDanglingSerializer.java | 0 ...xWithRankAndDanglingSerializerFactory.java | 0 .../types/VertexWithRankComparator.java | 0 .../VertexWithRankComparatorFactory.java | 0 ...ithAdjacencyListPairComparatorFactory.java | 0 ...ToVertexWithRankPairComparatorFactory.java | 0 .../types/VertexWithRankSerializer.java | 0 .../VertexWithRankSerializerFactory.java | 0 .../danglingpagerank/AsciiLongArrayView.java | 0 .../danglingpagerank/BooleanValue.java | 0 .../CompensatableDanglingPageRank.java | 0 .../CompensatableDotProductCoGroup.java | 0 .../CompensatableDotProductMatch.java | 0 .../danglingpagerank/CompensatingMap.java | 0 .../DanglingPageGenerateRankInputFormat.java | 0 .../DiffL1NormConvergenceCriterion.java | 0 .../ImprovedAdjacencyListInputFormat.java | 0 .../ImprovedDanglingPageRankInputFormat.java | 0 .../danglingpagerank/LongArrayView.java | 0 .../danglingpagerank/PageRankStats.java | 0 .../PageRankStatsAggregator.java | 0 .../PageWithRankOutFormat.java | 0 .../javaApiOperators/AggregateITCase.java | 0 .../test/javaApiOperators/CoGroupITCase.java | 0 .../test/javaApiOperators/CrossITCase.java | 0 .../test/javaApiOperators/DistinctITCase.java | 0 .../test/javaApiOperators/FilterITCase.java | 0 .../test/javaApiOperators/FlatMapITCase.java | 0 .../javaApiOperators/GroupReduceITCase.java | 0 .../test/javaApiOperators/JoinITCase.java | 0 .../test/javaApiOperators/MapITCase.java | 0 .../test/javaApiOperators/ProjectITCase.java | 0 .../test/javaApiOperators/ReduceITCase.java | 0 .../javaApiOperators/SumMinMaxITCase.java | 0 .../test/javaApiOperators/UnionITCase.java | 0 .../util/CollectionDataSets.java | 0 .../PackagedProgramEndToEndITCase.java | 0 .../flink/test/operators/CoGroupITCase.java | 0 .../flink/test/operators/CrossITCase.java | 0 .../flink/test/operators/JoinITCase.java | 0 .../flink/test/operators/MapITCase.java | 0 .../flink/test/operators/ReduceITCase.java | 0 .../flink/test/operators/UnionITCase.java | 0 .../flink/test/operators/UnionSinkITCase.java | 0 .../operators/io/ContractITCaseIOFormats.java | 0 .../recordJobTests/CollectionSourceTest.java | 0 .../CollectionValidationTest.java | 0 .../ComputeEdgeDegreesITCase.java | 0 ...EnumTrianglesOnEdgesWithDegreesITCase.java | 0 .../EnumTrianglesRDFITCase.java | 0 .../recordJobTests/GlobalSortingITCase.java | 0 .../GlobalSortingMixedOrderITCase.java | 0 .../GroupOrderReduceITCase.java | 0 .../recordJobTests/MergeOnlyJoinITCase.java | 0 .../test/recordJobTests/PairwiseSPITCase.java | 0 .../recordJobTests/TPCHQuery10ITCase.java | 0 .../test/recordJobTests/TPCHQuery3ITCase.java | 0 .../TPCHQuery3WithUnionITCase.java | 0 .../test/recordJobTests/TPCHQuery4ITCase.java | 0 .../test/recordJobTests/TPCHQuery9ITCase.java | 0 .../TPCHQueryAsterixITCase.java | 0 .../test/recordJobTests/TeraSortITCase.java | 0 .../recordJobTests/WebLogAnalysisITCase.java | 0 .../test/recordJobTests/WordCountITCase.java | 0 .../WordCountUnionReduceITCase.java | 0 .../recordJobs/graph/ComputeEdgeDegrees.java | 0 .../graph/ConnectedComponentsWithCoGroup.java | 0 .../recordJobs/graph/DanglingPageRank.java | 0 .../graph/DeltaPageRankWithInitialDeltas.java | 0 .../EnumTrianglesOnEdgesWithDegrees.java | 0 .../graph/EnumTrianglesRdfFoaf.java | 0 .../graph/EnumTrianglesWithDegrees.java | 0 .../test/recordJobs/graph/PairwiseSP.java | 0 .../test/recordJobs/graph/SimplePageRank.java | 0 .../graph/WorksetConnectedComponents.java | 0 .../pageRankUtil/AsciiLongArrayView.java | 0 .../DanglingPageRankInputFormat.java | 0 .../DiffL1NormConvergenceCriterion.java | 0 .../graph/pageRankUtil/DotProductCoGroup.java | 0 .../graph/pageRankUtil/DotProductMatch.java | 0 .../ImprovedAdjacencyListInputFormat.java | 0 .../graph/pageRankUtil/LongArrayView.java | 0 .../graph/pageRankUtil/PageRankStats.java | 0 .../pageRankUtil/PageRankStatsAggregator.java | 0 .../pageRankUtil/PageWithRankOutFormat.java | 0 .../triangleEnumUtil/EdgeInputFormat.java | 0 .../EdgeWithDegreesInputFormat.java | 0 .../EdgeWithDegreesOutputFormat.java | 0 .../TriangleOutputFormat.java | 0 .../recordJobs/kmeans/KMeansBroadcast.java | 0 .../test/recordJobs/kmeans/KMeansCross.java | 0 .../recordJobs/kmeans/KMeansSingleStep.java | 0 .../kmeans/udfs/ComputeDistance.java | 0 .../udfs/ComputeDistanceParameterized.java | 0 .../recordJobs/kmeans/udfs/CoordVector.java | 0 .../kmeans/udfs/FindNearestCenter.java | 0 .../recordJobs/kmeans/udfs/PointInFormat.java | 0 .../kmeans/udfs/PointOutFormat.java | 0 .../kmeans/udfs/RecomputeClusterCenter.java | 0 .../recordJobs/relational/MergeOnlyJoin.java | 0 .../recordJobs/relational/TPCHQuery1.java | 0 .../recordJobs/relational/TPCHQuery10.java | 0 .../recordJobs/relational/TPCHQuery3.java | 0 .../relational/TPCHQuery3Unioned.java | 0 .../recordJobs/relational/TPCHQuery4.java | 0 .../recordJobs/relational/TPCHQuery9.java | 0 .../relational/TPCHQueryAsterix.java | 0 .../recordJobs/relational/WebLogAnalysis.java | 0 .../query1Util/GroupByReturnFlag.java | 0 .../relational/query1Util/LineItemFilter.java | 0 .../query1Util/LineItemFilterTest.java | 0 .../query9Util/AmountAggregate.java | 0 .../query9Util/FilteredPartsJoin.java | 0 .../relational/query9Util/IntPair.java | 0 .../relational/query9Util/LineItemMap.java | 0 .../relational/query9Util/OrderMap.java | 0 .../query9Util/OrderedPartsJoin.java | 0 .../relational/query9Util/PartFilter.java | 0 .../relational/query9Util/PartJoin.java | 0 .../relational/query9Util/PartListJoin.java | 0 .../relational/query9Util/PartsuppMap.java | 0 .../relational/query9Util/StringIntPair.java | 0 .../StringIntPairStringDataOutFormat.java | 0 .../relational/query9Util/SupplierMap.java | 0 .../relational/query9Util/SuppliersJoin.java | 0 .../test/recordJobs/sort/ReduceGroupSort.java | 0 .../flink/test/recordJobs/sort/TeraSort.java | 0 .../sort/tsUtil/TeraDistribution.java | 0 .../sort/tsUtil/TeraInputFormat.java | 0 .../test/recordJobs/sort/tsUtil/TeraKey.java | 0 .../sort/tsUtil/TeraOutputFormat.java | 0 .../recordJobs/sort/tsUtil/TeraValue.java | 0 .../test/recordJobs/util/ConfigUtils.java | 0 .../util/DiscardingOutputFormat.java | 0 .../util/InfiniteIntegerInputFormat.java | 0 .../InfiniteIntegerInputFormatWithDelay.java | 0 .../recordJobs/util/IntTupleDataInFormat.java | 0 .../util/StringTupleDataOutFormat.java | 0 .../flink/test/recordJobs/util/Tuple.java | 0 .../test/recordJobs/util/UniformIntInput.java | 0 .../test/recordJobs/wordcount/WordCount.java | 0 .../wordcount/WordCountAccumulators.java | 0 .../test/runtime/NetworkStackThroughput.java | 0 .../util/tests/IntTupleDataInFormatTest.java | 0 .../testPrograms/util/tests/TupleTest.java | 0 .../test/testdata/WebLogAnalysisData.java | 0 .../flink/test/util/FailingTestBase.java | 0 .../test/util/testjar/KMeansForTest.java | 0 .../src/test/resources/testdata/terainput.txt | 0 pom.xml | 56 +++++------ .../src/main/stratosphere-bin/NOTICE | 13 --- stratosphere-quickstart/README.md | 89 ------------------ .../quickstart-SNAPSHOT.sh | 51 ---------- .../quickstart-scala-SNAPSHOT.sh | 51 ---------- tools/generate_specific_pom.sh | 6 +- 1979 files changed, 768 insertions(+), 850 deletions(-) rename {stratosphere-addons => flink-addons}/avro/pom.xml (91%) rename {stratosphere-addons => flink-addons}/avro/src/main/java/org/apache/flink/api/avro/AvroBaseValue.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/main/java/org/apache/flink/api/avro/DataInputDecoder.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/main/java/org/apache/flink/api/avro/DataOutputEncoder.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/main/java/org/apache/flink/api/avro/FSDataInputStreamWrapper.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/main/java/org/apache/flink/api/java/io/AvroInputFormat.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroInputFormat.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormat.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/ReflectiveAvroTypeExample.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/SUser.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/User.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/test/assembly/test-assembly.xml (100%) rename {stratosphere-addons => flink-addons}/avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/test/java/org/apache/flink/api/avro/AvroOutputFormatTest.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/test/java/org/apache/flink/api/avro/AvroWithEmptyArrayITCase.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/test/java/org/apache/flink/api/avro/testjar/AvroExternalJarProgram.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/test/java/org/apache/flink/api/java/io/AvroInputFormatTypeExtractionTest.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/test/java/org/apache/flink/api/java/record/io/avro/generated/Colors.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/test/java/org/apache/flink/api/java/record/io/avro/generated/User.java (100%) rename {stratosphere-addons => flink-addons}/avro/src/test/resources/avro/user.avsc (100%) rename {stratosphere-addons => flink-addons}/avro/src/test/resources/testdata.avro (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/pom.xml (76%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopInputFormat.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopOutputFormat.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/example/WordCount.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopDataSink.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopDataSource.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopRecordInputFormat.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopRecordOutputFormat.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/DefaultFlinkTypeConverter.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/DefaultHadoopTypeConverter.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/FlinkTypeConverter.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/HadoopFileOutputCommitter.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/HadoopTypeConverter.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableComparableWrapper.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableWrapper.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableWrapperConverter.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/example/WordCount.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/example/WordCountWithOutputFormat.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/utils/HadoopUtils.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopDummyProgressable.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopDummyReporter.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopInputSplit.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopInputFormat.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopOutputFormat.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/example/WordCount.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/utils/HadoopUtils.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/wrapper/HadoopInputSplit.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopInputOutputITCase.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/record/HadoopRecordInputOutputITCase.java (100%) rename {stratosphere-addons => flink-addons}/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/HadoopInputOutputITCase.java (100%) rename {stratosphere-addons => flink-addons}/hbase/pom.xml (89%) rename {stratosphere-addons => flink-addons}/hbase/src/main/java/org/apache/flink/addons/hbase/GenericTableOutputFormat.java (100%) rename {stratosphere-addons => flink-addons}/hbase/src/main/java/org/apache/flink/addons/hbase/HBaseDataSink.java (100%) rename {stratosphere-addons => flink-addons}/hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java (100%) rename {stratosphere-addons => flink-addons}/hbase/src/main/java/org/apache/flink/addons/hbase/TableInputSplit.java (100%) rename {stratosphere-addons => flink-addons}/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseKey.java (100%) rename {stratosphere-addons => flink-addons}/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseResult.java (100%) rename {stratosphere-addons => flink-addons}/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseUtil.java (100%) rename {stratosphere-addons => flink-addons}/hbase/src/main/java/org/apache/flink/addons/hbase/example/HBaseReadExample.java (100%) rename {stratosphere-addons => flink-addons}/jdbc/pom.xml (72%) rename {stratosphere-addons => flink-addons}/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java (100%) rename {stratosphere-addons => flink-addons}/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java (100%) rename {stratosphere-addons => flink-addons}/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/example/JDBCExample.java (100%) rename {stratosphere-addons => flink-addons}/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormat.java (100%) rename {stratosphere-addons => flink-addons}/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormat.java (100%) rename {stratosphere-addons => flink-addons}/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/example/JDBCExample.java (100%) rename {stratosphere-addons => flink-addons}/jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java (100%) rename {stratosphere-addons => flink-addons}/jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java (100%) rename {stratosphere-addons => flink-addons}/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/DevNullLogStream.java (100%) rename {stratosphere-addons => flink-addons}/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormatTest.java (100%) rename {stratosphere-addons => flink-addons}/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java (100%) rename {stratosphere-addons => flink-addons}/pom.xml (91%) rename {stratosphere-addons => flink-addons}/spargel/pom.xml (65%) rename {stratosphere-addons => flink-addons}/spargel/src/main/java/org/apache/flink/spargel/java/MessageIterator.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/main/java/org/apache/flink/spargel/java/MessagingFunction.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/main/java/org/apache/flink/spargel/java/OutgoingEdge.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/main/java/org/apache/flink/spargel/java/VertexCentricIteration.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/main/java/org/apache/flink/spargel/java/VertexUpdateFunction.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelConnectedComponents.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelPageRank.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelPageRankCountingVertices.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/main/java/org/apache/flink/spargel/java/record/Edge.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/main/java/org/apache/flink/spargel/java/record/MessageIterator.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/main/java/org/apache/flink/spargel/java/record/MessagingFunction.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/main/java/org/apache/flink/spargel/java/record/SpargelIteration.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/main/java/org/apache/flink/spargel/java/record/VertexUpdateFunction.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/test/java/org/apache/flink/spargel/java/SpargelCompilerTest.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/test/java/org/apache/flink/spargel/java/SpargelTranslationTest.java (100%) rename {stratosphere-addons => flink-addons}/spargel/src/test/java/org/apache/flink/test/spargel/SpargelConnectedComponentsITCase.java (100%) rename {stratosphere-addons => flink-addons}/yarn/pom.xml (84%) rename {stratosphere-addons => flink-addons}/yarn/src/main/java/org/apache/flink/yarn/ApplicationMaster.java (100%) rename {stratosphere-addons => flink-addons}/yarn/src/main/java/org/apache/flink/yarn/Client.java (100%) rename {stratosphere-addons => flink-addons}/yarn/src/main/java/org/apache/flink/yarn/Utils.java (100%) rename {stratosphere-addons => flink-addons}/yarn/src/main/java/org/apache/flink/yarn/YarnTaskManagerRunner.java (100%) rename {stratosphere-clients => flink-clients}/pom.xml (86%) rename {stratosphere-clients => flink-clients}/resources/web-docs/css/bootstrap.css (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/css/graph.css (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/css/nephelefrontend.css (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/css/overlay.css (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/css/pactgraphs.css (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/FlinkLogo.png (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/GradientBoxes.png (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/StratosphereLogo.png (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arr.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arr2.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arr2_d.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arr2_l.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arr2_r.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arr2_u.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arr_d.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arr_l.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arr_r.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arr_u.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arrow.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arrow_d.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arrow_l.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arrow_r.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/arrows/arrow_u.gif (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/delete-icon.png (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/gradient.jpg (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/img/overlay/close.png (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/index.html (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/js/bootstrap.min.js (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/js/d3.js (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/js/dagre-d3.js (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/js/graphCreator.js (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/js/jquery-2.1.0.js (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/js/jquery.tools.min.js (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/js/program.js (100%) rename {stratosphere-clients => flink-clients}/resources/web-docs/launch.html (100%) rename {stratosphere-clients => flink-clients}/src/main/assembly/test-assembly.xml (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/CliFrontend.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/LocalExecutor.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/RemoteExecutor.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/WebFrontend.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/minicluster/NepheleMiniCluster.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/program/Client.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/program/ContextEnvironment.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/program/JobWithJars.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/program/PackagedProgram.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/program/ProgramInvocationException.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/web/GUIServletStub.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/web/JobsInfoServlet.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/web/JobsServlet.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/web/PactJobJSONServlet.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/web/PlanDisplayServlet.java (100%) rename {stratosphere-clients => flink-clients}/src/main/java/org/apache/flink/client/web/WebInterfaceServer.java (100%) rename {stratosphere-clients => flink-clients}/src/test/java/org/apache/flink/client/CliFrontendInfoTest.java (100%) rename {stratosphere-clients => flink-clients}/src/test/java/org/apache/flink/client/CliFrontendJobManagerConnectionTest.java (100%) rename {stratosphere-clients => flink-clients}/src/test/java/org/apache/flink/client/CliFrontendListCancelTest.java (100%) rename {stratosphere-clients => flink-clients}/src/test/java/org/apache/flink/client/CliFrontendPackageProgramTest.java (100%) rename {stratosphere-clients => flink-clients}/src/test/java/org/apache/flink/client/CliFrontendRunTest.java (100%) rename {stratosphere-clients => flink-clients}/src/test/java/org/apache/flink/client/CliFrontendTestUtils.java (100%) rename {stratosphere-clients => flink-clients}/src/test/java/org/apache/flink/client/program/ClientTest.java (100%) rename {stratosphere-clients => flink-clients}/src/test/java/org/apache/flink/client/program/PackagedProgramTest.java (100%) rename {stratosphere-clients => flink-clients}/src/test/java/org/apache/flink/client/testjar/JobWithExternalDependency.java (100%) rename {stratosphere-clients => flink-clients}/src/test/java/org/apache/flink/client/testjar/WordCount.java (100%) rename {stratosphere-clients => flink-clients}/src/test/resources/invalidtestconfig/flink-conf.yaml (100%) rename {stratosphere-clients => flink-clients}/src/test/resources/testconfig/flink-conf.yaml (100%) rename {stratosphere-clients => flink-clients}/src/test/resources/testconfigwithinvalidyarn/.yarn-jobmanager (100%) rename {stratosphere-clients => flink-clients}/src/test/resources/testconfigwithinvalidyarn/flink-conf.yaml (100%) rename {stratosphere-clients => flink-clients}/src/test/resources/testconfigwithyarn/.yarn-jobmanager (100%) rename {stratosphere-clients => flink-clients}/src/test/resources/testconfigwithyarn/flink-conf.yaml (100%) rename {stratosphere-compiler => flink-compiler}/pom.xml (64%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/CompilerException.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/CompilerPostPassException.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/DataStatistics.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/NonCachingDataStatistics.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/PactCompiler.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/contextcheck/ContextChecker.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/contextcheck/MissingChildException.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/contextcheck/Validatable.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/costs/CostEstimator.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/costs/Costs.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/costs/DefaultCostEstimator.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/AbstractPartialSolutionNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/BinaryUnionNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/BulkIterationNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/BulkPartialSolutionNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/CoGroupNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/CollectorMapNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/CrossNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/DataSinkNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/DataSourceNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/EstimateProvider.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/FilterNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/FlatMapNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/GroupReduceNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/InterestingPropertiesClearer.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/IterationNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/MapNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/MatchNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/NoOpNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/OptimizerNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/PactConnection.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/PlanCacheCleaner.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/ReduceNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/SingleInputNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/SinkJoiner.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/SolutionSetNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/TempMode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/TwoInputNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/UnaryOperatorNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/WorksetIterationNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dag/WorksetNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dataproperties/GlobalProperties.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dataproperties/InterestingProperties.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dataproperties/LocalProperties.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dataproperties/PartitioningProperty.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dataproperties/RequestedGlobalProperties.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/dataproperties/RequestedLocalProperties.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockEdge.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockGraph.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockPreventer.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockVertex.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/AbstractJoinDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/AbstractOperatorDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/AllGroupReduceProperties.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/AllGroupWithPartialPreGroupProperties.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/AllReduceProperties.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/BinaryUnionOpDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/CartesianProductDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/CoGroupDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/CoGroupWithSolutionSetFirstDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/CoGroupWithSolutionSetSecondDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/CollectorMapDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/CrossBlockOuterFirstDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/CrossBlockOuterSecondDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/CrossStreamOuterFirstDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/CrossStreamOuterSecondDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/FilterDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/FlatMapDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/GroupReduceProperties.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/GroupReduceWithCombineProperties.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/HashJoinBuildFirstProperties.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/HashJoinBuildSecondProperties.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/MapDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/NoOpDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/OperatorDescriptorDual.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/OperatorDescriptorSingle.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/PartialGroupProperties.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/ReduceProperties.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/SolutionSetDeltaOperator.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/SortMergeJoinDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/operators/UtilSinkJoinOpDescriptor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/BinaryUnionPlanNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/BulkIterationPlanNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/BulkPartialSolutionPlanNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/Channel.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/DualInputPlanNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/IterationPlanNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/NAryUnionPlanNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/NamedChannel.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/OptimizedPlan.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/PlanNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/SingleInputPlanNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/SinkJoinerPlanNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/SinkPlanNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/SolutionSetPlanNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/SourcePlanNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/WorksetIterationPlanNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plan/WorksetPlanNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plandump/DumpableConnection.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plandump/DumpableNode.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plandump/PlanJSONDumpGenerator.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/postpass/AbstractSchema.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/postpass/ConflictingFieldTypeInfoException.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/postpass/DenseValueSchema.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/postpass/GenericFlatTypePostPass.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/postpass/JavaApiPostPass.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/postpass/MissingFieldTypeInfoException.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/postpass/OptimizerPostPass.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/postpass/PostPassUtils.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/postpass/RecordModelPostPass.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/postpass/SparseKeySchema.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/util/NoOpBinaryUdfOp.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/util/NoOpFunction.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/util/NoOpUnaryUdfOp.java (100%) rename {stratosphere-compiler => flink-compiler}/src/main/java/org/apache/flink/compiler/util/Utils.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/AdditionalOperatorsTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/BranchingPlansCompilerTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/BroadcastVariablePipelinebreakerTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/CachedMatchStrategyCompilerTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/CoGroupSolutionSetFirstTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/CompilerTestBase.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/DOPChangeTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/FeedbackPropertiesMatchTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/GroupOrderTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/GroupReduceCompilationTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/HardPlansCompilationTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/IterationsCompilerTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/ReduceAllTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/ReduceCompilationTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/UnionPropertyPropagationTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/UnionReplacementTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/WorksetIterationsJavaApiCompilerTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/WorksetIterationsRecordApiCompilerTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/costs/DefaultCostEstimatorTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/plan/ChannelTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/plandump/NumberFormattingTest.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/testfunctions/DummyJoinFunction.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/testfunctions/IdentityGroupReducer.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/testfunctions/IdentityKeyExtractor.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/testfunctions/IdentityMapper.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/testfunctions/Top1GroupReducer.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/util/DummyCoGroupStub.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/util/DummyCrossStub.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/util/DummyInputFormat.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/util/DummyMatchStub.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/util/DummyNonPreservingMatchStub.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/util/DummyOutputFormat.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/util/IdentityMap.java (100%) rename {stratosphere-compiler => flink-compiler}/src/test/java/org/apache/flink/compiler/util/IdentityReduce.java (100%) rename {stratosphere-core => flink-core}/pom.xml (85%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/InvalidProgramException.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/JobExecutionResult.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/NonSerializableUserCodeException.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/Plan.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/PlanExecutor.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/Program.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/ProgramDescription.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/accumulators/Accumulator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/accumulators/DoubleCounter.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/accumulators/Histogram.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/accumulators/IntCounter.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/accumulators/LongCounter.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/accumulators/SimpleAccumulator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/aggregators/Aggregator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/aggregators/AggregatorRegistry.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/aggregators/AggregatorWithName.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/aggregators/ConvergenceCriterion.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/aggregators/DoubleSumAggregator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/aggregators/DoubleZeroConvergence.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/aggregators/LongSumAggregator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/aggregators/LongZeroConvergence.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/cache/DistributedCache.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/distributions/DataDistribution.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/distributions/SimpleDistribution.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/distributions/SimpleIntegerDistribution.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/distributions/UniformDoubleDistribution.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/distributions/UniformIntegerDistribution.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/AbstractFunction.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/ExecutionContext.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/Function.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/GenericCoGrouper.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/GenericCollectorMap.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/GenericCombine.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/GenericCrosser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/GenericFilter.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/GenericFlatMap.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/GenericGroupReduce.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/GenericJoiner.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/GenericMap.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/GenericReduce.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/IterationRuntimeContext.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/functions/RuntimeContext.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/BinaryInputFormat.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/BinaryOutputFormat.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/BlockInfo.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/DelimitedInputFormat.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/FileOutputFormat.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/FormatUtil.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/GenericCsvInputFormat.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/GenericInputFormat.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/InflaterInputStreamFSInputWrapper.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/InitializeOnMaster.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/InputFormat.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/NonParallelInput.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/OutputFormat.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/ParseException.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/SerializedInputFormat.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/SerializedOutputFormat.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/io/statistics/BaseStatistics.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/AbstractUdfOperator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/BinaryOperatorInformation.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/CompilerHints.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/DualInputOperator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/DualInputSemanticProperties.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/IterationOperator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/Operator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/OperatorInformation.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/Order.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/Ordering.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/RecordOperator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/SemanticProperties.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/SingleInputOperator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/SingleInputSemanticProperties.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/UnaryOperatorInformation.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/Union.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/CoGroupOperatorBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/CollectorMapOperatorBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/DeltaIterationBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/FileDataSinkBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/FileDataSourceBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/FilterOperatorBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/FlatMapOperatorBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/GenericDataSinkBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/GenericDataSourceBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/GroupReduceOperatorBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/MapOperatorBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/base/ReduceOperatorBase.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/util/FieldList.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/util/FieldSet.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/util/OperatorUtil.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/util/UserCodeClassWrapper.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/util/UserCodeObjectWrapper.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/operators/util/UserCodeWrapper.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/TypeComparatorFactory.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparatorFactory.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerFactory.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanComparator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/ByteComparator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/CharComparator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleComparator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/FloatComparator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/IntComparator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/LongComparator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/ShortComparator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/StringComparator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueSerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializer.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/configuration/ConfigConstants.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/configuration/Configuration.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/configuration/GlobalConfiguration.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/configuration/IllegalConfigurationException.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/fs/BlockLocation.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/fs/FSDataInputStream.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/fs/FSDataOutputStream.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/fs/FileChannelWrapper.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/fs/FileInputSplit.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/fs/FileStatus.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/fs/FileSystem.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/fs/Path.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/fs/local/LocalBlockLocation.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/fs/local/LocalDataInputStream.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/fs/local/LocalDataOutputStream.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/fs/local/LocalFileStatus.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/fs/local/LocalFileSystem.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/io/GenericInputSplit.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/io/IOReadableWritable.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/io/InputSplit.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/io/LocatableInputSplit.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/io/StringRecord.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/memory/DataInputView.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/memory/DataOutputView.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/memory/InputViewDataInputStreamWrapper.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/memory/InputViewObjectInputStreamWrapper.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/memory/MemorySegment.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/memory/MemorySegmentSource.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/memory/MemoryUtils.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/memory/OutputViewDataOutputStreamWrapper.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/memory/OutputViewObjectOutputStreamWrapper.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/memory/SeekableDataInputView.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/memory/SeekableDataOutputView.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/core/protocols/VersionedProtocol.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/BooleanValue.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/ByteValue.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/CharValue.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/CopyableValue.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/DeserializationException.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/DoubleValue.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/FloatValue.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/IntValue.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/Key.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/KeyFieldOutOfBoundsException.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/ListValue.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/LongValue.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/MapValue.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/NormalizableKey.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/Nothing.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/NothingTypeInfo.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/NullKeyFieldException.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/NullValue.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/Pair.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/Record.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/ResettableValue.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/ShortValue.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/StringValue.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/TypeInformation.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/Value.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/ValueUtil.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/ByteParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/ByteValueParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/DoubleParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/DoubleValueParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/FieldParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/FloatParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/FloatValueParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/IntParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/IntValueParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/LongParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/LongValueParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/ShortParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/ShortValueParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/StringParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/types/parser/StringValueParser.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/util/ClassUtils.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/util/Collector.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/util/InstantiationUtil.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/util/IterableIterator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/util/LogUtils.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/util/MutableObjectIterator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/util/NumberSequenceIterator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/util/OperatingSystem.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/util/ReflectionUtil.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/util/SimpleStringUtils.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/util/SplittableIterator.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/util/StringUtils.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/util/Visitable.java (100%) rename {stratosphere-core => flink-core}/src/main/java/org/apache/flink/util/Visitor.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/io/BinaryInputFormatTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatSamplingTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/io/GenericCsvInputFormatTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/io/SequentialFormatTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/operators/util/FieldListTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/operators/util/FieldSetTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/operators/util/OperatorUtilTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/ComparatorTestBase.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestInstance.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanComparatorTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanSerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/ByteComparatorTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/ByteSerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/CharComparatorTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/CharSerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleComparatorTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleSerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/FloatComparatorTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/FloatSerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/IntComparatorTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/LongComparatorTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/ShortComparatorTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/ShortSerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/StringComparatorTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/StringSerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializerTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/api/distributions/SimpleDataDistributionTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/configuration/ConfigurationTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/configuration/GlobalConfigurationTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/core/fs/local/LocalFileSystemTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/core/testutils/CommonTestUtils.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/testutils/TestConfigUtils.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/testutils/TestFileSystem.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/testutils/TestFileUtils.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/CollectionsDataTypeTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/NormalizableKeyTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/RecordITCase.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/RecordTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/StringSerializationTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/ByteParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/ByteValueParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/DoubleParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/DoubleValueParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/FloatParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/FloatValueParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/IntParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/IntValueParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/LongParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/LongValueParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/ParserTestBase.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/ShortParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/ShortValueParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/StringParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/StringValueParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/types/parser/VarLengthStringParserTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/util/InstantiationUtilsTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/util/NumberSequenceIteratorTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/util/SimpleStringUtilsTest.java (100%) rename {stratosphere-core => flink-core}/src/test/java/org/apache/flink/util/StringUtilsTest.java (100%) rename {stratosphere-dist => flink-dist}/pom.xml (85%) rename {stratosphere-dist => flink-dist}/src/deb/bin/jobmanager (76%) rename {stratosphere-dist => flink-dist}/src/deb/bin/taskmanager (76%) rename {stratosphere-dist => flink-dist}/src/deb/bin/webclient (77%) rename {stratosphere-dist => flink-dist}/src/deb/control/control (100%) rename {stratosphere-dist => flink-dist}/src/deb/control/postinst (100%) rename {stratosphere-dist => flink-dist}/src/main/assemblies/bin.xml (77%) rename {stratosphere-dist => flink-dist}/src/main/assemblies/yarn-uberjar.xml (88%) rename {stratosphere-dist => flink-dist}/src/main/assemblies/yarn.xml (71%) create mode 100644 flink-dist/src/main/flink-bin/DISCLAIMER rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/LICENSE (100%) create mode 100644 flink-dist/src/main/flink-bin/NOTICE rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/README.txt (100%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/bin/config.sh (78%) rename stratosphere-dist/src/main/stratosphere-bin/bin/stratosphere => flink-dist/src/main/flink-bin/bin/flink (63%) rename stratosphere-dist/src/main/stratosphere-bin/bin/stratosphere.bat => flink-dist/src/main/flink-bin/bin/flink.bat (74%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/bin/jobmanager.sh (61%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/bin/start-cluster.sh (84%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/bin/start-local.bat (78%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/bin/start-local.sh (95%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/bin/start-webclient.sh (95%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/bin/stop-cluster.sh (85%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/bin/stop-local.sh (95%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/bin/stop-webclient.sh (95%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/bin/taskmanager.sh (63%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/bin/webclient.sh (52%) rename stratosphere-dist/src/main/stratosphere-bin/conf/stratosphere-conf.yaml => flink-dist/src/main/flink-bin/conf/flink-conf.yaml (100%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/conf/log4j.properties (100%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/conf/log4jconsole.properties (100%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/conf/slaves (100%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/tools/planVisualizer.html (100%) rename {stratosphere-dist/src/main/stratosphere-bin => flink-dist/src/main/flink-bin}/yarn-bin/yarn-session.sh (71%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/pom.xml (97%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/clustering/KMeans.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/clustering/util/KMeansData.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/clustering/util/KMeansDataGenerator.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/graph/ConnectedComponents.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/graph/EnumTrianglesBasic.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/graph/EnumTrianglesOpt.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/graph/PageRankBasic.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/graph/TransitiveClosureNaive.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/graph/util/ConnectedComponentsData.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/graph/util/EnumTrianglesData.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/graph/util/EnumTrianglesDataTypes.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/graph/util/PageRankData.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/ml/LinearRegression.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/ml/util/LinearRegressionData.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/ml/util/LinearRegressionDataGenerator.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/relational/RelationalQuery.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/relational/TPCHQuery10.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/relational/TPCHQuery3.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/relational/WebLogAnalysis.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/relational/util/WebLogData.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/relational/util/WebLogDataGenerator.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/wordcount/WordCount.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/wordcount/WordCountPOJO.java (100%) rename {stratosphere-examples/stratosphere-java-examples => flink-examples/flink-java-examples}/src/main/java/org/apache/flink/example/java/wordcount/util/WordCountData.java (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/pom.xml (97%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/java/org/apache/flink/examples/scala/Dummy.java (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/datamining/BatchGradientDescent.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/datamining/KMeans.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/graph/ComputeEdgeDegrees.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/graph/ConnectedComponents.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/graph/EnumTrianglesOnEdgesWithDegrees.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/graph/LineRank.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/graph/PageRank.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/graph/PageRankWithWeight.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/graph/TransitiveClosureNaive.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/iterative/TerminationCriterion.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/relational/RelationalQuery.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/relational/WebLogAnalysis.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/testing/KMeansForTest.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCount.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCountWithCount.scala (100%) rename {stratosphere-examples/stratosphere-scala-examples => flink-examples/flink-scala-examples}/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCountWithUserDefinedType.scala (100%) rename {stratosphere-examples => flink-examples}/pom.xml (59%) rename {stratosphere-java => flink-java}/pom.xml (73%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/BulkIterationResultSet.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/DataSet.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/DeltaIteration.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/DeltaIterationResultSet.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/IterativeDataSet.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/LocalEnvironment.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/RemoteEnvironment.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunctionFactory.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/aggregation/Aggregations.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/aggregation/AvgAggregationFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/aggregation/MaxAggregationFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/aggregation/MinAggregationFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/aggregation/SumAggregationFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/aggregation/UnsupportedAggregationTypeException.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/functions/CoGroupFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/functions/CrossFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/functions/FilterFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/functions/FlatMapFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/functions/FlatMapIterator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/functions/FunctionAnnotation.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/functions/GroupReduceFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/functions/GroupReduceIterator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/functions/InvalidTypesException.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/functions/JoinFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/functions/KeySelector.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/functions/MapFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/functions/ReduceFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/functions/SemanticPropUtil.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/io/CollectionInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/io/CsvInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/io/CsvReader.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/io/DiscardingOuputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/io/DiscardingOutputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/io/IteratorInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/io/LocalCollectionOutputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/io/ParallelIteratorInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/io/PrintingOutputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/io/TextInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/io/TextOutputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/AggregateOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/CoGroupOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/CustomUnaryOperation.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/DataSink.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/DataSource.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/DistinctOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/FilterOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/FlatMapOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/Grouping.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/JoinOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/Keys.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/MapOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/Operator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/OperatorTranslation.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/ProjectOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/ReduceGroupOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/ReduceOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/SingleInputOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/SingleInputUdfOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/SortedGrouping.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/TwoInputOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/TwoInputUdfOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/UdfOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/UnionOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/UnsortedGrouping.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/translation/JavaPlan.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/translation/KeyExtractingMapper.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/translation/KeyRemovingMapper.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/translation/PlanProjectOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingCoGroupOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingJoinOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceGroupOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/translation/TupleKeyExtractingMapper.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/translation/TupleUnwrappingIterator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/translation/TupleWrappingCollector.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/operators/translation/WrappingFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/functions/CoGroupFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/functions/CrossFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/functions/FunctionAnnotation.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/functions/JoinFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/functions/MapFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/functions/ReduceFunction.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/io/CollectionInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/io/CsvInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/io/CsvOutputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/io/DelimitedInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/io/DelimitedOutputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputSplit.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/io/FileInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/io/FileOutputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/io/FixedLengthInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/io/GenericInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/io/TextInputFormat.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/BulkIteration.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/CoGroupOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/CollectionDataSource.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/CrossOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/CrossWithLargeOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/CrossWithSmallOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/DeltaIteration.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/FileDataSink.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/FileDataSource.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/GenericDataSink.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/GenericDataSource.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/JoinOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/MapOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/OperatorInfoHelper.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/record/operators/ReduceOperator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple1.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple10.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple11.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple12.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple13.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple14.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple15.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple16.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple17.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple18.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple19.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple2.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple20.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple21.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple22.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple23.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple24.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple25.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple3.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple4.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple5.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple6.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple7.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple8.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/Tuple9.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/TupleGenerator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple10Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple11Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple12Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple13Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple14Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple15Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple16Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple17Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple18Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple19Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple1Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple20Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple21Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple22Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple23Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple24Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple25Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple2Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple3Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple4Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple5Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple6Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple7Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple8Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple9Builder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/AtomicType.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/BasicArrayTypeInfo.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/BasicTypeInfo.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/CompositeType.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/GenericTypeInfo.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/InputTypeConfigurable.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/PojoField.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/PojoTypeInfo.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/PrimitiveArrayTypeInfo.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/RecordTypeInfo.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/ResultTypeQueryable.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/TupleTypeInfo.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/TypeInfoParser.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/WritableTypeInfo.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/AvroSerializer.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueSerializer.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputDecoder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputEncoder.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericArraySerializer.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoPairComparator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializer.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeComparatorFactory.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimePairComparatorFactory.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeStatefulSerializerFactory.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeStatelessSerializerFactory.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldComparator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldPairComparator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/TuplePairComparator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializer.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueComparator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializer.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableComparator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializer.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordComparator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordComparatorFactory.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordPairComparator.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordPairComparatorFactory.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordSerializer.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordSerializerFactory.java (100%) rename {stratosphere-java => flink-java}/src/main/java/org/apache/hadoop/io/Writable.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/MultipleInvokationsTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesProjectionTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesTranslationTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/io/CSVReaderTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/io/CollectionInputFormatTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/io/TextInputFormatTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/operator/AggregateOperatorTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/operator/CoGroupOperatorTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/operator/CrossOperatorTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/operator/DistinctOperatorTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/operator/GroupingTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/operator/JoinOperatorTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/operator/ProjectionOperatorTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/operators/translation/AggregateTranslationTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/operators/translation/DeltaIterationTranslationTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/operators/translation/ReduceTranslationTests.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/record/io/CsvOutputFormatTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormatTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormatTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/record/io/FixedLenghtInputFormatTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/record/io/TextInputFormatTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/tuple/Tuple2Test.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/type/extractor/PojoTypeInformationTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/type/extractor/TypeExtractorInputFormatsTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/type/extractor/TypeExtractorTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparatorTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericArraySerializerTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparatorTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeSerializerTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/StringArrayWritable.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD2Test.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD3Test.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDC3Test.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDX1Test.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDXC2Test.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD1Test.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD2Test.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD3Test.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldComparatorTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldPairComparatorTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/TuplePairComparatorTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerTestInstance.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueComparatorTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableComparatorTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializerTest.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/tuple/base/TupleComparatorTestBase.java (100%) rename {stratosphere-java => flink-java}/src/test/java/org/apache/flink/api/java/typeutils/runtime/tuple/base/TuplePairComparatorTestBase.java (100%) create mode 100644 flink-quickstart/README.md rename {stratosphere-quickstart => flink-quickstart}/pom.xml (75%) create mode 100755 flink-quickstart/quickstart-SNAPSHOT.sh rename {stratosphere-quickstart => flink-quickstart}/quickstart-java/pom.xml (85%) rename {stratosphere-quickstart/quickstart-java/src/main/java/eu/stratosphere => flink-quickstart/quickstart-java/src/main/java/org/apache/flink}/quickstart/Dummy.java (96%) rename {stratosphere-quickstart => flink-quickstart}/quickstart-java/src/main/resources/META-INF/maven/archetype.xml (92%) rename {stratosphere-quickstart => flink-quickstart}/quickstart-java/src/main/resources/archetype-resources/pom.xml (87%) rename {stratosphere-quickstart => flink-quickstart}/quickstart-java/src/main/resources/archetype-resources/src/main/java/Job.java (73%) rename {stratosphere-quickstart => flink-quickstart}/quickstart-java/src/main/resources/archetype-resources/src/main/java/WordCountJob.java (82%) create mode 100755 flink-quickstart/quickstart-scala-SNAPSHOT.sh rename {stratosphere-quickstart => flink-quickstart}/quickstart-scala.sh (70%) rename {stratosphere-quickstart => flink-quickstart}/quickstart-scala/pom.xml (85%) rename {stratosphere-quickstart/quickstart-scala/src/main/java/eu/stratosphere => flink-quickstart/quickstart-scala/src/main/java/org/apache/flink}/quickstart/Dummy.java (96%) rename {stratosphere-quickstart => flink-quickstart}/quickstart-scala/src/main/resources/META-INF/maven/archetype-metadata.xml (100%) rename {stratosphere-quickstart => flink-quickstart}/quickstart-scala/src/main/resources/META-INF/maven/archetype.xml (90%) rename {stratosphere-quickstart => flink-quickstart}/quickstart-scala/src/main/resources/archetype-resources/pom.xml (92%) rename {stratosphere-quickstart => flink-quickstart}/quickstart-scala/src/main/resources/archetype-resources/src/main/scala/Job.scala (76%) rename {stratosphere-quickstart => flink-quickstart}/quickstart.sh (70%) rename {stratosphere-runtime => flink-runtime}/pom.xml (94%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/analyze.html (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/blank-page.html (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/configuration.html (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/css/bootstrap.css (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/css/bootstrap.min.css (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/css/nephelefrontend.css (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/css/sb-admin.css (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/css/timeline.css (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/css/font-awesome.css (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/css/font-awesome.min.css (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/fonts/FontAwesome.otf (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.eot (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.svg (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.ttf (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.woff (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/less/bordered-pulled.less (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/less/core.less (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/less/fixed-width.less (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/less/font-awesome.less (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/less/icons.less (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/less/larger.less (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/less/list.less (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/less/mixins.less (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/less/path.less (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/less/rotated-flipped.less (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/less/spinning.less (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/less/stacked.less (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/less/variables.less (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/scss/_bordered-pulled.scss (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/scss/_core.scss (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/scss/_fixed-width.scss (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/scss/_icons.scss (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/scss/_larger.scss (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/scss/_list.scss (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/scss/_mixins.scss (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/scss/_path.scss (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/scss/_rotated-flipped.scss (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/scss/_spinning.scss (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/scss/_stacked.scss (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/scss/_variables.scss (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/font-awesome/scss/font-awesome.scss (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/history.html (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/img/StratosphereLogo.png (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/index.html (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/analyzer.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/bootstrap.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/bootstrap.min.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/configuration.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/flot/chart-data-flot.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/flot/excanvas.min.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/flot/jquery.flot.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/flot/jquery.flot.pie.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/flot/jquery.flot.resize.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/flot/jquery.flot.tooltip.min.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/googlejsapi.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/helpers.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/jcanvas.min.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/jobmanagerFrontend.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/jquery-1.10.2.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/jquery.flot.categories.min.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/jquery.flot.min.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/jquery.flot.stack.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/jquery.flot.time.min.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/jquery.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/taskmanager.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/js/timeline.js (100%) rename {stratosphere-runtime => flink-runtime}/resources/web-docs-infoserver/taskmanagers.html (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/AbstractID.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/ExecutionMode.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/JobSubmissionException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/accumulators/AccumulatorEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/client/AbstractJobResult.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/client/JobCancelResult.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/client/JobClient.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/client/JobExecutionException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/client/JobProgressResult.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/client/JobSubmissionResult.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptor.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptor.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptor.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/event/job/AbstractEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/event/job/ExecutionStateChangeEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/event/job/JobEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/event/job/ManagementEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/event/job/RecentJobEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/event/job/VertexAssignmentEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/event/job/VertexEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/event/task/AbstractEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/event/task/AbstractTaskEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/event/task/EventList.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/event/task/EventListener.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/event/task/EventNotificationManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/event/task/IntegerTaskEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/event/task/StringTaskEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/execution/CancelTaskException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/execution/Environment.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/execution/ExecutionListener.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/execution/ExecutionObserver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/execution/ExecutionState.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/execution/ExecutionStateTransition.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/execution/RuntimeEnvironment.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheProfileRequest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheProfileResponse.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheUpdate.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/DistributionPatternProvider.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionEdge.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGate.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupEdge.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupVertex.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupVertexIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionPipeline.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionSignature.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionStage.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionStageListener.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertexID.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/GraphConversionException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/InternalJobStatus.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/JobStatusListener.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/ManagementGraphFactory.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/executiongraph/VertexAssignmentListener.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/filecache/FileCache.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedBlockLocation.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedDataInputStream.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedDataOutputStream.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileStatus.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileSystem.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/fs/s3/S3BlockLocation.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/fs/s3/S3BucketObjectPair.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/fs/s3/S3DataInputStream.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/fs/s3/S3DataOutputStream.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/fs/s3/S3DirectoryStructure.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/fs/s3/S3FileStatus.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/fs/s3/S3FileSystem.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/AllocatedResource.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/AllocatedSlot.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/AllocationID.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/DefaultInstanceManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/DummyInstance.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/Hardware.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/HardwareDescription.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/HardwareDescriptionFactory.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/Instance.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/InstanceConnectionInfo.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/InstanceException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/InstanceID.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/InstanceListener.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/InstanceNotifier.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/instance/LocalInstanceManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/ChannelReaderInputViewIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/InputViewIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/RandomAccessInputView.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/RandomAccessOutputView.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/SimpleCollectingOutputView.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/SpillingBuffer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelAccess.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelReader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelWriter.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BulkBlockChannelReader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/iomanager/Channel.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelAccess.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelReaderInputView.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelWriterOutputView.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/iomanager/Deserializer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/iomanager/HeaderlessChannelReaderInputView.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IORequest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/disk/iomanager/RequestQueue.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/Buffer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/BufferRecycler.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/ChannelManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/ConnectionInfoLookupResponse.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/Envelope.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/EnvelopeDispatcher.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/EnvelopeReceiverList.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/InsufficientResourcesException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/LocalConnectionManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/LocalReceiverCancelledException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/NetworkConnectionManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/RemoteReceiver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/SenderHintEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/api/AbstractRecordReader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/api/AbstractSingleGateRecordReader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/api/AbstractUnionRecordReader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/api/BufferWriter.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/api/ChannelSelector.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/api/MutableReader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/api/MutableRecordReader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/api/MutableUnionRecordReader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/api/Reader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/api/ReaderBase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/api/RecordReader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/api/RecordWriter.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/api/RoundRobinChannelSelector.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/api/UnionRecordReader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferAvailabilityListener.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferProvider.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferProviderBroker.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/DiscardBufferPool.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/GlobalBufferPool.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPool.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolOwner.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/channels/BufferOrEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/channels/Channel.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelCloseEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelID.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/channels/EndOfSuperstepEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/channels/InputChannel.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/channels/OutputChannel.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/channels/ReceiverAlreadyClosedException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/gates/Gate.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/gates/GateID.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/gates/InputChannelResult.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/gates/InputGate.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/gates/OutputGate.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/gates/RecordAvailabilityListener.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoder.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDispatcher.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundConnectionQueue.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoder.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/serialization/AdaptiveSpanningRecordDeserializer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/serialization/DataInputDeserializer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/serialization/DataOutputSerializer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/serialization/RecordDeserializer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/serialization/RecordSerializer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/ipc/Client.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/ipc/ConnectionHeader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/ipc/RPC.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/ipc/RemoteException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/ipc/Server.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/ipc/Status.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannelBroker.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/concurrent/Broker.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/concurrent/IterationAggregatorBroker.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetBroker.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetUpdateBarrier.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetUpdateBarrierBroker.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepBarrier.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/convergence/WorksetEmptyConvergenceCriterion.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/event/AllWorkersDoneEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/event/IterationEventWithAggregators.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/event/TerminationEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/event/WorkerDoneEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/io/FakeOutputTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/io/HashPartitionIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/io/SerializedUpdateBuffer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/io/SolutionSetFastUpdateOutputCollector.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/io/SolutionSetUpdateOutputCollector.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/io/WorksetUpdateOutputCollector.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/task/AbstractIterativePactTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/task/IterationHeadPactTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/task/IterationIntermediatePactTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/task/IterationTailPactTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/task/RuntimeAggregatorRegistry.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/iterative/task/Terminable.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobInputVertex.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobOutputVertex.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobVertex.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/DistributionPattern.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/JobEdge.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/JobGraph.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/JobGraphDefinitionException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/JobID.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/JobInputVertex.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/JobOutputVertex.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/JobStatus.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/JobTaskVertex.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/JobVertexID.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/tasks/AbstractInvokable.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/tasks/InputSplitIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobgraph/tasks/InputSplitProvider.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/DeploymentManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/EventCollector.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerUtils.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/accumulators/AccumulatorManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/accumulators/JobAccumulators.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/archive/ArchiveListener.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/archive/MemoryArchivist.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultExecutionListener.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultScheduler.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulingException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/DefaultInputSplitAssigner.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitAssigner.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitTracker.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitWrapper.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitAssigner.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitList.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitAssigner.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitList.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/web/JobmanagerInfoServlet.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/web/MenuServlet.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/web/SetupInfoServlet.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/jobmanager/web/WebInfoServer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/managementgraph/ManagementAttachment.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/managementgraph/ManagementEdge.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/managementgraph/ManagementEdgeID.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGate.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGateID.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraph.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraphIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupEdge.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertex.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertexID.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertexIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/managementgraph/ManagementStage.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/managementgraph/ManagementVertex.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/managementgraph/ManagementVertexID.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/memorymanager/AbstractPagedInputView.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/memorymanager/AbstractPagedOutputView.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/memorymanager/CheckedMemorySegment.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/memorymanager/DefaultMemoryManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/memorymanager/ListMemorySegmentSource.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/memorymanager/MemoryAllocationException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/memorymanager/MemoryManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/memorymanager/SimpleMemorySegment.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/memorymanager/UnsafeMemorySegment.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/net/NetUtils.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/net/SocketIOWithTimeout.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/net/SocketInputStream.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/net/SocketOutputStream.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/AbstractCachedBuildSideMatchDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/BuildFirstCachedMatchDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/BuildSecondCachedMatchDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetFirstDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetSecondDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/CollectorMapDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/DamBehavior.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/DataSinkTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/DataSourceTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/DriverStrategy.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/FlatMapDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/GroupReduceCombineDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetFirstDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetSecondDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/MapDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/NoOpDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/PactDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/PactTaskContext.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/ReduceCombineDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/ResettablePactDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/RuntimeExecutionContext.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/TempBarrier.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedCollectorMapDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedFlatMapDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedMapDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedTerminationCriterionDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/chaining/ExceptionInChainedStubException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/chaining/SynchronousChainedCombineDriver.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/hash/AbstractHashTableProber.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/hash/AbstractMutableHashTable.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/hash/BuildFirstHashMatchIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/hash/BuildFirstReOpenableHashMatchIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/hash/BuildSecondHashMatchIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/hash/BuildSecondReOpenableHashMatchIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/hash/HashPartition.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/hash/InMemoryPartition.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableHashPartition.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableMutableHashTable.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/resettable/AbstractBlockResettableIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/shipping/HistogramPartitionFunction.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/shipping/OutputCollector.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/shipping/OutputEmitter.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/shipping/PartitionFunction.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputCollector.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputEmitter.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/shipping/ShipStrategyType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/AsynchronousPartialSorter.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/AsynchronousPartialSorterCollector.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMerger.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/ExceptionHandler.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorter.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/HeapSort.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/InMemorySorter.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/IndexedSortable.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/IndexedSorter.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/MergeIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/MergeMatchIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorter.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/PartialOrderPriorityQueue.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/QuickSort.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/Sorter.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/udf/RuntimeUDFContext.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/util/CloseableInputProvider.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/util/CoGroupTaskIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/util/CorruptConfigurationException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/util/JoinTaskIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/util/LocalStrategy.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/util/ReaderIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/util/RecordReaderIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/util/SimpleCloseableInputProvider.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/operators/util/TaskConfig.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/plugable/DeserializationDelegate.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/plugable/SerializationDelegate.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/JobManagerProfiler.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/ProfilingException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/ProfilingListener.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/ProfilingUtils.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/TaskManagerProfiler.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentListenerImpl.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentThreadSet.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/impl/InstanceProfiler.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/impl/JobManagerProfilerImpl.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/impl/JobProfilingData.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/impl/ProfilerImplProtocol.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/impl/TaskManagerProfilerImpl.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalExecutionVertexProfilingData.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalExecutionVertexThreadProfilingData.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalInputGateProfilingData.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalInstanceProfilingData.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalOutputGateProfilingData.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalProfilingData.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/impl/types/ProfilingDataContainer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/types/InputGateProfilingEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/types/InstanceProfilingEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/types/InstanceSummaryProfilingEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/types/OutputGateProfilingEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/types/ProfilingEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/types/SingleInstanceProfilingEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/types/ThreadProfilingEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/profiling/types/VertexProfilingEvent.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/protocols/AccumulatorProtocol.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/protocols/ChannelLookupProtocol.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/protocols/ExtendedManagementProtocol.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/protocols/InputSplitProviderProtocol.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/protocols/JobManagementProtocol.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/protocols/JobManagerProtocol.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/protocols/TaskOperationProtocol.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/taskmanager/AbstractTaskResult.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/taskmanager/ExecutorThreadFactory.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/taskmanager/Task.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/taskmanager/TaskCancelResult.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/taskmanager/TaskExecutionState.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/taskmanager/TaskInputSplitProvider.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/taskmanager/TaskKillResult.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/taskmanager/TaskSubmissionResult.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/taskmanager/runtime/ExecutorThreadFactory.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/taskmanager/transferenvelope/RegisterTaskManagerResult.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/topology/NetworkNode.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/topology/NetworkTopology.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/topology/NetworkTopologyIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/types/FileRecord.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/types/IntegerRecord.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/AtomicEnum.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/AtomicEnumerator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/BufferPoolConnector.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/EmptyIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/EmptyMutableObjectIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/EnumUtils.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/FileUtils.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/IOUtils.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/JarFileCreator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/KeyGroupedIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/KeyGroupedMutableObjectIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/MathUtils.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/MemoryBlockIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/MutableToRegularIteratorWrapper.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/NativeCodeLoader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/RegularToMutableObjectIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/ResettableIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/ResettableMutableObjectIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/SerializableArrayList.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/SerializableHashMap.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/SerializableHashSet.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/SingleElementIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/main/java/org/apache/flink/runtime/util/UnmodifiableIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/AbstractIDTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/client/JobResultTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptorTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptorTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptorTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/event/job/JobEventTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/event/job/ManagementEventTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/event/task/EventNotificationManagerTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/event/task/TaskEventTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask1Input1Output.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask1Input2Outputs.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask2Inputs1Output.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/executiongraph/SelfCrossForwardTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/fs/LineReader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/fs/LineReaderTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/fs/s3/S3FileSystemTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTestUtils.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/instance/HostInClusterTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/instance/TestInstanceListener.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/instance/local/LocalInstanceManagerTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/instance/local/TestInstanceListener.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/disk/ChannelViewsTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/DefaultChannelSelectorTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoderTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManagerTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoderTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/DataInputOutputSerializerTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/PagedViewsTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializationTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializerTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/AsciiStringType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/BooleanType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteArrayType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteSubArrayType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/CharType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/DoubleType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/FloatType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/IntType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/LongType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/SerializationTestType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/SerializationTestTypeFactory.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ShortType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/UnsignedByteType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/UnsignedShortType.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/io/network/serialization/types/Util.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannelTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/iterative/concurrent/BrokerTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/iterative/concurrent/StringPair.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/iterative/concurrent/SuperstepBarrierTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/iterative/event/EventWithAggregatorsTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/jobgraph/JobGraphTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/jobmanager/DoubleSourceTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/jobmanager/DoubleTargetTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/jobmanager/ExceptionOutputFormat.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/jobmanager/ExceptionTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/jobmanager/ForwardTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/jobmanager/RuntimeExceptionTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/jobmanager/UnionTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultSchedulerTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/TestDeploymentManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/TestInstanceManager.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/managementgraph/ManagementGraphTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/memory/DefaultMemoryManagerTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/memory/MemorySegmentSpeedBenchmark.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/memory/MemorySegmentTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/CachedMatchTaskTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskExternalITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/CombineTaskExternalITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/CombineTaskTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/CrossTaskExternalITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/CrossTaskTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/MapTaskTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/MatchTaskExternalITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/MatchTaskTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/drivers/AllGroupReduceDriverTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/drivers/AllReduceDriverTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/drivers/DriverTestData.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/drivers/GatheringCollector.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/drivers/GroupReduceDriverTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/drivers/ReduceCombineDriverTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/drivers/ReduceDriverTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/drivers/TestTaskContext.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/hash/HashMatchIteratorITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/hash/HashTablePerformanceComparison.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/hash/MemoryHashTableTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/hash/util/LastBitsToRange.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/hash/util/RandomIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/hash/util/RangeCalculator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/hash/util/RangeIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/hash/util/StepRangeIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableIteratorTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIteratorTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/sort/AsynchonousPartialSorterITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorterTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/sort/MassiveStringSortingITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/sort/MergeIteratorTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/sort/MockRecordReader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorterTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeMatchIteratorITCase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/DelayingInfinitiveInputIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/DiscardingOutputCollector.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/DummyInvokable.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/ExpectedTestException.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/InfiniteInputIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironment.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/MockInputSplitProvider.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/MutableObjectIteratorWrapper.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/NirvanaOutputList.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/RandomIntPairGenerator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/TaskCancelThread.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/TaskTestBase.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/TestData.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/UniformIntPairGenerator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/UniformRecordGenerator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/UniformStringPairGenerator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/UnionIterator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntList.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListComparator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListPairComparator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListSerializer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPair.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairComparator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairListPairComparator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairPairComparator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairSerializer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntValueSerializer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPair.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairComparator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairPairComparator.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairSerializer.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/util/HashVsSortMiniBenchmark.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/operators/util/RecordOutputEmitterTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/profiling/impl/InstanceProfilerTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/profiling/types/ProfilingTypesTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/testutils/CommonTestUtils.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/testutils/DiscardingRecycler.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/testutils/InterruptibleByteChannel.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/testutils/ManagementTestUtils.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/testutils/ServerTestUtils.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/testutils/TestBufferProvider.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/testutils/tasks/DoubleSourceTask.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/testutils/tasks/FileLineReader.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/testutils/tasks/FileLineWriter.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/testutils/tasks/JobFileInputVertex.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/testutils/tasks/JobFileOutputVertex.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/topology/NetworkTopologyTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/types/StringRecordTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/types/TypeTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/util/KeyGroupedIteratorTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/util/MathUtilTest.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/java/org/apache/flink/runtime/util/TestDelegatingConfiguration.java (100%) rename {stratosphere-runtime => flink-runtime}/src/test/resources/topology.txt (100%) rename {stratosphere-scala => flink-scala}/pom.xml (91%) rename {stratosphere-scala => flink-scala}/src/main/java/org/apache/flink/api/scala/operators/Annotations.java (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/AnnotationUtil.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/CompilerHints.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/DataSet.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/DataSink.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/DataSource.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/ScalaOperator.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/ScalaPlan.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/analysis/Extractors.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/analysis/FieldSelector.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaFields.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaGenerator.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaPrinter.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/analysis/UserDefinedFunction.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/analysis/UserDefinedType.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/analysis/postPass/AmbientFieldDetector.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/analysis/postPass/EdgeDependencySets.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/analysis/postPass/Extractors.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaCompactor.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaOptimizer.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaPrinter.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/analysis/postPass/OutputSets.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/codegen/Counter.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/codegen/DeserializeMethodGen.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/codegen/Logger.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/codegen/MacroContextHolder.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/codegen/SelectionExtractor.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/codegen/SerializeMethodGen.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/codegen/SerializerGen.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/codegen/TreeGen.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/codegen/UDTAnalyzer.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/codegen/UDTDescriptors.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/codegen/UDTGen.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/codegen/Util.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/functions/CoGroupFunction.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/functions/CrossFunction.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/functions/DeserializingIterator.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/functions/JoinFunction.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/functions/MapFunction.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/functions/ReduceFunction.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/operators/ClosureCleaner.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/operators/CoGroupOperator.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/operators/CopyOperator.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/operators/CrossOperator.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/operators/DataSinkMacros.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/operators/DataSourceMacros.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/operators/IterateOperators.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/operators/JoinOperator.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/operators/MapOperator.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/operators/ReduceOperator.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/operators/UnionOperator.scala (100%) rename {stratosphere-scala => flink-scala}/src/main/scala/org/apache/flink/api/scala/operators/package.scala (100%) rename {stratosphere-scala => flink-scala}/src/test/scala/org/apache/flink/api/scala/CollectionDataSourceTest.scala (100%) rename {stratosphere-test-utils => flink-test-utils}/pom.xml (60%) rename {stratosphere-test-utils => flink-test-utils}/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java (100%) rename {stratosphere-test-utils => flink-test-utils}/src/main/java/org/apache/flink/test/compiler/util/OperatorResolver.java (100%) rename {stratosphere-test-utils => flink-test-utils}/src/main/java/org/apache/flink/test/testdata/ConnectedComponentsData.java (100%) rename {stratosphere-test-utils => flink-test-utils}/src/main/java/org/apache/flink/test/testdata/EnumTriangleData.java (100%) rename {stratosphere-test-utils => flink-test-utils}/src/main/java/org/apache/flink/test/testdata/KMeansData.java (100%) rename {stratosphere-test-utils => flink-test-utils}/src/main/java/org/apache/flink/test/testdata/PageRankData.java (100%) rename {stratosphere-test-utils => flink-test-utils}/src/main/java/org/apache/flink/test/testdata/TransitiveClosureData.java (100%) rename {stratosphere-test-utils => flink-test-utils}/src/main/java/org/apache/flink/test/testdata/WordCountData.java (100%) rename {stratosphere-test-utils => flink-test-utils}/src/main/java/org/apache/flink/test/util/AbstractTestBase.java (100%) rename {stratosphere-test-utils => flink-test-utils}/src/main/java/org/apache/flink/test/util/JavaProgramTestBase.java (100%) rename {stratosphere-test-utils => flink-test-utils}/src/main/java/org/apache/flink/test/util/RecordAPITestBase.java (100%) rename {stratosphere-tests => flink-tests}/pom.xml (81%) rename {stratosphere-tests => flink-tests}/src/test/assembly/test-assembly.xml (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/accumulators/AccumulatorIterativeITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/broadcastvars/BroadcastBranchingITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/broadcastvars/BroadcastVarsNepheleITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/cancelling/MapCancelingITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/cancelling/MatchJoinCancelingITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/compiler/examples/KMeansSingleStepTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/compiler/examples/RelationalQueryCompilerTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/compiler/examples/WordCountCompilerTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/compiler/iterations/ConnectedComponentsCoGroupTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/compiler/iterations/ConnectedComponentsTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/compiler/iterations/IterativeKMeansTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/compiler/iterations/MultipleJoinsWithSolutionSetCompilerTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/compiler/iterations/PageRankCompilerTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/compiler/plandump/DumpCompiledPlanTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/distributedCache/DistributedCacheTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleJavaPrograms/ConnectedComponentsITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleJavaPrograms/EnumTriangleBasicITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleJavaPrograms/EnumTriangleOptITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleJavaPrograms/PageRankITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleJavaPrograms/TransitiveClosureITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleJavaPrograms/WebLogAnalysisITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountPOJOITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountWithCollectionITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleScalaPrograms/ComputeEdgeDegreesITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleScalaPrograms/ConnectedComponentsITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleScalaPrograms/EnumTrianglesOnEdgesWithDegreesITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleScalaPrograms/IterativeKMeansITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleScalaPrograms/RelationalQueryITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleScalaPrograms/TransitiveClosureNaiveITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleScalaPrograms/WebLogAnalysisITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountPactValueITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountWithCountFunctionITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/failingPrograms/TaskFailureITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/BulkIterationWithAllReducerITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/CoGroupConnectedComponentsITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/CoGroupConnectedComponentsSecondITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsWithDeferredUpdateITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsWithSolutionSetFirstITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/DanglingPageRankITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/DeltaPageRankITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/DependencyConnectedComponentsITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/IterationTerminationWithTerminationTail.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/IterationTerminationWithTwoTails.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/IterationWithAllReducerITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/IterationWithChainingITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/IterationWithUnionITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/IterativeKMeansITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/KMeansITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/LineRankITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/MultipleSolutionSetJoinsITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/PageRankITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableConvergenceITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/ConfigUtils.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/ConnectedComponentsNepheleITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankNepheleITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankWithCombinerNepheleITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/IterationWithChainingNepheleITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/JobGraphUtils.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDanglingPageRank.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDanglingPageRankWithCombiner.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDotProductCoGroup.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDotProductMatch.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatingMap.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomImprovedAdjacencyListInputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomImprovedDanglingPageRankInputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomPageWithRankOutFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomRankCombiner.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyList.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListComparator.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListComparatorFactory.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListSerializer.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListSerializerFactory.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRank.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDangling.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingComparator.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingComparatorFactory.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingSerializer.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingSerializerFactory.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankComparator.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankComparatorFactory.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankDanglingToVertexWithAdjacencyListPairComparatorFactory.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankDanglingToVertexWithRankPairComparatorFactory.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankSerializer.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankSerializerFactory.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/AsciiLongArrayView.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/BooleanValue.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDanglingPageRank.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDotProductCoGroup.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDotProductMatch.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatingMap.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DanglingPageGenerateRankInputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/ImprovedAdjacencyListInputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/ImprovedDanglingPageRankInputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/LongArrayView.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageRankStats.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageRankStatsAggregator.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageWithRankOutFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/javaApiOperators/AggregateITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/javaApiOperators/CoGroupITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/javaApiOperators/CrossITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/javaApiOperators/DistinctITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/javaApiOperators/FilterITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/javaApiOperators/FlatMapITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/javaApiOperators/GroupReduceITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/javaApiOperators/JoinITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/javaApiOperators/ProjectITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/javaApiOperators/ReduceITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/javaApiOperators/SumMinMaxITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/javaApiOperators/UnionITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/javaApiOperators/util/CollectionDataSets.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/operators/CoGroupITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/operators/CrossITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/operators/JoinITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/operators/MapITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/operators/ReduceITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/operators/UnionITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/operators/UnionSinkITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/CollectionSourceTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/CollectionValidationTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/ComputeEdgeDegreesITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/EnumTrianglesOnEdgesWithDegreesITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/EnumTrianglesRDFITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingMixedOrderITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/GroupOrderReduceITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/MergeOnlyJoinITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/PairwiseSPITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery10ITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3ITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3WithUnionITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery4ITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery9ITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/TPCHQueryAsterixITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/TeraSortITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/WebLogAnalysisITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/WordCountITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobTests/WordCountUnionReduceITCase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/ComputeEdgeDegrees.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/ConnectedComponentsWithCoGroup.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/DanglingPageRank.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/DeltaPageRankWithInitialDeltas.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesOnEdgesWithDegrees.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesRdfFoaf.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesWithDegrees.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/PairwiseSP.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/SimplePageRank.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/WorksetConnectedComponents.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/AsciiLongArrayView.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DanglingPageRankInputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DotProductCoGroup.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DotProductMatch.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/ImprovedAdjacencyListInputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/LongArrayView.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageRankStats.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageRankStatsAggregator.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageWithRankOutFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeInputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeWithDegreesInputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeWithDegreesOutputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/TriangleOutputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansBroadcast.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansCross.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansSingleStep.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/ComputeDistance.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/ComputeDistanceParameterized.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/CoordVector.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/FindNearestCenter.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/PointInFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/PointOutFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/RecomputeClusterCenter.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/MergeOnlyJoin.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery1.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery10.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery3.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery3Unioned.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQueryAsterix.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/WebLogAnalysis.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/GroupByReturnFlag.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/AmountAggregate.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/FilteredPartsJoin.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/IntPair.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/LineItemMap.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/OrderMap.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/OrderedPartsJoin.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartFilter.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartJoin.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartListJoin.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartsuppMap.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/StringIntPair.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/StringIntPairStringDataOutFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/SupplierMap.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/SuppliersJoin.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/sort/ReduceGroupSort.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/sort/TeraSort.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraDistribution.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraInputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraKey.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraOutputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraValue.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/util/ConfigUtils.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/util/DiscardingOutputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/util/InfiniteIntegerInputFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/util/InfiniteIntegerInputFormatWithDelay.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/util/IntTupleDataInFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/util/StringTupleDataOutFormat.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/util/Tuple.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/util/UniformIntInput.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/wordcount/WordCount.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/recordJobs/wordcount/WordCountAccumulators.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/testPrograms/util/tests/IntTupleDataInFormatTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/testPrograms/util/tests/TupleTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/testdata/WebLogAnalysisData.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/util/FailingTestBase.java (100%) rename {stratosphere-tests => flink-tests}/src/test/java/org/apache/flink/test/util/testjar/KMeansForTest.java (100%) rename {stratosphere-tests => flink-tests}/src/test/resources/testdata/terainput.txt (100%) delete mode 100644 stratosphere-dist/src/main/stratosphere-bin/NOTICE delete mode 100644 stratosphere-quickstart/README.md delete mode 100755 stratosphere-quickstart/quickstart-SNAPSHOT.sh delete mode 100755 stratosphere-quickstart/quickstart-scala-SNAPSHOT.sh diff --git a/LICENSE b/LICENSE index fcc5395461313..d82630d2c6860 100644 --- a/LICENSE +++ b/LICENSE @@ -202,14 +202,14 @@ ======================================================================= -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. ----------------------------------------------------------------------- For jQuery 1.4.2 (MIT) in: - - stratosphere-runtime/resources/web-docs-infoserver/js/jquery.js - - stratosphere-clients/resources/web-docs/jquery.js + - flink-runtime/resources/web-docs-infoserver/js/jquery.js + - flink-clients/resources/web-docs/jquery.js ----------------------------------------------------------------------- Copyright 2014 jQuery Foundation and other contributors http://jquery.com/ @@ -235,7 +235,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ----------------------------------------------------------------------- For jCanvas 13.11.21 (MIT) in: - - stratosphere-runtime/resources/web-docs-infoserver/js/jcanvas.min.js + - flink-runtime/resources/web-docs-infoserver/js/jcanvas.min.js ----------------------------------------------------------------------- Copyright 2014 Caleb Evans http://calebevans.me/projects/jcanvas/ @@ -261,7 +261,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ----------------------------------------------------------------------- For Flot 0.8.1 in: - - stratosphere-runtime/resources/web-docs-infoserver/js/jquery.flot.* + - flink-runtime/resources/web-docs-infoserver/js/jquery.flot.* ----------------------------------------------------------------------- Copyright (c) 2007-2013 IOLA and Ole Laursen @@ -288,7 +288,7 @@ OTHER DEALINGS IN THE SOFTWARE. ----------------------------------------------------------------------- For js-graph.it 1.0 (LGPL 2.1) in: - - stratosphere-clients/resources/web-docs/js/js-graph-it.js + - flink-clients/resources/web-docs/js/js-graph-it.js ----------------------------------------------------------------------- GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 diff --git a/docs/cluster_execution.md b/docs/cluster_execution.md index 3ba387c33f316..015a6562b8681 100644 --- a/docs/cluster_execution.md +++ b/docs/cluster_execution.md @@ -26,8 +26,8 @@ If you are developing your program as a Maven project, you have to add the ```xml - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients {{ site.FLINK_VERSION_STABLE }} ``` @@ -72,8 +72,8 @@ If you are developing your program in a Maven project, you have to add the ```xml - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients {{ site.FLINK_VERSION_STABLE }} ``` diff --git a/docs/java_api_guide.md b/docs/java_api_guide.md index 65e108c028efc..516636b493c7d 100644 --- a/docs/java_api_guide.md +++ b/docs/java_api_guide.md @@ -80,13 +80,13 @@ If you want to add Stratosphere to an existing Maven project, add the following ```xml - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java {{site.FLINK_VERSION_STABLE }} - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients {{site.FLINK_VERSION_STABLE }} ``` diff --git a/docs/local_execution.md b/docs/local_execution.md index 912dc14b8738a..11047b51011c2 100644 --- a/docs/local_execution.md +++ b/docs/local_execution.md @@ -23,8 +23,8 @@ If you are developing your program in a Maven project, you have to add the `stra ```xml - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients {{site.FLINK_VERSION_STABLE}} ``` diff --git a/docs/scala_api_guide.md b/docs/scala_api_guide.md index 08bcc70f7c8ae..7a1b7476938c7 100644 --- a/docs/scala_api_guide.md +++ b/docs/scala_api_guide.md @@ -92,13 +92,13 @@ following lines to your POM. ```xml - eu.stratosphere - stratosphere-scala + org.apache.flink + flink-scala {{site.FLINK_VERSION_STABLE}} - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients {{site.FLINK_VERSION_STABLE}} diff --git a/docs/spargel_guide.md b/docs/spargel_guide.md index 59d1d736b2e54..7a74155f8936b 100644 --- a/docs/spargel_guide.md +++ b/docs/spargel_guide.md @@ -23,7 +23,7 @@ Add the following dependency to your `pom.xml` to use the Spargel. ```xml - eu.stratosphere + org.apache.flink spargel {{site.FLINK_VERSION_STABLE}} diff --git a/stratosphere-addons/avro/pom.xml b/flink-addons/avro/pom.xml similarity index 91% rename from stratosphere-addons/avro/pom.xml rename to flink-addons/avro/pom.xml index 9160afc9899b6..2a7869e3ad130 100644 --- a/stratosphere-addons/avro/pom.xml +++ b/flink-addons/avro/pom.xml @@ -6,8 +6,8 @@ 4.0.0 - stratosphere-addons - eu.stratosphere + flink-addons + org.apache.flink 0.6-SNAPSHOT .. @@ -19,14 +19,14 @@ - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java ${project.version} - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients ${project.version} @@ -43,8 +43,8 @@ - eu.stratosphere - stratosphere-test-utils + org.apache.flink + flink-test-utils ${project.version} test diff --git a/stratosphere-addons/avro/src/main/java/org/apache/flink/api/avro/AvroBaseValue.java b/flink-addons/avro/src/main/java/org/apache/flink/api/avro/AvroBaseValue.java similarity index 100% rename from stratosphere-addons/avro/src/main/java/org/apache/flink/api/avro/AvroBaseValue.java rename to flink-addons/avro/src/main/java/org/apache/flink/api/avro/AvroBaseValue.java diff --git a/stratosphere-addons/avro/src/main/java/org/apache/flink/api/avro/DataInputDecoder.java b/flink-addons/avro/src/main/java/org/apache/flink/api/avro/DataInputDecoder.java similarity index 100% rename from stratosphere-addons/avro/src/main/java/org/apache/flink/api/avro/DataInputDecoder.java rename to flink-addons/avro/src/main/java/org/apache/flink/api/avro/DataInputDecoder.java diff --git a/stratosphere-addons/avro/src/main/java/org/apache/flink/api/avro/DataOutputEncoder.java b/flink-addons/avro/src/main/java/org/apache/flink/api/avro/DataOutputEncoder.java similarity index 100% rename from stratosphere-addons/avro/src/main/java/org/apache/flink/api/avro/DataOutputEncoder.java rename to flink-addons/avro/src/main/java/org/apache/flink/api/avro/DataOutputEncoder.java diff --git a/stratosphere-addons/avro/src/main/java/org/apache/flink/api/avro/FSDataInputStreamWrapper.java b/flink-addons/avro/src/main/java/org/apache/flink/api/avro/FSDataInputStreamWrapper.java similarity index 100% rename from stratosphere-addons/avro/src/main/java/org/apache/flink/api/avro/FSDataInputStreamWrapper.java rename to flink-addons/avro/src/main/java/org/apache/flink/api/avro/FSDataInputStreamWrapper.java diff --git a/stratosphere-addons/avro/src/main/java/org/apache/flink/api/java/io/AvroInputFormat.java b/flink-addons/avro/src/main/java/org/apache/flink/api/java/io/AvroInputFormat.java similarity index 100% rename from stratosphere-addons/avro/src/main/java/org/apache/flink/api/java/io/AvroInputFormat.java rename to flink-addons/avro/src/main/java/org/apache/flink/api/java/io/AvroInputFormat.java diff --git a/stratosphere-addons/avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java b/flink-addons/avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java similarity index 100% rename from stratosphere-addons/avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java rename to flink-addons/avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java diff --git a/stratosphere-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroInputFormat.java b/flink-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroInputFormat.java similarity index 100% rename from stratosphere-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroInputFormat.java rename to flink-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroInputFormat.java diff --git a/stratosphere-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormat.java b/flink-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormat.java similarity index 100% rename from stratosphere-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormat.java rename to flink-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormat.java diff --git a/stratosphere-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/ReflectiveAvroTypeExample.java b/flink-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/ReflectiveAvroTypeExample.java similarity index 100% rename from stratosphere-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/ReflectiveAvroTypeExample.java rename to flink-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/ReflectiveAvroTypeExample.java diff --git a/stratosphere-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/SUser.java b/flink-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/SUser.java similarity index 100% rename from stratosphere-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/SUser.java rename to flink-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/SUser.java diff --git a/stratosphere-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/User.java b/flink-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/User.java similarity index 100% rename from stratosphere-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/User.java rename to flink-addons/avro/src/main/java/org/apache/flink/api/java/record/io/avro/example/User.java diff --git a/stratosphere-addons/avro/src/test/assembly/test-assembly.xml b/flink-addons/avro/src/test/assembly/test-assembly.xml similarity index 100% rename from stratosphere-addons/avro/src/test/assembly/test-assembly.xml rename to flink-addons/avro/src/test/assembly/test-assembly.xml diff --git a/stratosphere-addons/avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java b/flink-addons/avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java similarity index 100% rename from stratosphere-addons/avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java rename to flink-addons/avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java diff --git a/stratosphere-addons/avro/src/test/java/org/apache/flink/api/avro/AvroOutputFormatTest.java b/flink-addons/avro/src/test/java/org/apache/flink/api/avro/AvroOutputFormatTest.java similarity index 100% rename from stratosphere-addons/avro/src/test/java/org/apache/flink/api/avro/AvroOutputFormatTest.java rename to flink-addons/avro/src/test/java/org/apache/flink/api/avro/AvroOutputFormatTest.java diff --git a/stratosphere-addons/avro/src/test/java/org/apache/flink/api/avro/AvroWithEmptyArrayITCase.java b/flink-addons/avro/src/test/java/org/apache/flink/api/avro/AvroWithEmptyArrayITCase.java similarity index 100% rename from stratosphere-addons/avro/src/test/java/org/apache/flink/api/avro/AvroWithEmptyArrayITCase.java rename to flink-addons/avro/src/test/java/org/apache/flink/api/avro/AvroWithEmptyArrayITCase.java diff --git a/stratosphere-addons/avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java b/flink-addons/avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java similarity index 100% rename from stratosphere-addons/avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java rename to flink-addons/avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java diff --git a/stratosphere-addons/avro/src/test/java/org/apache/flink/api/avro/testjar/AvroExternalJarProgram.java b/flink-addons/avro/src/test/java/org/apache/flink/api/avro/testjar/AvroExternalJarProgram.java similarity index 100% rename from stratosphere-addons/avro/src/test/java/org/apache/flink/api/avro/testjar/AvroExternalJarProgram.java rename to flink-addons/avro/src/test/java/org/apache/flink/api/avro/testjar/AvroExternalJarProgram.java diff --git a/stratosphere-addons/avro/src/test/java/org/apache/flink/api/java/io/AvroInputFormatTypeExtractionTest.java b/flink-addons/avro/src/test/java/org/apache/flink/api/java/io/AvroInputFormatTypeExtractionTest.java similarity index 100% rename from stratosphere-addons/avro/src/test/java/org/apache/flink/api/java/io/AvroInputFormatTypeExtractionTest.java rename to flink-addons/avro/src/test/java/org/apache/flink/api/java/io/AvroInputFormatTypeExtractionTest.java diff --git a/stratosphere-addons/avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java b/flink-addons/avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java similarity index 100% rename from stratosphere-addons/avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java rename to flink-addons/avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java diff --git a/stratosphere-addons/avro/src/test/java/org/apache/flink/api/java/record/io/avro/generated/Colors.java b/flink-addons/avro/src/test/java/org/apache/flink/api/java/record/io/avro/generated/Colors.java similarity index 100% rename from stratosphere-addons/avro/src/test/java/org/apache/flink/api/java/record/io/avro/generated/Colors.java rename to flink-addons/avro/src/test/java/org/apache/flink/api/java/record/io/avro/generated/Colors.java diff --git a/stratosphere-addons/avro/src/test/java/org/apache/flink/api/java/record/io/avro/generated/User.java b/flink-addons/avro/src/test/java/org/apache/flink/api/java/record/io/avro/generated/User.java similarity index 100% rename from stratosphere-addons/avro/src/test/java/org/apache/flink/api/java/record/io/avro/generated/User.java rename to flink-addons/avro/src/test/java/org/apache/flink/api/java/record/io/avro/generated/User.java diff --git a/stratosphere-addons/avro/src/test/resources/avro/user.avsc b/flink-addons/avro/src/test/resources/avro/user.avsc similarity index 100% rename from stratosphere-addons/avro/src/test/resources/avro/user.avsc rename to flink-addons/avro/src/test/resources/avro/user.avsc diff --git a/stratosphere-addons/avro/src/test/resources/testdata.avro b/flink-addons/avro/src/test/resources/testdata.avro similarity index 100% rename from stratosphere-addons/avro/src/test/resources/testdata.avro rename to flink-addons/avro/src/test/resources/testdata.avro diff --git a/stratosphere-addons/hadoop-compatibility/pom.xml b/flink-addons/hadoop-compatibility/pom.xml similarity index 76% rename from stratosphere-addons/hadoop-compatibility/pom.xml rename to flink-addons/hadoop-compatibility/pom.xml index 79f1e5af0a145..6b3f338f39a91 100644 --- a/stratosphere-addons/hadoop-compatibility/pom.xml +++ b/flink-addons/hadoop-compatibility/pom.xml @@ -6,8 +6,8 @@ 4.0.0 - stratosphere-addons - eu.stratosphere + flink-addons + org.apache.flink 0.6-SNAPSHOT .. @@ -19,25 +19,25 @@ - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java ${project.version} - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients ${project.version} - eu.stratosphere - stratosphere-tests + org.apache.flink + flink-tests ${project.version} test - eu.stratosphere - stratosphere-test-utils + org.apache.flink + flink-test-utils ${project.version} test diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopInputFormat.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopInputFormat.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopInputFormat.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopInputFormat.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopOutputFormat.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopOutputFormat.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopOutputFormat.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopOutputFormat.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/example/WordCount.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/example/WordCount.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/example/WordCount.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/example/WordCount.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopDataSink.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopDataSink.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopDataSink.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopDataSink.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopDataSource.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopDataSource.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopDataSource.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopDataSource.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopRecordInputFormat.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopRecordInputFormat.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopRecordInputFormat.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopRecordInputFormat.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopRecordOutputFormat.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopRecordOutputFormat.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopRecordOutputFormat.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/HadoopRecordOutputFormat.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/DefaultFlinkTypeConverter.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/DefaultFlinkTypeConverter.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/DefaultFlinkTypeConverter.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/DefaultFlinkTypeConverter.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/DefaultHadoopTypeConverter.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/DefaultHadoopTypeConverter.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/DefaultHadoopTypeConverter.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/DefaultHadoopTypeConverter.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/FlinkTypeConverter.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/FlinkTypeConverter.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/FlinkTypeConverter.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/FlinkTypeConverter.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/HadoopFileOutputCommitter.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/HadoopFileOutputCommitter.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/HadoopFileOutputCommitter.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/HadoopFileOutputCommitter.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/HadoopTypeConverter.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/HadoopTypeConverter.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/HadoopTypeConverter.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/HadoopTypeConverter.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableComparableWrapper.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableComparableWrapper.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableComparableWrapper.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableComparableWrapper.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableWrapper.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableWrapper.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableWrapper.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableWrapper.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableWrapperConverter.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableWrapperConverter.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableWrapperConverter.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/datatypes/WritableWrapperConverter.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/example/WordCount.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/example/WordCount.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/example/WordCount.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/example/WordCount.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/example/WordCountWithOutputFormat.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/example/WordCountWithOutputFormat.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/example/WordCountWithOutputFormat.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/record/example/WordCountWithOutputFormat.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/utils/HadoopUtils.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/utils/HadoopUtils.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/utils/HadoopUtils.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/utils/HadoopUtils.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopDummyProgressable.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopDummyProgressable.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopDummyProgressable.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopDummyProgressable.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopDummyReporter.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopDummyReporter.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopDummyReporter.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopDummyReporter.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopInputSplit.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopInputSplit.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopInputSplit.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopInputSplit.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopInputFormat.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopInputFormat.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopInputFormat.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopInputFormat.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopOutputFormat.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopOutputFormat.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopOutputFormat.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopOutputFormat.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/example/WordCount.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/example/WordCount.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/example/WordCount.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/example/WordCount.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/utils/HadoopUtils.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/utils/HadoopUtils.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/utils/HadoopUtils.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/utils/HadoopUtils.java diff --git a/stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/wrapper/HadoopInputSplit.java b/flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/wrapper/HadoopInputSplit.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/wrapper/HadoopInputSplit.java rename to flink-addons/hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/wrapper/HadoopInputSplit.java diff --git a/stratosphere-addons/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopInputOutputITCase.java b/flink-addons/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopInputOutputITCase.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopInputOutputITCase.java rename to flink-addons/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopInputOutputITCase.java diff --git a/stratosphere-addons/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/record/HadoopRecordInputOutputITCase.java b/flink-addons/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/record/HadoopRecordInputOutputITCase.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/record/HadoopRecordInputOutputITCase.java rename to flink-addons/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/record/HadoopRecordInputOutputITCase.java diff --git a/stratosphere-addons/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/HadoopInputOutputITCase.java b/flink-addons/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/HadoopInputOutputITCase.java similarity index 100% rename from stratosphere-addons/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/HadoopInputOutputITCase.java rename to flink-addons/hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/HadoopInputOutputITCase.java diff --git a/stratosphere-addons/hbase/pom.xml b/flink-addons/hbase/pom.xml similarity index 89% rename from stratosphere-addons/hbase/pom.xml rename to flink-addons/hbase/pom.xml index c6a787da80ed6..3cca2e747e5b0 100644 --- a/stratosphere-addons/hbase/pom.xml +++ b/flink-addons/hbase/pom.xml @@ -5,8 +5,8 @@ 4.0.0 - stratosphere-addons - eu.stratosphere + flink-addons + org.apache.flink 0.6-SNAPSHOT .. @@ -34,14 +34,14 @@ - eu.stratosphere - stratosphere-core + org.apache.flink + flink-core ${project.version} - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java ${project.version} diff --git a/stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/GenericTableOutputFormat.java b/flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/GenericTableOutputFormat.java similarity index 100% rename from stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/GenericTableOutputFormat.java rename to flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/GenericTableOutputFormat.java diff --git a/stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/HBaseDataSink.java b/flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/HBaseDataSink.java similarity index 100% rename from stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/HBaseDataSink.java rename to flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/HBaseDataSink.java diff --git a/stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java b/flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java similarity index 100% rename from stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java rename to flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java diff --git a/stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/TableInputSplit.java b/flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/TableInputSplit.java similarity index 100% rename from stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/TableInputSplit.java rename to flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/TableInputSplit.java diff --git a/stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseKey.java b/flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseKey.java similarity index 100% rename from stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseKey.java rename to flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseKey.java diff --git a/stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseResult.java b/flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseResult.java similarity index 100% rename from stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseResult.java rename to flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseResult.java diff --git a/stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseUtil.java b/flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseUtil.java similarity index 100% rename from stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseUtil.java rename to flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/common/HBaseUtil.java diff --git a/stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/example/HBaseReadExample.java b/flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/example/HBaseReadExample.java similarity index 100% rename from stratosphere-addons/hbase/src/main/java/org/apache/flink/addons/hbase/example/HBaseReadExample.java rename to flink-addons/hbase/src/main/java/org/apache/flink/addons/hbase/example/HBaseReadExample.java diff --git a/stratosphere-addons/jdbc/pom.xml b/flink-addons/jdbc/pom.xml similarity index 72% rename from stratosphere-addons/jdbc/pom.xml rename to flink-addons/jdbc/pom.xml index 71f9d48b58d0b..e5d3c1f645d9c 100644 --- a/stratosphere-addons/jdbc/pom.xml +++ b/flink-addons/jdbc/pom.xml @@ -6,8 +6,8 @@ 4.0.0 - stratosphere-addons - eu.stratosphere + flink-addons + org.apache.flink 0.6-SNAPSHOT .. @@ -19,20 +19,20 @@ - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java ${project.version} - eu.stratosphere - stratosphere-core + org.apache.flink + flink-core ${project.version} - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients ${project.version} diff --git a/stratosphere-addons/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java b/flink-addons/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java similarity index 100% rename from stratosphere-addons/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java rename to flink-addons/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java diff --git a/stratosphere-addons/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java b/flink-addons/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java similarity index 100% rename from stratosphere-addons/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java rename to flink-addons/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java diff --git a/stratosphere-addons/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/example/JDBCExample.java b/flink-addons/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/example/JDBCExample.java similarity index 100% rename from stratosphere-addons/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/example/JDBCExample.java rename to flink-addons/jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/example/JDBCExample.java diff --git a/stratosphere-addons/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormat.java b/flink-addons/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormat.java similarity index 100% rename from stratosphere-addons/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormat.java rename to flink-addons/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormat.java diff --git a/stratosphere-addons/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormat.java b/flink-addons/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormat.java similarity index 100% rename from stratosphere-addons/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormat.java rename to flink-addons/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormat.java diff --git a/stratosphere-addons/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/example/JDBCExample.java b/flink-addons/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/example/JDBCExample.java similarity index 100% rename from stratosphere-addons/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/example/JDBCExample.java rename to flink-addons/jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/example/JDBCExample.java diff --git a/stratosphere-addons/jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java b/flink-addons/jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java similarity index 100% rename from stratosphere-addons/jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java rename to flink-addons/jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java diff --git a/stratosphere-addons/jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java b/flink-addons/jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java similarity index 100% rename from stratosphere-addons/jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java rename to flink-addons/jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java diff --git a/stratosphere-addons/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/DevNullLogStream.java b/flink-addons/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/DevNullLogStream.java similarity index 100% rename from stratosphere-addons/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/DevNullLogStream.java rename to flink-addons/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/DevNullLogStream.java diff --git a/stratosphere-addons/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormatTest.java b/flink-addons/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormatTest.java similarity index 100% rename from stratosphere-addons/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormatTest.java rename to flink-addons/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormatTest.java diff --git a/stratosphere-addons/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java b/flink-addons/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java similarity index 100% rename from stratosphere-addons/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java rename to flink-addons/jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java diff --git a/stratosphere-addons/pom.xml b/flink-addons/pom.xml similarity index 91% rename from stratosphere-addons/pom.xml rename to flink-addons/pom.xml index 39cc44f691a06..f518d54e7774c 100644 --- a/stratosphere-addons/pom.xml +++ b/flink-addons/pom.xml @@ -5,14 +5,14 @@ 4.0.0 - eu.stratosphere - stratosphere + org.apache.flink + flink-parent 0.6-SNAPSHOT .. - stratosphere-addons - stratosphere-addons + flink-addons + flink-addons pom diff --git a/stratosphere-addons/spargel/pom.xml b/flink-addons/spargel/pom.xml similarity index 65% rename from stratosphere-addons/spargel/pom.xml rename to flink-addons/spargel/pom.xml index f89669fb6e217..f9180402f274e 100644 --- a/stratosphere-addons/spargel/pom.xml +++ b/flink-addons/spargel/pom.xml @@ -5,8 +5,8 @@ 4.0.0 - stratosphere-addons - eu.stratosphere + flink-addons + org.apache.flink 0.6-SNAPSHOT .. @@ -18,23 +18,23 @@ - eu.stratosphere - stratosphere-core + org.apache.flink + flink-core ${project.version} - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java ${project.version} - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients ${project.version} - eu.stratosphere - stratosphere-test-utils + org.apache.flink + flink-test-utils ${project.version} test diff --git a/stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/MessageIterator.java b/flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/MessageIterator.java similarity index 100% rename from stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/MessageIterator.java rename to flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/MessageIterator.java diff --git a/stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/MessagingFunction.java b/flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/MessagingFunction.java similarity index 100% rename from stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/MessagingFunction.java rename to flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/MessagingFunction.java diff --git a/stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/OutgoingEdge.java b/flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/OutgoingEdge.java similarity index 100% rename from stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/OutgoingEdge.java rename to flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/OutgoingEdge.java diff --git a/stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/VertexCentricIteration.java b/flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/VertexCentricIteration.java similarity index 100% rename from stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/VertexCentricIteration.java rename to flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/VertexCentricIteration.java diff --git a/stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/VertexUpdateFunction.java b/flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/VertexUpdateFunction.java similarity index 100% rename from stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/VertexUpdateFunction.java rename to flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/VertexUpdateFunction.java diff --git a/stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelConnectedComponents.java b/flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelConnectedComponents.java similarity index 100% rename from stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelConnectedComponents.java rename to flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelConnectedComponents.java diff --git a/stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelPageRank.java b/flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelPageRank.java similarity index 100% rename from stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelPageRank.java rename to flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelPageRank.java diff --git a/stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelPageRankCountingVertices.java b/flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelPageRankCountingVertices.java similarity index 100% rename from stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelPageRankCountingVertices.java rename to flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/examples/SpargelPageRankCountingVertices.java diff --git a/stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/Edge.java b/flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/Edge.java similarity index 100% rename from stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/Edge.java rename to flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/Edge.java diff --git a/stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/MessageIterator.java b/flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/MessageIterator.java similarity index 100% rename from stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/MessageIterator.java rename to flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/MessageIterator.java diff --git a/stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/MessagingFunction.java b/flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/MessagingFunction.java similarity index 100% rename from stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/MessagingFunction.java rename to flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/MessagingFunction.java diff --git a/stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/SpargelIteration.java b/flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/SpargelIteration.java similarity index 100% rename from stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/SpargelIteration.java rename to flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/SpargelIteration.java diff --git a/stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/VertexUpdateFunction.java b/flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/VertexUpdateFunction.java similarity index 100% rename from stratosphere-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/VertexUpdateFunction.java rename to flink-addons/spargel/src/main/java/org/apache/flink/spargel/java/record/VertexUpdateFunction.java diff --git a/stratosphere-addons/spargel/src/test/java/org/apache/flink/spargel/java/SpargelCompilerTest.java b/flink-addons/spargel/src/test/java/org/apache/flink/spargel/java/SpargelCompilerTest.java similarity index 100% rename from stratosphere-addons/spargel/src/test/java/org/apache/flink/spargel/java/SpargelCompilerTest.java rename to flink-addons/spargel/src/test/java/org/apache/flink/spargel/java/SpargelCompilerTest.java diff --git a/stratosphere-addons/spargel/src/test/java/org/apache/flink/spargel/java/SpargelTranslationTest.java b/flink-addons/spargel/src/test/java/org/apache/flink/spargel/java/SpargelTranslationTest.java similarity index 100% rename from stratosphere-addons/spargel/src/test/java/org/apache/flink/spargel/java/SpargelTranslationTest.java rename to flink-addons/spargel/src/test/java/org/apache/flink/spargel/java/SpargelTranslationTest.java diff --git a/stratosphere-addons/spargel/src/test/java/org/apache/flink/test/spargel/SpargelConnectedComponentsITCase.java b/flink-addons/spargel/src/test/java/org/apache/flink/test/spargel/SpargelConnectedComponentsITCase.java similarity index 100% rename from stratosphere-addons/spargel/src/test/java/org/apache/flink/test/spargel/SpargelConnectedComponentsITCase.java rename to flink-addons/spargel/src/test/java/org/apache/flink/test/spargel/SpargelConnectedComponentsITCase.java diff --git a/stratosphere-addons/yarn/pom.xml b/flink-addons/yarn/pom.xml similarity index 84% rename from stratosphere-addons/yarn/pom.xml rename to flink-addons/yarn/pom.xml index a11c29c15d843..b35a6e94516a0 100644 --- a/stratosphere-addons/yarn/pom.xml +++ b/flink-addons/yarn/pom.xml @@ -3,8 +3,8 @@ 4.0.0 - eu.stratosphere - stratosphere-addons + org.apache.flink + flink-addons 0.6-SNAPSHOT .. @@ -16,8 +16,8 @@ - eu.stratosphere - stratosphere-runtime + org.apache.flink + flink-runtime ${project.version} @@ -28,8 +28,8 @@ - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients ${project.version} diff --git a/stratosphere-addons/yarn/src/main/java/org/apache/flink/yarn/ApplicationMaster.java b/flink-addons/yarn/src/main/java/org/apache/flink/yarn/ApplicationMaster.java similarity index 100% rename from stratosphere-addons/yarn/src/main/java/org/apache/flink/yarn/ApplicationMaster.java rename to flink-addons/yarn/src/main/java/org/apache/flink/yarn/ApplicationMaster.java diff --git a/stratosphere-addons/yarn/src/main/java/org/apache/flink/yarn/Client.java b/flink-addons/yarn/src/main/java/org/apache/flink/yarn/Client.java similarity index 100% rename from stratosphere-addons/yarn/src/main/java/org/apache/flink/yarn/Client.java rename to flink-addons/yarn/src/main/java/org/apache/flink/yarn/Client.java diff --git a/stratosphere-addons/yarn/src/main/java/org/apache/flink/yarn/Utils.java b/flink-addons/yarn/src/main/java/org/apache/flink/yarn/Utils.java similarity index 100% rename from stratosphere-addons/yarn/src/main/java/org/apache/flink/yarn/Utils.java rename to flink-addons/yarn/src/main/java/org/apache/flink/yarn/Utils.java diff --git a/stratosphere-addons/yarn/src/main/java/org/apache/flink/yarn/YarnTaskManagerRunner.java b/flink-addons/yarn/src/main/java/org/apache/flink/yarn/YarnTaskManagerRunner.java similarity index 100% rename from stratosphere-addons/yarn/src/main/java/org/apache/flink/yarn/YarnTaskManagerRunner.java rename to flink-addons/yarn/src/main/java/org/apache/flink/yarn/YarnTaskManagerRunner.java diff --git a/stratosphere-clients/pom.xml b/flink-clients/pom.xml similarity index 86% rename from stratosphere-clients/pom.xml rename to flink-clients/pom.xml index a0ce635f50d48..bf406a9f5f8d2 100644 --- a/stratosphere-clients/pom.xml +++ b/flink-clients/pom.xml @@ -5,40 +5,40 @@ 4.0.0 - eu.stratosphere - stratosphere + org.apache.flink + flink-parent 0.6-SNAPSHOT .. - stratosphere-clients - stratosphere-clients + flink-clients + flink-clients jar - eu.stratosphere - stratosphere-core + org.apache.flink + flink-core ${project.version} - eu.stratosphere - stratosphere-runtime + org.apache.flink + flink-runtime ${project.version} - eu.stratosphere - stratosphere-compiler + org.apache.flink + flink-compiler ${project.version} - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java ${project.version} @@ -88,7 +88,7 @@ maven-compiler-plugin - **/src/test/java/eu/stratosphere/client/testjar/*.java + **/src/test/java/org/apache/flink/client/testjar/*.java diff --git a/stratosphere-clients/resources/web-docs/css/bootstrap.css b/flink-clients/resources/web-docs/css/bootstrap.css similarity index 100% rename from stratosphere-clients/resources/web-docs/css/bootstrap.css rename to flink-clients/resources/web-docs/css/bootstrap.css diff --git a/stratosphere-clients/resources/web-docs/css/graph.css b/flink-clients/resources/web-docs/css/graph.css similarity index 100% rename from stratosphere-clients/resources/web-docs/css/graph.css rename to flink-clients/resources/web-docs/css/graph.css diff --git a/stratosphere-clients/resources/web-docs/css/nephelefrontend.css b/flink-clients/resources/web-docs/css/nephelefrontend.css similarity index 100% rename from stratosphere-clients/resources/web-docs/css/nephelefrontend.css rename to flink-clients/resources/web-docs/css/nephelefrontend.css diff --git a/stratosphere-clients/resources/web-docs/css/overlay.css b/flink-clients/resources/web-docs/css/overlay.css similarity index 100% rename from stratosphere-clients/resources/web-docs/css/overlay.css rename to flink-clients/resources/web-docs/css/overlay.css diff --git a/stratosphere-clients/resources/web-docs/css/pactgraphs.css b/flink-clients/resources/web-docs/css/pactgraphs.css similarity index 100% rename from stratosphere-clients/resources/web-docs/css/pactgraphs.css rename to flink-clients/resources/web-docs/css/pactgraphs.css diff --git a/stratosphere-clients/resources/web-docs/img/FlinkLogo.png b/flink-clients/resources/web-docs/img/FlinkLogo.png similarity index 100% rename from stratosphere-clients/resources/web-docs/img/FlinkLogo.png rename to flink-clients/resources/web-docs/img/FlinkLogo.png diff --git a/stratosphere-clients/resources/web-docs/img/GradientBoxes.png b/flink-clients/resources/web-docs/img/GradientBoxes.png similarity index 100% rename from stratosphere-clients/resources/web-docs/img/GradientBoxes.png rename to flink-clients/resources/web-docs/img/GradientBoxes.png diff --git a/stratosphere-clients/resources/web-docs/img/StratosphereLogo.png b/flink-clients/resources/web-docs/img/StratosphereLogo.png similarity index 100% rename from stratosphere-clients/resources/web-docs/img/StratosphereLogo.png rename to flink-clients/resources/web-docs/img/StratosphereLogo.png diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arr.gif b/flink-clients/resources/web-docs/img/arrows/arr.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arr.gif rename to flink-clients/resources/web-docs/img/arrows/arr.gif diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arr2.gif b/flink-clients/resources/web-docs/img/arrows/arr2.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arr2.gif rename to flink-clients/resources/web-docs/img/arrows/arr2.gif diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arr2_d.gif b/flink-clients/resources/web-docs/img/arrows/arr2_d.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arr2_d.gif rename to flink-clients/resources/web-docs/img/arrows/arr2_d.gif diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arr2_l.gif b/flink-clients/resources/web-docs/img/arrows/arr2_l.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arr2_l.gif rename to flink-clients/resources/web-docs/img/arrows/arr2_l.gif diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arr2_r.gif b/flink-clients/resources/web-docs/img/arrows/arr2_r.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arr2_r.gif rename to flink-clients/resources/web-docs/img/arrows/arr2_r.gif diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arr2_u.gif b/flink-clients/resources/web-docs/img/arrows/arr2_u.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arr2_u.gif rename to flink-clients/resources/web-docs/img/arrows/arr2_u.gif diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arr_d.gif b/flink-clients/resources/web-docs/img/arrows/arr_d.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arr_d.gif rename to flink-clients/resources/web-docs/img/arrows/arr_d.gif diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arr_l.gif b/flink-clients/resources/web-docs/img/arrows/arr_l.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arr_l.gif rename to flink-clients/resources/web-docs/img/arrows/arr_l.gif diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arr_r.gif b/flink-clients/resources/web-docs/img/arrows/arr_r.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arr_r.gif rename to flink-clients/resources/web-docs/img/arrows/arr_r.gif diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arr_u.gif b/flink-clients/resources/web-docs/img/arrows/arr_u.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arr_u.gif rename to flink-clients/resources/web-docs/img/arrows/arr_u.gif diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arrow.gif b/flink-clients/resources/web-docs/img/arrows/arrow.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arrow.gif rename to flink-clients/resources/web-docs/img/arrows/arrow.gif diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arrow_d.gif b/flink-clients/resources/web-docs/img/arrows/arrow_d.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arrow_d.gif rename to flink-clients/resources/web-docs/img/arrows/arrow_d.gif diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arrow_l.gif b/flink-clients/resources/web-docs/img/arrows/arrow_l.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arrow_l.gif rename to flink-clients/resources/web-docs/img/arrows/arrow_l.gif diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arrow_r.gif b/flink-clients/resources/web-docs/img/arrows/arrow_r.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arrow_r.gif rename to flink-clients/resources/web-docs/img/arrows/arrow_r.gif diff --git a/stratosphere-clients/resources/web-docs/img/arrows/arrow_u.gif b/flink-clients/resources/web-docs/img/arrows/arrow_u.gif similarity index 100% rename from stratosphere-clients/resources/web-docs/img/arrows/arrow_u.gif rename to flink-clients/resources/web-docs/img/arrows/arrow_u.gif diff --git a/stratosphere-clients/resources/web-docs/img/delete-icon.png b/flink-clients/resources/web-docs/img/delete-icon.png similarity index 100% rename from stratosphere-clients/resources/web-docs/img/delete-icon.png rename to flink-clients/resources/web-docs/img/delete-icon.png diff --git a/stratosphere-clients/resources/web-docs/img/gradient.jpg b/flink-clients/resources/web-docs/img/gradient.jpg similarity index 100% rename from stratosphere-clients/resources/web-docs/img/gradient.jpg rename to flink-clients/resources/web-docs/img/gradient.jpg diff --git a/stratosphere-clients/resources/web-docs/img/overlay/close.png b/flink-clients/resources/web-docs/img/overlay/close.png similarity index 100% rename from stratosphere-clients/resources/web-docs/img/overlay/close.png rename to flink-clients/resources/web-docs/img/overlay/close.png diff --git a/stratosphere-clients/resources/web-docs/index.html b/flink-clients/resources/web-docs/index.html similarity index 100% rename from stratosphere-clients/resources/web-docs/index.html rename to flink-clients/resources/web-docs/index.html diff --git a/stratosphere-clients/resources/web-docs/js/bootstrap.min.js b/flink-clients/resources/web-docs/js/bootstrap.min.js similarity index 100% rename from stratosphere-clients/resources/web-docs/js/bootstrap.min.js rename to flink-clients/resources/web-docs/js/bootstrap.min.js diff --git a/stratosphere-clients/resources/web-docs/js/d3.js b/flink-clients/resources/web-docs/js/d3.js similarity index 100% rename from stratosphere-clients/resources/web-docs/js/d3.js rename to flink-clients/resources/web-docs/js/d3.js diff --git a/stratosphere-clients/resources/web-docs/js/dagre-d3.js b/flink-clients/resources/web-docs/js/dagre-d3.js similarity index 100% rename from stratosphere-clients/resources/web-docs/js/dagre-d3.js rename to flink-clients/resources/web-docs/js/dagre-d3.js diff --git a/stratosphere-clients/resources/web-docs/js/graphCreator.js b/flink-clients/resources/web-docs/js/graphCreator.js similarity index 100% rename from stratosphere-clients/resources/web-docs/js/graphCreator.js rename to flink-clients/resources/web-docs/js/graphCreator.js diff --git a/stratosphere-clients/resources/web-docs/js/jquery-2.1.0.js b/flink-clients/resources/web-docs/js/jquery-2.1.0.js similarity index 100% rename from stratosphere-clients/resources/web-docs/js/jquery-2.1.0.js rename to flink-clients/resources/web-docs/js/jquery-2.1.0.js diff --git a/stratosphere-clients/resources/web-docs/js/jquery.tools.min.js b/flink-clients/resources/web-docs/js/jquery.tools.min.js similarity index 100% rename from stratosphere-clients/resources/web-docs/js/jquery.tools.min.js rename to flink-clients/resources/web-docs/js/jquery.tools.min.js diff --git a/stratosphere-clients/resources/web-docs/js/program.js b/flink-clients/resources/web-docs/js/program.js similarity index 100% rename from stratosphere-clients/resources/web-docs/js/program.js rename to flink-clients/resources/web-docs/js/program.js diff --git a/stratosphere-clients/resources/web-docs/launch.html b/flink-clients/resources/web-docs/launch.html similarity index 100% rename from stratosphere-clients/resources/web-docs/launch.html rename to flink-clients/resources/web-docs/launch.html diff --git a/stratosphere-clients/src/main/assembly/test-assembly.xml b/flink-clients/src/main/assembly/test-assembly.xml similarity index 100% rename from stratosphere-clients/src/main/assembly/test-assembly.xml rename to flink-clients/src/main/assembly/test-assembly.xml diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/CliFrontend.java b/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/CliFrontend.java rename to flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/LocalExecutor.java b/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/LocalExecutor.java rename to flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/RemoteExecutor.java b/flink-clients/src/main/java/org/apache/flink/client/RemoteExecutor.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/RemoteExecutor.java rename to flink-clients/src/main/java/org/apache/flink/client/RemoteExecutor.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/WebFrontend.java b/flink-clients/src/main/java/org/apache/flink/client/WebFrontend.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/WebFrontend.java rename to flink-clients/src/main/java/org/apache/flink/client/WebFrontend.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/minicluster/NepheleMiniCluster.java b/flink-clients/src/main/java/org/apache/flink/client/minicluster/NepheleMiniCluster.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/minicluster/NepheleMiniCluster.java rename to flink-clients/src/main/java/org/apache/flink/client/minicluster/NepheleMiniCluster.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/program/Client.java b/flink-clients/src/main/java/org/apache/flink/client/program/Client.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/program/Client.java rename to flink-clients/src/main/java/org/apache/flink/client/program/Client.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/program/ContextEnvironment.java b/flink-clients/src/main/java/org/apache/flink/client/program/ContextEnvironment.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/program/ContextEnvironment.java rename to flink-clients/src/main/java/org/apache/flink/client/program/ContextEnvironment.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/program/JobWithJars.java b/flink-clients/src/main/java/org/apache/flink/client/program/JobWithJars.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/program/JobWithJars.java rename to flink-clients/src/main/java/org/apache/flink/client/program/JobWithJars.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/program/PackagedProgram.java b/flink-clients/src/main/java/org/apache/flink/client/program/PackagedProgram.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/program/PackagedProgram.java rename to flink-clients/src/main/java/org/apache/flink/client/program/PackagedProgram.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/program/ProgramInvocationException.java b/flink-clients/src/main/java/org/apache/flink/client/program/ProgramInvocationException.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/program/ProgramInvocationException.java rename to flink-clients/src/main/java/org/apache/flink/client/program/ProgramInvocationException.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/web/GUIServletStub.java b/flink-clients/src/main/java/org/apache/flink/client/web/GUIServletStub.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/web/GUIServletStub.java rename to flink-clients/src/main/java/org/apache/flink/client/web/GUIServletStub.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java b/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java rename to flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/web/JobsInfoServlet.java b/flink-clients/src/main/java/org/apache/flink/client/web/JobsInfoServlet.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/web/JobsInfoServlet.java rename to flink-clients/src/main/java/org/apache/flink/client/web/JobsInfoServlet.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/web/JobsServlet.java b/flink-clients/src/main/java/org/apache/flink/client/web/JobsServlet.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/web/JobsServlet.java rename to flink-clients/src/main/java/org/apache/flink/client/web/JobsServlet.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/web/PactJobJSONServlet.java b/flink-clients/src/main/java/org/apache/flink/client/web/PactJobJSONServlet.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/web/PactJobJSONServlet.java rename to flink-clients/src/main/java/org/apache/flink/client/web/PactJobJSONServlet.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/web/PlanDisplayServlet.java b/flink-clients/src/main/java/org/apache/flink/client/web/PlanDisplayServlet.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/web/PlanDisplayServlet.java rename to flink-clients/src/main/java/org/apache/flink/client/web/PlanDisplayServlet.java diff --git a/stratosphere-clients/src/main/java/org/apache/flink/client/web/WebInterfaceServer.java b/flink-clients/src/main/java/org/apache/flink/client/web/WebInterfaceServer.java similarity index 100% rename from stratosphere-clients/src/main/java/org/apache/flink/client/web/WebInterfaceServer.java rename to flink-clients/src/main/java/org/apache/flink/client/web/WebInterfaceServer.java diff --git a/stratosphere-clients/src/test/java/org/apache/flink/client/CliFrontendInfoTest.java b/flink-clients/src/test/java/org/apache/flink/client/CliFrontendInfoTest.java similarity index 100% rename from stratosphere-clients/src/test/java/org/apache/flink/client/CliFrontendInfoTest.java rename to flink-clients/src/test/java/org/apache/flink/client/CliFrontendInfoTest.java diff --git a/stratosphere-clients/src/test/java/org/apache/flink/client/CliFrontendJobManagerConnectionTest.java b/flink-clients/src/test/java/org/apache/flink/client/CliFrontendJobManagerConnectionTest.java similarity index 100% rename from stratosphere-clients/src/test/java/org/apache/flink/client/CliFrontendJobManagerConnectionTest.java rename to flink-clients/src/test/java/org/apache/flink/client/CliFrontendJobManagerConnectionTest.java diff --git a/stratosphere-clients/src/test/java/org/apache/flink/client/CliFrontendListCancelTest.java b/flink-clients/src/test/java/org/apache/flink/client/CliFrontendListCancelTest.java similarity index 100% rename from stratosphere-clients/src/test/java/org/apache/flink/client/CliFrontendListCancelTest.java rename to flink-clients/src/test/java/org/apache/flink/client/CliFrontendListCancelTest.java diff --git a/stratosphere-clients/src/test/java/org/apache/flink/client/CliFrontendPackageProgramTest.java b/flink-clients/src/test/java/org/apache/flink/client/CliFrontendPackageProgramTest.java similarity index 100% rename from stratosphere-clients/src/test/java/org/apache/flink/client/CliFrontendPackageProgramTest.java rename to flink-clients/src/test/java/org/apache/flink/client/CliFrontendPackageProgramTest.java diff --git a/stratosphere-clients/src/test/java/org/apache/flink/client/CliFrontendRunTest.java b/flink-clients/src/test/java/org/apache/flink/client/CliFrontendRunTest.java similarity index 100% rename from stratosphere-clients/src/test/java/org/apache/flink/client/CliFrontendRunTest.java rename to flink-clients/src/test/java/org/apache/flink/client/CliFrontendRunTest.java diff --git a/stratosphere-clients/src/test/java/org/apache/flink/client/CliFrontendTestUtils.java b/flink-clients/src/test/java/org/apache/flink/client/CliFrontendTestUtils.java similarity index 100% rename from stratosphere-clients/src/test/java/org/apache/flink/client/CliFrontendTestUtils.java rename to flink-clients/src/test/java/org/apache/flink/client/CliFrontendTestUtils.java diff --git a/stratosphere-clients/src/test/java/org/apache/flink/client/program/ClientTest.java b/flink-clients/src/test/java/org/apache/flink/client/program/ClientTest.java similarity index 100% rename from stratosphere-clients/src/test/java/org/apache/flink/client/program/ClientTest.java rename to flink-clients/src/test/java/org/apache/flink/client/program/ClientTest.java diff --git a/stratosphere-clients/src/test/java/org/apache/flink/client/program/PackagedProgramTest.java b/flink-clients/src/test/java/org/apache/flink/client/program/PackagedProgramTest.java similarity index 100% rename from stratosphere-clients/src/test/java/org/apache/flink/client/program/PackagedProgramTest.java rename to flink-clients/src/test/java/org/apache/flink/client/program/PackagedProgramTest.java diff --git a/stratosphere-clients/src/test/java/org/apache/flink/client/testjar/JobWithExternalDependency.java b/flink-clients/src/test/java/org/apache/flink/client/testjar/JobWithExternalDependency.java similarity index 100% rename from stratosphere-clients/src/test/java/org/apache/flink/client/testjar/JobWithExternalDependency.java rename to flink-clients/src/test/java/org/apache/flink/client/testjar/JobWithExternalDependency.java diff --git a/stratosphere-clients/src/test/java/org/apache/flink/client/testjar/WordCount.java b/flink-clients/src/test/java/org/apache/flink/client/testjar/WordCount.java similarity index 100% rename from stratosphere-clients/src/test/java/org/apache/flink/client/testjar/WordCount.java rename to flink-clients/src/test/java/org/apache/flink/client/testjar/WordCount.java diff --git a/stratosphere-clients/src/test/resources/invalidtestconfig/flink-conf.yaml b/flink-clients/src/test/resources/invalidtestconfig/flink-conf.yaml similarity index 100% rename from stratosphere-clients/src/test/resources/invalidtestconfig/flink-conf.yaml rename to flink-clients/src/test/resources/invalidtestconfig/flink-conf.yaml diff --git a/stratosphere-clients/src/test/resources/testconfig/flink-conf.yaml b/flink-clients/src/test/resources/testconfig/flink-conf.yaml similarity index 100% rename from stratosphere-clients/src/test/resources/testconfig/flink-conf.yaml rename to flink-clients/src/test/resources/testconfig/flink-conf.yaml diff --git a/stratosphere-clients/src/test/resources/testconfigwithinvalidyarn/.yarn-jobmanager b/flink-clients/src/test/resources/testconfigwithinvalidyarn/.yarn-jobmanager similarity index 100% rename from stratosphere-clients/src/test/resources/testconfigwithinvalidyarn/.yarn-jobmanager rename to flink-clients/src/test/resources/testconfigwithinvalidyarn/.yarn-jobmanager diff --git a/stratosphere-clients/src/test/resources/testconfigwithinvalidyarn/flink-conf.yaml b/flink-clients/src/test/resources/testconfigwithinvalidyarn/flink-conf.yaml similarity index 100% rename from stratosphere-clients/src/test/resources/testconfigwithinvalidyarn/flink-conf.yaml rename to flink-clients/src/test/resources/testconfigwithinvalidyarn/flink-conf.yaml diff --git a/stratosphere-clients/src/test/resources/testconfigwithyarn/.yarn-jobmanager b/flink-clients/src/test/resources/testconfigwithyarn/.yarn-jobmanager similarity index 100% rename from stratosphere-clients/src/test/resources/testconfigwithyarn/.yarn-jobmanager rename to flink-clients/src/test/resources/testconfigwithyarn/.yarn-jobmanager diff --git a/stratosphere-clients/src/test/resources/testconfigwithyarn/flink-conf.yaml b/flink-clients/src/test/resources/testconfigwithyarn/flink-conf.yaml similarity index 100% rename from stratosphere-clients/src/test/resources/testconfigwithyarn/flink-conf.yaml rename to flink-clients/src/test/resources/testconfigwithyarn/flink-conf.yaml diff --git a/stratosphere-compiler/pom.xml b/flink-compiler/pom.xml similarity index 64% rename from stratosphere-compiler/pom.xml rename to flink-compiler/pom.xml index 4e234f717719e..69887980d725b 100644 --- a/stratosphere-compiler/pom.xml +++ b/flink-compiler/pom.xml @@ -5,35 +5,35 @@ 4.0.0 - eu.stratosphere - stratosphere + org.apache.flink + flink-parent 0.6-SNAPSHOT .. - stratosphere-compiler - stratosphere-compiler + flink-compiler + flink-compiler jar - eu.stratosphere - stratosphere-core + org.apache.flink + flink-core ${project.version} compile - eu.stratosphere - stratosphere-runtime + org.apache.flink + flink-runtime ${project.version} compile - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java ${project.version} compile diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/CompilerException.java b/flink-compiler/src/main/java/org/apache/flink/compiler/CompilerException.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/CompilerException.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/CompilerException.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/CompilerPostPassException.java b/flink-compiler/src/main/java/org/apache/flink/compiler/CompilerPostPassException.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/CompilerPostPassException.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/CompilerPostPassException.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/DataStatistics.java b/flink-compiler/src/main/java/org/apache/flink/compiler/DataStatistics.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/DataStatistics.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/DataStatistics.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/NonCachingDataStatistics.java b/flink-compiler/src/main/java/org/apache/flink/compiler/NonCachingDataStatistics.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/NonCachingDataStatistics.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/NonCachingDataStatistics.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/PactCompiler.java b/flink-compiler/src/main/java/org/apache/flink/compiler/PactCompiler.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/PactCompiler.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/PactCompiler.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/contextcheck/ContextChecker.java b/flink-compiler/src/main/java/org/apache/flink/compiler/contextcheck/ContextChecker.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/contextcheck/ContextChecker.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/contextcheck/ContextChecker.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/contextcheck/MissingChildException.java b/flink-compiler/src/main/java/org/apache/flink/compiler/contextcheck/MissingChildException.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/contextcheck/MissingChildException.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/contextcheck/MissingChildException.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/contextcheck/Validatable.java b/flink-compiler/src/main/java/org/apache/flink/compiler/contextcheck/Validatable.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/contextcheck/Validatable.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/contextcheck/Validatable.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/costs/CostEstimator.java b/flink-compiler/src/main/java/org/apache/flink/compiler/costs/CostEstimator.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/costs/CostEstimator.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/costs/CostEstimator.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/costs/Costs.java b/flink-compiler/src/main/java/org/apache/flink/compiler/costs/Costs.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/costs/Costs.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/costs/Costs.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/costs/DefaultCostEstimator.java b/flink-compiler/src/main/java/org/apache/flink/compiler/costs/DefaultCostEstimator.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/costs/DefaultCostEstimator.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/costs/DefaultCostEstimator.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/AbstractPartialSolutionNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/AbstractPartialSolutionNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/AbstractPartialSolutionNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/AbstractPartialSolutionNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/BinaryUnionNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/BinaryUnionNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/BinaryUnionNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/BinaryUnionNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/BulkIterationNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/BulkIterationNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/BulkIterationNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/BulkIterationNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/BulkPartialSolutionNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/BulkPartialSolutionNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/BulkPartialSolutionNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/BulkPartialSolutionNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/CoGroupNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/CoGroupNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/CoGroupNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/CoGroupNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/CollectorMapNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/CollectorMapNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/CollectorMapNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/CollectorMapNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/CrossNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/CrossNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/CrossNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/CrossNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/DataSinkNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/DataSinkNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/DataSinkNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/DataSinkNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/DataSourceNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/DataSourceNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/DataSourceNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/DataSourceNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/EstimateProvider.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/EstimateProvider.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/EstimateProvider.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/EstimateProvider.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/FilterNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/FilterNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/FilterNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/FilterNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/FlatMapNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/FlatMapNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/FlatMapNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/FlatMapNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/GroupReduceNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/GroupReduceNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/GroupReduceNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/GroupReduceNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/InterestingPropertiesClearer.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/InterestingPropertiesClearer.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/InterestingPropertiesClearer.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/InterestingPropertiesClearer.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/IterationNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/IterationNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/IterationNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/IterationNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/MapNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/MapNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/MapNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/MapNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/MatchNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/MatchNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/MatchNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/MatchNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/NoOpNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/NoOpNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/NoOpNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/NoOpNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/OptimizerNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/OptimizerNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/OptimizerNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/OptimizerNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/PactConnection.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/PactConnection.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/PactConnection.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/PactConnection.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/PlanCacheCleaner.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/PlanCacheCleaner.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/PlanCacheCleaner.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/PlanCacheCleaner.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/ReduceNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/ReduceNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/ReduceNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/ReduceNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/SingleInputNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/SingleInputNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/SingleInputNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/SingleInputNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/SinkJoiner.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/SinkJoiner.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/SinkJoiner.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/SinkJoiner.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/SolutionSetNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/SolutionSetNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/SolutionSetNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/SolutionSetNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/TempMode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/TempMode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/TempMode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/TempMode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/TwoInputNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/TwoInputNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/TwoInputNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/TwoInputNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/UnaryOperatorNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/UnaryOperatorNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/UnaryOperatorNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/UnaryOperatorNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/WorksetIterationNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/WorksetIterationNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/WorksetIterationNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/WorksetIterationNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/WorksetNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dag/WorksetNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dag/WorksetNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dag/WorksetNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dataproperties/GlobalProperties.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dataproperties/GlobalProperties.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dataproperties/GlobalProperties.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dataproperties/GlobalProperties.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dataproperties/InterestingProperties.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dataproperties/InterestingProperties.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dataproperties/InterestingProperties.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dataproperties/InterestingProperties.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dataproperties/LocalProperties.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dataproperties/LocalProperties.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dataproperties/LocalProperties.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dataproperties/LocalProperties.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dataproperties/PartitioningProperty.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dataproperties/PartitioningProperty.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dataproperties/PartitioningProperty.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dataproperties/PartitioningProperty.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dataproperties/RequestedGlobalProperties.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dataproperties/RequestedGlobalProperties.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dataproperties/RequestedGlobalProperties.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dataproperties/RequestedGlobalProperties.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/dataproperties/RequestedLocalProperties.java b/flink-compiler/src/main/java/org/apache/flink/compiler/dataproperties/RequestedLocalProperties.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/dataproperties/RequestedLocalProperties.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/dataproperties/RequestedLocalProperties.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockEdge.java b/flink-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockEdge.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockEdge.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockEdge.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockGraph.java b/flink-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockGraph.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockGraph.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockGraph.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockPreventer.java b/flink-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockPreventer.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockPreventer.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockPreventer.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockVertex.java b/flink-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockVertex.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockVertex.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/deadlockdetect/DeadlockVertex.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/AbstractJoinDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/AbstractJoinDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/AbstractJoinDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/AbstractJoinDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/AbstractOperatorDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/AbstractOperatorDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/AbstractOperatorDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/AbstractOperatorDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/AllGroupReduceProperties.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/AllGroupReduceProperties.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/AllGroupReduceProperties.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/AllGroupReduceProperties.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/AllGroupWithPartialPreGroupProperties.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/AllGroupWithPartialPreGroupProperties.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/AllGroupWithPartialPreGroupProperties.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/AllGroupWithPartialPreGroupProperties.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/AllReduceProperties.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/AllReduceProperties.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/AllReduceProperties.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/AllReduceProperties.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/BinaryUnionOpDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/BinaryUnionOpDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/BinaryUnionOpDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/BinaryUnionOpDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CartesianProductDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/CartesianProductDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CartesianProductDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/CartesianProductDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CoGroupDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/CoGroupDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CoGroupDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/CoGroupDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CoGroupWithSolutionSetFirstDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/CoGroupWithSolutionSetFirstDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CoGroupWithSolutionSetFirstDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/CoGroupWithSolutionSetFirstDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CoGroupWithSolutionSetSecondDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/CoGroupWithSolutionSetSecondDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CoGroupWithSolutionSetSecondDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/CoGroupWithSolutionSetSecondDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CollectorMapDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/CollectorMapDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CollectorMapDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/CollectorMapDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CrossBlockOuterFirstDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/CrossBlockOuterFirstDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CrossBlockOuterFirstDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/CrossBlockOuterFirstDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CrossBlockOuterSecondDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/CrossBlockOuterSecondDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CrossBlockOuterSecondDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/CrossBlockOuterSecondDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CrossStreamOuterFirstDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/CrossStreamOuterFirstDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CrossStreamOuterFirstDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/CrossStreamOuterFirstDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CrossStreamOuterSecondDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/CrossStreamOuterSecondDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/CrossStreamOuterSecondDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/CrossStreamOuterSecondDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/FilterDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/FilterDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/FilterDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/FilterDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/FlatMapDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/FlatMapDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/FlatMapDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/FlatMapDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/GroupReduceProperties.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/GroupReduceProperties.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/GroupReduceProperties.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/GroupReduceProperties.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/GroupReduceWithCombineProperties.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/GroupReduceWithCombineProperties.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/GroupReduceWithCombineProperties.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/GroupReduceWithCombineProperties.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/HashJoinBuildFirstProperties.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/HashJoinBuildFirstProperties.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/HashJoinBuildFirstProperties.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/HashJoinBuildFirstProperties.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/HashJoinBuildSecondProperties.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/HashJoinBuildSecondProperties.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/HashJoinBuildSecondProperties.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/HashJoinBuildSecondProperties.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/MapDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/MapDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/MapDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/MapDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/NoOpDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/NoOpDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/NoOpDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/NoOpDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/OperatorDescriptorDual.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/OperatorDescriptorDual.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/OperatorDescriptorDual.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/OperatorDescriptorDual.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/OperatorDescriptorSingle.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/OperatorDescriptorSingle.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/OperatorDescriptorSingle.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/OperatorDescriptorSingle.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/PartialGroupProperties.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/PartialGroupProperties.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/PartialGroupProperties.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/PartialGroupProperties.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/ReduceProperties.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/ReduceProperties.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/ReduceProperties.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/ReduceProperties.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/SolutionSetDeltaOperator.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/SolutionSetDeltaOperator.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/SolutionSetDeltaOperator.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/SolutionSetDeltaOperator.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/SortMergeJoinDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/SortMergeJoinDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/SortMergeJoinDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/SortMergeJoinDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/UtilSinkJoinOpDescriptor.java b/flink-compiler/src/main/java/org/apache/flink/compiler/operators/UtilSinkJoinOpDescriptor.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/operators/UtilSinkJoinOpDescriptor.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/operators/UtilSinkJoinOpDescriptor.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/BinaryUnionPlanNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/BinaryUnionPlanNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/BinaryUnionPlanNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/BinaryUnionPlanNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/BulkIterationPlanNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/BulkIterationPlanNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/BulkIterationPlanNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/BulkIterationPlanNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/BulkPartialSolutionPlanNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/BulkPartialSolutionPlanNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/BulkPartialSolutionPlanNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/BulkPartialSolutionPlanNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/Channel.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/Channel.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/Channel.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/Channel.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/DualInputPlanNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/DualInputPlanNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/DualInputPlanNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/DualInputPlanNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/IterationPlanNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/IterationPlanNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/IterationPlanNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/IterationPlanNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/NAryUnionPlanNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/NAryUnionPlanNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/NAryUnionPlanNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/NAryUnionPlanNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/NamedChannel.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/NamedChannel.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/NamedChannel.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/NamedChannel.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/OptimizedPlan.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/OptimizedPlan.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/OptimizedPlan.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/OptimizedPlan.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/PlanNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/PlanNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/PlanNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/PlanNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/SingleInputPlanNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/SingleInputPlanNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/SingleInputPlanNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/SingleInputPlanNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/SinkJoinerPlanNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/SinkJoinerPlanNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/SinkJoinerPlanNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/SinkJoinerPlanNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/SinkPlanNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/SinkPlanNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/SinkPlanNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/SinkPlanNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/SolutionSetPlanNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/SolutionSetPlanNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/SolutionSetPlanNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/SolutionSetPlanNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/SourcePlanNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/SourcePlanNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/SourcePlanNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/SourcePlanNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/WorksetIterationPlanNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/WorksetIterationPlanNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/WorksetIterationPlanNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/WorksetIterationPlanNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/WorksetPlanNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/WorksetPlanNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plan/WorksetPlanNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plan/WorksetPlanNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plandump/DumpableConnection.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plandump/DumpableConnection.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plandump/DumpableConnection.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plandump/DumpableConnection.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plandump/DumpableNode.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plandump/DumpableNode.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plandump/DumpableNode.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plandump/DumpableNode.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plandump/PlanJSONDumpGenerator.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plandump/PlanJSONDumpGenerator.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plandump/PlanJSONDumpGenerator.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plandump/PlanJSONDumpGenerator.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/AbstractSchema.java b/flink-compiler/src/main/java/org/apache/flink/compiler/postpass/AbstractSchema.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/AbstractSchema.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/postpass/AbstractSchema.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/ConflictingFieldTypeInfoException.java b/flink-compiler/src/main/java/org/apache/flink/compiler/postpass/ConflictingFieldTypeInfoException.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/ConflictingFieldTypeInfoException.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/postpass/ConflictingFieldTypeInfoException.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/DenseValueSchema.java b/flink-compiler/src/main/java/org/apache/flink/compiler/postpass/DenseValueSchema.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/DenseValueSchema.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/postpass/DenseValueSchema.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/GenericFlatTypePostPass.java b/flink-compiler/src/main/java/org/apache/flink/compiler/postpass/GenericFlatTypePostPass.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/GenericFlatTypePostPass.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/postpass/GenericFlatTypePostPass.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/JavaApiPostPass.java b/flink-compiler/src/main/java/org/apache/flink/compiler/postpass/JavaApiPostPass.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/JavaApiPostPass.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/postpass/JavaApiPostPass.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/MissingFieldTypeInfoException.java b/flink-compiler/src/main/java/org/apache/flink/compiler/postpass/MissingFieldTypeInfoException.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/MissingFieldTypeInfoException.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/postpass/MissingFieldTypeInfoException.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/OptimizerPostPass.java b/flink-compiler/src/main/java/org/apache/flink/compiler/postpass/OptimizerPostPass.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/OptimizerPostPass.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/postpass/OptimizerPostPass.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/PostPassUtils.java b/flink-compiler/src/main/java/org/apache/flink/compiler/postpass/PostPassUtils.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/PostPassUtils.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/postpass/PostPassUtils.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/RecordModelPostPass.java b/flink-compiler/src/main/java/org/apache/flink/compiler/postpass/RecordModelPostPass.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/RecordModelPostPass.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/postpass/RecordModelPostPass.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/SparseKeySchema.java b/flink-compiler/src/main/java/org/apache/flink/compiler/postpass/SparseKeySchema.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/postpass/SparseKeySchema.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/postpass/SparseKeySchema.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/util/NoOpBinaryUdfOp.java b/flink-compiler/src/main/java/org/apache/flink/compiler/util/NoOpBinaryUdfOp.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/util/NoOpBinaryUdfOp.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/util/NoOpBinaryUdfOp.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/util/NoOpFunction.java b/flink-compiler/src/main/java/org/apache/flink/compiler/util/NoOpFunction.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/util/NoOpFunction.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/util/NoOpFunction.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/util/NoOpUnaryUdfOp.java b/flink-compiler/src/main/java/org/apache/flink/compiler/util/NoOpUnaryUdfOp.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/util/NoOpUnaryUdfOp.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/util/NoOpUnaryUdfOp.java diff --git a/stratosphere-compiler/src/main/java/org/apache/flink/compiler/util/Utils.java b/flink-compiler/src/main/java/org/apache/flink/compiler/util/Utils.java similarity index 100% rename from stratosphere-compiler/src/main/java/org/apache/flink/compiler/util/Utils.java rename to flink-compiler/src/main/java/org/apache/flink/compiler/util/Utils.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/AdditionalOperatorsTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/AdditionalOperatorsTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/AdditionalOperatorsTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/AdditionalOperatorsTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/BranchingPlansCompilerTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/BranchingPlansCompilerTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/BranchingPlansCompilerTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/BranchingPlansCompilerTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/BroadcastVariablePipelinebreakerTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/BroadcastVariablePipelinebreakerTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/BroadcastVariablePipelinebreakerTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/BroadcastVariablePipelinebreakerTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/CachedMatchStrategyCompilerTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/CachedMatchStrategyCompilerTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/CachedMatchStrategyCompilerTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/CachedMatchStrategyCompilerTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/CoGroupSolutionSetFirstTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/CoGroupSolutionSetFirstTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/CoGroupSolutionSetFirstTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/CoGroupSolutionSetFirstTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/CompilerTestBase.java b/flink-compiler/src/test/java/org/apache/flink/compiler/CompilerTestBase.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/CompilerTestBase.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/CompilerTestBase.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/DOPChangeTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/DOPChangeTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/DOPChangeTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/DOPChangeTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/FeedbackPropertiesMatchTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/FeedbackPropertiesMatchTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/FeedbackPropertiesMatchTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/FeedbackPropertiesMatchTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/GroupOrderTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/GroupOrderTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/GroupOrderTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/GroupOrderTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/GroupReduceCompilationTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/GroupReduceCompilationTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/GroupReduceCompilationTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/GroupReduceCompilationTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/HardPlansCompilationTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/HardPlansCompilationTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/HardPlansCompilationTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/HardPlansCompilationTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/IterationsCompilerTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/IterationsCompilerTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/IterationsCompilerTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/IterationsCompilerTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/ReduceAllTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/ReduceAllTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/ReduceAllTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/ReduceAllTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/ReduceCompilationTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/ReduceCompilationTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/ReduceCompilationTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/ReduceCompilationTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/UnionPropertyPropagationTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/UnionPropertyPropagationTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/UnionPropertyPropagationTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/UnionPropertyPropagationTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/UnionReplacementTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/UnionReplacementTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/UnionReplacementTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/UnionReplacementTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/WorksetIterationsJavaApiCompilerTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/WorksetIterationsJavaApiCompilerTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/WorksetIterationsJavaApiCompilerTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/WorksetIterationsJavaApiCompilerTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/WorksetIterationsRecordApiCompilerTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/WorksetIterationsRecordApiCompilerTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/WorksetIterationsRecordApiCompilerTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/WorksetIterationsRecordApiCompilerTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/costs/DefaultCostEstimatorTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/costs/DefaultCostEstimatorTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/costs/DefaultCostEstimatorTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/costs/DefaultCostEstimatorTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/plan/ChannelTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/plan/ChannelTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/plan/ChannelTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/plan/ChannelTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/plandump/NumberFormattingTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/plandump/NumberFormattingTest.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/plandump/NumberFormattingTest.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/plandump/NumberFormattingTest.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/testfunctions/DummyJoinFunction.java b/flink-compiler/src/test/java/org/apache/flink/compiler/testfunctions/DummyJoinFunction.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/testfunctions/DummyJoinFunction.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/testfunctions/DummyJoinFunction.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/testfunctions/IdentityGroupReducer.java b/flink-compiler/src/test/java/org/apache/flink/compiler/testfunctions/IdentityGroupReducer.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/testfunctions/IdentityGroupReducer.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/testfunctions/IdentityGroupReducer.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/testfunctions/IdentityKeyExtractor.java b/flink-compiler/src/test/java/org/apache/flink/compiler/testfunctions/IdentityKeyExtractor.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/testfunctions/IdentityKeyExtractor.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/testfunctions/IdentityKeyExtractor.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/testfunctions/IdentityMapper.java b/flink-compiler/src/test/java/org/apache/flink/compiler/testfunctions/IdentityMapper.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/testfunctions/IdentityMapper.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/testfunctions/IdentityMapper.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/testfunctions/Top1GroupReducer.java b/flink-compiler/src/test/java/org/apache/flink/compiler/testfunctions/Top1GroupReducer.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/testfunctions/Top1GroupReducer.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/testfunctions/Top1GroupReducer.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/DummyCoGroupStub.java b/flink-compiler/src/test/java/org/apache/flink/compiler/util/DummyCoGroupStub.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/DummyCoGroupStub.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/util/DummyCoGroupStub.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/DummyCrossStub.java b/flink-compiler/src/test/java/org/apache/flink/compiler/util/DummyCrossStub.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/DummyCrossStub.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/util/DummyCrossStub.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/DummyInputFormat.java b/flink-compiler/src/test/java/org/apache/flink/compiler/util/DummyInputFormat.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/DummyInputFormat.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/util/DummyInputFormat.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/DummyMatchStub.java b/flink-compiler/src/test/java/org/apache/flink/compiler/util/DummyMatchStub.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/DummyMatchStub.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/util/DummyMatchStub.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/DummyNonPreservingMatchStub.java b/flink-compiler/src/test/java/org/apache/flink/compiler/util/DummyNonPreservingMatchStub.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/DummyNonPreservingMatchStub.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/util/DummyNonPreservingMatchStub.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/DummyOutputFormat.java b/flink-compiler/src/test/java/org/apache/flink/compiler/util/DummyOutputFormat.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/DummyOutputFormat.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/util/DummyOutputFormat.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/IdentityMap.java b/flink-compiler/src/test/java/org/apache/flink/compiler/util/IdentityMap.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/IdentityMap.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/util/IdentityMap.java diff --git a/stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/IdentityReduce.java b/flink-compiler/src/test/java/org/apache/flink/compiler/util/IdentityReduce.java similarity index 100% rename from stratosphere-compiler/src/test/java/org/apache/flink/compiler/util/IdentityReduce.java rename to flink-compiler/src/test/java/org/apache/flink/compiler/util/IdentityReduce.java diff --git a/stratosphere-core/pom.xml b/flink-core/pom.xml similarity index 85% rename from stratosphere-core/pom.xml rename to flink-core/pom.xml index f90a4ba66248a..9282ef5980f55 100644 --- a/stratosphere-core/pom.xml +++ b/flink-core/pom.xml @@ -5,14 +5,14 @@ 4.0.0 - eu.stratosphere - stratosphere + org.apache.flink + flink-parent 0.6-SNAPSHOT .. - stratosphere-core - stratosphere-core + flink-core + flink-core jar diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/InvalidProgramException.java b/flink-core/src/main/java/org/apache/flink/api/common/InvalidProgramException.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/InvalidProgramException.java rename to flink-core/src/main/java/org/apache/flink/api/common/InvalidProgramException.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/JobExecutionResult.java b/flink-core/src/main/java/org/apache/flink/api/common/JobExecutionResult.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/JobExecutionResult.java rename to flink-core/src/main/java/org/apache/flink/api/common/JobExecutionResult.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/NonSerializableUserCodeException.java b/flink-core/src/main/java/org/apache/flink/api/common/NonSerializableUserCodeException.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/NonSerializableUserCodeException.java rename to flink-core/src/main/java/org/apache/flink/api/common/NonSerializableUserCodeException.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/Plan.java b/flink-core/src/main/java/org/apache/flink/api/common/Plan.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/Plan.java rename to flink-core/src/main/java/org/apache/flink/api/common/Plan.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/PlanExecutor.java b/flink-core/src/main/java/org/apache/flink/api/common/PlanExecutor.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/PlanExecutor.java rename to flink-core/src/main/java/org/apache/flink/api/common/PlanExecutor.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/Program.java b/flink-core/src/main/java/org/apache/flink/api/common/Program.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/Program.java rename to flink-core/src/main/java/org/apache/flink/api/common/Program.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/ProgramDescription.java b/flink-core/src/main/java/org/apache/flink/api/common/ProgramDescription.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/ProgramDescription.java rename to flink-core/src/main/java/org/apache/flink/api/common/ProgramDescription.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/accumulators/Accumulator.java b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/Accumulator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/accumulators/Accumulator.java rename to flink-core/src/main/java/org/apache/flink/api/common/accumulators/Accumulator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java rename to flink-core/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/accumulators/DoubleCounter.java b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/DoubleCounter.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/accumulators/DoubleCounter.java rename to flink-core/src/main/java/org/apache/flink/api/common/accumulators/DoubleCounter.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/accumulators/Histogram.java b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/Histogram.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/accumulators/Histogram.java rename to flink-core/src/main/java/org/apache/flink/api/common/accumulators/Histogram.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/accumulators/IntCounter.java b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/IntCounter.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/accumulators/IntCounter.java rename to flink-core/src/main/java/org/apache/flink/api/common/accumulators/IntCounter.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/accumulators/LongCounter.java b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/LongCounter.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/accumulators/LongCounter.java rename to flink-core/src/main/java/org/apache/flink/api/common/accumulators/LongCounter.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/accumulators/SimpleAccumulator.java b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/SimpleAccumulator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/accumulators/SimpleAccumulator.java rename to flink-core/src/main/java/org/apache/flink/api/common/accumulators/SimpleAccumulator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/Aggregator.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/Aggregator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/Aggregator.java rename to flink-core/src/main/java/org/apache/flink/api/common/aggregators/Aggregator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorRegistry.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorRegistry.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorRegistry.java rename to flink-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorRegistry.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorWithName.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorWithName.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorWithName.java rename to flink-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorWithName.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/ConvergenceCriterion.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/ConvergenceCriterion.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/ConvergenceCriterion.java rename to flink-core/src/main/java/org/apache/flink/api/common/aggregators/ConvergenceCriterion.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleSumAggregator.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleSumAggregator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleSumAggregator.java rename to flink-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleSumAggregator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleZeroConvergence.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleZeroConvergence.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleZeroConvergence.java rename to flink-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleZeroConvergence.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/LongSumAggregator.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/LongSumAggregator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/LongSumAggregator.java rename to flink-core/src/main/java/org/apache/flink/api/common/aggregators/LongSumAggregator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/LongZeroConvergence.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/LongZeroConvergence.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/aggregators/LongZeroConvergence.java rename to flink-core/src/main/java/org/apache/flink/api/common/aggregators/LongZeroConvergence.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/cache/DistributedCache.java b/flink-core/src/main/java/org/apache/flink/api/common/cache/DistributedCache.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/cache/DistributedCache.java rename to flink-core/src/main/java/org/apache/flink/api/common/cache/DistributedCache.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/distributions/DataDistribution.java b/flink-core/src/main/java/org/apache/flink/api/common/distributions/DataDistribution.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/distributions/DataDistribution.java rename to flink-core/src/main/java/org/apache/flink/api/common/distributions/DataDistribution.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/distributions/SimpleDistribution.java b/flink-core/src/main/java/org/apache/flink/api/common/distributions/SimpleDistribution.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/distributions/SimpleDistribution.java rename to flink-core/src/main/java/org/apache/flink/api/common/distributions/SimpleDistribution.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/distributions/SimpleIntegerDistribution.java b/flink-core/src/main/java/org/apache/flink/api/common/distributions/SimpleIntegerDistribution.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/distributions/SimpleIntegerDistribution.java rename to flink-core/src/main/java/org/apache/flink/api/common/distributions/SimpleIntegerDistribution.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/distributions/UniformDoubleDistribution.java b/flink-core/src/main/java/org/apache/flink/api/common/distributions/UniformDoubleDistribution.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/distributions/UniformDoubleDistribution.java rename to flink-core/src/main/java/org/apache/flink/api/common/distributions/UniformDoubleDistribution.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/distributions/UniformIntegerDistribution.java b/flink-core/src/main/java/org/apache/flink/api/common/distributions/UniformIntegerDistribution.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/distributions/UniformIntegerDistribution.java rename to flink-core/src/main/java/org/apache/flink/api/common/distributions/UniformIntegerDistribution.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/AbstractFunction.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/AbstractFunction.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/AbstractFunction.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/AbstractFunction.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/ExecutionContext.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/ExecutionContext.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/ExecutionContext.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/ExecutionContext.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/Function.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/Function.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/Function.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/Function.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericCoGrouper.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/GenericCoGrouper.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericCoGrouper.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/GenericCoGrouper.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericCollectorMap.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/GenericCollectorMap.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericCollectorMap.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/GenericCollectorMap.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericCombine.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/GenericCombine.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericCombine.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/GenericCombine.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericCrosser.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/GenericCrosser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericCrosser.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/GenericCrosser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericFilter.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/GenericFilter.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericFilter.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/GenericFilter.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericFlatMap.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/GenericFlatMap.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericFlatMap.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/GenericFlatMap.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericGroupReduce.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/GenericGroupReduce.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericGroupReduce.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/GenericGroupReduce.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericJoiner.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/GenericJoiner.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericJoiner.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/GenericJoiner.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericMap.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/GenericMap.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericMap.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/GenericMap.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericReduce.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/GenericReduce.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/GenericReduce.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/GenericReduce.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/IterationRuntimeContext.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/IterationRuntimeContext.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/IterationRuntimeContext.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/IterationRuntimeContext.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/functions/RuntimeContext.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/RuntimeContext.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/functions/RuntimeContext.java rename to flink-core/src/main/java/org/apache/flink/api/common/functions/RuntimeContext.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/BinaryInputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryInputFormat.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/BinaryInputFormat.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/BinaryInputFormat.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/BinaryOutputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryOutputFormat.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/BinaryOutputFormat.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/BinaryOutputFormat.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/BlockInfo.java b/flink-core/src/main/java/org/apache/flink/api/common/io/BlockInfo.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/BlockInfo.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/BlockInfo.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/DelimitedInputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/DelimitedInputFormat.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/DelimitedInputFormat.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/DelimitedInputFormat.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/FileOutputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/FileOutputFormat.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/FileOutputFormat.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/FileOutputFormat.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/FormatUtil.java b/flink-core/src/main/java/org/apache/flink/api/common/io/FormatUtil.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/FormatUtil.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/FormatUtil.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/GenericCsvInputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/GenericCsvInputFormat.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/GenericCsvInputFormat.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/GenericCsvInputFormat.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/GenericInputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/GenericInputFormat.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/GenericInputFormat.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/GenericInputFormat.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/InflaterInputStreamFSInputWrapper.java b/flink-core/src/main/java/org/apache/flink/api/common/io/InflaterInputStreamFSInputWrapper.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/InflaterInputStreamFSInputWrapper.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/InflaterInputStreamFSInputWrapper.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/InitializeOnMaster.java b/flink-core/src/main/java/org/apache/flink/api/common/io/InitializeOnMaster.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/InitializeOnMaster.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/InitializeOnMaster.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/InputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/InputFormat.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/InputFormat.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/InputFormat.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/NonParallelInput.java b/flink-core/src/main/java/org/apache/flink/api/common/io/NonParallelInput.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/NonParallelInput.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/NonParallelInput.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/OutputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/OutputFormat.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/OutputFormat.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/OutputFormat.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/ParseException.java b/flink-core/src/main/java/org/apache/flink/api/common/io/ParseException.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/ParseException.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/ParseException.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/SerializedInputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/SerializedInputFormat.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/SerializedInputFormat.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/SerializedInputFormat.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/SerializedOutputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/SerializedOutputFormat.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/SerializedOutputFormat.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/SerializedOutputFormat.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/io/statistics/BaseStatistics.java b/flink-core/src/main/java/org/apache/flink/api/common/io/statistics/BaseStatistics.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/io/statistics/BaseStatistics.java rename to flink-core/src/main/java/org/apache/flink/api/common/io/statistics/BaseStatistics.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/AbstractUdfOperator.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/AbstractUdfOperator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/AbstractUdfOperator.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/AbstractUdfOperator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/BinaryOperatorInformation.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/BinaryOperatorInformation.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/BinaryOperatorInformation.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/BinaryOperatorInformation.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/CompilerHints.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/CompilerHints.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/CompilerHints.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/CompilerHints.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/DualInputOperator.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/DualInputOperator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/DualInputOperator.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/DualInputOperator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/DualInputSemanticProperties.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/DualInputSemanticProperties.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/DualInputSemanticProperties.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/DualInputSemanticProperties.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/IterationOperator.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/IterationOperator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/IterationOperator.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/IterationOperator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/Operator.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/Operator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/Operator.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/Operator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/OperatorInformation.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/OperatorInformation.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/OperatorInformation.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/OperatorInformation.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/Order.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/Order.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/Order.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/Order.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/Ordering.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/Ordering.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/Ordering.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/Ordering.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/RecordOperator.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/RecordOperator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/RecordOperator.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/RecordOperator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/SemanticProperties.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/SemanticProperties.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/SemanticProperties.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/SemanticProperties.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/SingleInputOperator.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/SingleInputOperator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/SingleInputOperator.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/SingleInputOperator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/SingleInputSemanticProperties.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/SingleInputSemanticProperties.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/SingleInputSemanticProperties.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/SingleInputSemanticProperties.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/UnaryOperatorInformation.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/UnaryOperatorInformation.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/UnaryOperatorInformation.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/UnaryOperatorInformation.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/Union.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/Union.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/Union.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/Union.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupOperatorBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupOperatorBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupOperatorBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/CollectorMapOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CollectorMapOperatorBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/CollectorMapOperatorBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/CollectorMapOperatorBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/DeltaIterationBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/DeltaIterationBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/DeltaIterationBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/DeltaIterationBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/FileDataSinkBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FileDataSinkBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/FileDataSinkBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/FileDataSinkBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/FileDataSourceBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FileDataSourceBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/FileDataSourceBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/FileDataSourceBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/FilterOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FilterOperatorBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/FilterOperatorBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/FilterOperatorBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/FlatMapOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FlatMapOperatorBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/FlatMapOperatorBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/FlatMapOperatorBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/GenericDataSinkBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GenericDataSinkBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/GenericDataSinkBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/GenericDataSinkBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/GenericDataSourceBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GenericDataSourceBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/GenericDataSourceBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/GenericDataSourceBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/GroupReduceOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupReduceOperatorBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/GroupReduceOperatorBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupReduceOperatorBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/MapOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapOperatorBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/MapOperatorBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapOperatorBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/ReduceOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/ReduceOperatorBase.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/base/ReduceOperatorBase.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/base/ReduceOperatorBase.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/util/FieldList.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/FieldList.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/util/FieldList.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/util/FieldList.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/util/FieldSet.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/FieldSet.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/util/FieldSet.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/util/FieldSet.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/util/OperatorUtil.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/OperatorUtil.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/util/OperatorUtil.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/util/OperatorUtil.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeClassWrapper.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeClassWrapper.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeClassWrapper.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeClassWrapper.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeObjectWrapper.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeObjectWrapper.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeObjectWrapper.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeObjectWrapper.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeWrapper.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeWrapper.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeWrapper.java rename to flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeWrapper.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparatorFactory.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparatorFactory.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparatorFactory.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparatorFactory.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparator.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparatorFactory.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparatorFactory.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparatorFactory.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparatorFactory.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerFactory.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerFactory.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerFactory.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerFactory.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanComparator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanComparator.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanComparator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteComparator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteComparator.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteComparator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharComparator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharComparator.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharComparator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleComparator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleComparator.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleComparator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatComparator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatComparator.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatComparator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntComparator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntComparator.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntComparator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongComparator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongComparator.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongComparator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortComparator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortComparator.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortComparator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringComparator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringComparator.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringComparator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueSerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueSerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueSerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializer.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializer.java rename to flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializer.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java rename to flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/configuration/Configuration.java b/flink-core/src/main/java/org/apache/flink/configuration/Configuration.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/configuration/Configuration.java rename to flink-core/src/main/java/org/apache/flink/configuration/Configuration.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/configuration/GlobalConfiguration.java b/flink-core/src/main/java/org/apache/flink/configuration/GlobalConfiguration.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/configuration/GlobalConfiguration.java rename to flink-core/src/main/java/org/apache/flink/configuration/GlobalConfiguration.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/configuration/IllegalConfigurationException.java b/flink-core/src/main/java/org/apache/flink/configuration/IllegalConfigurationException.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/configuration/IllegalConfigurationException.java rename to flink-core/src/main/java/org/apache/flink/configuration/IllegalConfigurationException.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/fs/BlockLocation.java b/flink-core/src/main/java/org/apache/flink/core/fs/BlockLocation.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/fs/BlockLocation.java rename to flink-core/src/main/java/org/apache/flink/core/fs/BlockLocation.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/fs/FSDataInputStream.java b/flink-core/src/main/java/org/apache/flink/core/fs/FSDataInputStream.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/fs/FSDataInputStream.java rename to flink-core/src/main/java/org/apache/flink/core/fs/FSDataInputStream.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/fs/FSDataOutputStream.java b/flink-core/src/main/java/org/apache/flink/core/fs/FSDataOutputStream.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/fs/FSDataOutputStream.java rename to flink-core/src/main/java/org/apache/flink/core/fs/FSDataOutputStream.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/fs/FileChannelWrapper.java b/flink-core/src/main/java/org/apache/flink/core/fs/FileChannelWrapper.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/fs/FileChannelWrapper.java rename to flink-core/src/main/java/org/apache/flink/core/fs/FileChannelWrapper.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/fs/FileInputSplit.java b/flink-core/src/main/java/org/apache/flink/core/fs/FileInputSplit.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/fs/FileInputSplit.java rename to flink-core/src/main/java/org/apache/flink/core/fs/FileInputSplit.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/fs/FileStatus.java b/flink-core/src/main/java/org/apache/flink/core/fs/FileStatus.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/fs/FileStatus.java rename to flink-core/src/main/java/org/apache/flink/core/fs/FileStatus.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/fs/FileSystem.java b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/fs/FileSystem.java rename to flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/fs/Path.java b/flink-core/src/main/java/org/apache/flink/core/fs/Path.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/fs/Path.java rename to flink-core/src/main/java/org/apache/flink/core/fs/Path.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/fs/local/LocalBlockLocation.java b/flink-core/src/main/java/org/apache/flink/core/fs/local/LocalBlockLocation.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/fs/local/LocalBlockLocation.java rename to flink-core/src/main/java/org/apache/flink/core/fs/local/LocalBlockLocation.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/fs/local/LocalDataInputStream.java b/flink-core/src/main/java/org/apache/flink/core/fs/local/LocalDataInputStream.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/fs/local/LocalDataInputStream.java rename to flink-core/src/main/java/org/apache/flink/core/fs/local/LocalDataInputStream.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/fs/local/LocalDataOutputStream.java b/flink-core/src/main/java/org/apache/flink/core/fs/local/LocalDataOutputStream.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/fs/local/LocalDataOutputStream.java rename to flink-core/src/main/java/org/apache/flink/core/fs/local/LocalDataOutputStream.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/fs/local/LocalFileStatus.java b/flink-core/src/main/java/org/apache/flink/core/fs/local/LocalFileStatus.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/fs/local/LocalFileStatus.java rename to flink-core/src/main/java/org/apache/flink/core/fs/local/LocalFileStatus.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/fs/local/LocalFileSystem.java b/flink-core/src/main/java/org/apache/flink/core/fs/local/LocalFileSystem.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/fs/local/LocalFileSystem.java rename to flink-core/src/main/java/org/apache/flink/core/fs/local/LocalFileSystem.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/io/GenericInputSplit.java b/flink-core/src/main/java/org/apache/flink/core/io/GenericInputSplit.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/io/GenericInputSplit.java rename to flink-core/src/main/java/org/apache/flink/core/io/GenericInputSplit.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/io/IOReadableWritable.java b/flink-core/src/main/java/org/apache/flink/core/io/IOReadableWritable.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/io/IOReadableWritable.java rename to flink-core/src/main/java/org/apache/flink/core/io/IOReadableWritable.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/io/InputSplit.java b/flink-core/src/main/java/org/apache/flink/core/io/InputSplit.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/io/InputSplit.java rename to flink-core/src/main/java/org/apache/flink/core/io/InputSplit.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/io/LocatableInputSplit.java b/flink-core/src/main/java/org/apache/flink/core/io/LocatableInputSplit.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/io/LocatableInputSplit.java rename to flink-core/src/main/java/org/apache/flink/core/io/LocatableInputSplit.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/io/StringRecord.java b/flink-core/src/main/java/org/apache/flink/core/io/StringRecord.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/io/StringRecord.java rename to flink-core/src/main/java/org/apache/flink/core/io/StringRecord.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/memory/DataInputView.java b/flink-core/src/main/java/org/apache/flink/core/memory/DataInputView.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/memory/DataInputView.java rename to flink-core/src/main/java/org/apache/flink/core/memory/DataInputView.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/memory/DataOutputView.java b/flink-core/src/main/java/org/apache/flink/core/memory/DataOutputView.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/memory/DataOutputView.java rename to flink-core/src/main/java/org/apache/flink/core/memory/DataOutputView.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/memory/InputViewDataInputStreamWrapper.java b/flink-core/src/main/java/org/apache/flink/core/memory/InputViewDataInputStreamWrapper.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/memory/InputViewDataInputStreamWrapper.java rename to flink-core/src/main/java/org/apache/flink/core/memory/InputViewDataInputStreamWrapper.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/memory/InputViewObjectInputStreamWrapper.java b/flink-core/src/main/java/org/apache/flink/core/memory/InputViewObjectInputStreamWrapper.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/memory/InputViewObjectInputStreamWrapper.java rename to flink-core/src/main/java/org/apache/flink/core/memory/InputViewObjectInputStreamWrapper.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/memory/MemorySegment.java b/flink-core/src/main/java/org/apache/flink/core/memory/MemorySegment.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/memory/MemorySegment.java rename to flink-core/src/main/java/org/apache/flink/core/memory/MemorySegment.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/memory/MemorySegmentSource.java b/flink-core/src/main/java/org/apache/flink/core/memory/MemorySegmentSource.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/memory/MemorySegmentSource.java rename to flink-core/src/main/java/org/apache/flink/core/memory/MemorySegmentSource.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/memory/MemoryUtils.java b/flink-core/src/main/java/org/apache/flink/core/memory/MemoryUtils.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/memory/MemoryUtils.java rename to flink-core/src/main/java/org/apache/flink/core/memory/MemoryUtils.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/memory/OutputViewDataOutputStreamWrapper.java b/flink-core/src/main/java/org/apache/flink/core/memory/OutputViewDataOutputStreamWrapper.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/memory/OutputViewDataOutputStreamWrapper.java rename to flink-core/src/main/java/org/apache/flink/core/memory/OutputViewDataOutputStreamWrapper.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/memory/OutputViewObjectOutputStreamWrapper.java b/flink-core/src/main/java/org/apache/flink/core/memory/OutputViewObjectOutputStreamWrapper.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/memory/OutputViewObjectOutputStreamWrapper.java rename to flink-core/src/main/java/org/apache/flink/core/memory/OutputViewObjectOutputStreamWrapper.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/memory/SeekableDataInputView.java b/flink-core/src/main/java/org/apache/flink/core/memory/SeekableDataInputView.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/memory/SeekableDataInputView.java rename to flink-core/src/main/java/org/apache/flink/core/memory/SeekableDataInputView.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/memory/SeekableDataOutputView.java b/flink-core/src/main/java/org/apache/flink/core/memory/SeekableDataOutputView.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/memory/SeekableDataOutputView.java rename to flink-core/src/main/java/org/apache/flink/core/memory/SeekableDataOutputView.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/core/protocols/VersionedProtocol.java b/flink-core/src/main/java/org/apache/flink/core/protocols/VersionedProtocol.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/core/protocols/VersionedProtocol.java rename to flink-core/src/main/java/org/apache/flink/core/protocols/VersionedProtocol.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/BooleanValue.java b/flink-core/src/main/java/org/apache/flink/types/BooleanValue.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/BooleanValue.java rename to flink-core/src/main/java/org/apache/flink/types/BooleanValue.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/ByteValue.java b/flink-core/src/main/java/org/apache/flink/types/ByteValue.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/ByteValue.java rename to flink-core/src/main/java/org/apache/flink/types/ByteValue.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/CharValue.java b/flink-core/src/main/java/org/apache/flink/types/CharValue.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/CharValue.java rename to flink-core/src/main/java/org/apache/flink/types/CharValue.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/CopyableValue.java b/flink-core/src/main/java/org/apache/flink/types/CopyableValue.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/CopyableValue.java rename to flink-core/src/main/java/org/apache/flink/types/CopyableValue.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/DeserializationException.java b/flink-core/src/main/java/org/apache/flink/types/DeserializationException.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/DeserializationException.java rename to flink-core/src/main/java/org/apache/flink/types/DeserializationException.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/DoubleValue.java b/flink-core/src/main/java/org/apache/flink/types/DoubleValue.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/DoubleValue.java rename to flink-core/src/main/java/org/apache/flink/types/DoubleValue.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/FloatValue.java b/flink-core/src/main/java/org/apache/flink/types/FloatValue.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/FloatValue.java rename to flink-core/src/main/java/org/apache/flink/types/FloatValue.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/IntValue.java b/flink-core/src/main/java/org/apache/flink/types/IntValue.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/IntValue.java rename to flink-core/src/main/java/org/apache/flink/types/IntValue.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/Key.java b/flink-core/src/main/java/org/apache/flink/types/Key.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/Key.java rename to flink-core/src/main/java/org/apache/flink/types/Key.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/KeyFieldOutOfBoundsException.java b/flink-core/src/main/java/org/apache/flink/types/KeyFieldOutOfBoundsException.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/KeyFieldOutOfBoundsException.java rename to flink-core/src/main/java/org/apache/flink/types/KeyFieldOutOfBoundsException.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/ListValue.java b/flink-core/src/main/java/org/apache/flink/types/ListValue.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/ListValue.java rename to flink-core/src/main/java/org/apache/flink/types/ListValue.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/LongValue.java b/flink-core/src/main/java/org/apache/flink/types/LongValue.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/LongValue.java rename to flink-core/src/main/java/org/apache/flink/types/LongValue.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/MapValue.java b/flink-core/src/main/java/org/apache/flink/types/MapValue.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/MapValue.java rename to flink-core/src/main/java/org/apache/flink/types/MapValue.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/NormalizableKey.java b/flink-core/src/main/java/org/apache/flink/types/NormalizableKey.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/NormalizableKey.java rename to flink-core/src/main/java/org/apache/flink/types/NormalizableKey.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/Nothing.java b/flink-core/src/main/java/org/apache/flink/types/Nothing.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/Nothing.java rename to flink-core/src/main/java/org/apache/flink/types/Nothing.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/NothingTypeInfo.java b/flink-core/src/main/java/org/apache/flink/types/NothingTypeInfo.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/NothingTypeInfo.java rename to flink-core/src/main/java/org/apache/flink/types/NothingTypeInfo.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/NullKeyFieldException.java b/flink-core/src/main/java/org/apache/flink/types/NullKeyFieldException.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/NullKeyFieldException.java rename to flink-core/src/main/java/org/apache/flink/types/NullKeyFieldException.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/NullValue.java b/flink-core/src/main/java/org/apache/flink/types/NullValue.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/NullValue.java rename to flink-core/src/main/java/org/apache/flink/types/NullValue.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/Pair.java b/flink-core/src/main/java/org/apache/flink/types/Pair.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/Pair.java rename to flink-core/src/main/java/org/apache/flink/types/Pair.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/Record.java b/flink-core/src/main/java/org/apache/flink/types/Record.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/Record.java rename to flink-core/src/main/java/org/apache/flink/types/Record.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/ResettableValue.java b/flink-core/src/main/java/org/apache/flink/types/ResettableValue.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/ResettableValue.java rename to flink-core/src/main/java/org/apache/flink/types/ResettableValue.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/ShortValue.java b/flink-core/src/main/java/org/apache/flink/types/ShortValue.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/ShortValue.java rename to flink-core/src/main/java/org/apache/flink/types/ShortValue.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/StringValue.java b/flink-core/src/main/java/org/apache/flink/types/StringValue.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/StringValue.java rename to flink-core/src/main/java/org/apache/flink/types/StringValue.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/TypeInformation.java b/flink-core/src/main/java/org/apache/flink/types/TypeInformation.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/TypeInformation.java rename to flink-core/src/main/java/org/apache/flink/types/TypeInformation.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/Value.java b/flink-core/src/main/java/org/apache/flink/types/Value.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/Value.java rename to flink-core/src/main/java/org/apache/flink/types/Value.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/ValueUtil.java b/flink-core/src/main/java/org/apache/flink/types/ValueUtil.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/ValueUtil.java rename to flink-core/src/main/java/org/apache/flink/types/ValueUtil.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/ByteParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/ByteParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/ByteParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/ByteParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/ByteValueParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/ByteValueParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/ByteValueParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/ByteValueParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/DoubleParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/DoubleParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/DoubleParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/DoubleParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/DoubleValueParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/DoubleValueParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/DoubleValueParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/DoubleValueParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/FieldParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/FieldParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/FieldParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/FieldParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/FloatParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/FloatParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/FloatParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/FloatParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/FloatValueParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/FloatValueParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/FloatValueParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/FloatValueParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/IntParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/IntParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/IntParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/IntParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/IntValueParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/IntValueParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/IntValueParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/IntValueParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/LongParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/LongParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/LongParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/LongParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/LongValueParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/LongValueParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/LongValueParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/LongValueParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/ShortParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/ShortParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/ShortParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/ShortParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/ShortValueParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/ShortValueParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/ShortValueParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/ShortValueParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/StringParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/StringParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/StringParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/StringParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/types/parser/StringValueParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/StringValueParser.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/types/parser/StringValueParser.java rename to flink-core/src/main/java/org/apache/flink/types/parser/StringValueParser.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/util/ClassUtils.java b/flink-core/src/main/java/org/apache/flink/util/ClassUtils.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/util/ClassUtils.java rename to flink-core/src/main/java/org/apache/flink/util/ClassUtils.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/util/Collector.java b/flink-core/src/main/java/org/apache/flink/util/Collector.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/util/Collector.java rename to flink-core/src/main/java/org/apache/flink/util/Collector.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/util/InstantiationUtil.java b/flink-core/src/main/java/org/apache/flink/util/InstantiationUtil.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/util/InstantiationUtil.java rename to flink-core/src/main/java/org/apache/flink/util/InstantiationUtil.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/util/IterableIterator.java b/flink-core/src/main/java/org/apache/flink/util/IterableIterator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/util/IterableIterator.java rename to flink-core/src/main/java/org/apache/flink/util/IterableIterator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/util/LogUtils.java b/flink-core/src/main/java/org/apache/flink/util/LogUtils.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/util/LogUtils.java rename to flink-core/src/main/java/org/apache/flink/util/LogUtils.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/util/MutableObjectIterator.java b/flink-core/src/main/java/org/apache/flink/util/MutableObjectIterator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/util/MutableObjectIterator.java rename to flink-core/src/main/java/org/apache/flink/util/MutableObjectIterator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/util/NumberSequenceIterator.java b/flink-core/src/main/java/org/apache/flink/util/NumberSequenceIterator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/util/NumberSequenceIterator.java rename to flink-core/src/main/java/org/apache/flink/util/NumberSequenceIterator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/util/OperatingSystem.java b/flink-core/src/main/java/org/apache/flink/util/OperatingSystem.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/util/OperatingSystem.java rename to flink-core/src/main/java/org/apache/flink/util/OperatingSystem.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/util/ReflectionUtil.java b/flink-core/src/main/java/org/apache/flink/util/ReflectionUtil.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/util/ReflectionUtil.java rename to flink-core/src/main/java/org/apache/flink/util/ReflectionUtil.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/util/SimpleStringUtils.java b/flink-core/src/main/java/org/apache/flink/util/SimpleStringUtils.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/util/SimpleStringUtils.java rename to flink-core/src/main/java/org/apache/flink/util/SimpleStringUtils.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/util/SplittableIterator.java b/flink-core/src/main/java/org/apache/flink/util/SplittableIterator.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/util/SplittableIterator.java rename to flink-core/src/main/java/org/apache/flink/util/SplittableIterator.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/util/StringUtils.java b/flink-core/src/main/java/org/apache/flink/util/StringUtils.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/util/StringUtils.java rename to flink-core/src/main/java/org/apache/flink/util/StringUtils.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/util/Visitable.java b/flink-core/src/main/java/org/apache/flink/util/Visitable.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/util/Visitable.java rename to flink-core/src/main/java/org/apache/flink/util/Visitable.java diff --git a/stratosphere-core/src/main/java/org/apache/flink/util/Visitor.java b/flink-core/src/main/java/org/apache/flink/util/Visitor.java similarity index 100% rename from stratosphere-core/src/main/java/org/apache/flink/util/Visitor.java rename to flink-core/src/main/java/org/apache/flink/util/Visitor.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/io/BinaryInputFormatTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/BinaryInputFormatTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/io/BinaryInputFormatTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/io/BinaryInputFormatTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatSamplingTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatSamplingTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatSamplingTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatSamplingTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/io/GenericCsvInputFormatTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/GenericCsvInputFormatTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/io/GenericCsvInputFormatTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/io/GenericCsvInputFormatTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/io/SequentialFormatTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/SequentialFormatTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/io/SequentialFormatTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/io/SequentialFormatTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/operators/util/FieldListTest.java b/flink-core/src/test/java/org/apache/flink/api/common/operators/util/FieldListTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/operators/util/FieldListTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/operators/util/FieldListTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/operators/util/FieldSetTest.java b/flink-core/src/test/java/org/apache/flink/api/common/operators/util/FieldSetTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/operators/util/FieldSetTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/operators/util/FieldSetTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/operators/util/OperatorUtilTest.java b/flink-core/src/test/java/org/apache/flink/api/common/operators/util/OperatorUtilTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/operators/util/OperatorUtilTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/operators/util/OperatorUtilTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/ComparatorTestBase.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/ComparatorTestBase.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/ComparatorTestBase.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/ComparatorTestBase.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestInstance.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestInstance.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestInstance.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestInstance.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanComparatorTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanComparatorTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanComparatorTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanSerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanSerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanSerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteComparatorTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteComparatorTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteComparatorTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteSerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteSerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteSerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharComparatorTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharComparatorTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharComparatorTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharSerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharSerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharSerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleComparatorTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleComparatorTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleComparatorTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleSerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleSerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleSerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatComparatorTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatComparatorTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatComparatorTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatSerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatSerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatSerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntComparatorTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntComparatorTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntComparatorTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongComparatorTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongComparatorTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongComparatorTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortComparatorTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortComparatorTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortComparatorTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortSerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortSerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortSerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringComparatorTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringComparatorTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringComparatorTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringSerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringSerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringSerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializerTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializerTest.java rename to flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializerTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/api/distributions/SimpleDataDistributionTest.java b/flink-core/src/test/java/org/apache/flink/api/distributions/SimpleDataDistributionTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/api/distributions/SimpleDataDistributionTest.java rename to flink-core/src/test/java/org/apache/flink/api/distributions/SimpleDataDistributionTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/configuration/ConfigurationTest.java b/flink-core/src/test/java/org/apache/flink/configuration/ConfigurationTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/configuration/ConfigurationTest.java rename to flink-core/src/test/java/org/apache/flink/configuration/ConfigurationTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/configuration/GlobalConfigurationTest.java b/flink-core/src/test/java/org/apache/flink/configuration/GlobalConfigurationTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/configuration/GlobalConfigurationTest.java rename to flink-core/src/test/java/org/apache/flink/configuration/GlobalConfigurationTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/core/fs/local/LocalFileSystemTest.java b/flink-core/src/test/java/org/apache/flink/core/fs/local/LocalFileSystemTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/core/fs/local/LocalFileSystemTest.java rename to flink-core/src/test/java/org/apache/flink/core/fs/local/LocalFileSystemTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/core/testutils/CommonTestUtils.java b/flink-core/src/test/java/org/apache/flink/core/testutils/CommonTestUtils.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/core/testutils/CommonTestUtils.java rename to flink-core/src/test/java/org/apache/flink/core/testutils/CommonTestUtils.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/testutils/TestConfigUtils.java b/flink-core/src/test/java/org/apache/flink/testutils/TestConfigUtils.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/testutils/TestConfigUtils.java rename to flink-core/src/test/java/org/apache/flink/testutils/TestConfigUtils.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/testutils/TestFileSystem.java b/flink-core/src/test/java/org/apache/flink/testutils/TestFileSystem.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/testutils/TestFileSystem.java rename to flink-core/src/test/java/org/apache/flink/testutils/TestFileSystem.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/testutils/TestFileUtils.java b/flink-core/src/test/java/org/apache/flink/testutils/TestFileUtils.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/testutils/TestFileUtils.java rename to flink-core/src/test/java/org/apache/flink/testutils/TestFileUtils.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/CollectionsDataTypeTest.java b/flink-core/src/test/java/org/apache/flink/types/CollectionsDataTypeTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/CollectionsDataTypeTest.java rename to flink-core/src/test/java/org/apache/flink/types/CollectionsDataTypeTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/NormalizableKeyTest.java b/flink-core/src/test/java/org/apache/flink/types/NormalizableKeyTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/NormalizableKeyTest.java rename to flink-core/src/test/java/org/apache/flink/types/NormalizableKeyTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java b/flink-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java rename to flink-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/RecordITCase.java b/flink-core/src/test/java/org/apache/flink/types/RecordITCase.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/RecordITCase.java rename to flink-core/src/test/java/org/apache/flink/types/RecordITCase.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/RecordTest.java b/flink-core/src/test/java/org/apache/flink/types/RecordTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/RecordTest.java rename to flink-core/src/test/java/org/apache/flink/types/RecordTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/StringSerializationTest.java b/flink-core/src/test/java/org/apache/flink/types/StringSerializationTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/StringSerializationTest.java rename to flink-core/src/test/java/org/apache/flink/types/StringSerializationTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/ByteParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/ByteParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/ByteParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/ByteParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/ByteValueParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/ByteValueParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/ByteValueParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/ByteValueParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/DoubleParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/DoubleParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/DoubleParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/DoubleParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/DoubleValueParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/DoubleValueParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/DoubleValueParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/DoubleValueParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/FloatParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/FloatParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/FloatParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/FloatParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/FloatValueParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/FloatValueParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/FloatValueParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/FloatValueParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/IntParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/IntParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/IntParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/IntParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/IntValueParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/IntValueParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/IntValueParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/IntValueParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/LongParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/LongParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/LongParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/LongParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/LongValueParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/LongValueParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/LongValueParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/LongValueParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/ParserTestBase.java b/flink-core/src/test/java/org/apache/flink/types/parser/ParserTestBase.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/ParserTestBase.java rename to flink-core/src/test/java/org/apache/flink/types/parser/ParserTestBase.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/ShortParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/ShortParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/ShortParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/ShortParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/ShortValueParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/ShortValueParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/ShortValueParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/ShortValueParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/StringParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/StringParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/StringParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/StringParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/StringValueParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/StringValueParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/StringValueParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/StringValueParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/types/parser/VarLengthStringParserTest.java b/flink-core/src/test/java/org/apache/flink/types/parser/VarLengthStringParserTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/types/parser/VarLengthStringParserTest.java rename to flink-core/src/test/java/org/apache/flink/types/parser/VarLengthStringParserTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/util/InstantiationUtilsTest.java b/flink-core/src/test/java/org/apache/flink/util/InstantiationUtilsTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/util/InstantiationUtilsTest.java rename to flink-core/src/test/java/org/apache/flink/util/InstantiationUtilsTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/util/NumberSequenceIteratorTest.java b/flink-core/src/test/java/org/apache/flink/util/NumberSequenceIteratorTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/util/NumberSequenceIteratorTest.java rename to flink-core/src/test/java/org/apache/flink/util/NumberSequenceIteratorTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/util/SimpleStringUtilsTest.java b/flink-core/src/test/java/org/apache/flink/util/SimpleStringUtilsTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/util/SimpleStringUtilsTest.java rename to flink-core/src/test/java/org/apache/flink/util/SimpleStringUtilsTest.java diff --git a/stratosphere-core/src/test/java/org/apache/flink/util/StringUtilsTest.java b/flink-core/src/test/java/org/apache/flink/util/StringUtilsTest.java similarity index 100% rename from stratosphere-core/src/test/java/org/apache/flink/util/StringUtilsTest.java rename to flink-core/src/test/java/org/apache/flink/util/StringUtilsTest.java diff --git a/stratosphere-dist/pom.xml b/flink-dist/pom.xml similarity index 85% rename from stratosphere-dist/pom.xml rename to flink-dist/pom.xml index 6d4d16e67d8a7..5c9b180797eb3 100644 --- a/stratosphere-dist/pom.xml +++ b/flink-dist/pom.xml @@ -5,75 +5,75 @@ 4.0.0 - eu.stratosphere - stratosphere + org.apache.flink + flink-parent 0.6-SNAPSHOT .. - stratosphere-dist - stratosphere-dist + flink-dist + flink-dist pom - eu.stratosphere - stratosphere-core + org.apache.flink + flink-core ${project.version} - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java ${project.version} - eu.stratosphere - stratosphere-scala + org.apache.flink + flink-scala ${project.version} - eu.stratosphere - stratosphere-runtime + org.apache.flink + flink-runtime ${project.version} - eu.stratosphere - stratosphere-compiler + org.apache.flink + flink-compiler ${project.version} - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients ${project.version} - eu.stratosphere + org.apache.flink spargel ${project.version} - eu.stratosphere + org.apache.flink avro ${project.version} - eu.stratosphere - stratosphere-java-examples + org.apache.flink + flink-java-examples ${project.version} - eu.stratosphere - stratosphere-scala-examples + org.apache.flink + flink-scala-examples ${project.version} @@ -103,7 +103,7 @@ - eu.stratosphere + org.apache.flink yarn ${project.version} @@ -129,7 +129,7 @@ - eu.stratosphere.yarn.Client + org.apache.flink.yarn.Client true true @@ -156,7 +156,7 @@ - eu.stratosphere + org.apache.flink hbase ${project.version} @@ -215,7 +215,7 @@ - ${project.build.directory}/${project.artifactId}-${project.version}-bin/stratosphere-${project.version}/bin + ${project.build.directory}/${project.artifactId}-${project.version}-bin/flink-${project.version}/bin directory perm @@ -226,7 +226,7 @@ - ${project.build.directory}/${project.artifactId}-${project.version}-bin/stratosphere-${project.version}/examples + ${project.build.directory}/${project.artifactId}-${project.version}-bin/flink-${project.version}/examples directory perm @@ -236,7 +236,7 @@ - ${project.build.directory}/${project.artifactId}-${project.version}-bin/stratosphere-${project.version}/lib + ${project.build.directory}/${project.artifactId}-${project.version}-bin/flink-${project.version}/lib directory perm @@ -246,7 +246,7 @@ - ${project.build.directory}/${project.artifactId}-${project.version}-bin/stratosphere-${project.version}/lib_clients + ${project.build.directory}/${project.artifactId}-${project.version}-bin/flink-${project.version}/lib_clients directory perm @@ -256,7 +256,7 @@ - ${project.build.directory}/${project.artifactId}-${project.version}-bin/stratosphere-${project.version}/resources + ${project.build.directory}/${project.artifactId}-${project.version}-bin/flink-${project.version}/resources directory perm @@ -266,7 +266,7 @@ - ${project.build.directory}/${project.artifactId}-${project.version}-bin/stratosphere-${project.version}/conf + ${project.build.directory}/${project.artifactId}-${project.version}-bin/flink-${project.version}/conf directory perm @@ -348,7 +348,7 @@ true false false - src/main/stratosphere-bin/.version.properties + src/main/flink-bin/.version.properties diff --git a/stratosphere-dist/src/deb/bin/jobmanager b/flink-dist/src/deb/bin/jobmanager similarity index 76% rename from stratosphere-dist/src/deb/bin/jobmanager rename to flink-dist/src/deb/bin/jobmanager index 696b689b4eac6..2150430a7e85f 100755 --- a/stratosphere-dist/src/deb/bin/jobmanager +++ b/flink-dist/src/deb/bin/jobmanager @@ -23,42 +23,42 @@ # # Version: @(#)skeleton 1.9 26-Feb-2001 miquels@cistron.nl # -# Starts a stratosphere jobmanager +# Starts a flink jobmanager # # chkconfig: 2345 85 15 -# description: stratosphere jobmanager +# description: flink jobmanager # ### BEGIN INIT INFO -# Provides: stratosphere-jobmanager +# Provides: flink-jobmanager # Required-Start: $network $local_fs # Required-Stop: # Should-Start: $named # Should-Stop: # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: stratosphere jobmanager daemon +# Short-Description: flink jobmanager daemon ### END INIT INFO -# Include stratosphere defaults if available -if [ -f /etc/default/stratosphere ] ; then - . /etc/default/stratosphere +# Include flink defaults if available +if [ -f /etc/default/flink ] ; then + . /etc/default/flink fi -if [ "$STRATOSPHERE_PID_DIR" = "" ]; then - STRATOSPHERE_PID_DIR=/tmp +if [ "$FLINK_PID_DIR" = "" ]; then + FLINK_PID_DIR=/tmp fi -if [ "$STRATOSPHERE_IDENT_STRING" = "" ]; then - STRATOSPHERE_IDENT_STRING="$USER" +if [ "$FLINK_IDENT_STRING" = "" ]; then + FLINK_IDENT_STRING="$USER" fi -STRATOSPHERE_HOME=/usr/share/stratosphere-dist +FLINK_HOME=/usr/share/flink-dist PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON_SCRIPT=$STRATOSPHERE_HOME/bin/jobmanager.sh -NAME=stratosphere-jobmanager -DESC="stratosphere jobmanager daemon" -PID_FILE=$STRATOSPHERE_PID_DIR/stratosphere-$STRATOSPHERE_IDENT_STRING-jobmanager.pid +DAEMON_SCRIPT=$FLINK_HOME/bin/jobmanager.sh +NAME=flink-jobmanager +DESC="flink jobmanager daemon" +PID_FILE=$FLINK_PID_DIR/flink-$FLINK_IDENT_STRING-jobmanager.pid test -x $DAEMON_SCRIPT || exit 1 @@ -70,14 +70,14 @@ DODTIME=5 # Time to wait for the server to die, in seconds # Checks if the given pid represents a live process. # Returns 0 if the pid is a live process, 1 otherwise -stratosphere_is_process_alive() { +flink_is_process_alive() { local pid="$1" ps -fp $pid | grep $pid | grep jobmanager > /dev/null 2>&1 } # Check if the process associated to a pidfile is running. # Return 0 if the pidfile exists and the process is running, 1 otherwise -stratosphere_check_pidfile() { +flink_check_pidfile() { local pidfile="$1" # IN local pid @@ -90,10 +90,10 @@ stratosphere_check_pidfile() { set -- $pid pid="$1" - stratosphere_is_process_alive $pid + flink_is_process_alive $pid } -stratosphere_process_kill() { +flink_process_kill() { local pid="$1" # IN local signal="$2" # IN local second @@ -102,7 +102,7 @@ stratosphere_process_kill() { # Wait a bit to see if the dirty job has really been done for second in 0 1 2 3 4 5 6 7 8 9 10; do - if stratosphere_is_process_alive "$pid"; then + if flink_is_process_alive "$pid"; then # Success return 0 fi @@ -115,7 +115,7 @@ stratosphere_process_kill() { } # Kill the process associated to a pidfile -stratosphere_stop_pidfile() { +flink_stop_pidfile() { local pidfile="$1" # IN local pid @@ -129,12 +129,12 @@ stratosphere_stop_pidfile() { pid="$1" # First try the easy way - if stratosphere_process_kill "$pid" 15; then + if flink_process_kill "$pid" 15; then return 0 fi # Otherwise try the hard way - if stratosphere_process_kill "$pid" 9; then + if flink_process_kill "$pid" 9; then return 0 fi @@ -142,11 +142,11 @@ stratosphere_stop_pidfile() { } start() { - $STRATOSPHERE_HOME/bin/jobmanager.sh start cluster + $FLINK_HOME/bin/jobmanager.sh start cluster } stop() { - $STRATOSPHERE_HOME/bin/jobmanager.sh stop + $FLINK_HOME/bin/jobmanager.sh stop } check_for_root() { @@ -157,14 +157,14 @@ check_for_root() { fi } -stratosphere_service() { +flink_service() { case "$1" in start) check_for_root echo -n "Starting $DESC: " start - if stratosphere_check_pidfile $PID_FILE ; then + if flink_check_pidfile $PID_FILE ; then echo "$NAME." else echo "ERROR. Could not start $DESC" @@ -177,7 +177,7 @@ stratosphere_service() { stop [ -n "$DODTIME" ] && sleep $DODTIME - if stratosphere_check_pidfile $PID_FILE ; then + if flink_check_pidfile $PID_FILE ; then echo "ERROR. Could not stop $DESC" exit 1 else @@ -187,10 +187,10 @@ stratosphere_service() { force-stop) check_for_root echo -n "Forcefully stopping $DESC: " - stratosphere_stop_pidfile $PID_FILE + flink_stop_pidfile $PID_FILE [ -n "$DODTIME" ] && sleep $DODTIME - if ! stratosphere_check_pidfile $PID_FILE ; then + if ! flink_check_pidfile $PID_FILE ; then echo "$NAME." else echo "ERROR. Could not force stop $DESC" @@ -200,7 +200,7 @@ stratosphere_service() { force-reload) check_for_root echo -n "Forcefully reloading $DESC: " - stratosphere_check_pidfile $PID_FILE && $0 restart + flink_check_pidfile $PID_FILE && $0 restart ;; restart) check_for_root @@ -211,7 +211,7 @@ stratosphere_service() { ;; status) echo -n "$NAME is " - if stratosphere_check_pidfile $PID_FILE ; then + if flink_check_pidfile $PID_FILE ; then echo "running" else echo "not running." @@ -226,6 +226,6 @@ stratosphere_service() { esac } -stratosphere_service "$1" +flink_service "$1" exit 0 diff --git a/stratosphere-dist/src/deb/bin/taskmanager b/flink-dist/src/deb/bin/taskmanager similarity index 76% rename from stratosphere-dist/src/deb/bin/taskmanager rename to flink-dist/src/deb/bin/taskmanager index c0982b029b17b..6bcaad3346519 100755 --- a/stratosphere-dist/src/deb/bin/taskmanager +++ b/flink-dist/src/deb/bin/taskmanager @@ -23,42 +23,42 @@ # # Version: @(#)skeleton 1.9 26-Feb-2001 miquels@cistron.nl # -# Starts a stratosphere taskmanager +# Starts a flink taskmanager # # chkconfig: 2345 85 15 -# description: stratosphere taskmanager +# description: flink taskmanager # ### BEGIN INIT INFO -# Provides: stratosphere-taskmanager +# Provides: flink-taskmanager # Required-Start: $network $local_fs # Required-Stop: # Should-Start: $named # Should-Stop: # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: stratosphere taskmanager daemon +# Short-Description: flink taskmanager daemon ### END INIT INFO # Include hadoop defaults if available -if [ -f /etc/default/stratosphere ] ; then - . /etc/default/stratosphere +if [ -f /etc/default/flink ] ; then + . /etc/default/flink fi -if [ "$STRATOSPHERE_PID_DIR" = "" ]; then - STRATOSPHERE_PID_DIR=/tmp +if [ "$FLINK_PID_DIR" = "" ]; then + FLINK_PID_DIR=/tmp fi -if [ "$STRATOSPHERE_IDENT_STRING" = "" ]; then - STRATOSPHERE_IDENT_STRING="$USER" +if [ "$FLINK_IDENT_STRING" = "" ]; then + FLINK_IDENT_STRING="$USER" fi -STRATOSPHERE_HOME=/usr/share/stratosphere-dist +FLINK_HOME=/usr/share/flink-dist PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON_SCRIPT=$STRATOSPHERE_HOME/bin/taskmanager.sh -NAME=stratosphere-taskmanager -DESC="stratosphere taskmanager daemon" -PID_FILE=$STRATOSPHERE_PID_DIR/stratosphere-$STRATOSPHERE_IDENT_STRING-taskmanager.pid +DAEMON_SCRIPT=$FLINK_HOME/bin/taskmanager.sh +NAME=flink-taskmanager +DESC="flink taskmanager daemon" +PID_FILE=$FLINK_PID_DIR/flink-$FLINK_IDENT_STRING-taskmanager.pid test -x $DAEMON_SCRIPT || exit 1 @@ -70,14 +70,14 @@ DODTIME=5 # Time to wait for the server to die, in seconds # Checks if the given pid represents a live process. # Returns 0 if the pid is a live process, 1 otherwise -stratosphere_is_process_alive() { +flink_is_process_alive() { local pid="$1" ps -fp $pid | grep $pid | grep taskmanager > /dev/null 2>&1 } # Check if the process associated to a pidfile is running. # Return 0 if the pidfile exists and the process is running, 1 otherwise -stratosphere_check_pidfile() { +flink_check_pidfile() { local pidfile="$1" # IN local pid @@ -90,10 +90,10 @@ stratosphere_check_pidfile() { set -- $pid pid="$1" - stratosphere_is_process_alive $pid + flink_is_process_alive $pid } -stratosphere_process_kill() { +flink_process_kill() { local pid="$1" # IN local signal="$2" # IN local second @@ -102,7 +102,7 @@ stratosphere_process_kill() { # Wait a bit to see if the dirty job has really been done for second in 0 1 2 3 4 5 6 7 8 9 10; do - if stratosphere_is_process_alive "$pid"; then + if flink_is_process_alive "$pid"; then # Success return 0 fi @@ -115,7 +115,7 @@ stratosphere_process_kill() { } # Kill the process associated to a pidfile -stratosphere_stop_pidfile() { +flink_stop_pidfile() { local pidfile="$1" # IN local pid @@ -129,12 +129,12 @@ stratosphere_stop_pidfile() { pid="$1" # First try the easy way - if stratosphere_process_kill "$pid" 15; then + if flink_process_kill "$pid" 15; then return 0 fi # Otherwise try the hard way - if stratosphere_process_kill "$pid" 9; then + if flink_process_kill "$pid" 9; then return 0 fi @@ -142,11 +142,11 @@ stratosphere_stop_pidfile() { } start() { - $STRATOSPHERE_HOME/bin/taskmanager.sh start + $FLINK_HOME/bin/taskmanager.sh start } stop() { - $STRATOSPHERE_HOME/bin/taskmanager.sh stop + $FLINK_HOME/bin/taskmanager.sh stop } check_for_root() { @@ -157,14 +157,14 @@ check_for_root() { fi } -stratosphere_service() { +flink_service() { case "$1" in start) check_for_root echo -n "Starting $DESC: " start - if stratosphere_check_pidfile $PID_FILE ; then + if flink_check_pidfile $PID_FILE ; then echo "$NAME." else echo "ERROR. Could not start $DESC" @@ -177,7 +177,7 @@ stratosphere_service() { stop [ -n "$DODTIME" ] && sleep $DODTIME - if stratosphere_check_pidfile $PID_FILE ; then + if flink_check_pidfile $PID_FILE ; then echo "ERROR. Could not stop $DESC" exit 1 else @@ -187,10 +187,10 @@ stratosphere_service() { force-stop) check_for_root echo -n "Forcefully stopping $DESC: " - stratosphere_stop_pidfile $PID_FILE + flink_stop_pidfile $PID_FILE [ -n "$DODTIME" ] && sleep $DODTIME - if ! stratosphere_check_pidfile $PID_FILE ; then + if ! flink_check_pidfile $PID_FILE ; then echo "$NAME." else echo "ERROR. Could not force stop $DESC" @@ -200,7 +200,7 @@ stratosphere_service() { force-reload) check_for_root echo -n "Forcefully reloading $DESC: " - stratosphere_check_pidfile $PID_FILE && $0 restart + flink_check_pidfile $PID_FILE && $0 restart ;; restart) check_for_root @@ -211,7 +211,7 @@ stratosphere_service() { ;; status) echo -n "$NAME is " - if stratosphere_check_pidfile $PID_FILE ; then + if flink_check_pidfile $PID_FILE ; then echo "running" else echo "not running." @@ -226,6 +226,6 @@ stratosphere_service() { esac } -stratosphere_service "$1" +flink_service "$1" exit 0 diff --git a/stratosphere-dist/src/deb/bin/webclient b/flink-dist/src/deb/bin/webclient similarity index 77% rename from stratosphere-dist/src/deb/bin/webclient rename to flink-dist/src/deb/bin/webclient index 9cdd9bc2a6fcd..7ba9121c3acd7 100755 --- a/stratosphere-dist/src/deb/bin/webclient +++ b/flink-dist/src/deb/bin/webclient @@ -23,42 +23,42 @@ # # Version: @(#)skeleton 1.9 26-Feb-2001 miquels@cistron.nl # -# Starts the stratosphere webclient +# Starts the flink webclient # # chkconfig: 2345 85 15 -# description: stratosphere webclient +# description: flink webclient # ### BEGIN INIT INFO -# Provides: stratosphere-webclient +# Provides: flink-webclient # Required-Start: $network $local_fs # Required-Stop: # Should-Start: $named # Should-Stop: # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: stratosphere webclient daemon +# Short-Description: flink webclient daemon ### END INIT INFO # Include hadoop defaults if available -if [ -f /etc/default/stratosphere ] ; then - . /etc/default/stratosphere +if [ -f /etc/default/flink ] ; then + . /etc/default/flink fi -if [ "$STRATOSPHERE_PID_DIR" = "" ]; then - STRATOSPHERE_PID_DIR=/tmp +if [ "$FLINK_PID_DIR" = "" ]; then + FLINK_PID_DIR=/tmp fi -if [ "$STRATOSPHERE_IDENT_STRING" = "" ]; then - STRATOSPHERE_IDENT_STRING="$USER" +if [ "$FLINK_IDENT_STRING" = "" ]; then + FLINK_IDENT_STRING="$USER" fi -STRATOSPHERE_HOME=/usr/share/stratosphere-dist +FLINK_HOME=/usr/share/flink-dist PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON_SCRIPT=$STRATOSPHERE_HOME/bin/webclient.sh -NAME=stratosphere-webclient -DESC="stratosphere webclient daemon" -PID_FILE=$STRATOSPHERE_PID_DIR/stratosphere-$STRATOSPHERE_IDENT_STRING-webclient.pid +DAEMON_SCRIPT=$FLINK_HOME/bin/webclient.sh +NAME=flink-webclient +DESC="flink webclient daemon" +PID_FILE=$FLINK_PID_DIR/flink-$FLINK_IDENT_STRING-webclient.pid test -x $DAEMON_SCRIPT || exit 1 @@ -70,14 +70,14 @@ DODTIME=5 # Time to wait for the server to die, in seconds # Checks if the given pid represents a live process. # Returns 0 if the pid is a live process, 1 otherwise -stratosphere_is_process_alive() { +flink_is_process_alive() { local pid="$1" ps -fp $pid | grep $pid | grep webclient > /dev/null 2>&1 } # Check if the process associated to a pidfile is running. # Return 0 if the pidfile exists and the process is running, 1 otherwise -stratosphere_check_pidfile() { +flink_check_pidfile() { local pidfile="$1" # IN local pid @@ -90,10 +90,10 @@ stratosphere_check_pidfile() { set -- $pid pid="$1" - stratosphere_is_process_alive $pid + flink_is_process_alive $pid } -stratosphere_process_kill() { +flink_process_kill() { local pid="$1" # IN local signal="$2" # IN local second @@ -102,7 +102,7 @@ stratosphere_process_kill() { # Wait a bit to see if the dirty job has really been done for second in 0 1 2 3 4 5 6 7 8 9 10; do - if stratosphere_is_process_alive "$pid"; then + if flink_is_process_alive "$pid"; then # Success return 0 fi @@ -115,7 +115,7 @@ stratosphere_process_kill() { } # Kill the process associated to a pidfile -stratosphere_stop_pidfile() { +flink_stop_pidfile() { local pidfile="$1" # IN local pid @@ -129,12 +129,12 @@ stratosphere_stop_pidfile() { pid="$1" # First try the easy way - if stratosphere_process_kill "$pid" 15; then + if flink_process_kill "$pid" 15; then return 0 fi # Otherwise try the hard way - if stratosphere_process_kill "$pid" 9; then + if flink_process_kill "$pid" 9; then return 0 fi @@ -142,11 +142,11 @@ stratosphere_stop_pidfile() { } start() { - $STRATOSPHERE_HOME/bin/webclient.sh start + $FLINK_HOME/bin/webclient.sh start } stop() { - $STRATOSPHERE_HOME/bin/webclient.sh stop + $FLINK_HOME/bin/webclient.sh stop } check_for_root() { @@ -157,14 +157,14 @@ check_for_root() { fi } -stratosphere_service() { +flink_service() { case "$1" in start) check_for_root echo -n "Starting $DESC: " start - if stratosphere_check_pidfile $PID_FILE ; then + if flink_check_pidfile $PID_FILE ; then echo "$NAME." else echo "ERROR. Could not start $DESC" @@ -177,7 +177,7 @@ stratosphere_service() { stop [ -n "$DODTIME" ] && sleep $DODTIME - if stratosphere_check_pidfile $PID_FILE ; then + if flink_check_pidfile $PID_FILE ; then echo "ERROR. Could not stop $DESC" exit 1 else @@ -187,10 +187,10 @@ stratosphere_service() { force-stop) check_for_root echo -n "Forcefully stopping $DESC: " - stratosphere_stop_pidfile $PID_FILE + flink_stop_pidfile $PID_FILE [ -n "$DODTIME" ] && sleep $DODTIME - if ! stratosphere_check_pidfile $PID_FILE ; then + if ! flink_check_pidfile $PID_FILE ; then echo "$NAME." else echo "ERROR. Could not force stop $DESC" @@ -200,7 +200,7 @@ stratosphere_service() { force-reload) check_for_root echo -n "Forcefully reloading $DESC: " - stratosphere_check_pidfile $PID_FILE && $0 restart + flink_check_pidfile $PID_FILE && $0 restart ;; restart) check_for_root @@ -211,7 +211,7 @@ stratosphere_service() { ;; status) echo -n "$NAME is " - if stratosphere_check_pidfile $PID_FILE ; then + if flink_check_pidfile $PID_FILE ; then echo "running" else echo "not running." @@ -226,6 +226,6 @@ stratosphere_service() { esac } -stratosphere_service "$1" +flink_service "$1" exit 0 diff --git a/stratosphere-dist/src/deb/control/control b/flink-dist/src/deb/control/control similarity index 100% rename from stratosphere-dist/src/deb/control/control rename to flink-dist/src/deb/control/control diff --git a/stratosphere-dist/src/deb/control/postinst b/flink-dist/src/deb/control/postinst similarity index 100% rename from stratosphere-dist/src/deb/control/postinst rename to flink-dist/src/deb/control/postinst diff --git a/stratosphere-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml similarity index 77% rename from stratosphere-dist/src/main/assemblies/bin.xml rename to flink-dist/src/main/assemblies/bin.xml index 5785551f91db6..8718ad090695b 100644 --- a/stratosphere-dist/src/main/assemblies/bin.xml +++ b/flink-dist/src/main/assemblies/bin.xml @@ -24,7 +24,7 @@ true - stratosphere-${project.version} + flink-${project.version} @@ -37,8 +37,8 @@ true - eu.stratosphere:stratosphere-java-examples - eu.stratosphere:stratosphere-scala-examples + org.apache.flink:flink-java-examples + org.apache.flink:flink-scala-examples - src/main/stratosphere-bin/bin + src/main/flink-bin/bin bin 0755 - src/main/stratosphere-bin/conf + src/main/flink-bin/conf conf 0644 - src/main/stratosphere-bin/ + src/main/flink-bin/ log 0644 @@ -101,7 +101,7 @@ - src/main/stratosphere-bin/ + src/main/flink-bin/ 0644 @@ -116,7 +116,7 @@ ../target - stratosphere-*-javadoc.jar + flink-*-javadoc.jar docs/javadoc 0644 @@ -124,7 +124,7 @@ - ../stratosphere-clients/resources + ../flink-clients/resources resources 0644 @@ -134,7 +134,7 @@ - ../stratosphere-runtime/resources + ../flink-runtime/resources resources 0644 @@ -144,49 +144,49 @@ - src/main/stratosphere-bin/tools + src/main/flink-bin/tools tools 0644 - ../stratosphere-examples/stratosphere-java-examples/target + ../flink-examples/flink-java-examples/target examples 0644 *.jar - stratosphere-java-examples-${project.version}.jar - stratosphere-java-examples-${project.version}-sources.jar + flink-java-examples-${project.version}.jar + flink-java-examples-${project.version}-sources.jar - ../stratosphere-examples/stratosphere-scala-examples/target + ../flink-examples/flink-scala-examples/target examples 0644 *.jar - stratosphere-scala-examples-${project.version}.jar - stratosphere-scala-examples-${project.version}-sources.jar + flink-scala-examples-${project.version}.jar + flink-scala-examples-${project.version}-sources.jar - ../stratosphere-examples/stratosphere-java-examples/src/main/java/eu/stratosphere/example/java/record + ../flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/record examples/java-src/ 0644 - ../stratosphere-examples/stratosphere-scala-examples/src/main/scala/eu/stratosphere/examples/scala + ../flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala examples/scala-src/ 0644 diff --git a/stratosphere-dist/src/main/assemblies/yarn-uberjar.xml b/flink-dist/src/main/assemblies/yarn-uberjar.xml similarity index 88% rename from stratosphere-dist/src/main/assemblies/yarn-uberjar.xml rename to flink-dist/src/main/assemblies/yarn-uberjar.xml index 2f0c42628f63d..60a234203740c 100644 --- a/stratosphere-dist/src/main/assemblies/yarn-uberjar.xml +++ b/flink-dist/src/main/assemblies/yarn-uberjar.xml @@ -31,8 +31,8 @@ true runtime - eu.stratosphere:stratosphere-java-examples:* - eu.stratosphere:stratosphere-scala-examples:* + org.apache.flink:flink-java-examples:* + org.apache.flink:flink-scala-examples:* @@ -40,7 +40,7 @@ - src/main/stratosphere-bin/conf/stratosphere-conf.yaml + src/main/flink-bin/conf/flink-conf.yaml / 0644 @@ -59,7 +59,7 @@ - ../stratosphere-runtime/resources + ../flink-runtime/resources resources 0644 diff --git a/stratosphere-dist/src/main/assemblies/yarn.xml b/flink-dist/src/main/assemblies/yarn.xml similarity index 71% rename from stratosphere-dist/src/main/assemblies/yarn.xml rename to flink-dist/src/main/assemblies/yarn.xml index 372696629cf88..5f0f28eede202 100644 --- a/stratosphere-dist/src/main/assemblies/yarn.xml +++ b/flink-dist/src/main/assemblies/yarn.xml @@ -25,18 +25,18 @@ true - stratosphere-yarn-${project.version} + flink-yarn-${project.version} - src/main/stratosphere-bin/yarn-bin + src/main/flink-bin/yarn-bin bin 0755 - src/main/stratosphere-bin/ + src/main/flink-bin/ log 0644 @@ -46,7 +46,7 @@ - src/main/stratosphere-bin/ + src/main/flink-bin/ ship 0644 @@ -56,7 +56,7 @@ - src/main/stratosphere-bin/ + src/main/flink-bin/ 0644 @@ -67,36 +67,36 @@ - src/main/stratosphere-bin/tools + src/main/flink-bin/tools tools 0644 - ../stratosphere-examples/stratosphere-java-examples/target + ../flink-examples/flink-java-examples/target examples 0644 *.jar - stratosphere-java-examples-${project.version}.jar - stratosphere-java-examples-${project.version}-sources.jar + flink-java-examples-${project.version}.jar + flink-java-examples-${project.version}-sources.jar - ../stratosphere-examples/stratosphere-scala-examples/target + ../flink-examples/flink-scala-examples/target examples 0644 *.jar - stratosphere-scala-examples-${project.version}.jar - stratosphere-scala-examples-${project.version}-sources.jar + flink-scala-examples-${project.version}.jar + flink-scala-examples-${project.version}-sources.jar @@ -104,31 +104,30 @@ - src/main/stratosphere-bin/conf/stratosphere-conf.yaml + src/main/flink-bin/conf/flink-conf.yaml conf 0644 - src/main/stratosphere-bin/conf/log4j.properties + src/main/flink-bin/conf/log4j.properties conf 0644 - target/stratosphere-dist-${project.version}-yarn-uberjar.jar + target/flink-dist-${project.version}-yarn-uberjar.jar lib/ 0644 - - src/main/stratosphere-bin/bin/stratosphere + src/main/flink-bin/bin/flink bin/ 0755 - src/main/stratosphere-bin/bin/config.sh + src/main/flink-bin/bin/config.sh bin/ 0755 diff --git a/flink-dist/src/main/flink-bin/DISCLAIMER b/flink-dist/src/main/flink-bin/DISCLAIMER new file mode 100644 index 0000000000000..48a1a19d5034c --- /dev/null +++ b/flink-dist/src/main/flink-bin/DISCLAIMER @@ -0,0 +1,11 @@ +Apache Flink is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness +or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. + diff --git a/stratosphere-dist/src/main/stratosphere-bin/LICENSE b/flink-dist/src/main/flink-bin/LICENSE similarity index 100% rename from stratosphere-dist/src/main/stratosphere-bin/LICENSE rename to flink-dist/src/main/flink-bin/LICENSE diff --git a/flink-dist/src/main/flink-bin/NOTICE b/flink-dist/src/main/flink-bin/NOTICE new file mode 100644 index 0000000000000..d2b108ef9e57f --- /dev/null +++ b/flink-dist/src/main/flink-bin/NOTICE @@ -0,0 +1,6 @@ +Apache Flink +Copyright (c) 2014 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + diff --git a/stratosphere-dist/src/main/stratosphere-bin/README.txt b/flink-dist/src/main/flink-bin/README.txt similarity index 100% rename from stratosphere-dist/src/main/stratosphere-bin/README.txt rename to flink-dist/src/main/flink-bin/README.txt diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/config.sh b/flink-dist/src/main/flink-bin/bin/config.sh similarity index 78% rename from stratosphere-dist/src/main/stratosphere-bin/bin/config.sh rename to flink-dist/src/main/flink-bin/bin/config.sh index d1880b02ec3ea..8edc14a75405e 100755 --- a/stratosphere-dist/src/main/stratosphere-bin/bin/config.sh +++ b/flink-dist/src/main/flink-bin/bin/config.sh @@ -54,13 +54,13 @@ readFromConfig() { } ######################################################################################################################## -# DEFAULT CONFIG VALUES: These values will be used when nothing has been specified in conf/stratosphere-conf.yaml +# DEFAULT CONFIG VALUES: These values will be used when nothing has been specified in conf/flink-conf.yaml # -or- the respective environment variables are not set. ######################################################################################################################## # WARNING !!! , these values are only used if there is nothing else is specified in -# conf/stratosphere-conf.yaml +# conf/flink-conf.yaml DEFAULT_ENV_PID_DIR="/tmp" # Directory to store *.pid files to DEFAULT_ENV_LOG_MAX=5 # Maximum number of old log files to keep @@ -68,7 +68,7 @@ DEFAULT_ENV_JAVA_OPTS="" # Optional JVM args DEFAULT_ENV_SSH_OPTS="" # Optional SSH parameters running in cluster mode ######################################################################################################################## -# CONFIG KEYS: The default values can be overwritten by the following keys in conf/stratosphere-conf.yaml +# CONFIG KEYS: The default values can be overwritten by the following keys in conf/flink-conf.yaml ######################################################################################################################## KEY_JOBM_HEAP_MB="jobmanager.heap.mb" @@ -101,18 +101,18 @@ script=`basename "$this"` bin=`cd "$bin"; pwd` this="$bin/$script" -# Define the main directory of the stratosphere installation -STRATOSPHERE_ROOT_DIR=`dirname "$this"`/.. -STRATOSPHERE_LIB_DIR=$STRATOSPHERE_ROOT_DIR/lib +# Define the main directory of the flink installation +FLINK_ROOT_DIR=`dirname "$this"`/.. +FLINK_LIB_DIR=$FLINK_ROOT_DIR/lib # These need to be mangled because they are directly passed to java. # The above lib path is used by the shell script to retrieve jars in a # directory, so it needs to be unmangled. -STRATOSPHERE_ROOT_DIR_MANGLED=`manglePath "$STRATOSPHERE_ROOT_DIR"` -STRATOSPHERE_CONF_DIR=$STRATOSPHERE_ROOT_DIR_MANGLED/conf -STRATOSPHERE_BIN_DIR=$STRATOSPHERE_ROOT_DIR_MANGLED/bin -STRATOSPHERE_LOG_DIR=$STRATOSPHERE_ROOT_DIR_MANGLED/log -YAML_CONF=${STRATOSPHERE_CONF_DIR}/stratosphere-conf.yaml +FLINK_ROOT_DIR_MANGLED=`manglePath "$FLINK_ROOT_DIR"` +FLINK_CONF_DIR=$FLINK_ROOT_DIR_MANGLED/conf +FLINK_BIN_DIR=$FLINK_ROOT_DIR_MANGLED/bin +FLINK_LOG_DIR=$FLINK_ROOT_DIR_MANGLED/log +YAML_CONF=${FLINK_CONF_DIR}/flink-conf.yaml ######################################################################################################################## # ENVIRONMENT VARIABLES @@ -127,7 +127,7 @@ if [ -z "${MY_JAVA_HOME}" ]; then fi # check if we have a valid JAVA_HOME and if java is not available if [ -z "${MY_JAVA_HOME}" ] && ! type java > /dev/null 2> /dev/null; then - echo "Please specify JAVA_HOME. Either in Stratosphere config ./conf/stratosphere-conf.yaml or as system-wide JAVA_HOME." + echo "Please specify JAVA_HOME. Either in Flink config ./conf/flink-conf.yaml or as system-wide JAVA_HOME." exit 1 else JAVA_HOME=${MY_JAVA_HOME} @@ -149,42 +149,42 @@ if [ -z "${HOSTNAME}" ]; then HOSTNAME=`hostname` fi -# Define STRATOSPHERE_JM_HEAP if it is not already set -if [ -z "${STRATOSPHERE_JM_HEAP}" ]; then - STRATOSPHERE_JM_HEAP=$(readFromConfig ${KEY_JOBM_HEAP_MB} 0 "${YAML_CONF}") +# Define FLINK_JM_HEAP if it is not already set +if [ -z "${FLINK_JM_HEAP}" ]; then + FLINK_JM_HEAP=$(readFromConfig ${KEY_JOBM_HEAP_MB} 0 "${YAML_CONF}") fi -# Define STRATOSPHERE_TM_HEAP if it is not already set -if [ -z "${STRATOSPHERE_TM_HEAP}" ]; then - STRATOSPHERE_TM_HEAP=$(readFromConfig ${KEY_TASKM_HEAP_MB} 0 "${YAML_CONF}") +# Define FLINK_TM_HEAP if it is not already set +if [ -z "${FLINK_TM_HEAP}" ]; then + FLINK_TM_HEAP=$(readFromConfig ${KEY_TASKM_HEAP_MB} 0 "${YAML_CONF}") fi if [ -z "${MAX_LOG_FILE_NUMBER}" ]; then MAX_LOG_FILE_NUMBER=$(readFromConfig ${KEY_ENV_LOG_MAX} ${DEFAULT_ENV_LOG_MAX} "${YAML_CONF}") fi -if [ -z "${STRATOSPHERE_PID_DIR}" ]; then - STRATOSPHERE_PID_DIR=$(readFromConfig ${KEY_ENV_PID_DIR} "${DEFAULT_ENV_PID_DIR}" "${YAML_CONF}") +if [ -z "${FLINK_PID_DIR}" ]; then + FLINK_PID_DIR=$(readFromConfig ${KEY_ENV_PID_DIR} "${DEFAULT_ENV_PID_DIR}" "${YAML_CONF}") fi -if [ -z "${STRATOSPHERE_ENV_JAVA_OPTS}" ]; then - STRATOSPHERE_ENV_JAVA_OPTS=$(readFromConfig ${KEY_ENV_JAVA_OPTS} "${DEFAULT_ENV_JAVA_OPTS}" "${YAML_CONF}") +if [ -z "${FLINK_ENV_JAVA_OPTS}" ]; then + FLINK_ENV_JAVA_OPTS=$(readFromConfig ${KEY_ENV_JAVA_OPTS} "${DEFAULT_ENV_JAVA_OPTS}" "${YAML_CONF}") # Remove leading and ending double quotes (if present) of value - STRATOSPHERE_ENV_JAVA_OPTS="$( echo "${STRATOSPHERE_ENV_JAVA_OPTS}" | sed -e 's/^"//' -e 's/"$//' )" + FLINK_ENV_JAVA_OPTS="$( echo "${FLINK_ENV_JAVA_OPTS}" | sed -e 's/^"//' -e 's/"$//' )" fi -if [ -z "${STRATOSPHERE_SSH_OPTS}" ]; then - STRATOSPHERE_SSH_OPTS=$(readFromConfig ${KEY_ENV_SSH_OPTS} "${DEFAULT_ENV_SSH_OPTS}" "${YAML_CONF}") +if [ -z "${FLINK_SSH_OPTS}" ]; then + FLINK_SSH_OPTS=$(readFromConfig ${KEY_ENV_SSH_OPTS} "${DEFAULT_ENV_SSH_OPTS}" "${YAML_CONF}") fi # Arguments for the JVM. Used for job and task manager JVMs. -# DO NOT USE FOR MEMORY SETTINGS! Use conf/stratosphere-conf.yaml with keys +# DO NOT USE FOR MEMORY SETTINGS! Use conf/flink-conf.yaml with keys # KEY_JOBM_HEAP_MB and KEY_TASKM_HEAP_MB for that! JVM_ARGS="" # Default classpath -CLASSPATH=`manglePathList $( echo $STRATOSPHERE_LIB_DIR/*.jar . | sed 's/ /:/g' )` +CLASSPATH=`manglePathList $( echo $FLINK_LIB_DIR/*.jar . | sed 's/ /:/g' )` # Auxilliary function which extracts the name of host from a line which # also potentialy includes topology information and the instance type diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/stratosphere b/flink-dist/src/main/flink-bin/bin/flink similarity index 63% rename from stratosphere-dist/src/main/stratosphere-bin/bin/stratosphere rename to flink-dist/src/main/flink-bin/bin/flink index 28a60597d86af..251dc234f9da4 100755 --- a/stratosphere-dist/src/main/stratosphere-bin/bin/stratosphere +++ b/flink-dist/src/main/flink-bin/bin/flink @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################################################################## # -# Copyright (C) 2010 by the Stratosphere project (http://stratosphere.eu) +# Copyright (C) 2010-2013 by the Apache Flink project (http://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,21 +17,21 @@ bin=`dirname "$0"` bin=`cd "$bin"; pwd` -# get stratosphere config +# get flink config . "$bin"/config.sh -if [ "$STRATOSPHERE_IDENT_STRING" = "" ]; then - STRATOSPHERE_IDENT_STRING="$USER" +if [ "$FLINK_IDENT_STRING" = "" ]; then + FLINK_IDENT_STRING="$USER" fi -STRATOSPHERE_LIB_CLIENTS_DIR=$STRATOSPHERE_ROOT_DIR/lib_clients +FLINK_LIB_CLIENTS_DIR=$FLINK_ROOT_DIR/lib_clients # auxiliary function to construct a lightweight classpath for the -# Stratosphere CLI client +# Flink CLI client constructCLIClientClassPath() { - for jarfile in $STRATOSPHERE_LIB_DIR/*.jar ; do + for jarfile in $FLINK_LIB_DIR/*.jar ; do if [[ $CC_CLASSPATH = "" ]]; then CC_CLASSPATH=$jarfile; else @@ -39,7 +39,7 @@ constructCLIClientClassPath() { fi done - for jarfile in $STRATOSPHERE_LIB_CLIENTS_DIR/*.jar ; do + for jarfile in $FLINK_LIB_CLIENTS_DIR/*.jar ; do CC_CLASSPATH=$CC_CLASSPATH:$jarfile done @@ -48,9 +48,9 @@ constructCLIClientClassPath() { CC_CLASSPATH=`manglePathList $(constructCLIClientClassPath)` -log=$STRATOSPHERE_LOG_DIR/stratosphere-$STRATOSPHERE_IDENT_STRING-stratosphere-client-$HOSTNAME.log -log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$STRATOSPHERE_CONF_DIR"/log4j.properties" +log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-flink-client-$HOSTNAME.log +log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties" -export STRATOSPHERE_CONF_DIR +export FLINK_CONF_DIR -$JAVA_RUN $JVM_ARGS $log_setting -classpath $CC_CLASSPATH eu.stratosphere.client.CliFrontend $* +$JAVA_RUN $JVM_ARGS $log_setting -classpath $CC_CLASSPATH org.apache.flink.client.CliFrontend $* diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/stratosphere.bat b/flink-dist/src/main/flink-bin/bin/flink.bat similarity index 74% rename from stratosphere-dist/src/main/stratosphere-bin/bin/stratosphere.bat rename to flink-dist/src/main/flink-bin/bin/flink.bat index 61611644b2c87..22154e7c4d946 100644 --- a/stratosphere-dist/src/main/stratosphere-bin/bin/stratosphere.bat +++ b/flink-dist/src/main/flink-bin/bin/flink.bat @@ -1,6 +1,6 @@ -::####################################################################################################################### +::######################################################################################################################## :: -:: Copyright (C) 2010 by the Stratosphere project (http://stratosphere.eu) +:: Copyright (C) 2010-2013 by the Apache Flink project (http://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 @@ -11,7 +11,8 @@ :: 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. :: -::####################################################################################################################### +::######################################################################################################################## + setlocal SET bin=%~dp0 @@ -22,6 +23,6 @@ SET JVM_ARGS=-Xmx512m SET NEPHELE_JM_CLASSPATH=%NEPHELE_LIB_DIR%\* -java %JVM_ARGS% -cp "%NEPHELE_JM_CLASSPATH%" eu.stratosphere.client.CliFrontend %* +java %JVM_ARGS% -cp "%NEPHELE_JM_CLASSPATH%" org.apache.flink.client.CliFrontend %* endlocal diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/jobmanager.sh b/flink-dist/src/main/flink-bin/bin/jobmanager.sh similarity index 61% rename from stratosphere-dist/src/main/stratosphere-bin/bin/jobmanager.sh rename to flink-dist/src/main/flink-bin/bin/jobmanager.sh index 5c5f5c0cd40a0..5a24ce5e527a4 100755 --- a/stratosphere-dist/src/main/stratosphere-bin/bin/jobmanager.sh +++ b/flink-dist/src/main/flink-bin/bin/jobmanager.sh @@ -23,43 +23,43 @@ bin=`cd "$bin"; pwd` . "$bin"/config.sh if [ "$EXECUTIONMODE" = "local" ]; then - STRATOSPHERE_JM_HEAP=`expr $STRATOSPHERE_JM_HEAP + $STRATOSPHERE_TM_HEAP` + FLINK_JM_HEAP=`expr $FLINK_JM_HEAP + $FLINK_TM_HEAP` fi JVM_ARGS="$JVM_ARGS -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m" -if [ "$STRATOSPHERE_JM_HEAP" -gt 0 ]; then - JVM_ARGS="$JVM_ARGS -Xms"$STRATOSPHERE_JM_HEAP"m -Xmx"$STRATOSPHERE_JM_HEAP"m" +if [ "$FLINK_JM_HEAP" -gt 0 ]; then + JVM_ARGS="$JVM_ARGS -Xms"$FLINK_JM_HEAP"m -Xmx"$FLINK_JM_HEAP"m" fi -if [ "$STRATOSPHERE_IDENT_STRING" = "" ]; then - STRATOSPHERE_IDENT_STRING="$USER" +if [ "$FLINK_IDENT_STRING" = "" ]; then + FLINK_IDENT_STRING="$USER" fi # auxilliary function to construct a the classpath for the jobmanager constructJobManagerClassPath() { - for jarfile in "$STRATOSPHERE_LIB_DIR"/*.jar ; do - if [[ $STRATOSPHERE_JM_CLASSPATH = "" ]]; then - STRATOSPHERE_JM_CLASSPATH=$jarfile; + for jarfile in "$FLINK_LIB_DIR"/*.jar ; do + if [[ $FLINK_JM_CLASSPATH = "" ]]; then + FLINK_JM_CLASSPATH=$jarfile; else - STRATOSPHERE_JM_CLASSPATH=$STRATOSPHERE_JM_CLASSPATH:$jarfile + FLINK_JM_CLASSPATH=$FLINK_JM_CLASSPATH:$jarfile fi done - echo $STRATOSPHERE_JM_CLASSPATH + echo $FLINK_JM_CLASSPATH } -STRATOSPHERE_JM_CLASSPATH=`manglePathList "$(constructJobManagerClassPath)"` +FLINK_JM_CLASSPATH=`manglePathList "$(constructJobManagerClassPath)"` -log=$STRATOSPHERE_LOG_DIR/stratosphere-$STRATOSPHERE_IDENT_STRING-jobmanager-$HOSTNAME.log -out=$STRATOSPHERE_LOG_DIR/stratosphere-$STRATOSPHERE_IDENT_STRING-jobmanager-$HOSTNAME.out -pid=$STRATOSPHERE_PID_DIR/stratosphere-$STRATOSPHERE_IDENT_STRING-jobmanager.pid -log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$STRATOSPHERE_CONF_DIR"/log4j.properties) +log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-jobmanager-$HOSTNAME.log +out=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-jobmanager-$HOSTNAME.out +pid=$FLINK_PID_DIR/flink-$FLINK_IDENT_STRING-jobmanager.pid +log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties) case $STARTSTOP in (start) - mkdir -p "$STRATOSPHERE_PID_DIR" + mkdir -p "$FLINK_PID_DIR" if [ -f $pid ]; then if kill -0 `cat $pid` > /dev/null 2>&1; then echo Job manager running as process `cat $pid`. Stop it first. @@ -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" org.apache.flink.runtime.jobmanager.JobManager -executionMode $EXECUTIONMODE -configDir "$STRATOSPHERE_CONF_DIR" > "$out" 2>&1 < /dev/null & + $JAVA_RUN $JVM_ARGS ${FLINK_ENV_JAVA_OPTS} "${log_setting[@]}" -classpath "$FLINK_JM_CLASSPATH" org.apache.flink.runtime.jobmanager.JobManager -executionMode $EXECUTIONMODE -configDir "$FLINK_CONF_DIR" > "$out" 2>&1 < /dev/null & echo $! > $pid ;; diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/start-cluster.sh b/flink-dist/src/main/flink-bin/bin/start-cluster.sh similarity index 84% rename from stratosphere-dist/src/main/stratosphere-bin/bin/start-cluster.sh rename to flink-dist/src/main/flink-bin/bin/start-cluster.sh index 80495723366a0..6b924cc1132a3 100755 --- a/stratosphere-dist/src/main/stratosphere-bin/bin/start-cluster.sh +++ b/flink-dist/src/main/flink-bin/bin/start-cluster.sh @@ -19,10 +19,10 @@ bin=`cd "$bin"; pwd` . "$bin"/config.sh -HOSTLIST=$STRATOSPHERE_SLAVES +HOSTLIST=$FLINK_SLAVES if [ "$HOSTLIST" = "" ]; then - HOSTLIST="${STRATOSPHERE_CONF_DIR}/slaves" + HOSTLIST="${FLINK_CONF_DIR}/slaves" fi if [ ! -f "$HOSTLIST" ]; then @@ -31,7 +31,7 @@ if [ ! -f "$HOSTLIST" ]; then fi # cluster mode, bring up job manager locally and a task manager on every slave host -"$STRATOSPHERE_BIN_DIR"/jobmanager.sh start cluster +"$FLINK_BIN_DIR"/jobmanager.sh start cluster GOON=true while $GOON @@ -39,6 +39,6 @@ do read line || GOON=false if [ -n "$line" ]; then HOST=$( extractHostName $line) - ssh -n $STRATOSPHERE_SSH_OPTS $HOST -- "nohup /bin/bash $STRATOSPHERE_BIN_DIR/taskmanager.sh start &" + ssh -n $FLINK_SSH_OPTS $HOST -- "nohup /bin/bash $FLINK_BIN_DIR/taskmanager.sh start &" fi done < "$HOSTLIST" diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/start-local.bat b/flink-dist/src/main/flink-bin/bin/start-local.bat similarity index 78% rename from stratosphere-dist/src/main/stratosphere-bin/bin/start-local.bat rename to flink-dist/src/main/flink-bin/bin/start-local.bat index fdb2e81e70225..bb53a5b5f7788 100644 --- a/stratosphere-dist/src/main/stratosphere-bin/bin/start-local.bat +++ b/flink-dist/src/main/flink-bin/bin/start-local.bat @@ -1,6 +1,6 @@ -::####################################################################################################################### +::######################################################################################################################## :: -:: Copyright (C) 2010 by the Stratosphere project (http://stratosphere.eu) +:: Copyright (C) 2010-2013 by the Apache Flink project (http://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 @@ -11,7 +11,8 @@ :: 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. :: -::####################################################################################################################### +::######################################################################################################################## + @echo off setlocal EnableDelayedExpansion @@ -45,9 +46,9 @@ DEL "%logname%.6" 2> nul DEL "%outname%.6" 2> nul -echo Starting Stratosphere job manager. Webinterface by default on http://localhost:8081/. +echo Starting Flink job manager. Webinterface by default on http://localhost:8081/. echo Don't close this batch window. Stop job manager by pressing Ctrl+C. -java %JVM_ARGS% %log_setting% -cp %NEPHELE_JM_CLASSPATH% eu.stratosphere.nephele.jobmanager.JobManager -executionMode local -configDir %NEPHELE_CONF_DIR% > "%out%" 2>&1 +java %JVM_ARGS% %log_setting% -cp %NEPHELE_JM_CLASSPATH% org.apache.flink.nephele.jobmanager.JobManager -executionMode local -configDir %NEPHELE_CONF_DIR% > "%out%" 2>&1 endlocal diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/start-local.sh b/flink-dist/src/main/flink-bin/bin/start-local.sh similarity index 95% rename from stratosphere-dist/src/main/stratosphere-bin/bin/start-local.sh rename to flink-dist/src/main/flink-bin/bin/start-local.sh index 6ab66d7852212..ed0a5f1f7633f 100755 --- a/stratosphere-dist/src/main/stratosphere-bin/bin/start-local.sh +++ b/flink-dist/src/main/flink-bin/bin/start-local.sh @@ -20,4 +20,4 @@ bin=`cd "$bin"; pwd` . "$bin"/config.sh # local mode, only bring up job manager. The job manager will start an internal task manager -"$STRATOSPHERE_BIN_DIR"/jobmanager.sh start local +"$FLINK_BIN_DIR"/jobmanager.sh start local diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/start-webclient.sh b/flink-dist/src/main/flink-bin/bin/start-webclient.sh similarity index 95% rename from stratosphere-dist/src/main/stratosphere-bin/bin/start-webclient.sh rename to flink-dist/src/main/flink-bin/bin/start-webclient.sh index ad5d568a68b02..6a89bd103b0f8 100755 --- a/stratosphere-dist/src/main/stratosphere-bin/bin/start-webclient.sh +++ b/flink-dist/src/main/flink-bin/bin/start-webclient.sh @@ -19,4 +19,4 @@ bin=`cd "$bin"; pwd` . "$bin"/config.sh -"$STRATOSPHERE_BIN_DIR"/webclient.sh start +"$FLINK_BIN_DIR"/webclient.sh start diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/stop-cluster.sh b/flink-dist/src/main/flink-bin/bin/stop-cluster.sh similarity index 85% rename from stratosphere-dist/src/main/stratosphere-bin/bin/stop-cluster.sh rename to flink-dist/src/main/flink-bin/bin/stop-cluster.sh index e25119aebf355..3627b4722872c 100755 --- a/stratosphere-dist/src/main/stratosphere-bin/bin/stop-cluster.sh +++ b/flink-dist/src/main/flink-bin/bin/stop-cluster.sh @@ -19,10 +19,10 @@ bin=`cd "$bin"; pwd` . "$bin"/config.sh -HOSTLIST=$STRATOSPHERE_SLAVES +HOSTLIST=$FLINK_SLAVES if [ "$HOSTLIST" = "" ]; then - HOSTLIST="${STRATOSPHERE_CONF_DIR}/slaves" + HOSTLIST="${FLINK_CONF_DIR}/slaves" fi if [ ! -f "$HOSTLIST" ]; then @@ -31,7 +31,7 @@ if [ ! -f "$HOSTLIST" ]; then fi # cluster mode, stop the job manager locally and stop the task manager on every slave host -"$STRATOSPHERE_BIN_DIR"/jobmanager.sh stop +"$FLINK_BIN_DIR"/jobmanager.sh stop GOON=true while $GOON @@ -39,6 +39,6 @@ do read line || GOON=false if [ -n "$line" ]; then HOST=$( extractHostName $line) - ssh -n $STRATOSPHERE_SSH_OPTS $HOST -- "nohup /bin/bash $STRATOSPHERE_BIN_DIR/taskmanager.sh stop &" + ssh -n $FLINK_SSH_OPTS $HOST -- "nohup /bin/bash $FLINK_BIN_DIR/taskmanager.sh stop &" fi done < $HOSTLIST diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/stop-local.sh b/flink-dist/src/main/flink-bin/bin/stop-local.sh similarity index 95% rename from stratosphere-dist/src/main/stratosphere-bin/bin/stop-local.sh rename to flink-dist/src/main/flink-bin/bin/stop-local.sh index f1c4d4e47e524..c564bc3441921 100755 --- a/stratosphere-dist/src/main/stratosphere-bin/bin/stop-local.sh +++ b/flink-dist/src/main/flink-bin/bin/stop-local.sh @@ -20,4 +20,4 @@ bin=`cd "$bin"; pwd` . "$bin"/config.sh # stop local job manager (has an internal task manager) -"$STRATOSPHERE_BIN_DIR"/jobmanager.sh stop +"$FLINK_BIN_DIR"/jobmanager.sh stop diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/stop-webclient.sh b/flink-dist/src/main/flink-bin/bin/stop-webclient.sh similarity index 95% rename from stratosphere-dist/src/main/stratosphere-bin/bin/stop-webclient.sh rename to flink-dist/src/main/flink-bin/bin/stop-webclient.sh index a48b8774ca683..0b187fc46a278 100755 --- a/stratosphere-dist/src/main/stratosphere-bin/bin/stop-webclient.sh +++ b/flink-dist/src/main/flink-bin/bin/stop-webclient.sh @@ -19,4 +19,4 @@ bin=`cd "$bin"; pwd` . "$bin"/config.sh -"$STRATOSPHERE_BIN_DIR"/webclient.sh stop +"$FLINK_BIN_DIR"/webclient.sh stop diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/taskmanager.sh b/flink-dist/src/main/flink-bin/bin/taskmanager.sh similarity index 63% rename from stratosphere-dist/src/main/stratosphere-bin/bin/taskmanager.sh rename to flink-dist/src/main/flink-bin/bin/taskmanager.sh index f83a6344fea01..4d2081055a2ed 100755 --- a/stratosphere-dist/src/main/stratosphere-bin/bin/taskmanager.sh +++ b/flink-dist/src/main/flink-bin/bin/taskmanager.sh @@ -21,42 +21,42 @@ bin=`cd "$bin"; pwd` . "$bin"/config.sh -if [ "$STRATOSPHERE_IDENT_STRING" = "" ]; then - STRATOSPHERE_IDENT_STRING="$USER" +if [ "$FLINK_IDENT_STRING" = "" ]; then + FLINK_IDENT_STRING="$USER" fi # auxilliary function to construct a lightweight classpath for the -# Stratosphere TaskManager +# Flink TaskManager constructTaskManagerClassPath() { - for jarfile in "$STRATOSPHERE_LIB_DIR"/*.jar ; do - if [[ $STRATOSPHERE_TM_CLASSPATH = "" ]]; then - STRATOSPHERE_TM_CLASSPATH=$jarfile; + for jarfile in "$FLINK_LIB_DIR"/*.jar ; do + if [[ $FLINK_TM_CLASSPATH = "" ]]; then + FLINK_TM_CLASSPATH=$jarfile; else - STRATOSPHERE_TM_CLASSPATH=$STRATOSPHERE_TM_CLASSPATH:$jarfile + FLINK_TM_CLASSPATH=$FLINK_TM_CLASSPATH:$jarfile fi done - echo $STRATOSPHERE_TM_CLASSPATH + echo $FLINK_TM_CLASSPATH } -STRATOSPHERE_TM_CLASSPATH=`manglePathList "$(constructTaskManagerClassPath)"` +FLINK_TM_CLASSPATH=`manglePathList "$(constructTaskManagerClassPath)"` -log=$STRATOSPHERE_LOG_DIR/stratosphere-$STRATOSPHERE_IDENT_STRING-taskmanager-$HOSTNAME.log -out=$STRATOSPHERE_LOG_DIR/stratosphere-$STRATOSPHERE_IDENT_STRING-taskmanager-$HOSTNAME.out -pid=$STRATOSPHERE_PID_DIR/stratosphere-$STRATOSPHERE_IDENT_STRING-taskmanager.pid -log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$STRATOSPHERE_CONF_DIR"/log4j.properties) +log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-taskmanager-$HOSTNAME.log +out=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-taskmanager-$HOSTNAME.out +pid=$FLINK_PID_DIR/flink-$FLINK_IDENT_STRING-taskmanager.pid +log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties) JVM_ARGS="$JVM_ARGS -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -XX:NewRatio=6" -if [ "$STRATOSPHERE_TM_HEAP" -gt 0 ]; then - JVM_ARGS="$JVM_ARGS -Xms"$STRATOSPHERE_TM_HEAP"m -Xmx"$STRATOSPHERE_TM_HEAP"m" +if [ "$FLINK_TM_HEAP" -gt 0 ]; then + JVM_ARGS="$JVM_ARGS -Xms"$FLINK_TM_HEAP"m -Xmx"$FLINK_TM_HEAP"m" fi case $STARTSTOP in (start) - mkdir -p "$STRATOSPHERE_PID_DIR" + mkdir -p "$FLINK_PID_DIR" if [ -f $pid ]; then if kill -0 `cat $pid` > /dev/null 2>&1; then echo Task manager running as process `cat $pid` on host $HOSTNAME. Stop it first. @@ -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" org.apache.flink.runtime.taskmanager.TaskManager -configDir "$STRATOSPHERE_CONF_DIR" > "$out" 2>&1 < /dev/null & + $JAVA_RUN $JVM_ARGS ${FLINK_ENV_JAVA_OPTS} "${log_setting[@]}" -classpath "$FLINK_TM_CLASSPATH" org.apache.flink.runtime.taskmanager.TaskManager -configDir "$FLINK_CONF_DIR" > "$out" 2>&1 < /dev/null & echo $! > $pid ;; diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/webclient.sh b/flink-dist/src/main/flink-bin/bin/webclient.sh similarity index 52% rename from stratosphere-dist/src/main/stratosphere-bin/bin/webclient.sh rename to flink-dist/src/main/flink-bin/bin/webclient.sh index 3d6688597ab48..5442976e5e6a5 100755 --- a/stratosphere-dist/src/main/stratosphere-bin/bin/webclient.sh +++ b/flink-dist/src/main/flink-bin/bin/webclient.sh @@ -22,64 +22,64 @@ bin=`cd "$bin"; pwd` # get nephele config . "$bin"/config.sh -if [ "$STRATOSPHERE_IDENT_STRING" = "" ]; then - STRATOSPHERE_IDENT_STRING="$USER" +if [ "$FLINK_IDENT_STRING" = "" ]; then + FLINK_IDENT_STRING="$USER" fi -STRATOSPHERE_LIB_CLIENTS_DIR=$STRATOSPHERE_ROOT_DIR/lib_clients +FLINK_LIB_CLIENTS_DIR=$FLINK_ROOT_DIR/lib_clients JVM_ARGS="$JVM_ARGS -Xmx512m" # auxilliary function to construct the classpath for the webclient constructWebclientClassPath() { - for jarfile in "$STRATOSPHERE_LIB_DIR"/*.jar ; do - if [[ $STRATOSPHERE_WEBCLIENT_CLASSPATH = "" ]]; then - STRATOSPHERE_WEBCLIENT_CLASSPATH=$jarfile; + for jarfile in "$FLINK_LIB_DIR"/*.jar ; do + if [[ $FLINK_WEBCLIENT_CLASSPATH = "" ]]; then + FLINK_WEBCLIENT_CLASSPATH=$jarfile; else - STRATOSPHERE_WEBCLIENT_CLASSPATH=$STRATOSPHERE_WEBCLIENT_CLASSPATH:$jarfile + FLINK_WEBCLIENT_CLASSPATH=$FLINK_WEBCLIENT_CLASSPATH:$jarfile fi done - for jarfile in "$STRATOSPHERE_LIB_CLIENTS_DIR"/*.jar ; do - STRATOSPHERE_WEBCLIENT_CLASSPATH=$STRATOSPHERE_WEBCLIENT_CLASSPATH:$jarfile + for jarfile in "$FLINK_LIB_CLIENTS_DIR"/*.jar ; do + FLINK_WEBCLIENT_CLASSPATH=$FLINK_WEBCLIENT_CLASSPATH:$jarfile done - echo $STRATOSPHERE_WEBCLIENT_CLASSPATH + echo $FLINK_WEBCLIENT_CLASSPATH } -STRATOSPHERE_WEBCLIENT_CLASSPATH=`manglePathList "$(constructWebclientClassPath)"` +FLINK_WEBCLIENT_CLASSPATH=`manglePathList "$(constructWebclientClassPath)"` -log=$STRATOSPHERE_LOG_DIR/stratosphere-$STRATOSPHERE_IDENT_STRING-webclient-$HOSTNAME.log -out=$STRATOSPHERE_LOG_DIR/stratosphere-$STRATOSPHERE_IDENT_STRING-webclient-$HOSTNAME.out -pid=$STRATOSPHERE_PID_DIR/stratosphere-$STRATOSPHERE_IDENT_STRING-webclient.pid -log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$STRATOSPHERE_CONF_DIR"/log4j.properties) +log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-webclient-$HOSTNAME.log +out=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-webclient-$HOSTNAME.out +pid=$FLINK_PID_DIR/flink-$FLINK_IDENT_STRING-webclient.pid +log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties) case $STARTSTOP in (start) - mkdir -p "$STRATOSPHERE_PID_DIR" + mkdir -p "$FLINK_PID_DIR" if [ -f $pid ]; then if kill -0 `cat $pid` > /dev/null 2>&1; then - echo Stratosphere webclient running as process `cat $pid`. Stop it first. + echo Flink webclient running as process `cat $pid`. Stop it first. exit 1 fi fi - echo Starting Stratosphere webclient - $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 Starting Flink webclient + $JAVA_RUN $JVM_ARGS "${log_setting[@]}" -classpath "$FLINK_WEBCLIENT_CLASSPATH" org.apache.flink.client.WebFrontend -configDir "$FLINK_CONF_DIR" > "$out" 2>&1 < /dev/null & echo $! > $pid ;; (stop) if [ -f $pid ]; then if kill -0 `cat $pid` > /dev/null 2>&1; then - echo Stopping Stratosphere webclient + echo Stopping Flink webclient kill `cat $pid` else - echo No Stratosphere webclient to stop + echo No Flink webclient to stop fi else - echo No Stratosphere webclient to stop + echo No Flink webclient to stop fi ;; diff --git a/stratosphere-dist/src/main/stratosphere-bin/conf/stratosphere-conf.yaml b/flink-dist/src/main/flink-bin/conf/flink-conf.yaml similarity index 100% rename from stratosphere-dist/src/main/stratosphere-bin/conf/stratosphere-conf.yaml rename to flink-dist/src/main/flink-bin/conf/flink-conf.yaml diff --git a/stratosphere-dist/src/main/stratosphere-bin/conf/log4j.properties b/flink-dist/src/main/flink-bin/conf/log4j.properties similarity index 100% rename from stratosphere-dist/src/main/stratosphere-bin/conf/log4j.properties rename to flink-dist/src/main/flink-bin/conf/log4j.properties diff --git a/stratosphere-dist/src/main/stratosphere-bin/conf/log4jconsole.properties b/flink-dist/src/main/flink-bin/conf/log4jconsole.properties similarity index 100% rename from stratosphere-dist/src/main/stratosphere-bin/conf/log4jconsole.properties rename to flink-dist/src/main/flink-bin/conf/log4jconsole.properties diff --git a/stratosphere-dist/src/main/stratosphere-bin/conf/slaves b/flink-dist/src/main/flink-bin/conf/slaves similarity index 100% rename from stratosphere-dist/src/main/stratosphere-bin/conf/slaves rename to flink-dist/src/main/flink-bin/conf/slaves diff --git a/stratosphere-dist/src/main/stratosphere-bin/tools/planVisualizer.html b/flink-dist/src/main/flink-bin/tools/planVisualizer.html similarity index 100% rename from stratosphere-dist/src/main/stratosphere-bin/tools/planVisualizer.html rename to flink-dist/src/main/flink-bin/tools/planVisualizer.html diff --git a/stratosphere-dist/src/main/stratosphere-bin/yarn-bin/yarn-session.sh b/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh similarity index 71% rename from stratosphere-dist/src/main/stratosphere-bin/yarn-bin/yarn-session.sh rename to flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh index 97d4fada499d7..51d172db566c9 100644 --- a/stratosphere-dist/src/main/stratosphere-bin/yarn-bin/yarn-session.sh +++ b/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh @@ -18,17 +18,17 @@ bin=`dirname "$0"` bin=`cd "$bin"; pwd` -# get stratosphere config +# get Flink config . "$bin"/config.sh -if [ "$STRATOSPHERE_IDENT_STRING" = "" ]; then - STRATOSPHERE_IDENT_STRING="$USER" +if [ "$FLINK_IDENT_STRING" = "" ]; then + FLINK_IDENT_STRING="$USER" fi JVM_ARGS="$JVM_ARGS -Xmx512m" # auxilliary function to construct a lightweight classpath for the -# Stratosphere CLI client +# Flink CLI client constructCLIClientClassPath() { for jarfile in $STRATOSPHERE_LIB_DIR/*.jar ; do @@ -43,11 +43,10 @@ constructCLIClientClassPath() { CC_CLASSPATH=`manglePathList $(constructCLIClientClassPath)` -#log=$STRATOSPHERE_LOG_DIR/stratosphere-$STRATOSPHERE_IDENT_STRING-yarn-session-$HOSTNAME.log -#log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$STRATOSPHERE_CONF_DIR"/log4j.properties" +#log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-yarn-session-$HOSTNAME.log +#log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties" -export STRATOSPHERE_CONF_DIR -# $log_setting +export FLINK_CONF_DIR -$JAVA_RUN $JVM_ARGS -classpath $CC_CLASSPATH eu.stratosphere.yarn.Client -ship $bin/../ship/ -confDir $STRATOSPHERE_CONF_DIR -j $STRATOSPHERE_LIB_DIR/*yarn-uberjar.jar $* +$JAVA_RUN $JVM_ARGS -classpath $CC_CLASSPATH org.apache.flink.yarn.Client -ship $bin/../ship/ -confDir $FLINK_CONF_DIR -j $FLINK_LIB_DIR/*yarn-uberjar.jar $* diff --git a/stratosphere-examples/stratosphere-java-examples/pom.xml b/flink-examples/flink-java-examples/pom.xml similarity index 97% rename from stratosphere-examples/stratosphere-java-examples/pom.xml rename to flink-examples/flink-java-examples/pom.xml index 822120a28547f..26089c8703015 100644 --- a/stratosphere-examples/stratosphere-java-examples/pom.xml +++ b/flink-examples/flink-java-examples/pom.xml @@ -4,20 +4,20 @@ 4.0.0 - eu.stratosphere - stratosphere-examples + org.apache.flink + flink-examples 0.6-SNAPSHOT .. - stratosphere-java-examples - stratosphere-java-examples + flink-java-examples + flink-java-examples jar - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java ${project.version} diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/clustering/KMeans.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/clustering/KMeans.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/clustering/KMeans.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/clustering/KMeans.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/clustering/util/KMeansData.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/clustering/util/KMeansData.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/clustering/util/KMeansData.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/clustering/util/KMeansData.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/clustering/util/KMeansDataGenerator.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/clustering/util/KMeansDataGenerator.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/clustering/util/KMeansDataGenerator.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/clustering/util/KMeansDataGenerator.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/ConnectedComponents.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/ConnectedComponents.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/ConnectedComponents.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/ConnectedComponents.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/EnumTrianglesBasic.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/EnumTrianglesBasic.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/EnumTrianglesBasic.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/EnumTrianglesBasic.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/EnumTrianglesOpt.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/EnumTrianglesOpt.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/EnumTrianglesOpt.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/EnumTrianglesOpt.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/PageRankBasic.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/PageRankBasic.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/PageRankBasic.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/PageRankBasic.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/TransitiveClosureNaive.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/TransitiveClosureNaive.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/TransitiveClosureNaive.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/TransitiveClosureNaive.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/util/ConnectedComponentsData.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/util/ConnectedComponentsData.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/util/ConnectedComponentsData.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/util/ConnectedComponentsData.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/util/EnumTrianglesData.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/util/EnumTrianglesData.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/util/EnumTrianglesData.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/util/EnumTrianglesData.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/util/EnumTrianglesDataTypes.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/util/EnumTrianglesDataTypes.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/util/EnumTrianglesDataTypes.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/util/EnumTrianglesDataTypes.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/util/PageRankData.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/util/PageRankData.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/graph/util/PageRankData.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/graph/util/PageRankData.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/ml/LinearRegression.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/ml/LinearRegression.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/ml/LinearRegression.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/ml/LinearRegression.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/ml/util/LinearRegressionData.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/ml/util/LinearRegressionData.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/ml/util/LinearRegressionData.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/ml/util/LinearRegressionData.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/ml/util/LinearRegressionDataGenerator.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/ml/util/LinearRegressionDataGenerator.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/ml/util/LinearRegressionDataGenerator.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/ml/util/LinearRegressionDataGenerator.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/relational/RelationalQuery.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/relational/RelationalQuery.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/relational/RelationalQuery.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/relational/RelationalQuery.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/relational/TPCHQuery10.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/relational/TPCHQuery10.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/relational/TPCHQuery10.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/relational/TPCHQuery10.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/relational/TPCHQuery3.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/relational/TPCHQuery3.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/relational/TPCHQuery3.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/relational/TPCHQuery3.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/relational/WebLogAnalysis.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/relational/WebLogAnalysis.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/relational/WebLogAnalysis.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/relational/WebLogAnalysis.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/relational/util/WebLogData.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/relational/util/WebLogData.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/relational/util/WebLogData.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/relational/util/WebLogData.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/relational/util/WebLogDataGenerator.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/relational/util/WebLogDataGenerator.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/relational/util/WebLogDataGenerator.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/relational/util/WebLogDataGenerator.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/wordcount/WordCount.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/wordcount/WordCount.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/wordcount/WordCount.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/wordcount/WordCount.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/wordcount/WordCountPOJO.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/wordcount/WordCountPOJO.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/wordcount/WordCountPOJO.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/wordcount/WordCountPOJO.java diff --git a/stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/wordcount/util/WordCountData.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/wordcount/util/WordCountData.java similarity index 100% rename from stratosphere-examples/stratosphere-java-examples/src/main/java/org/apache/flink/example/java/wordcount/util/WordCountData.java rename to flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java/wordcount/util/WordCountData.java diff --git a/stratosphere-examples/stratosphere-scala-examples/pom.xml b/flink-examples/flink-scala-examples/pom.xml similarity index 97% rename from stratosphere-examples/stratosphere-scala-examples/pom.xml rename to flink-examples/flink-scala-examples/pom.xml index d3bfd770ed811..9270867f85aac 100644 --- a/stratosphere-examples/stratosphere-scala-examples/pom.xml +++ b/flink-examples/flink-scala-examples/pom.xml @@ -4,20 +4,20 @@ 4.0.0 - eu.stratosphere - stratosphere-examples + org.apache.flink + flink-examples 0.6-SNAPSHOT .. - stratosphere-scala-examples - stratosphere-scala-examples + flink-scala-examples + flink-scala-examples jar - eu.stratosphere - stratosphere-scala + org.apache.flink + flink-scala ${project.version} diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/java/org/apache/flink/examples/scala/Dummy.java b/flink-examples/flink-scala-examples/src/main/java/org/apache/flink/examples/scala/Dummy.java similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/java/org/apache/flink/examples/scala/Dummy.java rename to flink-examples/flink-scala-examples/src/main/java/org/apache/flink/examples/scala/Dummy.java diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/datamining/BatchGradientDescent.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/datamining/BatchGradientDescent.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/datamining/BatchGradientDescent.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/datamining/BatchGradientDescent.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/datamining/KMeans.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/datamining/KMeans.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/datamining/KMeans.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/datamining/KMeans.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/ComputeEdgeDegrees.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/ComputeEdgeDegrees.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/ComputeEdgeDegrees.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/ComputeEdgeDegrees.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/ConnectedComponents.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/ConnectedComponents.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/ConnectedComponents.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/ConnectedComponents.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/EnumTrianglesOnEdgesWithDegrees.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/EnumTrianglesOnEdgesWithDegrees.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/EnumTrianglesOnEdgesWithDegrees.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/EnumTrianglesOnEdgesWithDegrees.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/LineRank.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/LineRank.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/LineRank.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/LineRank.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/PageRank.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/PageRank.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/PageRank.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/PageRank.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/PageRankWithWeight.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/PageRankWithWeight.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/PageRankWithWeight.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/PageRankWithWeight.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/TransitiveClosureNaive.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/TransitiveClosureNaive.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/TransitiveClosureNaive.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/graph/TransitiveClosureNaive.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/iterative/TerminationCriterion.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/iterative/TerminationCriterion.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/iterative/TerminationCriterion.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/iterative/TerminationCriterion.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/RelationalQuery.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/RelationalQuery.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/RelationalQuery.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/RelationalQuery.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/WebLogAnalysis.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/WebLogAnalysis.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/WebLogAnalysis.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/WebLogAnalysis.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/testing/KMeansForTest.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/testing/KMeansForTest.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/testing/KMeansForTest.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/testing/KMeansForTest.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCount.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCount.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCount.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCount.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCountWithCount.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCountWithCount.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCountWithCount.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCountWithCount.scala diff --git a/stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCountWithUserDefinedType.scala b/flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCountWithUserDefinedType.scala similarity index 100% rename from stratosphere-examples/stratosphere-scala-examples/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCountWithUserDefinedType.scala rename to flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCountWithUserDefinedType.scala diff --git a/stratosphere-examples/pom.xml b/flink-examples/pom.xml similarity index 59% rename from stratosphere-examples/pom.xml rename to flink-examples/pom.xml index 8e21c38922852..1440617f2251e 100644 --- a/stratosphere-examples/pom.xml +++ b/flink-examples/pom.xml @@ -4,33 +4,33 @@ 4.0.0 - eu.stratosphere - stratosphere + org.apache.flink + flink-parent 0.6-SNAPSHOT .. - stratosphere-examples - stratosphere-examples + flink-examples + flink-examples pom - eu.stratosphere - stratosphere-core + org.apache.flink + flink-core ${project.version} - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients ${project.version} - stratosphere-java-examples - stratosphere-scala-examples + flink-java-examples + flink-scala-examples diff --git a/stratosphere-java/pom.xml b/flink-java/pom.xml similarity index 73% rename from stratosphere-java/pom.xml rename to flink-java/pom.xml index 677f23408c27f..90de8e4be9de5 100644 --- a/stratosphere-java/pom.xml +++ b/flink-java/pom.xml @@ -5,26 +5,26 @@ 4.0.0 - eu.stratosphere - stratosphere + org.apache.flink + flink-parent 0.6-SNAPSHOT .. - stratosphere-java - stratosphere-java + flink-java + flink-java jar - eu.stratosphere - stratosphere-core + org.apache.flink + flink-core ${project.version} - eu.stratosphere - stratosphere-core + org.apache.flink + flink-core ${project.version} test-jar test diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/BulkIterationResultSet.java b/flink-java/src/main/java/org/apache/flink/api/java/BulkIterationResultSet.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/BulkIterationResultSet.java rename to flink-java/src/main/java/org/apache/flink/api/java/BulkIterationResultSet.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/DataSet.java b/flink-java/src/main/java/org/apache/flink/api/java/DataSet.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/DataSet.java rename to flink-java/src/main/java/org/apache/flink/api/java/DataSet.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/DeltaIteration.java b/flink-java/src/main/java/org/apache/flink/api/java/DeltaIteration.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/DeltaIteration.java rename to flink-java/src/main/java/org/apache/flink/api/java/DeltaIteration.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/DeltaIterationResultSet.java b/flink-java/src/main/java/org/apache/flink/api/java/DeltaIterationResultSet.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/DeltaIterationResultSet.java rename to flink-java/src/main/java/org/apache/flink/api/java/DeltaIterationResultSet.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java b/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java rename to flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/IterativeDataSet.java b/flink-java/src/main/java/org/apache/flink/api/java/IterativeDataSet.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/IterativeDataSet.java rename to flink-java/src/main/java/org/apache/flink/api/java/IterativeDataSet.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java b/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java rename to flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/RemoteEnvironment.java b/flink-java/src/main/java/org/apache/flink/api/java/RemoteEnvironment.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/RemoteEnvironment.java rename to flink-java/src/main/java/org/apache/flink/api/java/RemoteEnvironment.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunctionFactory.java b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunctionFactory.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunctionFactory.java rename to flink-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunctionFactory.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/Aggregations.java b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/Aggregations.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/Aggregations.java rename to flink-java/src/main/java/org/apache/flink/api/java/aggregation/Aggregations.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/AvgAggregationFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/AvgAggregationFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/AvgAggregationFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/aggregation/AvgAggregationFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/MaxAggregationFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/MaxAggregationFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/MaxAggregationFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/aggregation/MaxAggregationFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/MinAggregationFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/MinAggregationFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/MinAggregationFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/aggregation/MinAggregationFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/SumAggregationFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/SumAggregationFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/SumAggregationFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/aggregation/SumAggregationFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/UnsupportedAggregationTypeException.java b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/UnsupportedAggregationTypeException.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/aggregation/UnsupportedAggregationTypeException.java rename to flink-java/src/main/java/org/apache/flink/api/java/aggregation/UnsupportedAggregationTypeException.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/functions/CoGroupFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/CoGroupFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/functions/CoGroupFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/functions/CoGroupFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/functions/CrossFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/CrossFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/functions/CrossFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/functions/CrossFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/functions/FilterFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/FilterFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/functions/FilterFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/functions/FilterFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/functions/FlatMapFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/FlatMapFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/functions/FlatMapFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/functions/FlatMapFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/functions/FlatMapIterator.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/FlatMapIterator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/functions/FlatMapIterator.java rename to flink-java/src/main/java/org/apache/flink/api/java/functions/FlatMapIterator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/functions/FunctionAnnotation.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/FunctionAnnotation.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/functions/FunctionAnnotation.java rename to flink-java/src/main/java/org/apache/flink/api/java/functions/FunctionAnnotation.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/functions/GroupReduceFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/GroupReduceFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/functions/GroupReduceFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/functions/GroupReduceFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/functions/GroupReduceIterator.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/GroupReduceIterator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/functions/GroupReduceIterator.java rename to flink-java/src/main/java/org/apache/flink/api/java/functions/GroupReduceIterator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/functions/InvalidTypesException.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/InvalidTypesException.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/functions/InvalidTypesException.java rename to flink-java/src/main/java/org/apache/flink/api/java/functions/InvalidTypesException.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/functions/JoinFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/JoinFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/functions/JoinFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/functions/JoinFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/functions/KeySelector.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/KeySelector.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/functions/KeySelector.java rename to flink-java/src/main/java/org/apache/flink/api/java/functions/KeySelector.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/functions/MapFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/MapFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/functions/MapFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/functions/MapFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/functions/ReduceFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/ReduceFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/functions/ReduceFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/functions/ReduceFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/functions/SemanticPropUtil.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/SemanticPropUtil.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/functions/SemanticPropUtil.java rename to flink-java/src/main/java/org/apache/flink/api/java/functions/SemanticPropUtil.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/io/CollectionInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/CollectionInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/io/CollectionInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/io/CollectionInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/io/CsvInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/CsvInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/io/CsvInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/io/CsvInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/io/CsvReader.java b/flink-java/src/main/java/org/apache/flink/api/java/io/CsvReader.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/io/CsvReader.java rename to flink-java/src/main/java/org/apache/flink/api/java/io/CsvReader.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/io/DiscardingOuputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/DiscardingOuputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/io/DiscardingOuputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/io/DiscardingOuputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/io/DiscardingOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/DiscardingOutputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/io/DiscardingOutputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/io/DiscardingOutputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/io/IteratorInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/IteratorInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/io/IteratorInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/io/IteratorInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/io/LocalCollectionOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/LocalCollectionOutputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/io/LocalCollectionOutputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/io/LocalCollectionOutputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/io/ParallelIteratorInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/ParallelIteratorInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/io/ParallelIteratorInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/io/ParallelIteratorInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/io/PrintingOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/PrintingOutputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/io/PrintingOutputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/io/PrintingOutputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/io/TextInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/TextInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/io/TextInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/io/TextInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/io/TextOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/TextOutputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/io/TextOutputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/io/TextOutputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/AggregateOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/AggregateOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/AggregateOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/AggregateOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/CoGroupOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/CoGroupOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/CoGroupOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/CoGroupOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/CustomUnaryOperation.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/CustomUnaryOperation.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/CustomUnaryOperation.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/CustomUnaryOperation.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/DataSink.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/DataSink.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/DataSink.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/DataSink.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/DataSource.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/DataSource.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/DataSource.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/DataSource.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/DistinctOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/DistinctOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/DistinctOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/DistinctOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/FilterOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/FilterOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/FilterOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/FilterOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/FlatMapOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/FlatMapOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/FlatMapOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/FlatMapOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/Grouping.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/Grouping.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/Grouping.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/Grouping.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/JoinOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/JoinOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/JoinOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/JoinOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/Keys.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/Keys.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/Keys.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/Keys.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/MapOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/MapOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/MapOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/MapOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/Operator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/Operator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/Operator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/Operator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/OperatorTranslation.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/OperatorTranslation.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/OperatorTranslation.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/OperatorTranslation.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/ProjectOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/ProjectOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/ProjectOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/ProjectOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/ReduceGroupOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/ReduceGroupOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/ReduceGroupOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/ReduceGroupOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/ReduceOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/ReduceOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/ReduceOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/ReduceOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/SingleInputOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/SingleInputOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/SingleInputOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/SingleInputOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/SingleInputUdfOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/SingleInputUdfOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/SingleInputUdfOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/SingleInputUdfOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/SortedGrouping.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/SortedGrouping.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/SortedGrouping.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/SortedGrouping.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/TwoInputOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/TwoInputOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/TwoInputOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/TwoInputOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/TwoInputUdfOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/TwoInputUdfOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/TwoInputUdfOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/TwoInputUdfOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/UdfOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/UdfOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/UdfOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/UdfOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/UnionOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/UnionOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/UnionOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/UnionOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/UnsortedGrouping.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/UnsortedGrouping.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/UnsortedGrouping.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/UnsortedGrouping.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/JavaPlan.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/JavaPlan.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/JavaPlan.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/translation/JavaPlan.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyExtractingMapper.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyExtractingMapper.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyExtractingMapper.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyExtractingMapper.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyRemovingMapper.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyRemovingMapper.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyRemovingMapper.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyRemovingMapper.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanProjectOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanProjectOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanProjectOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanProjectOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingCoGroupOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingCoGroupOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingCoGroupOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingCoGroupOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingJoinOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingJoinOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingJoinOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingJoinOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceGroupOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceGroupOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceGroupOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceGroupOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleKeyExtractingMapper.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleKeyExtractingMapper.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleKeyExtractingMapper.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleKeyExtractingMapper.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleUnwrappingIterator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleUnwrappingIterator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleUnwrappingIterator.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleUnwrappingIterator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleWrappingCollector.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleWrappingCollector.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleWrappingCollector.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleWrappingCollector.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/WrappingFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/WrappingFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/operators/translation/WrappingFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/operators/translation/WrappingFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/functions/CoGroupFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/record/functions/CoGroupFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/functions/CoGroupFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/functions/CoGroupFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/functions/CrossFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/record/functions/CrossFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/functions/CrossFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/functions/CrossFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/functions/FunctionAnnotation.java b/flink-java/src/main/java/org/apache/flink/api/java/record/functions/FunctionAnnotation.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/functions/FunctionAnnotation.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/functions/FunctionAnnotation.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/functions/JoinFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/record/functions/JoinFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/functions/JoinFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/functions/JoinFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/functions/MapFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/record/functions/MapFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/functions/MapFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/functions/MapFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/functions/ReduceFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/record/functions/ReduceFunction.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/functions/ReduceFunction.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/functions/ReduceFunction.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/CollectionInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/CollectionInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/CollectionInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/io/CollectionInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/CsvInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/CsvInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/CsvInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/io/CsvInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/CsvOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/CsvOutputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/CsvOutputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/io/CsvOutputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/DelimitedInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/DelimitedInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/DelimitedInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/io/DelimitedInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/DelimitedOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/DelimitedOutputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/DelimitedOutputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/io/DelimitedOutputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputSplit.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputSplit.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputSplit.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputSplit.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/FileInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/FileInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/FileInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/io/FileInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/FileOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/FileOutputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/FileOutputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/io/FileOutputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/FixedLengthInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/FixedLengthInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/FixedLengthInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/io/FixedLengthInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/GenericInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/GenericInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/GenericInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/io/GenericInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/TextInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/TextInputFormat.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/io/TextInputFormat.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/io/TextInputFormat.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/BulkIteration.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/BulkIteration.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/BulkIteration.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/BulkIteration.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/CoGroupOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/CoGroupOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/CoGroupOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/CoGroupOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/CollectionDataSource.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/CollectionDataSource.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/CollectionDataSource.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/CollectionDataSource.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/CrossOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/CrossOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/CrossOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/CrossOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/CrossWithLargeOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/CrossWithLargeOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/CrossWithLargeOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/CrossWithLargeOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/CrossWithSmallOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/CrossWithSmallOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/CrossWithSmallOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/CrossWithSmallOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/DeltaIteration.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/DeltaIteration.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/DeltaIteration.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/DeltaIteration.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/FileDataSink.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/FileDataSink.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/FileDataSink.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/FileDataSink.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/FileDataSource.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/FileDataSource.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/FileDataSource.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/FileDataSource.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/GenericDataSink.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/GenericDataSink.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/GenericDataSink.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/GenericDataSink.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/GenericDataSource.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/GenericDataSource.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/GenericDataSource.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/GenericDataSource.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/JoinOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/JoinOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/JoinOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/JoinOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/MapOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/MapOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/MapOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/MapOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/OperatorInfoHelper.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/OperatorInfoHelper.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/OperatorInfoHelper.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/OperatorInfoHelper.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/ReduceOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/record/operators/ReduceOperator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/record/operators/ReduceOperator.java rename to flink-java/src/main/java/org/apache/flink/api/java/record/operators/ReduceOperator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple1.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple1.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple1.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple1.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple10.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple10.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple10.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple10.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple11.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple11.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple11.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple11.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple12.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple12.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple12.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple12.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple13.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple13.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple13.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple13.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple14.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple14.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple14.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple14.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple15.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple15.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple15.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple15.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple16.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple16.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple16.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple16.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple17.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple17.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple17.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple17.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple18.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple18.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple18.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple18.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple19.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple19.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple19.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple19.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple2.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple2.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple2.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple2.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple20.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple20.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple20.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple20.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple21.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple21.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple21.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple21.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple22.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple22.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple22.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple22.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple23.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple23.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple23.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple23.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple24.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple24.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple24.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple24.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple25.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple25.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple25.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple25.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple3.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple3.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple3.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple3.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple4.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple4.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple4.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple4.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple5.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple5.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple5.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple5.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple6.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple6.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple6.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple6.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple7.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple7.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple7.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple7.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple8.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple8.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple8.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple8.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple9.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple9.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/Tuple9.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple9.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/TupleGenerator.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/TupleGenerator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/TupleGenerator.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/TupleGenerator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple10Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple10Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple10Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple10Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple11Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple11Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple11Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple11Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple12Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple12Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple12Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple12Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple13Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple13Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple13Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple13Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple14Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple14Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple14Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple14Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple15Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple15Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple15Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple15Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple16Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple16Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple16Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple16Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple17Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple17Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple17Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple17Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple18Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple18Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple18Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple18Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple19Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple19Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple19Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple19Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple1Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple1Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple1Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple1Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple20Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple20Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple20Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple20Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple21Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple21Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple21Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple21Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple22Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple22Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple22Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple22Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple23Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple23Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple23Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple23Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple24Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple24Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple24Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple24Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple25Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple25Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple25Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple25Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple2Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple2Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple2Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple2Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple3Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple3Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple3Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple3Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple4Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple4Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple4Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple4Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple5Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple5Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple5Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple5Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple6Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple6Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple6Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple6Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple7Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple7Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple7Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple7Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple8Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple8Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple8Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple8Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple9Builder.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple9Builder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple9Builder.java rename to flink-java/src/main/java/org/apache/flink/api/java/tuple/builder/Tuple9Builder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/AtomicType.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/AtomicType.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/AtomicType.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/AtomicType.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/BasicArrayTypeInfo.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/BasicArrayTypeInfo.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/BasicArrayTypeInfo.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/BasicArrayTypeInfo.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/BasicTypeInfo.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/BasicTypeInfo.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/BasicTypeInfo.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/BasicTypeInfo.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/CompositeType.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/CompositeType.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/CompositeType.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/CompositeType.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/GenericTypeInfo.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/GenericTypeInfo.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/GenericTypeInfo.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/GenericTypeInfo.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/InputTypeConfigurable.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/InputTypeConfigurable.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/InputTypeConfigurable.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/InputTypeConfigurable.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/PojoField.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/PojoField.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/PojoField.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/PojoField.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/PojoTypeInfo.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/PojoTypeInfo.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/PojoTypeInfo.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/PojoTypeInfo.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/PrimitiveArrayTypeInfo.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/PrimitiveArrayTypeInfo.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/PrimitiveArrayTypeInfo.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/PrimitiveArrayTypeInfo.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/RecordTypeInfo.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/RecordTypeInfo.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/RecordTypeInfo.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/RecordTypeInfo.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/ResultTypeQueryable.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ResultTypeQueryable.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/ResultTypeQueryable.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/ResultTypeQueryable.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/TupleTypeInfo.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/TupleTypeInfo.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/TupleTypeInfo.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/TupleTypeInfo.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/TypeInfoParser.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/TypeInfoParser.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/TypeInfoParser.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/TypeInfoParser.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/WritableTypeInfo.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/WritableTypeInfo.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/WritableTypeInfo.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/WritableTypeInfo.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/AvroSerializer.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/AvroSerializer.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/AvroSerializer.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/AvroSerializer.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparator.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparator.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueSerializer.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueSerializer.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueSerializer.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueSerializer.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputDecoder.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputDecoder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputDecoder.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputDecoder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputEncoder.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputEncoder.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputEncoder.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputEncoder.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericArraySerializer.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericArraySerializer.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericArraySerializer.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericArraySerializer.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparator.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparator.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoPairComparator.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoPairComparator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoPairComparator.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoPairComparator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializer.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializer.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializer.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializer.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeComparatorFactory.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeComparatorFactory.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeComparatorFactory.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeComparatorFactory.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimePairComparatorFactory.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimePairComparatorFactory.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimePairComparatorFactory.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimePairComparatorFactory.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeStatefulSerializerFactory.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeStatefulSerializerFactory.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeStatefulSerializerFactory.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeStatefulSerializerFactory.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeStatelessSerializerFactory.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeStatelessSerializerFactory.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeStatelessSerializerFactory.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeStatelessSerializerFactory.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparator.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparator.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldComparator.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldComparator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldComparator.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldComparator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldPairComparator.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldPairComparator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldPairComparator.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldPairComparator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TuplePairComparator.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TuplePairComparator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TuplePairComparator.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TuplePairComparator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializer.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializer.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializer.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializer.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueComparator.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueComparator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueComparator.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueComparator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializer.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializer.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializer.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializer.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableComparator.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableComparator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableComparator.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableComparator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializer.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializer.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializer.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializer.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordComparator.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordComparator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordComparator.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordComparator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordComparatorFactory.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordComparatorFactory.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordComparatorFactory.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordComparatorFactory.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordPairComparator.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordPairComparator.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordPairComparator.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordPairComparator.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordPairComparatorFactory.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordPairComparatorFactory.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordPairComparatorFactory.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordPairComparatorFactory.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordSerializer.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordSerializer.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordSerializer.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordSerializer.java diff --git a/stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordSerializerFactory.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordSerializerFactory.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordSerializerFactory.java rename to flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/record/RecordSerializerFactory.java diff --git a/stratosphere-java/src/main/java/org/apache/hadoop/io/Writable.java b/flink-java/src/main/java/org/apache/hadoop/io/Writable.java similarity index 100% rename from stratosphere-java/src/main/java/org/apache/hadoop/io/Writable.java rename to flink-java/src/main/java/org/apache/hadoop/io/Writable.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/MultipleInvokationsTest.java b/flink-java/src/test/java/org/apache/flink/api/java/MultipleInvokationsTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/MultipleInvokationsTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/MultipleInvokationsTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java b/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesProjectionTest.java b/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesProjectionTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesProjectionTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesProjectionTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesTranslationTest.java b/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesTranslationTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesTranslationTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesTranslationTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/io/CSVReaderTest.java b/flink-java/src/test/java/org/apache/flink/api/java/io/CSVReaderTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/io/CSVReaderTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/io/CSVReaderTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/io/CollectionInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/io/CollectionInputFormatTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/io/CollectionInputFormatTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/io/CollectionInputFormatTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/io/TextInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/io/TextInputFormatTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/io/TextInputFormatTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/io/TextInputFormatTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/operator/AggregateOperatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operator/AggregateOperatorTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/operator/AggregateOperatorTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/operator/AggregateOperatorTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/operator/CoGroupOperatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operator/CoGroupOperatorTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/operator/CoGroupOperatorTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/operator/CoGroupOperatorTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/operator/CrossOperatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operator/CrossOperatorTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/operator/CrossOperatorTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/operator/CrossOperatorTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/operator/DistinctOperatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operator/DistinctOperatorTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/operator/DistinctOperatorTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/operator/DistinctOperatorTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/operator/GroupingTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operator/GroupingTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/operator/GroupingTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/operator/GroupingTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/operator/JoinOperatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operator/JoinOperatorTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/operator/JoinOperatorTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/operator/JoinOperatorTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/operator/ProjectionOperatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operator/ProjectionOperatorTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/operator/ProjectionOperatorTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/operator/ProjectionOperatorTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/operators/translation/AggregateTranslationTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operators/translation/AggregateTranslationTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/operators/translation/AggregateTranslationTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/operators/translation/AggregateTranslationTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/operators/translation/DeltaIterationTranslationTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operators/translation/DeltaIterationTranslationTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/operators/translation/DeltaIterationTranslationTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/operators/translation/DeltaIterationTranslationTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/operators/translation/ReduceTranslationTests.java b/flink-java/src/test/java/org/apache/flink/api/java/operators/translation/ReduceTranslationTests.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/operators/translation/ReduceTranslationTests.java rename to flink-java/src/test/java/org/apache/flink/api/java/operators/translation/ReduceTranslationTests.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/record/io/CsvOutputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvOutputFormatTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/record/io/CsvOutputFormatTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvOutputFormatTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormatTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormatTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormatTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormatTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormatTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormatTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/record/io/FixedLenghtInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/record/io/FixedLenghtInputFormatTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/record/io/FixedLenghtInputFormatTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/record/io/FixedLenghtInputFormatTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/record/io/TextInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/record/io/TextInputFormatTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/record/io/TextInputFormatTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/record/io/TextInputFormatTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/tuple/Tuple2Test.java b/flink-java/src/test/java/org/apache/flink/api/java/tuple/Tuple2Test.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/tuple/Tuple2Test.java rename to flink-java/src/test/java/org/apache/flink/api/java/tuple/Tuple2Test.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/type/extractor/PojoTypeInformationTest.java b/flink-java/src/test/java/org/apache/flink/api/java/type/extractor/PojoTypeInformationTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/type/extractor/PojoTypeInformationTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/type/extractor/PojoTypeInformationTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/type/extractor/TypeExtractorInputFormatsTest.java b/flink-java/src/test/java/org/apache/flink/api/java/type/extractor/TypeExtractorInputFormatsTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/type/extractor/TypeExtractorInputFormatsTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/type/extractor/TypeExtractorInputFormatsTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/type/extractor/TypeExtractorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/type/extractor/TypeExtractorTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/type/extractor/TypeExtractorTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/type/extractor/TypeExtractorTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparatorTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparatorTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparatorTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericArraySerializerTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericArraySerializerTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericArraySerializerTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericArraySerializerTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparatorTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparatorTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparatorTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeSerializerTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeSerializerTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeSerializerTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeSerializerTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/StringArrayWritable.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/StringArrayWritable.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/StringArrayWritable.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/StringArrayWritable.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD2Test.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD2Test.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD2Test.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD2Test.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD3Test.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD3Test.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD3Test.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD3Test.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDC3Test.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDC3Test.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDC3Test.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDC3Test.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDX1Test.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDX1Test.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDX1Test.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDX1Test.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDXC2Test.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDXC2Test.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDXC2Test.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDXC2Test.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD1Test.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD1Test.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD1Test.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD1Test.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD2Test.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD2Test.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD2Test.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD2Test.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD3Test.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD3Test.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD3Test.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD3Test.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldComparatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldComparatorTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldComparatorTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldComparatorTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldPairComparatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldPairComparatorTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldPairComparatorTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleLeadingFieldPairComparatorTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TuplePairComparatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TuplePairComparatorTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TuplePairComparatorTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TuplePairComparatorTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerTestInstance.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerTestInstance.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerTestInstance.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerTestInstance.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueComparatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueComparatorTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueComparatorTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueComparatorTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableComparatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableComparatorTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableComparatorTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableComparatorTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializerTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializerTest.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializerTest.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializerTest.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/tuple/base/TupleComparatorTestBase.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/tuple/base/TupleComparatorTestBase.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/tuple/base/TupleComparatorTestBase.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/tuple/base/TupleComparatorTestBase.java diff --git a/stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/tuple/base/TuplePairComparatorTestBase.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/tuple/base/TuplePairComparatorTestBase.java similarity index 100% rename from stratosphere-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/tuple/base/TuplePairComparatorTestBase.java rename to flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/tuple/base/TuplePairComparatorTestBase.java diff --git a/flink-quickstart/README.md b/flink-quickstart/README.md new file mode 100644 index 0000000000000..9ba0b16f40235 --- /dev/null +++ b/flink-quickstart/README.md @@ -0,0 +1,27 @@ +flink-quickstart +======================= + +Two simple quickstart maven archetypes for Flink. + +When you import the scala project into eclipse you will also need the following plugins: + +Eclipse 4.x: + * scala-ide: http://download.scala-ide.org/sdk/e38/scala210/stable/site + * m2eclipse-scala: http://alchim31.free.fr/m2e-scala/update-site + * build-helper-maven-plugin: https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.15.0/N/0.15.0.201206251206/ + +Eclipse 3.7: + * scala-ide: http://download.scala-ide.org/sdk/e37/scala210/stable/site + * m2eclipse-scala: http://alchim31.free.fr/m2e-scala/update-site + * build-helper-maven-plugin: https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.14.0/N/0.14.0.201109282148/ + + +# Repository Organization + +The quickstart bash scripts do not necessarily point to the most recent version in the code. Since the archetypes are versioned, the quickstarts usually differ by pointing to a specific version. + +The `quickstart.sh` script always points to the current stable release (v0.4, v0.5) +`-SNAPSHOT` points to the current snapshot version. + + +(Use `-DarchetypeCatalog=local` for local testing during archetype development) diff --git a/stratosphere-quickstart/pom.xml b/flink-quickstart/pom.xml similarity index 75% rename from stratosphere-quickstart/pom.xml rename to flink-quickstart/pom.xml index ad90ab5f302de..c5fd844a8b489 100644 --- a/stratosphere-quickstart/pom.xml +++ b/flink-quickstart/pom.xml @@ -3,42 +3,18 @@ 4.0.0 - eu.stratosphere - stratosphere + org.apache.flink + flink-parent 0.6-SNAPSHOT .. - stratosphere-quickstart + flink-quickstart pom - stratosphere-quickstart - http://github.com/stratosphere/stratosphere - Parent project for different quickstart archetypes for Stratosphere.eu - 2013 + flink-quickstart + Parent project for different quickstart archetypes for Apache Flink - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - stratosphere - - - - - https://github.com/stratosphere/stratosphere - scm:git:git@github.com:stratosphere/stratosphere.git - scm:git:git@github.com:stratosphere/stratosphere.git - - - - - stratosphere-team - The Stratosphere Team - stratosphere-dev@googlegroups.com - - - diff --git a/flink-quickstart/quickstart-SNAPSHOT.sh b/flink-quickstart/quickstart-SNAPSHOT.sh new file mode 100755 index 0000000000000..870158ec1b885 --- /dev/null +++ b/flink-quickstart/quickstart-SNAPSHOT.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +######################################################################################################################## +# +# Copyright (C) 2010-2013 by the Apache Flink project (http://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 +# +# 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=quickstart + +mvn archetype:generate \ + -DarchetypeGroupId=org.apache.flink \ + -DarchetypeArtifactId=quickstart-java \ + -DarchetypeVersion=0.6-SNAPSHOT \ + -DgroupId=org.apache.flink \ + -DartifactId=$PACKAGE \ + -Dversion=0.1 \ + -Dpackage=org.apache.flink \ + -DinteractiveMode=false \ + -DarchetypeCatalog=https://oss.sonatype.org/content/repositories/snapshots/ + +# +# Give some guidance +# +echo -e "\\n\\n" +echo -e "\\tA sample quickstart Flink Job has been created." +echo -e "\\tSwitch into the directory using" +echo -e "\\t\\t cd $PACKAGE" +echo -e "\\tImport the project there using your favorite IDE (Import it as a maven project)" +echo -e "\\tBuild a jar inside the directory using" +echo -e "\\t\\t mvn clean package" +echo -e "\\tYou will find the runnable jar in $PACKAGE/target" +echo -e "\\n\\n" + + +# Use this command if you want to specify the coordinates of your generated artifact +# in an interactive menu: +# +#mvn archetype:generate \ +# -DarchetypeGroupId=org.apache.flink \ +# -DarchetypeArtifactId=quickstart-java \ +# -DarchetypeVersion=0.6-SNAPSHOT \ +# -DarchetypeCatalog=https://oss.sonatype.org/content/repositories/snapshots/ diff --git a/stratosphere-quickstart/quickstart-java/pom.xml b/flink-quickstart/quickstart-java/pom.xml similarity index 85% rename from stratosphere-quickstart/quickstart-java/pom.xml rename to flink-quickstart/quickstart-java/pom.xml index 31e448de8498b..930d2626ccc9b 100644 --- a/stratosphere-quickstart/quickstart-java/pom.xml +++ b/flink-quickstart/quickstart-java/pom.xml @@ -7,8 +7,8 @@ - eu.stratosphere - stratosphere-quickstart + org.apache.flink + flink-quickstart 0.6-SNAPSHOT .. diff --git a/stratosphere-quickstart/quickstart-java/src/main/java/eu/stratosphere/quickstart/Dummy.java b/flink-quickstart/quickstart-java/src/main/java/org/apache/flink/quickstart/Dummy.java similarity index 96% rename from stratosphere-quickstart/quickstart-java/src/main/java/eu/stratosphere/quickstart/Dummy.java rename to flink-quickstart/quickstart-java/src/main/java/org/apache/flink/quickstart/Dummy.java index 9cc0fdb5284be..7bd15575ba17c 100644 --- a/stratosphere-quickstart/quickstart-java/src/main/java/eu/stratosphere/quickstart/Dummy.java +++ b/flink-quickstart/quickstart-java/src/main/java/org/apache/flink/quickstart/Dummy.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. **********************************************************************************************************************/ -package eu.stratosphere.quickstart; +package org.apache.flink.quickstart; /** * This class solely exists to generate diff --git a/stratosphere-quickstart/quickstart-java/src/main/resources/META-INF/maven/archetype.xml b/flink-quickstart/quickstart-java/src/main/resources/META-INF/maven/archetype.xml similarity index 92% rename from stratosphere-quickstart/quickstart-java/src/main/resources/META-INF/maven/archetype.xml rename to flink-quickstart/quickstart-java/src/main/resources/META-INF/maven/archetype.xml index 0e150fcecf829..221c775c95920 100644 --- a/stratosphere-quickstart/quickstart-java/src/main/resources/META-INF/maven/archetype.xml +++ b/flink-quickstart/quickstart-java/src/main/resources/META-INF/maven/archetype.xml @@ -1,6 +1,6 @@ - stratosphere-quickstart + flink-quickstart src/main/java/Job.java src/main/java/WordCountJob.java diff --git a/stratosphere-quickstart/quickstart-java/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/quickstart-java/src/main/resources/archetype-resources/pom.xml similarity index 87% rename from stratosphere-quickstart/quickstart-java/src/main/resources/archetype-resources/pom.xml rename to flink-quickstart/quickstart-java/src/main/resources/archetype-resources/pom.xml index c2a419578aef7..c38da787765aa 100644 --- a/stratosphere-quickstart/quickstart-java/src/main/resources/archetype-resources/pom.xml +++ b/flink-quickstart/quickstart-java/src/main/resources/archetype-resources/pom.xml @@ -14,23 +14,23 @@ UTF-8 - - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java 0.6-SNAPSHOT - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients 0.6-SNAPSHOT + submit to your Flink cluster. --> diff --git a/stratosphere-quickstart/quickstart-java/src/main/resources/archetype-resources/src/main/java/Job.java b/flink-quickstart/quickstart-java/src/main/resources/archetype-resources/src/main/java/Job.java similarity index 73% rename from stratosphere-quickstart/quickstart-java/src/main/resources/archetype-resources/src/main/java/Job.java rename to flink-quickstart/quickstart-java/src/main/resources/archetype-resources/src/main/java/Job.java index b19172d6bee1c..55d262e6250e5 100644 --- a/stratosphere-quickstart/quickstart-java/src/main/resources/archetype-resources/src/main/java/Job.java +++ b/flink-quickstart/quickstart-java/src/main/resources/archetype-resources/src/main/java/Job.java @@ -3,33 +3,33 @@ import org.apache.flink.api.java.ExecutionEnvironment; /** - * Skeleton for a Stratosphere Job. - * - * For a full example of a Stratosphere Job, see the WordCountJob.java file in the + * Skeleton for a Flink Job. + * + * For a full example of a Flink Job, see the WordCountJob.java file in the * same package/directory or have a look at the website. - * - * You can also generate a .jar file that you can submit on your Stratosphere + * + * You can also generate a .jar file that you can submit on your Flink * cluster. - * Just type + * Just type * mvn clean package * in the projects root directory. - * You will find the jar in - * target/stratosphere-quickstart-0.1-SNAPSHOT-Sample.jar - * + * You will find the jar in + * target/flink-quickstart-0.1-SNAPSHOT-Sample.jar + * */ public class Job { - + public static void main(String[] args) throws Exception { // set up the execution environment final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment(); - - + + /** - * Here, you can start creating your execution plan for Stratosphere. - * + * Here, you can start creating your execution plan for Flink. + * * Start with getting some data from the environment, like * env.readTextFile(textPath); - * + * * then, transform the resulting DataSet using operations * like * .filter() @@ -38,15 +38,15 @@ public static void main(String[] args) throws Exception { * .group() * and many more. * Have a look at the programming guide for the Java API: - * + * * http://stratosphere.eu/docs/0.5/programming_guides/java.html - * + * * and the examples - * + * * http://stratosphere.eu/docs/0.5/programming_guides/examples.html - * + * */ - + // execute program env.execute("Stratosphere Java API Skeleton"); } diff --git a/stratosphere-quickstart/quickstart-java/src/main/resources/archetype-resources/src/main/java/WordCountJob.java b/flink-quickstart/quickstart-java/src/main/resources/archetype-resources/src/main/java/WordCountJob.java similarity index 82% rename from stratosphere-quickstart/quickstart-java/src/main/resources/archetype-resources/src/main/java/WordCountJob.java rename to flink-quickstart/quickstart-java/src/main/resources/archetype-resources/src/main/java/WordCountJob.java index ce9d77a674131..1ecd9799d086e 100644 --- a/stratosphere-quickstart/quickstart-java/src/main/resources/archetype-resources/src/main/java/WordCountJob.java +++ b/flink-quickstart/quickstart-java/src/main/resources/archetype-resources/src/main/java/WordCountJob.java @@ -2,36 +2,36 @@ import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; -import eu.stratosphere.api.java.aggregation.Aggregations; -import eu.stratosphere.api.java.functions.FlatMapFunction; -import eu.stratosphere.api.java.tuple.Tuple2; -import eu.stratosphere.util.Collector; +import org.apache.flink.api.java.aggregation.Aggregations; +import org.apache.flink.api.java.functions.FlatMapFunction; +import org.apache.flink.api.java.tuple.Tuple2; +import org.apache.flink.util.Collector; /** * Implements the "WordCount" program that computes a simple word occurrence histogram * over some sample data - * + * *

* This example shows how to: *

    - *
  • write a simple Stratosphere program. + *
  • write a simple Flink program. *
  • use Tuple data types. - *
  • write and use user-defined functions. + *
  • write and use user-defined functions. *
- * + * */ @SuppressWarnings("serial") public class WordCountJob { - + // - // Program. + // Program. // - + public static void main(String[] args) throws Exception { - + // set up the execution environment final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment(); - + // get input data DataSet text = env.fromElements( "To be, or not to be,--that is the question:--", @@ -39,8 +39,8 @@ public static void main(String[] args) throws Exception { "The slings and arrows of outrageous fortune", "Or to take arms against a sea of troubles," ); - - DataSet> counts = + + DataSet> counts = // split up the lines in pairs (2-tuples) containing: (word,1) text.flatMap(new LineSplitter()) // group by the tuple field "0" and sum up tuple field "1" @@ -49,18 +49,18 @@ public static void main(String[] args) throws Exception { // emit result counts.print(); - + // execute program env.execute("WordCount Example"); } - + // // User Functions // - + /** * Implements the string tokenizer that splits sentences into words as a user-defined - * FlatMapFunction. The function takes a line (String) and splits it into + * FlatMapFunction. The function takes a line (String) and splits it into * multiple pairs in the form of "(word,1)" (Tuple2). */ public static final class LineSplitter extends FlatMapFunction> { @@ -69,7 +69,7 @@ public static final class LineSplitter extends FlatMapFunction> out) { // normalize and split the line String[] tokens = value.toLowerCase().split("\\W+"); - + // emit the pairs for (String token : tokens) { if (token.length() > 0) { diff --git a/flink-quickstart/quickstart-scala-SNAPSHOT.sh b/flink-quickstart/quickstart-scala-SNAPSHOT.sh new file mode 100755 index 0000000000000..b3154004e5841 --- /dev/null +++ b/flink-quickstart/quickstart-scala-SNAPSHOT.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +######################################################################################################################## +# +# Copyright (C) 2010-2013 by the Apache Flink project (http://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 +# +# 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=quickstart + +mvn archetype:generate \ + -DarchetypeGroupId=org.apache.flink \ + -DarchetypeArtifactId=quickstart-scala \ + -DarchetypeVersion=0.6-SNAPSHOT \ + -DgroupId=org.apache.flink \ + -DartifactId=$PACKAGE \ + -Dversion=0.1 \ + -Dpackage=org.apache.flink.quickstart \ + -DinteractiveMode=false \ + -DarchetypeCatalog=https://oss.sonatype.org/content/repositories/snapshots/ + +# +# Give some guidance +# +echo -e "\\n\\n" +echo -e "\\tA sample quickstart Flink Job has been created." +echo -e "\\tSwitch into the directory using" +echo -e "\\t\\t cd $PACKAGE" +echo -e "\\tImport the project there using your favorite IDE (Import it as a maven project)" +echo -e "\\tBuild a jar inside the directory using" +echo -e "\\t\\t mvn clean package" +echo -e "\\tYou will find the runnable jar in $PACKAGE/target" +echo -e "\\n\\n" + + +# Use this command if you want to specify the coordinates of your generated artifact +# in an interactive menu: +# +#mvn archetype:generate \ +# -DarchetypeGroupId=org.apache.flink \ +# -DarchetypeArtifactId=quickstart-scala \ +# -DarchetypeVersion=0.6-SNAPSHOT \ +# -DarchetypeCatalog=https://oss.sonatype.org/content/repositories/snapshots/ diff --git a/stratosphere-quickstart/quickstart-scala.sh b/flink-quickstart/quickstart-scala.sh similarity index 70% rename from stratosphere-quickstart/quickstart-scala.sh rename to flink-quickstart/quickstart-scala.sh index a00959d00f196..b7110154e9661 100755 --- a/stratosphere-quickstart/quickstart-scala.sh +++ b/flink-quickstart/quickstart-scala.sh @@ -1,16 +1,18 @@ #!/usr/bin/env bash ######################################################################################################################## -# Copyright (C) 2010-2013 by the Stratosphere project (http://stratosphere.eu) -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on -# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -# specific language governing permissions and limitations under the License. +# +# Copyright (C) 2010-2013 by the Apache Flink project (http://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 +# +# 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=quickstart diff --git a/stratosphere-quickstart/quickstart-scala/pom.xml b/flink-quickstart/quickstart-scala/pom.xml similarity index 85% rename from stratosphere-quickstart/quickstart-scala/pom.xml rename to flink-quickstart/quickstart-scala/pom.xml index 3f02cfdc5941f..7c719421291b3 100644 --- a/stratosphere-quickstart/quickstart-scala/pom.xml +++ b/flink-quickstart/quickstart-scala/pom.xml @@ -7,8 +7,8 @@ - eu.stratosphere - stratosphere-quickstart + org.apache.flink + flink-quickstart 0.6-SNAPSHOT .. diff --git a/stratosphere-quickstart/quickstart-scala/src/main/java/eu/stratosphere/quickstart/Dummy.java b/flink-quickstart/quickstart-scala/src/main/java/org/apache/flink/quickstart/Dummy.java similarity index 96% rename from stratosphere-quickstart/quickstart-scala/src/main/java/eu/stratosphere/quickstart/Dummy.java rename to flink-quickstart/quickstart-scala/src/main/java/org/apache/flink/quickstart/Dummy.java index 9cc0fdb5284be..7bd15575ba17c 100644 --- a/stratosphere-quickstart/quickstart-scala/src/main/java/eu/stratosphere/quickstart/Dummy.java +++ b/flink-quickstart/quickstart-scala/src/main/java/org/apache/flink/quickstart/Dummy.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. **********************************************************************************************************************/ -package eu.stratosphere.quickstart; +package org.apache.flink.quickstart; /** * This class solely exists to generate diff --git a/stratosphere-quickstart/quickstart-scala/src/main/resources/META-INF/maven/archetype-metadata.xml b/flink-quickstart/quickstart-scala/src/main/resources/META-INF/maven/archetype-metadata.xml similarity index 100% rename from stratosphere-quickstart/quickstart-scala/src/main/resources/META-INF/maven/archetype-metadata.xml rename to flink-quickstart/quickstart-scala/src/main/resources/META-INF/maven/archetype-metadata.xml diff --git a/stratosphere-quickstart/quickstart-scala/src/main/resources/META-INF/maven/archetype.xml b/flink-quickstart/quickstart-scala/src/main/resources/META-INF/maven/archetype.xml similarity index 90% rename from stratosphere-quickstart/quickstart-scala/src/main/resources/META-INF/maven/archetype.xml rename to flink-quickstart/quickstart-scala/src/main/resources/META-INF/maven/archetype.xml index 45e7fd255f2e0..2b4bb846641cd 100644 --- a/stratosphere-quickstart/quickstart-scala/src/main/resources/META-INF/maven/archetype.xml +++ b/flink-quickstart/quickstart-scala/src/main/resources/META-INF/maven/archetype.xml @@ -1,6 +1,6 @@ - stratosphere-quickstart-scala + flink-quickstart-scala src/main/scala/Job.scala diff --git a/stratosphere-quickstart/quickstart-scala/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/quickstart-scala/src/main/resources/archetype-resources/pom.xml similarity index 92% rename from stratosphere-quickstart/quickstart-scala/src/main/resources/archetype-resources/pom.xml rename to flink-quickstart/quickstart-scala/src/main/resources/archetype-resources/pom.xml index cfcf57dd85435..d9218f8f5568c 100644 --- a/stratosphere-quickstart/quickstart-scala/src/main/resources/archetype-resources/pom.xml +++ b/flink-quickstart/quickstart-scala/src/main/resources/archetype-resources/pom.xml @@ -15,24 +15,24 @@ UTF-8 - - eu.stratosphere - stratosphere-scala + org.apache.flink + flink-scala 0.6-SNAPSHOT - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients 0.6-SNAPSHOT diff --git a/stratosphere-quickstart/quickstart-scala/src/main/resources/archetype-resources/src/main/scala/Job.scala b/flink-quickstart/quickstart-scala/src/main/resources/archetype-resources/src/main/scala/Job.scala similarity index 76% rename from stratosphere-quickstart/quickstart-scala/src/main/resources/archetype-resources/src/main/scala/Job.scala rename to flink-quickstart/quickstart-scala/src/main/resources/archetype-resources/src/main/scala/Job.scala index dae53494fb4ca..b179243e63d07 100644 --- a/stratosphere-quickstart/quickstart-scala/src/main/resources/archetype-resources/src/main/scala/Job.scala +++ b/flink-quickstart/quickstart-scala/src/main/resources/archetype-resources/src/main/scala/Job.scala @@ -1,14 +1,14 @@ package ${package}; -import eu.stratosphere.api.common.Program -import eu.stratosphere.api.common.ProgramDescription -import eu.stratosphere.client.LocalExecutor -import eu.stratosphere.api.scala.TextFile -import eu.stratosphere.api.scala.ScalaPlan -import eu.stratosphere.api.scala._ -import eu.stratosphere.api.scala.operators._ -import eu.stratosphere.client.RemoteExecutor +import org.apache.flink.api.common.Program +import org.apache.flink.api.common.ProgramDescription +import org.apache.flink.client.LocalExecutor +import org.apache.flink.api.scala.TextFile +import org.apache.flink.api.scala.ScalaPlan +import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.operators._ +import org.apache.flink.client.RemoteExecutor // You can run this locally using: // mvn exec:exec -Dexec.executable="java" -Dexec.args="-cp %classpath ${package}.RunJobLocal 2 file:///some/path file:///some/other/path" @@ -41,27 +41,27 @@ object RunJobRemote { // You will also need to change the name of the jar if you change the // project name and/or version. Before running this you also need // to run "mvn package" to create the jar. - val ex = new RemoteExecutor("localhost", 6123, "target/stratosphere-project-0.1-SNAPSHOT.jar") + val ex = new RemoteExecutor("localhost", 6123, "target/flink-project-0.1-SNAPSHOT.jar") ex.executePlan(plan) } } /** - * This is a outline for a Stratosphere scala job. It is actually the WordCount - * example from the stratosphere distribution. - * + * This is a outline for a Flink scala job. It is actually the WordCount + * example from the here distribution. + * * You can run it out of your IDE using the main() method of RunJob. - * This will use the LocalExecutor to start a little Stratosphere instance + * This will use the LocalExecutor to start a little Flink instance * out of your IDE. - * - * You can also generate a .jar file that you can submit on your Stratosphere + * + * You can also generate a .jar file that you can submit on your Flink * cluster. - * Just type + * Just type * mvn clean package * in the projects root directory. - * You will find the jar in - * target/stratosphere-quickstart-0.1-SNAPSHOT-Sample.jar + * You will find the jar in + * target/flink-quickstart-0.1-SNAPSHOT-Sample.jar * */ class Job extends Program with ProgramDescription with Serializable { @@ -83,7 +83,7 @@ class Job extends Program with ProgramDescription with Serializable { counts neglects { case (word, _) => word } counts preserves({ case (word, _) => word }, { case (word, _) => word }) val output = counts.write(wordsOutput, DelimitedOutputFormat(formatOutput.tupled)) - + val plan = new ScalaPlan(Seq(output), "Word Count (immutable)") plan.setDefaultParallelism(numSubTasks) plan diff --git a/stratosphere-quickstart/quickstart.sh b/flink-quickstart/quickstart.sh similarity index 70% rename from stratosphere-quickstart/quickstart.sh rename to flink-quickstart/quickstart.sh index 4c5228d127a08..b1041c9a11c20 100755 --- a/stratosphere-quickstart/quickstart.sh +++ b/flink-quickstart/quickstart.sh @@ -1,16 +1,18 @@ #!/usr/bin/env bash ######################################################################################################################## -# Copyright (C) 2010-2013 by the Stratosphere project (http://stratosphere.eu) -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on -# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -# specific language governing permissions and limitations under the License. +# +# Copyright (C) 2010-2013 by the Apache Flink project (http://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 +# +# 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=quickstart diff --git a/stratosphere-runtime/pom.xml b/flink-runtime/pom.xml similarity index 94% rename from stratosphere-runtime/pom.xml rename to flink-runtime/pom.xml index 7d196928daaf0..c4d50606cc653 100644 --- a/stratosphere-runtime/pom.xml +++ b/flink-runtime/pom.xml @@ -5,21 +5,21 @@ 4.0.0 - eu.stratosphere - stratosphere + org.apache.flink + flink-parent 0.6-SNAPSHOT .. - stratosphere-runtime - stratosphere-runtime + flink-runtime + flink-runtime jar - eu.stratosphere - stratosphere-core + org.apache.flink + flink-core ${project.version} @@ -60,8 +60,8 @@ - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java ${project.version} test diff --git a/stratosphere-runtime/resources/web-docs-infoserver/analyze.html b/flink-runtime/resources/web-docs-infoserver/analyze.html similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/analyze.html rename to flink-runtime/resources/web-docs-infoserver/analyze.html diff --git a/stratosphere-runtime/resources/web-docs-infoserver/blank-page.html b/flink-runtime/resources/web-docs-infoserver/blank-page.html similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/blank-page.html rename to flink-runtime/resources/web-docs-infoserver/blank-page.html diff --git a/stratosphere-runtime/resources/web-docs-infoserver/configuration.html b/flink-runtime/resources/web-docs-infoserver/configuration.html similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/configuration.html rename to flink-runtime/resources/web-docs-infoserver/configuration.html diff --git a/stratosphere-runtime/resources/web-docs-infoserver/css/bootstrap.css b/flink-runtime/resources/web-docs-infoserver/css/bootstrap.css similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/css/bootstrap.css rename to flink-runtime/resources/web-docs-infoserver/css/bootstrap.css diff --git a/stratosphere-runtime/resources/web-docs-infoserver/css/bootstrap.min.css b/flink-runtime/resources/web-docs-infoserver/css/bootstrap.min.css similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/css/bootstrap.min.css rename to flink-runtime/resources/web-docs-infoserver/css/bootstrap.min.css diff --git a/stratosphere-runtime/resources/web-docs-infoserver/css/nephelefrontend.css b/flink-runtime/resources/web-docs-infoserver/css/nephelefrontend.css similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/css/nephelefrontend.css rename to flink-runtime/resources/web-docs-infoserver/css/nephelefrontend.css diff --git a/stratosphere-runtime/resources/web-docs-infoserver/css/sb-admin.css b/flink-runtime/resources/web-docs-infoserver/css/sb-admin.css similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/css/sb-admin.css rename to flink-runtime/resources/web-docs-infoserver/css/sb-admin.css diff --git a/stratosphere-runtime/resources/web-docs-infoserver/css/timeline.css b/flink-runtime/resources/web-docs-infoserver/css/timeline.css similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/css/timeline.css rename to flink-runtime/resources/web-docs-infoserver/css/timeline.css diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/css/font-awesome.css b/flink-runtime/resources/web-docs-infoserver/font-awesome/css/font-awesome.css similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/css/font-awesome.css rename to flink-runtime/resources/web-docs-infoserver/font-awesome/css/font-awesome.css diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/css/font-awesome.min.css b/flink-runtime/resources/web-docs-infoserver/font-awesome/css/font-awesome.min.css similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/css/font-awesome.min.css rename to flink-runtime/resources/web-docs-infoserver/font-awesome/css/font-awesome.min.css diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/fonts/FontAwesome.otf b/flink-runtime/resources/web-docs-infoserver/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/fonts/FontAwesome.otf rename to flink-runtime/resources/web-docs-infoserver/font-awesome/fonts/FontAwesome.otf diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.eot b/flink-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.eot rename to flink-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.eot diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.svg b/flink-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.svg rename to flink-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.svg diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.ttf b/flink-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.ttf rename to flink-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.woff b/flink-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.woff rename to flink-runtime/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.woff diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/bordered-pulled.less b/flink-runtime/resources/web-docs-infoserver/font-awesome/less/bordered-pulled.less similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/bordered-pulled.less rename to flink-runtime/resources/web-docs-infoserver/font-awesome/less/bordered-pulled.less diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/core.less b/flink-runtime/resources/web-docs-infoserver/font-awesome/less/core.less similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/core.less rename to flink-runtime/resources/web-docs-infoserver/font-awesome/less/core.less diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/fixed-width.less b/flink-runtime/resources/web-docs-infoserver/font-awesome/less/fixed-width.less similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/fixed-width.less rename to flink-runtime/resources/web-docs-infoserver/font-awesome/less/fixed-width.less diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/font-awesome.less b/flink-runtime/resources/web-docs-infoserver/font-awesome/less/font-awesome.less similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/font-awesome.less rename to flink-runtime/resources/web-docs-infoserver/font-awesome/less/font-awesome.less diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/icons.less b/flink-runtime/resources/web-docs-infoserver/font-awesome/less/icons.less similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/icons.less rename to flink-runtime/resources/web-docs-infoserver/font-awesome/less/icons.less diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/larger.less b/flink-runtime/resources/web-docs-infoserver/font-awesome/less/larger.less similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/larger.less rename to flink-runtime/resources/web-docs-infoserver/font-awesome/less/larger.less diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/list.less b/flink-runtime/resources/web-docs-infoserver/font-awesome/less/list.less similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/list.less rename to flink-runtime/resources/web-docs-infoserver/font-awesome/less/list.less diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/mixins.less b/flink-runtime/resources/web-docs-infoserver/font-awesome/less/mixins.less similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/mixins.less rename to flink-runtime/resources/web-docs-infoserver/font-awesome/less/mixins.less diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/path.less b/flink-runtime/resources/web-docs-infoserver/font-awesome/less/path.less similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/path.less rename to flink-runtime/resources/web-docs-infoserver/font-awesome/less/path.less diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/rotated-flipped.less b/flink-runtime/resources/web-docs-infoserver/font-awesome/less/rotated-flipped.less similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/rotated-flipped.less rename to flink-runtime/resources/web-docs-infoserver/font-awesome/less/rotated-flipped.less diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/spinning.less b/flink-runtime/resources/web-docs-infoserver/font-awesome/less/spinning.less similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/spinning.less rename to flink-runtime/resources/web-docs-infoserver/font-awesome/less/spinning.less diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/stacked.less b/flink-runtime/resources/web-docs-infoserver/font-awesome/less/stacked.less similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/stacked.less rename to flink-runtime/resources/web-docs-infoserver/font-awesome/less/stacked.less diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/variables.less b/flink-runtime/resources/web-docs-infoserver/font-awesome/less/variables.less similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/less/variables.less rename to flink-runtime/resources/web-docs-infoserver/font-awesome/less/variables.less diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_bordered-pulled.scss b/flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_bordered-pulled.scss similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_bordered-pulled.scss rename to flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_bordered-pulled.scss diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_core.scss b/flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_core.scss similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_core.scss rename to flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_core.scss diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_fixed-width.scss b/flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_fixed-width.scss similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_fixed-width.scss rename to flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_fixed-width.scss diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_icons.scss b/flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_icons.scss similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_icons.scss rename to flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_icons.scss diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_larger.scss b/flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_larger.scss similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_larger.scss rename to flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_larger.scss diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_list.scss b/flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_list.scss similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_list.scss rename to flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_list.scss diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_mixins.scss b/flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_mixins.scss similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_mixins.scss rename to flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_mixins.scss diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_path.scss b/flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_path.scss similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_path.scss rename to flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_path.scss diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_rotated-flipped.scss b/flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_rotated-flipped.scss similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_rotated-flipped.scss rename to flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_rotated-flipped.scss diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_spinning.scss b/flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_spinning.scss similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_spinning.scss rename to flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_spinning.scss diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_stacked.scss b/flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_stacked.scss similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_stacked.scss rename to flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_stacked.scss diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_variables.scss b/flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_variables.scss similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/_variables.scss rename to flink-runtime/resources/web-docs-infoserver/font-awesome/scss/_variables.scss diff --git a/stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/font-awesome.scss b/flink-runtime/resources/web-docs-infoserver/font-awesome/scss/font-awesome.scss similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/font-awesome/scss/font-awesome.scss rename to flink-runtime/resources/web-docs-infoserver/font-awesome/scss/font-awesome.scss diff --git a/stratosphere-runtime/resources/web-docs-infoserver/history.html b/flink-runtime/resources/web-docs-infoserver/history.html similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/history.html rename to flink-runtime/resources/web-docs-infoserver/history.html diff --git a/stratosphere-runtime/resources/web-docs-infoserver/img/StratosphereLogo.png b/flink-runtime/resources/web-docs-infoserver/img/StratosphereLogo.png similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/img/StratosphereLogo.png rename to flink-runtime/resources/web-docs-infoserver/img/StratosphereLogo.png diff --git a/stratosphere-runtime/resources/web-docs-infoserver/index.html b/flink-runtime/resources/web-docs-infoserver/index.html similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/index.html rename to flink-runtime/resources/web-docs-infoserver/index.html diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/analyzer.js b/flink-runtime/resources/web-docs-infoserver/js/analyzer.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/analyzer.js rename to flink-runtime/resources/web-docs-infoserver/js/analyzer.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/bootstrap.js b/flink-runtime/resources/web-docs-infoserver/js/bootstrap.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/bootstrap.js rename to flink-runtime/resources/web-docs-infoserver/js/bootstrap.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/bootstrap.min.js b/flink-runtime/resources/web-docs-infoserver/js/bootstrap.min.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/bootstrap.min.js rename to flink-runtime/resources/web-docs-infoserver/js/bootstrap.min.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/configuration.js b/flink-runtime/resources/web-docs-infoserver/js/configuration.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/configuration.js rename to flink-runtime/resources/web-docs-infoserver/js/configuration.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/flot/chart-data-flot.js b/flink-runtime/resources/web-docs-infoserver/js/flot/chart-data-flot.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/flot/chart-data-flot.js rename to flink-runtime/resources/web-docs-infoserver/js/flot/chart-data-flot.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/flot/excanvas.min.js b/flink-runtime/resources/web-docs-infoserver/js/flot/excanvas.min.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/flot/excanvas.min.js rename to flink-runtime/resources/web-docs-infoserver/js/flot/excanvas.min.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.js b/flink-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.js rename to flink-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.pie.js b/flink-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.pie.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.pie.js rename to flink-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.pie.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.resize.js b/flink-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.resize.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.resize.js rename to flink-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.resize.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.tooltip.min.js b/flink-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.tooltip.min.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.tooltip.min.js rename to flink-runtime/resources/web-docs-infoserver/js/flot/jquery.flot.tooltip.min.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/googlejsapi.js b/flink-runtime/resources/web-docs-infoserver/js/googlejsapi.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/googlejsapi.js rename to flink-runtime/resources/web-docs-infoserver/js/googlejsapi.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/helpers.js b/flink-runtime/resources/web-docs-infoserver/js/helpers.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/helpers.js rename to flink-runtime/resources/web-docs-infoserver/js/helpers.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/jcanvas.min.js b/flink-runtime/resources/web-docs-infoserver/js/jcanvas.min.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/jcanvas.min.js rename to flink-runtime/resources/web-docs-infoserver/js/jcanvas.min.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/jobmanagerFrontend.js b/flink-runtime/resources/web-docs-infoserver/js/jobmanagerFrontend.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/jobmanagerFrontend.js rename to flink-runtime/resources/web-docs-infoserver/js/jobmanagerFrontend.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/jquery-1.10.2.js b/flink-runtime/resources/web-docs-infoserver/js/jquery-1.10.2.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/jquery-1.10.2.js rename to flink-runtime/resources/web-docs-infoserver/js/jquery-1.10.2.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/jquery.flot.categories.min.js b/flink-runtime/resources/web-docs-infoserver/js/jquery.flot.categories.min.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/jquery.flot.categories.min.js rename to flink-runtime/resources/web-docs-infoserver/js/jquery.flot.categories.min.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/jquery.flot.min.js b/flink-runtime/resources/web-docs-infoserver/js/jquery.flot.min.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/jquery.flot.min.js rename to flink-runtime/resources/web-docs-infoserver/js/jquery.flot.min.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/jquery.flot.stack.js b/flink-runtime/resources/web-docs-infoserver/js/jquery.flot.stack.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/jquery.flot.stack.js rename to flink-runtime/resources/web-docs-infoserver/js/jquery.flot.stack.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/jquery.flot.time.min.js b/flink-runtime/resources/web-docs-infoserver/js/jquery.flot.time.min.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/jquery.flot.time.min.js rename to flink-runtime/resources/web-docs-infoserver/js/jquery.flot.time.min.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/jquery.js b/flink-runtime/resources/web-docs-infoserver/js/jquery.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/jquery.js rename to flink-runtime/resources/web-docs-infoserver/js/jquery.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/taskmanager.js b/flink-runtime/resources/web-docs-infoserver/js/taskmanager.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/taskmanager.js rename to flink-runtime/resources/web-docs-infoserver/js/taskmanager.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/js/timeline.js b/flink-runtime/resources/web-docs-infoserver/js/timeline.js similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/js/timeline.js rename to flink-runtime/resources/web-docs-infoserver/js/timeline.js diff --git a/stratosphere-runtime/resources/web-docs-infoserver/taskmanagers.html b/flink-runtime/resources/web-docs-infoserver/taskmanagers.html similarity index 100% rename from stratosphere-runtime/resources/web-docs-infoserver/taskmanagers.html rename to flink-runtime/resources/web-docs-infoserver/taskmanagers.html diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/AbstractID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/AbstractID.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/AbstractID.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/AbstractID.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/ExecutionMode.java b/flink-runtime/src/main/java/org/apache/flink/runtime/ExecutionMode.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/ExecutionMode.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/ExecutionMode.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/JobSubmissionException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/JobSubmissionException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/JobSubmissionException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/JobSubmissionException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/accumulators/AccumulatorEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/accumulators/AccumulatorEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/accumulators/AccumulatorEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/accumulators/AccumulatorEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/client/AbstractJobResult.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/AbstractJobResult.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/client/AbstractJobResult.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/client/AbstractJobResult.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/client/JobCancelResult.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobCancelResult.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/client/JobCancelResult.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/client/JobCancelResult.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/client/JobExecutionException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobExecutionException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/client/JobExecutionException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/client/JobExecutionException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/client/JobProgressResult.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobProgressResult.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/client/JobProgressResult.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/client/JobProgressResult.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/client/JobSubmissionResult.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobSubmissionResult.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/client/JobSubmissionResult.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/client/JobSubmissionResult.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptor.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptor.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptor.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptor.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptor.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptor.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptor.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptor.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptor.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/job/AbstractEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/job/AbstractEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/job/AbstractEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/event/job/AbstractEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/job/ExecutionStateChangeEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/job/ExecutionStateChangeEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/job/ExecutionStateChangeEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/event/job/ExecutionStateChangeEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/job/JobEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/job/JobEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/job/JobEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/event/job/JobEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/job/ManagementEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/job/ManagementEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/job/ManagementEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/event/job/ManagementEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/job/RecentJobEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/job/RecentJobEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/job/RecentJobEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/event/job/RecentJobEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/job/VertexAssignmentEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/job/VertexAssignmentEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/job/VertexAssignmentEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/event/job/VertexAssignmentEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/job/VertexEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/job/VertexEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/job/VertexEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/event/job/VertexEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/task/AbstractEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/task/AbstractEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/task/AbstractEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/event/task/AbstractEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/task/AbstractTaskEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/task/AbstractTaskEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/task/AbstractTaskEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/event/task/AbstractTaskEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/task/EventList.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/task/EventList.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/task/EventList.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/event/task/EventList.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/task/EventListener.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/task/EventListener.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/task/EventListener.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/event/task/EventListener.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/task/EventNotificationManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/task/EventNotificationManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/task/EventNotificationManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/event/task/EventNotificationManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/task/IntegerTaskEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/task/IntegerTaskEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/task/IntegerTaskEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/event/task/IntegerTaskEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/task/StringTaskEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/task/StringTaskEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/event/task/StringTaskEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/event/task/StringTaskEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/CancelTaskException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/CancelTaskException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/CancelTaskException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/execution/CancelTaskException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/Environment.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/Environment.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/Environment.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/execution/Environment.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionListener.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionListener.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionListener.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionListener.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionObserver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionObserver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionObserver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionObserver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionState.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionState.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionState.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionStateTransition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionStateTransition.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionStateTransition.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionStateTransition.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/RuntimeEnvironment.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/RuntimeEnvironment.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/RuntimeEnvironment.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/execution/RuntimeEnvironment.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheProfileRequest.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheProfileRequest.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheProfileRequest.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheProfileRequest.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheProfileResponse.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheProfileResponse.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheProfileResponse.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheProfileResponse.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheUpdate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheUpdate.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheUpdate.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/LibraryCacheUpdate.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DistributionPatternProvider.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DistributionPatternProvider.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DistributionPatternProvider.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DistributionPatternProvider.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionEdge.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionEdge.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionEdge.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionEdge.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGate.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGate.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGate.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupEdge.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupEdge.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupEdge.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupEdge.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupVertex.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupVertex.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupVertex.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupVertexIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupVertexIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupVertexIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGroupVertexIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionPipeline.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionPipeline.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionPipeline.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionPipeline.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionSignature.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionSignature.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionSignature.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionSignature.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionStage.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionStage.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionStage.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionStage.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionStageListener.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionStageListener.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionStageListener.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionStageListener.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertexID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertexID.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertexID.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertexID.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/GraphConversionException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/GraphConversionException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/GraphConversionException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/GraphConversionException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/InternalJobStatus.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/InternalJobStatus.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/InternalJobStatus.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/InternalJobStatus.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/JobStatusListener.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/JobStatusListener.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/JobStatusListener.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/JobStatusListener.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ManagementGraphFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ManagementGraphFactory.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ManagementGraphFactory.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ManagementGraphFactory.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/VertexAssignmentListener.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/VertexAssignmentListener.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/executiongraph/VertexAssignmentListener.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/VertexAssignmentListener.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/filecache/FileCache.java b/flink-runtime/src/main/java/org/apache/flink/runtime/filecache/FileCache.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/filecache/FileCache.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/filecache/FileCache.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedBlockLocation.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedBlockLocation.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedBlockLocation.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedBlockLocation.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedDataInputStream.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedDataInputStream.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedDataInputStream.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedDataInputStream.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedDataOutputStream.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedDataOutputStream.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedDataOutputStream.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedDataOutputStream.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileStatus.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileStatus.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileStatus.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileStatus.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileSystem.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileSystem.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileSystem.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileSystem.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3BlockLocation.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3BlockLocation.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3BlockLocation.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3BlockLocation.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3BucketObjectPair.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3BucketObjectPair.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3BucketObjectPair.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3BucketObjectPair.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3DataInputStream.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3DataInputStream.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3DataInputStream.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3DataInputStream.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3DataOutputStream.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3DataOutputStream.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3DataOutputStream.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3DataOutputStream.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3DirectoryStructure.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3DirectoryStructure.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3DirectoryStructure.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3DirectoryStructure.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3FileStatus.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3FileStatus.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3FileStatus.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3FileStatus.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3FileSystem.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3FileSystem.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3FileSystem.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3FileSystem.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/AllocatedResource.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/AllocatedResource.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/AllocatedResource.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/AllocatedResource.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/AllocatedSlot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/AllocatedSlot.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/AllocatedSlot.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/AllocatedSlot.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/AllocationID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/AllocationID.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/AllocationID.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/AllocationID.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/DefaultInstanceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/DefaultInstanceManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/DefaultInstanceManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/DefaultInstanceManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/DummyInstance.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/DummyInstance.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/DummyInstance.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/DummyInstance.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/Hardware.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/Hardware.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/Hardware.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/Hardware.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/HardwareDescription.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/HardwareDescription.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/HardwareDescription.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/HardwareDescription.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/HardwareDescriptionFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/HardwareDescriptionFactory.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/HardwareDescriptionFactory.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/HardwareDescriptionFactory.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/Instance.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/Instance.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/Instance.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/Instance.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceConnectionInfo.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceConnectionInfo.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceConnectionInfo.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceConnectionInfo.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceID.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceID.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceID.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceListener.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceListener.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceListener.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceListener.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceNotifier.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceNotifier.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceNotifier.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/InstanceNotifier.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/LocalInstanceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/LocalInstanceManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/instance/LocalInstanceManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/instance/LocalInstanceManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/ChannelReaderInputViewIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/ChannelReaderInputViewIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/ChannelReaderInputViewIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/ChannelReaderInputViewIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/InputViewIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/InputViewIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/InputViewIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/InputViewIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/RandomAccessInputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/RandomAccessInputView.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/RandomAccessInputView.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/RandomAccessInputView.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/RandomAccessOutputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/RandomAccessOutputView.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/RandomAccessOutputView.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/RandomAccessOutputView.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/SimpleCollectingOutputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SimpleCollectingOutputView.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/SimpleCollectingOutputView.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SimpleCollectingOutputView.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/SpillingBuffer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SpillingBuffer.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/SpillingBuffer.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SpillingBuffer.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelAccess.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelAccess.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelAccess.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelAccess.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelReader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelReader.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelReader.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelReader.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelWriter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelWriter.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelWriter.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BlockChannelWriter.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BulkBlockChannelReader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BulkBlockChannelReader.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BulkBlockChannelReader.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/BulkBlockChannelReader.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/Channel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/Channel.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/Channel.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/Channel.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelAccess.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelAccess.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelAccess.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelAccess.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelReaderInputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelReaderInputView.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelReaderInputView.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelReaderInputView.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelWriterOutputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelWriterOutputView.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelWriterOutputView.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelWriterOutputView.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/Deserializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/Deserializer.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/Deserializer.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/Deserializer.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/HeaderlessChannelReaderInputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/HeaderlessChannelReaderInputView.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/HeaderlessChannelReaderInputView.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/HeaderlessChannelReaderInputView.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IORequest.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IORequest.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IORequest.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IORequest.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/RequestQueue.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/RequestQueue.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/RequestQueue.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/RequestQueue.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/Buffer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/Buffer.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/Buffer.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/Buffer.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/BufferRecycler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/BufferRecycler.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/BufferRecycler.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/BufferRecycler.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/ChannelManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ChannelManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/ChannelManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ChannelManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionInfoLookupResponse.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionInfoLookupResponse.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionInfoLookupResponse.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionInfoLookupResponse.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/Envelope.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/Envelope.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/Envelope.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/Envelope.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/EnvelopeDispatcher.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/EnvelopeDispatcher.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/EnvelopeDispatcher.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/EnvelopeDispatcher.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/EnvelopeReceiverList.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/EnvelopeReceiverList.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/EnvelopeReceiverList.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/EnvelopeReceiverList.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/InsufficientResourcesException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/InsufficientResourcesException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/InsufficientResourcesException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/InsufficientResourcesException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/LocalConnectionManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/LocalConnectionManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/LocalConnectionManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/LocalConnectionManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/LocalReceiverCancelledException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/LocalReceiverCancelledException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/LocalReceiverCancelledException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/LocalReceiverCancelledException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/NetworkConnectionManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/NetworkConnectionManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/NetworkConnectionManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/NetworkConnectionManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/RemoteReceiver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/RemoteReceiver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/RemoteReceiver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/RemoteReceiver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/SenderHintEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/SenderHintEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/SenderHintEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/SenderHintEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/AbstractRecordReader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/AbstractRecordReader.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/AbstractRecordReader.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/AbstractRecordReader.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/AbstractSingleGateRecordReader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/AbstractSingleGateRecordReader.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/AbstractSingleGateRecordReader.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/AbstractSingleGateRecordReader.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/AbstractUnionRecordReader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/AbstractUnionRecordReader.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/AbstractUnionRecordReader.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/AbstractUnionRecordReader.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/BufferWriter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/BufferWriter.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/BufferWriter.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/BufferWriter.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/ChannelSelector.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/ChannelSelector.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/ChannelSelector.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/ChannelSelector.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/MutableReader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/MutableReader.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/MutableReader.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/MutableReader.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/MutableRecordReader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/MutableRecordReader.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/MutableRecordReader.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/MutableRecordReader.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/MutableUnionRecordReader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/MutableUnionRecordReader.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/MutableUnionRecordReader.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/MutableUnionRecordReader.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/Reader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/Reader.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/Reader.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/Reader.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/ReaderBase.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/ReaderBase.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/ReaderBase.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/ReaderBase.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RecordReader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RecordReader.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RecordReader.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RecordReader.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RecordWriter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RecordWriter.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RecordWriter.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RecordWriter.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RoundRobinChannelSelector.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RoundRobinChannelSelector.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RoundRobinChannelSelector.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RoundRobinChannelSelector.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/UnionRecordReader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/UnionRecordReader.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/api/UnionRecordReader.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/UnionRecordReader.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferAvailabilityListener.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferAvailabilityListener.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferAvailabilityListener.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferAvailabilityListener.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferProvider.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferProvider.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferProvider.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferProvider.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferProviderBroker.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferProviderBroker.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferProviderBroker.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/BufferProviderBroker.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/DiscardBufferPool.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/DiscardBufferPool.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/DiscardBufferPool.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/DiscardBufferPool.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/GlobalBufferPool.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/GlobalBufferPool.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/GlobalBufferPool.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/GlobalBufferPool.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPool.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPool.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPool.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPool.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolOwner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolOwner.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolOwner.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolOwner.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/BufferOrEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/BufferOrEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/BufferOrEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/BufferOrEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/Channel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/Channel.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/Channel.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/Channel.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelCloseEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelCloseEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelCloseEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelCloseEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelID.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelID.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelID.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelType.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelType.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelType.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ChannelType.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/EndOfSuperstepEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/EndOfSuperstepEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/EndOfSuperstepEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/EndOfSuperstepEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/InputChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/InputChannel.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/InputChannel.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/InputChannel.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/OutputChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/OutputChannel.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/OutputChannel.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/OutputChannel.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ReceiverAlreadyClosedException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ReceiverAlreadyClosedException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ReceiverAlreadyClosedException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/ReceiverAlreadyClosedException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/Gate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/Gate.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/Gate.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/Gate.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/GateID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/GateID.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/GateID.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/GateID.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/InputChannelResult.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/InputChannelResult.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/InputChannelResult.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/InputChannelResult.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/InputGate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/InputGate.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/InputGate.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/InputGate.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/OutputGate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/OutputGate.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/OutputGate.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/OutputGate.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/RecordAvailabilityListener.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/RecordAvailabilityListener.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/RecordAvailabilityListener.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/RecordAvailabilityListener.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoder.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoder.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoder.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDispatcher.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDispatcher.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDispatcher.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDispatcher.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundConnectionQueue.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundConnectionQueue.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundConnectionQueue.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundConnectionQueue.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoder.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoder.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoder.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/AdaptiveSpanningRecordDeserializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/AdaptiveSpanningRecordDeserializer.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/AdaptiveSpanningRecordDeserializer.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/AdaptiveSpanningRecordDeserializer.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/DataInputDeserializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/DataInputDeserializer.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/DataInputDeserializer.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/DataInputDeserializer.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/DataOutputSerializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/DataOutputSerializer.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/DataOutputSerializer.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/DataOutputSerializer.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/RecordDeserializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/RecordDeserializer.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/RecordDeserializer.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/RecordDeserializer.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/RecordSerializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/RecordSerializer.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/RecordSerializer.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/RecordSerializer.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializer.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializer.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializer.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/ipc/Client.java b/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Client.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/ipc/Client.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Client.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/ipc/ConnectionHeader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/ConnectionHeader.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/ipc/ConnectionHeader.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/ipc/ConnectionHeader.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/ipc/RPC.java b/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/RPC.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/ipc/RPC.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/ipc/RPC.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/ipc/RemoteException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/RemoteException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/ipc/RemoteException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/ipc/RemoteException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/ipc/Server.java b/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Server.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/ipc/Server.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Server.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/ipc/Status.java b/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Status.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/ipc/Status.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Status.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannelBroker.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannelBroker.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannelBroker.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannelBroker.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/Broker.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/Broker.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/Broker.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/Broker.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/IterationAggregatorBroker.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/IterationAggregatorBroker.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/IterationAggregatorBroker.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/IterationAggregatorBroker.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetBroker.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetBroker.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetBroker.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetBroker.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetUpdateBarrier.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetUpdateBarrier.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetUpdateBarrier.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetUpdateBarrier.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetUpdateBarrierBroker.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetUpdateBarrierBroker.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetUpdateBarrierBroker.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SolutionSetUpdateBarrierBroker.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepBarrier.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepBarrier.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepBarrier.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepBarrier.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/convergence/WorksetEmptyConvergenceCriterion.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/convergence/WorksetEmptyConvergenceCriterion.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/convergence/WorksetEmptyConvergenceCriterion.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/convergence/WorksetEmptyConvergenceCriterion.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/event/AllWorkersDoneEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/AllWorkersDoneEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/event/AllWorkersDoneEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/AllWorkersDoneEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/event/IterationEventWithAggregators.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/IterationEventWithAggregators.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/event/IterationEventWithAggregators.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/IterationEventWithAggregators.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/event/TerminationEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/TerminationEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/event/TerminationEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/TerminationEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/event/WorkerDoneEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/WorkerDoneEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/event/WorkerDoneEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/WorkerDoneEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/io/FakeOutputTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/FakeOutputTask.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/io/FakeOutputTask.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/FakeOutputTask.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/io/HashPartitionIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/HashPartitionIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/io/HashPartitionIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/HashPartitionIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SerializedUpdateBuffer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SerializedUpdateBuffer.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SerializedUpdateBuffer.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SerializedUpdateBuffer.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SolutionSetFastUpdateOutputCollector.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SolutionSetFastUpdateOutputCollector.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SolutionSetFastUpdateOutputCollector.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SolutionSetFastUpdateOutputCollector.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SolutionSetUpdateOutputCollector.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SolutionSetUpdateOutputCollector.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SolutionSetUpdateOutputCollector.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SolutionSetUpdateOutputCollector.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/io/WorksetUpdateOutputCollector.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/WorksetUpdateOutputCollector.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/io/WorksetUpdateOutputCollector.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/WorksetUpdateOutputCollector.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/AbstractIterativePactTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/AbstractIterativePactTask.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/AbstractIterativePactTask.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/AbstractIterativePactTask.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationHeadPactTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationHeadPactTask.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationHeadPactTask.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationHeadPactTask.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationIntermediatePactTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationIntermediatePactTask.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationIntermediatePactTask.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationIntermediatePactTask.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationTailPactTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationTailPactTask.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationTailPactTask.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationTailPactTask.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/RuntimeAggregatorRegistry.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/RuntimeAggregatorRegistry.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/RuntimeAggregatorRegistry.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/RuntimeAggregatorRegistry.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/Terminable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/Terminable.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/iterative/task/Terminable.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/Terminable.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobInputVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobInputVertex.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobInputVertex.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobInputVertex.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobOutputVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobOutputVertex.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobOutputVertex.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobOutputVertex.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobVertex.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobVertex.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/AbstractJobVertex.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/DistributionPattern.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/DistributionPattern.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/DistributionPattern.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/DistributionPattern.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobEdge.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobEdge.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobEdge.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobEdge.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobGraph.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobGraph.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobGraph.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobGraph.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobGraphDefinitionException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobGraphDefinitionException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobGraphDefinitionException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobGraphDefinitionException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobID.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobID.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobID.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobInputVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobInputVertex.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobInputVertex.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobInputVertex.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobOutputVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobOutputVertex.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobOutputVertex.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobOutputVertex.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobStatus.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobStatus.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobStatus.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobStatus.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobTaskVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobTaskVertex.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobTaskVertex.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobTaskVertex.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobVertexID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobVertexID.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobVertexID.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobVertexID.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/tasks/AbstractInvokable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/tasks/AbstractInvokable.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/tasks/AbstractInvokable.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/tasks/AbstractInvokable.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/tasks/InputSplitIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/tasks/InputSplitIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/tasks/InputSplitIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/tasks/InputSplitIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/tasks/InputSplitProvider.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/tasks/InputSplitProvider.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobgraph/tasks/InputSplitProvider.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/tasks/InputSplitProvider.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/DeploymentManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/DeploymentManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/DeploymentManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/DeploymentManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/EventCollector.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/EventCollector.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/EventCollector.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/EventCollector.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerUtils.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerUtils.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerUtils.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/accumulators/AccumulatorManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/accumulators/AccumulatorManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/accumulators/AccumulatorManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/accumulators/AccumulatorManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/accumulators/JobAccumulators.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/accumulators/JobAccumulators.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/accumulators/JobAccumulators.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/accumulators/JobAccumulators.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/archive/ArchiveListener.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/archive/ArchiveListener.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/archive/ArchiveListener.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/archive/ArchiveListener.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/archive/MemoryArchivist.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/archive/MemoryArchivist.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/archive/MemoryArchivist.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/archive/MemoryArchivist.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultExecutionListener.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultExecutionListener.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultExecutionListener.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultExecutionListener.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultScheduler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultScheduler.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultScheduler.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultScheduler.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulingException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulingException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulingException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/SchedulingException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/DefaultInputSplitAssigner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/DefaultInputSplitAssigner.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/DefaultInputSplitAssigner.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/DefaultInputSplitAssigner.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitAssigner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitAssigner.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitAssigner.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitAssigner.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitTracker.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitTracker.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitTracker.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitTracker.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitWrapper.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitWrapper.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitWrapper.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitWrapper.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitAssigner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitAssigner.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitAssigner.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitAssigner.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitList.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitList.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitList.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitList.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitAssigner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitAssigner.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitAssigner.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitAssigner.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitList.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitList.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitList.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitList.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobmanagerInfoServlet.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobmanagerInfoServlet.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobmanagerInfoServlet.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobmanagerInfoServlet.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/MenuServlet.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/MenuServlet.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/MenuServlet.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/MenuServlet.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/SetupInfoServlet.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/SetupInfoServlet.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/SetupInfoServlet.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/SetupInfoServlet.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/WebInfoServer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/WebInfoServer.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/WebInfoServer.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/WebInfoServer.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementAttachment.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementAttachment.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementAttachment.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementAttachment.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementEdge.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementEdge.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementEdge.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementEdge.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementEdgeID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementEdgeID.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementEdgeID.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementEdgeID.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGate.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGate.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGate.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGateID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGateID.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGateID.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGateID.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraph.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraph.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraph.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraph.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraphIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraphIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraphIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraphIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupEdge.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupEdge.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupEdge.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupEdge.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertex.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertex.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertex.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertexID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertexID.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertexID.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertexID.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertexIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertexIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertexIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGroupVertexIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementStage.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementStage.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementStage.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementStage.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementVertex.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementVertex.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementVertex.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementVertexID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementVertexID.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementVertexID.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementVertexID.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/AbstractPagedInputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/AbstractPagedInputView.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/AbstractPagedInputView.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/AbstractPagedInputView.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/AbstractPagedOutputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/AbstractPagedOutputView.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/AbstractPagedOutputView.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/AbstractPagedOutputView.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/CheckedMemorySegment.java b/flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/CheckedMemorySegment.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/CheckedMemorySegment.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/CheckedMemorySegment.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/DefaultMemoryManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/DefaultMemoryManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/DefaultMemoryManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/DefaultMemoryManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/ListMemorySegmentSource.java b/flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/ListMemorySegmentSource.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/ListMemorySegmentSource.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/ListMemorySegmentSource.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/MemoryAllocationException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/MemoryAllocationException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/MemoryAllocationException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/MemoryAllocationException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/MemoryManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/MemoryManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/MemoryManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/MemoryManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/SimpleMemorySegment.java b/flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/SimpleMemorySegment.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/SimpleMemorySegment.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/SimpleMemorySegment.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/UnsafeMemorySegment.java b/flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/UnsafeMemorySegment.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/memorymanager/UnsafeMemorySegment.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/UnsafeMemorySegment.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/net/NetUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/net/NetUtils.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/net/NetUtils.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/net/NetUtils.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/net/SocketIOWithTimeout.java b/flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketIOWithTimeout.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/net/SocketIOWithTimeout.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketIOWithTimeout.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/net/SocketInputStream.java b/flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketInputStream.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/net/SocketInputStream.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketInputStream.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/net/SocketOutputStream.java b/flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketOutputStream.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/net/SocketOutputStream.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketOutputStream.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractCachedBuildSideMatchDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractCachedBuildSideMatchDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractCachedBuildSideMatchDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractCachedBuildSideMatchDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/BuildFirstCachedMatchDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/BuildFirstCachedMatchDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/BuildFirstCachedMatchDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/BuildFirstCachedMatchDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/BuildSecondCachedMatchDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/BuildSecondCachedMatchDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/BuildSecondCachedMatchDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/BuildSecondCachedMatchDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetFirstDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetFirstDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetFirstDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetFirstDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetSecondDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetSecondDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetSecondDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetSecondDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/CollectorMapDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CollectorMapDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/CollectorMapDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/CollectorMapDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/DamBehavior.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DamBehavior.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/DamBehavior.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/DamBehavior.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/DataSinkTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSinkTask.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/DataSinkTask.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSinkTask.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/DataSourceTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSourceTask.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/DataSourceTask.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSourceTask.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/DriverStrategy.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DriverStrategy.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/DriverStrategy.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/DriverStrategy.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/FlatMapDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/FlatMapDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/FlatMapDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/FlatMapDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceCombineDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceCombineDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceCombineDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceCombineDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetFirstDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetFirstDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetFirstDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetFirstDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetSecondDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetSecondDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetSecondDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetSecondDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/MapDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MapDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/MapDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/MapDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/NoOpDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/NoOpDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/NoOpDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/NoOpDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/PactDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/PactDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/PactDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/PactDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/PactTaskContext.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/PactTaskContext.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/PactTaskContext.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/PactTaskContext.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceCombineDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceCombineDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceCombineDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceCombineDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/ResettablePactDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ResettablePactDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/ResettablePactDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/ResettablePactDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/RuntimeExecutionContext.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RuntimeExecutionContext.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/RuntimeExecutionContext.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/RuntimeExecutionContext.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/TempBarrier.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/TempBarrier.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/TempBarrier.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/TempBarrier.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedCollectorMapDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedCollectorMapDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedCollectorMapDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedCollectorMapDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedFlatMapDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedFlatMapDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedFlatMapDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedFlatMapDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedMapDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedMapDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedMapDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedMapDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedTerminationCriterionDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedTerminationCriterionDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedTerminationCriterionDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedTerminationCriterionDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ExceptionInChainedStubException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ExceptionInChainedStubException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ExceptionInChainedStubException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ExceptionInChainedStubException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/SynchronousChainedCombineDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/SynchronousChainedCombineDriver.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/SynchronousChainedCombineDriver.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/SynchronousChainedCombineDriver.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/AbstractHashTableProber.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/AbstractHashTableProber.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/AbstractHashTableProber.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/AbstractHashTableProber.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/AbstractMutableHashTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/AbstractMutableHashTable.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/AbstractMutableHashTable.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/AbstractMutableHashTable.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildFirstHashMatchIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildFirstHashMatchIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildFirstHashMatchIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildFirstHashMatchIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildFirstReOpenableHashMatchIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildFirstReOpenableHashMatchIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildFirstReOpenableHashMatchIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildFirstReOpenableHashMatchIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildSecondHashMatchIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildSecondHashMatchIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildSecondHashMatchIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildSecondHashMatchIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildSecondReOpenableHashMatchIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildSecondReOpenableHashMatchIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildSecondReOpenableHashMatchIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/BuildSecondReOpenableHashMatchIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashPartition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashPartition.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashPartition.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashPartition.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/InMemoryPartition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/InMemoryPartition.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/InMemoryPartition.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/InMemoryPartition.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableHashPartition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableHashPartition.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableHashPartition.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableHashPartition.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableMutableHashTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableMutableHashTable.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableMutableHashTable.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableMutableHashTable.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/AbstractBlockResettableIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/AbstractBlockResettableIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/AbstractBlockResettableIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/AbstractBlockResettableIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/HistogramPartitionFunction.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/HistogramPartitionFunction.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/HistogramPartitionFunction.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/HistogramPartitionFunction.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/OutputCollector.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/OutputCollector.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/OutputCollector.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/OutputCollector.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/OutputEmitter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/OutputEmitter.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/OutputEmitter.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/OutputEmitter.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/PartitionFunction.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/PartitionFunction.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/PartitionFunction.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/PartitionFunction.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputCollector.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputCollector.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputCollector.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputCollector.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputEmitter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputEmitter.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputEmitter.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputEmitter.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/ShipStrategyType.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/ShipStrategyType.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/ShipStrategyType.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/ShipStrategyType.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AsynchronousPartialSorter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AsynchronousPartialSorter.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AsynchronousPartialSorter.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AsynchronousPartialSorter.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AsynchronousPartialSorterCollector.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AsynchronousPartialSorterCollector.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AsynchronousPartialSorterCollector.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AsynchronousPartialSorterCollector.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMerger.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMerger.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMerger.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMerger.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ExceptionHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ExceptionHandler.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ExceptionHandler.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ExceptionHandler.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorter.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorter.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorter.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/HeapSort.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/HeapSort.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/HeapSort.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/HeapSort.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/InMemorySorter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/InMemorySorter.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/InMemorySorter.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/InMemorySorter.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/IndexedSortable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/IndexedSortable.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/IndexedSortable.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/IndexedSortable.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/IndexedSorter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/IndexedSorter.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/IndexedSorter.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/IndexedSorter.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeMatchIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeMatchIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeMatchIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeMatchIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorter.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorter.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorter.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/PartialOrderPriorityQueue.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/PartialOrderPriorityQueue.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/PartialOrderPriorityQueue.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/PartialOrderPriorityQueue.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/QuickSort.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/QuickSort.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/QuickSort.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/QuickSort.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/Sorter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/Sorter.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/Sorter.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/Sorter.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/udf/RuntimeUDFContext.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/udf/RuntimeUDFContext.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/udf/RuntimeUDFContext.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/udf/RuntimeUDFContext.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/CloseableInputProvider.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/CloseableInputProvider.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/CloseableInputProvider.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/CloseableInputProvider.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/CoGroupTaskIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/CoGroupTaskIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/CoGroupTaskIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/CoGroupTaskIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/CorruptConfigurationException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/CorruptConfigurationException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/CorruptConfigurationException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/CorruptConfigurationException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/JoinTaskIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/JoinTaskIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/JoinTaskIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/JoinTaskIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/LocalStrategy.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/LocalStrategy.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/LocalStrategy.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/LocalStrategy.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/ReaderIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/ReaderIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/ReaderIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/ReaderIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/RecordReaderIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/RecordReaderIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/RecordReaderIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/RecordReaderIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/SimpleCloseableInputProvider.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/SimpleCloseableInputProvider.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/SimpleCloseableInputProvider.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/SimpleCloseableInputProvider.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/TaskConfig.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/TaskConfig.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/operators/util/TaskConfig.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/TaskConfig.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/plugable/DeserializationDelegate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/plugable/DeserializationDelegate.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/plugable/DeserializationDelegate.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/plugable/DeserializationDelegate.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/plugable/SerializationDelegate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/plugable/SerializationDelegate.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/plugable/SerializationDelegate.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/plugable/SerializationDelegate.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/JobManagerProfiler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/JobManagerProfiler.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/JobManagerProfiler.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/JobManagerProfiler.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingException.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingException.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingException.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingException.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingListener.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingListener.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingListener.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingListener.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingUtils.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingUtils.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingUtils.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/TaskManagerProfiler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/TaskManagerProfiler.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/TaskManagerProfiler.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/TaskManagerProfiler.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentListenerImpl.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentListenerImpl.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentListenerImpl.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentListenerImpl.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentThreadSet.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentThreadSet.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentThreadSet.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentThreadSet.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/InstanceProfiler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/InstanceProfiler.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/InstanceProfiler.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/InstanceProfiler.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/JobManagerProfilerImpl.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/JobManagerProfilerImpl.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/JobManagerProfilerImpl.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/JobManagerProfilerImpl.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/JobProfilingData.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/JobProfilingData.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/JobProfilingData.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/JobProfilingData.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/ProfilerImplProtocol.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/ProfilerImplProtocol.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/ProfilerImplProtocol.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/ProfilerImplProtocol.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/TaskManagerProfilerImpl.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/TaskManagerProfilerImpl.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/TaskManagerProfilerImpl.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/TaskManagerProfilerImpl.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalExecutionVertexProfilingData.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalExecutionVertexProfilingData.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalExecutionVertexProfilingData.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalExecutionVertexProfilingData.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalExecutionVertexThreadProfilingData.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalExecutionVertexThreadProfilingData.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalExecutionVertexThreadProfilingData.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalExecutionVertexThreadProfilingData.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalInputGateProfilingData.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalInputGateProfilingData.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalInputGateProfilingData.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalInputGateProfilingData.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalInstanceProfilingData.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalInstanceProfilingData.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalInstanceProfilingData.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalInstanceProfilingData.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalOutputGateProfilingData.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalOutputGateProfilingData.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalOutputGateProfilingData.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalOutputGateProfilingData.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalProfilingData.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalProfilingData.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalProfilingData.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/InternalProfilingData.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/ProfilingDataContainer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/ProfilingDataContainer.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/ProfilingDataContainer.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/types/ProfilingDataContainer.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/InputGateProfilingEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/InputGateProfilingEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/InputGateProfilingEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/InputGateProfilingEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/InstanceProfilingEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/InstanceProfilingEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/InstanceProfilingEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/InstanceProfilingEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/InstanceSummaryProfilingEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/InstanceSummaryProfilingEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/InstanceSummaryProfilingEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/InstanceSummaryProfilingEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/OutputGateProfilingEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/OutputGateProfilingEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/OutputGateProfilingEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/OutputGateProfilingEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/ProfilingEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/ProfilingEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/ProfilingEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/ProfilingEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/SingleInstanceProfilingEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/SingleInstanceProfilingEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/SingleInstanceProfilingEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/SingleInstanceProfilingEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/ThreadProfilingEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/ThreadProfilingEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/ThreadProfilingEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/ThreadProfilingEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/VertexProfilingEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/VertexProfilingEvent.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/profiling/types/VertexProfilingEvent.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/profiling/types/VertexProfilingEvent.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/protocols/AccumulatorProtocol.java b/flink-runtime/src/main/java/org/apache/flink/runtime/protocols/AccumulatorProtocol.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/protocols/AccumulatorProtocol.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/protocols/AccumulatorProtocol.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/protocols/ChannelLookupProtocol.java b/flink-runtime/src/main/java/org/apache/flink/runtime/protocols/ChannelLookupProtocol.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/protocols/ChannelLookupProtocol.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/protocols/ChannelLookupProtocol.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/protocols/ExtendedManagementProtocol.java b/flink-runtime/src/main/java/org/apache/flink/runtime/protocols/ExtendedManagementProtocol.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/protocols/ExtendedManagementProtocol.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/protocols/ExtendedManagementProtocol.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/protocols/InputSplitProviderProtocol.java b/flink-runtime/src/main/java/org/apache/flink/runtime/protocols/InputSplitProviderProtocol.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/protocols/InputSplitProviderProtocol.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/protocols/InputSplitProviderProtocol.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/protocols/JobManagementProtocol.java b/flink-runtime/src/main/java/org/apache/flink/runtime/protocols/JobManagementProtocol.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/protocols/JobManagementProtocol.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/protocols/JobManagementProtocol.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/protocols/JobManagerProtocol.java b/flink-runtime/src/main/java/org/apache/flink/runtime/protocols/JobManagerProtocol.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/protocols/JobManagerProtocol.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/protocols/JobManagerProtocol.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/protocols/TaskOperationProtocol.java b/flink-runtime/src/main/java/org/apache/flink/runtime/protocols/TaskOperationProtocol.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/protocols/TaskOperationProtocol.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/protocols/TaskOperationProtocol.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/AbstractTaskResult.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/AbstractTaskResult.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/AbstractTaskResult.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/AbstractTaskResult.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/ExecutorThreadFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/ExecutorThreadFactory.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/ExecutorThreadFactory.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/ExecutorThreadFactory.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskCancelResult.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskCancelResult.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskCancelResult.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskCancelResult.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskExecutionState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskExecutionState.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskExecutionState.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskExecutionState.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskInputSplitProvider.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskInputSplitProvider.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskInputSplitProvider.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskInputSplitProvider.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskKillResult.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskKillResult.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskKillResult.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskKillResult.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskSubmissionResult.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskSubmissionResult.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskSubmissionResult.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskSubmissionResult.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/runtime/ExecutorThreadFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/runtime/ExecutorThreadFactory.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/runtime/ExecutorThreadFactory.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/runtime/ExecutorThreadFactory.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/transferenvelope/RegisterTaskManagerResult.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/transferenvelope/RegisterTaskManagerResult.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/taskmanager/transferenvelope/RegisterTaskManagerResult.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/transferenvelope/RegisterTaskManagerResult.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/topology/NetworkNode.java b/flink-runtime/src/main/java/org/apache/flink/runtime/topology/NetworkNode.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/topology/NetworkNode.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/topology/NetworkNode.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/topology/NetworkTopology.java b/flink-runtime/src/main/java/org/apache/flink/runtime/topology/NetworkTopology.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/topology/NetworkTopology.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/topology/NetworkTopology.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/topology/NetworkTopologyIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/topology/NetworkTopologyIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/topology/NetworkTopologyIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/topology/NetworkTopologyIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/types/FileRecord.java b/flink-runtime/src/main/java/org/apache/flink/runtime/types/FileRecord.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/types/FileRecord.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/types/FileRecord.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/types/IntegerRecord.java b/flink-runtime/src/main/java/org/apache/flink/runtime/types/IntegerRecord.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/types/IntegerRecord.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/types/IntegerRecord.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/AtomicEnum.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/AtomicEnum.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/AtomicEnum.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/AtomicEnum.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/AtomicEnumerator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/AtomicEnumerator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/AtomicEnumerator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/AtomicEnumerator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/BufferPoolConnector.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/BufferPoolConnector.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/BufferPoolConnector.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/BufferPoolConnector.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/EmptyIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/EmptyIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/EmptyIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/EmptyIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/EmptyMutableObjectIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/EmptyMutableObjectIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/EmptyMutableObjectIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/EmptyMutableObjectIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/EnumUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnumUtils.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/EnumUtils.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/EnumUtils.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/FileUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/FileUtils.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/FileUtils.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/FileUtils.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/IOUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/IOUtils.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/IOUtils.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/IOUtils.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/JarFileCreator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/JarFileCreator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/JarFileCreator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/JarFileCreator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/KeyGroupedIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/KeyGroupedIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/KeyGroupedIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/KeyGroupedIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/KeyGroupedMutableObjectIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/KeyGroupedMutableObjectIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/KeyGroupedMutableObjectIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/KeyGroupedMutableObjectIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/MathUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/MathUtils.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/MathUtils.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/MathUtils.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/MemoryBlockIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/MemoryBlockIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/MemoryBlockIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/MemoryBlockIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/MutableToRegularIteratorWrapper.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/MutableToRegularIteratorWrapper.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/MutableToRegularIteratorWrapper.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/MutableToRegularIteratorWrapper.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/NativeCodeLoader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/NativeCodeLoader.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/NativeCodeLoader.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/NativeCodeLoader.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/RegularToMutableObjectIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/RegularToMutableObjectIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/RegularToMutableObjectIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/RegularToMutableObjectIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/ResettableIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/ResettableIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/ResettableIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/ResettableIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/ResettableMutableObjectIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/ResettableMutableObjectIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/ResettableMutableObjectIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/ResettableMutableObjectIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/SerializableArrayList.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/SerializableArrayList.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/SerializableArrayList.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/SerializableArrayList.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/SerializableHashMap.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/SerializableHashMap.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/SerializableHashMap.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/SerializableHashMap.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/SerializableHashSet.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/SerializableHashSet.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/SerializableHashSet.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/SerializableHashSet.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/SingleElementIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/SingleElementIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/SingleElementIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/SingleElementIterator.java diff --git a/stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/UnmodifiableIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/UnmodifiableIterator.java similarity index 100% rename from stratosphere-runtime/src/main/java/org/apache/flink/runtime/util/UnmodifiableIterator.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/util/UnmodifiableIterator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/AbstractIDTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/AbstractIDTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/AbstractIDTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/AbstractIDTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/client/JobResultTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/client/JobResultTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/client/JobResultTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/client/JobResultTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptorTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptorTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptorTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptorTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptorTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptorTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptorTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptorTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptorTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/event/job/JobEventTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/event/job/JobEventTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/event/job/JobEventTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/event/job/JobEventTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/event/job/ManagementEventTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/event/job/ManagementEventTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/event/job/ManagementEventTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/event/job/ManagementEventTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/event/task/EventNotificationManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/EventNotificationManagerTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/event/task/EventNotificationManagerTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/event/task/EventNotificationManagerTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/event/task/TaskEventTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/TaskEventTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/event/task/TaskEventTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/event/task/TaskEventTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask1Input1Output.java b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask1Input1Output.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask1Input1Output.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask1Input1Output.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask1Input2Outputs.java b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask1Input2Outputs.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask1Input2Outputs.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask1Input2Outputs.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask2Inputs1Output.java b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask2Inputs1Output.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask2Inputs1Output.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ForwardTask2Inputs1Output.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/executiongraph/SelfCrossForwardTask.java b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/SelfCrossForwardTask.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/executiongraph/SelfCrossForwardTask.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/SelfCrossForwardTask.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/fs/LineReader.java b/flink-runtime/src/test/java/org/apache/flink/runtime/fs/LineReader.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/fs/LineReader.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/fs/LineReader.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/fs/LineReaderTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/fs/LineReaderTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/fs/LineReaderTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/fs/LineReaderTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/fs/s3/S3FileSystemTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/fs/s3/S3FileSystemTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/fs/s3/S3FileSystemTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/fs/s3/S3FileSystemTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTestUtils.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTestUtils.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTestUtils.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/instance/HostInClusterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/instance/HostInClusterTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/instance/HostInClusterTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/instance/HostInClusterTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/instance/TestInstanceListener.java b/flink-runtime/src/test/java/org/apache/flink/runtime/instance/TestInstanceListener.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/instance/TestInstanceListener.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/instance/TestInstanceListener.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/instance/local/LocalInstanceManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/instance/local/LocalInstanceManagerTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/instance/local/LocalInstanceManagerTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/instance/local/LocalInstanceManagerTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/instance/local/TestInstanceListener.java b/flink-runtime/src/test/java/org/apache/flink/runtime/instance/local/TestInstanceListener.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/instance/local/TestInstanceListener.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/instance/local/TestInstanceListener.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/disk/ChannelViewsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/ChannelViewsTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/disk/ChannelViewsTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/ChannelViewsTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/DefaultChannelSelectorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/DefaultChannelSelectorTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/DefaultChannelSelectorTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/DefaultChannelSelectorTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoderTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoderTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoderTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoderTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManagerTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManagerTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManagerTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoderTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoderTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoderTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoderTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/DataInputOutputSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/DataInputOutputSerializerTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/DataInputOutputSerializerTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/DataInputOutputSerializerTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/PagedViewsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/PagedViewsTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/PagedViewsTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/PagedViewsTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializationTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializationTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializationTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializerTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializerTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializerTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/AsciiStringType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/AsciiStringType.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/AsciiStringType.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/AsciiStringType.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/BooleanType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/BooleanType.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/BooleanType.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/BooleanType.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteArrayType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteArrayType.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteArrayType.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteArrayType.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteSubArrayType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteSubArrayType.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteSubArrayType.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteSubArrayType.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteType.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteType.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ByteType.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/CharType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/CharType.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/CharType.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/CharType.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/DoubleType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/DoubleType.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/DoubleType.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/DoubleType.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/FloatType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/FloatType.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/FloatType.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/FloatType.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/IntType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/IntType.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/IntType.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/IntType.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/LongType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/LongType.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/LongType.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/LongType.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/SerializationTestType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/SerializationTestType.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/SerializationTestType.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/SerializationTestType.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/SerializationTestTypeFactory.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/SerializationTestTypeFactory.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/SerializationTestTypeFactory.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/SerializationTestTypeFactory.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ShortType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ShortType.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ShortType.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/ShortType.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/UnsignedByteType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/UnsignedByteType.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/UnsignedByteType.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/UnsignedByteType.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/UnsignedShortType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/UnsignedShortType.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/UnsignedShortType.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/UnsignedShortType.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/Util.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/Util.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/Util.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/Util.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannelTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannelTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannelTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannelTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BrokerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BrokerTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BrokerTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BrokerTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/StringPair.java b/flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/StringPair.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/StringPair.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/StringPair.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/SuperstepBarrierTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/SuperstepBarrierTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/SuperstepBarrierTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/SuperstepBarrierTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/iterative/event/EventWithAggregatorsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/iterative/event/EventWithAggregatorsTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/iterative/event/EventWithAggregatorsTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/iterative/event/EventWithAggregatorsTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobgraph/JobGraphTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobgraph/JobGraphTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobgraph/JobGraphTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/jobgraph/JobGraphTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/DoubleSourceTask.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/DoubleSourceTask.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/DoubleSourceTask.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/DoubleSourceTask.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/DoubleTargetTask.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/DoubleTargetTask.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/DoubleTargetTask.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/DoubleTargetTask.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ExceptionOutputFormat.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ExceptionOutputFormat.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ExceptionOutputFormat.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ExceptionOutputFormat.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ExceptionTask.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ExceptionTask.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ExceptionTask.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ExceptionTask.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ForwardTask.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ForwardTask.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ForwardTask.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ForwardTask.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/RuntimeExceptionTask.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/RuntimeExceptionTask.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/RuntimeExceptionTask.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/RuntimeExceptionTask.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/UnionTask.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/UnionTask.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/UnionTask.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/UnionTask.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultSchedulerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultSchedulerTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultSchedulerTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultSchedulerTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/TestDeploymentManager.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/TestDeploymentManager.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/TestDeploymentManager.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/TestDeploymentManager.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/TestInstanceManager.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/TestInstanceManager.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/TestInstanceManager.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/scheduler/TestInstanceManager.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/managementgraph/ManagementGraphTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/managementgraph/ManagementGraphTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/managementgraph/ManagementGraphTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/managementgraph/ManagementGraphTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/memory/DefaultMemoryManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/memory/DefaultMemoryManagerTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/memory/DefaultMemoryManagerTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/memory/DefaultMemoryManagerTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentSpeedBenchmark.java b/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentSpeedBenchmark.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentSpeedBenchmark.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentSpeedBenchmark.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/CachedMatchTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CachedMatchTaskTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/CachedMatchTaskTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/CachedMatchTaskTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskExternalITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskExternalITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskExternalITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskExternalITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskExternalITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskExternalITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskExternalITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskExternalITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskExternalITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/MapTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/MapTaskTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/MapTaskTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/MapTaskTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/MatchTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/MatchTaskExternalITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/MatchTaskExternalITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/MatchTaskExternalITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/MatchTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/MatchTaskTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/MatchTaskTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/MatchTaskTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/AllGroupReduceDriverTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/AllGroupReduceDriverTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/AllGroupReduceDriverTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/AllGroupReduceDriverTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/AllReduceDriverTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/AllReduceDriverTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/AllReduceDriverTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/AllReduceDriverTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/DriverTestData.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/DriverTestData.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/DriverTestData.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/DriverTestData.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/GatheringCollector.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/GatheringCollector.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/GatheringCollector.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/GatheringCollector.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/GroupReduceDriverTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/GroupReduceDriverTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/GroupReduceDriverTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/GroupReduceDriverTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/ReduceCombineDriverTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/ReduceCombineDriverTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/ReduceCombineDriverTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/ReduceCombineDriverTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/ReduceDriverTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/ReduceDriverTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/ReduceDriverTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/ReduceDriverTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/TestTaskContext.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/TestTaskContext.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/TestTaskContext.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/TestTaskContext.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashMatchIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashMatchIteratorITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashMatchIteratorITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashMatchIteratorITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTablePerformanceComparison.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTablePerformanceComparison.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTablePerformanceComparison.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTablePerformanceComparison.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/MemoryHashTableTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/MemoryHashTableTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/MemoryHashTableTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/MemoryHashTableTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/LastBitsToRange.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/LastBitsToRange.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/LastBitsToRange.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/LastBitsToRange.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/RandomIterator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/RandomIterator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/RandomIterator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/RandomIterator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/RangeCalculator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/RangeCalculator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/RangeCalculator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/RangeCalculator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/RangeIterator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/RangeIterator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/RangeIterator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/RangeIterator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/StepRangeIterator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/StepRangeIterator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/StepRangeIterator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/util/StepRangeIterator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableIteratorTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableIteratorTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableIteratorTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIteratorTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIteratorTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIteratorTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/AsynchonousPartialSorterITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/AsynchonousPartialSorterITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/AsynchonousPartialSorterITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/AsynchonousPartialSorterITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorterTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorterTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorterTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/MassiveStringSortingITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/MassiveStringSortingITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/MassiveStringSortingITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/MassiveStringSortingITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/MergeIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/MergeIteratorTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/MergeIteratorTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/MergeIteratorTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/MockRecordReader.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/MockRecordReader.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/MockRecordReader.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/MockRecordReader.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorterTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorterTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorterTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeMatchIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeMatchIteratorITCase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeMatchIteratorITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeMatchIteratorITCase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DelayingInfinitiveInputIterator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DelayingInfinitiveInputIterator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DelayingInfinitiveInputIterator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DelayingInfinitiveInputIterator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DiscardingOutputCollector.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DiscardingOutputCollector.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DiscardingOutputCollector.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DiscardingOutputCollector.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DummyInvokable.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DummyInvokable.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DummyInvokable.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DummyInvokable.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/ExpectedTestException.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/ExpectedTestException.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/ExpectedTestException.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/ExpectedTestException.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/InfiniteInputIterator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/InfiniteInputIterator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/InfiniteInputIterator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/InfiniteInputIterator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironment.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironment.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironment.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironment.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockInputSplitProvider.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockInputSplitProvider.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockInputSplitProvider.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockInputSplitProvider.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MutableObjectIteratorWrapper.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MutableObjectIteratorWrapper.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MutableObjectIteratorWrapper.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MutableObjectIteratorWrapper.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/NirvanaOutputList.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/NirvanaOutputList.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/NirvanaOutputList.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/NirvanaOutputList.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/RandomIntPairGenerator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/RandomIntPairGenerator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/RandomIntPairGenerator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/RandomIntPairGenerator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskCancelThread.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskCancelThread.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskCancelThread.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskCancelThread.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskTestBase.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskTestBase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskTestBase.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TestData.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TestData.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TestData.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TestData.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UniformIntPairGenerator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UniformIntPairGenerator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UniformIntPairGenerator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UniformIntPairGenerator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UniformRecordGenerator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UniformRecordGenerator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UniformRecordGenerator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UniformRecordGenerator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UniformStringPairGenerator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UniformStringPairGenerator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UniformStringPairGenerator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UniformStringPairGenerator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnionIterator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnionIterator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnionIterator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnionIterator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntList.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntList.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntList.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntList.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListComparator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListComparator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListComparator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListPairComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListPairComparator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListPairComparator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListPairComparator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListSerializer.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListSerializer.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListSerializer.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListSerializer.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPair.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPair.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPair.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPair.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairComparator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairComparator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairComparator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairListPairComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairListPairComparator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairListPairComparator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairListPairComparator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairPairComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairPairComparator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairPairComparator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairPairComparator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairSerializer.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairSerializer.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairSerializer.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairSerializer.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntValueSerializer.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntValueSerializer.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntValueSerializer.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntValueSerializer.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPair.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPair.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPair.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPair.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairComparator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairComparator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairComparator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairPairComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairPairComparator.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairPairComparator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairPairComparator.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairSerializer.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairSerializer.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairSerializer.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairSerializer.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/util/HashVsSortMiniBenchmark.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/HashVsSortMiniBenchmark.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/util/HashVsSortMiniBenchmark.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/HashVsSortMiniBenchmark.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/util/RecordOutputEmitterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/RecordOutputEmitterTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/operators/util/RecordOutputEmitterTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/RecordOutputEmitterTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/profiling/impl/InstanceProfilerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/profiling/impl/InstanceProfilerTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/profiling/impl/InstanceProfilerTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/profiling/impl/InstanceProfilerTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/profiling/types/ProfilingTypesTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/profiling/types/ProfilingTypesTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/profiling/types/ProfilingTypesTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/profiling/types/ProfilingTypesTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/CommonTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/CommonTestUtils.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/CommonTestUtils.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/CommonTestUtils.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/DiscardingRecycler.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/DiscardingRecycler.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/DiscardingRecycler.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/DiscardingRecycler.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/InterruptibleByteChannel.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/InterruptibleByteChannel.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/InterruptibleByteChannel.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/InterruptibleByteChannel.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/ManagementTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/ManagementTestUtils.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/ManagementTestUtils.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/ManagementTestUtils.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/ServerTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/ServerTestUtils.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/ServerTestUtils.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/ServerTestUtils.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/TestBufferProvider.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestBufferProvider.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/TestBufferProvider.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestBufferProvider.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/DoubleSourceTask.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/DoubleSourceTask.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/DoubleSourceTask.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/DoubleSourceTask.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/FileLineReader.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/FileLineReader.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/FileLineReader.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/FileLineReader.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/FileLineWriter.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/FileLineWriter.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/FileLineWriter.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/FileLineWriter.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/JobFileInputVertex.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/JobFileInputVertex.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/JobFileInputVertex.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/JobFileInputVertex.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/JobFileOutputVertex.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/JobFileOutputVertex.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/JobFileOutputVertex.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/tasks/JobFileOutputVertex.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/topology/NetworkTopologyTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/topology/NetworkTopologyTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/topology/NetworkTopologyTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/topology/NetworkTopologyTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/types/StringRecordTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/types/StringRecordTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/types/StringRecordTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/types/StringRecordTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/types/TypeTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/types/TypeTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/types/TypeTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/types/TypeTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/util/KeyGroupedIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/KeyGroupedIteratorTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/util/KeyGroupedIteratorTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/util/KeyGroupedIteratorTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/util/MathUtilTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/MathUtilTest.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/util/MathUtilTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/util/MathUtilTest.java diff --git a/stratosphere-runtime/src/test/java/org/apache/flink/runtime/util/TestDelegatingConfiguration.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/TestDelegatingConfiguration.java similarity index 100% rename from stratosphere-runtime/src/test/java/org/apache/flink/runtime/util/TestDelegatingConfiguration.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/util/TestDelegatingConfiguration.java diff --git a/stratosphere-runtime/src/test/resources/topology.txt b/flink-runtime/src/test/resources/topology.txt similarity index 100% rename from stratosphere-runtime/src/test/resources/topology.txt rename to flink-runtime/src/test/resources/topology.txt diff --git a/stratosphere-scala/pom.xml b/flink-scala/pom.xml similarity index 91% rename from stratosphere-scala/pom.xml rename to flink-scala/pom.xml index 86c192500f130..49e46a3f0cff8 100644 --- a/stratosphere-scala/pom.xml +++ b/flink-scala/pom.xml @@ -4,32 +4,32 @@ 4.0.0 - eu.stratosphere - stratosphere + org.apache.flink + flink-parent 0.6-SNAPSHOT .. - stratosphere-scala - stratosphere-scala + flink-scala + flink-scala jar - eu.stratosphere - stratosphere-core + org.apache.flink + flink-core ${project.version} - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java ${project.version} - eu.stratosphere - stratosphere-compiler + org.apache.flink + flink-compiler ${project.version} diff --git a/stratosphere-scala/src/main/java/org/apache/flink/api/scala/operators/Annotations.java b/flink-scala/src/main/java/org/apache/flink/api/scala/operators/Annotations.java similarity index 100% rename from stratosphere-scala/src/main/java/org/apache/flink/api/scala/operators/Annotations.java rename to flink-scala/src/main/java/org/apache/flink/api/scala/operators/Annotations.java diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/AnnotationUtil.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/AnnotationUtil.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/AnnotationUtil.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/AnnotationUtil.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/CompilerHints.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/CompilerHints.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/CompilerHints.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/CompilerHints.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/DataSet.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/DataSet.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/DataSet.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/DataSet.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/DataSink.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/DataSink.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/DataSink.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/DataSink.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/DataSource.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/DataSource.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/DataSource.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/DataSource.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/ScalaOperator.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/ScalaOperator.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/ScalaOperator.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/ScalaOperator.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/ScalaPlan.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/ScalaPlan.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/ScalaPlan.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/ScalaPlan.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/Extractors.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/Extractors.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/Extractors.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/Extractors.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/FieldSelector.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/FieldSelector.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/FieldSelector.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/FieldSelector.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaFields.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaFields.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaFields.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaFields.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaGenerator.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaGenerator.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaGenerator.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaGenerator.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaPrinter.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaPrinter.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaPrinter.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/GlobalSchemaPrinter.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/UserDefinedFunction.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/UserDefinedFunction.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/UserDefinedFunction.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/UserDefinedFunction.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/UserDefinedType.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/UserDefinedType.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/UserDefinedType.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/UserDefinedType.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/AmbientFieldDetector.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/AmbientFieldDetector.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/AmbientFieldDetector.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/AmbientFieldDetector.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/EdgeDependencySets.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/EdgeDependencySets.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/EdgeDependencySets.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/EdgeDependencySets.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/Extractors.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/Extractors.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/Extractors.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/Extractors.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaCompactor.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaCompactor.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaCompactor.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaCompactor.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaOptimizer.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaOptimizer.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaOptimizer.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaOptimizer.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaPrinter.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaPrinter.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaPrinter.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/GlobalSchemaPrinter.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/OutputSets.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/OutputSets.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/OutputSets.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/analysis/postPass/OutputSets.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/Counter.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/Counter.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/Counter.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/Counter.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/DeserializeMethodGen.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/DeserializeMethodGen.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/DeserializeMethodGen.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/DeserializeMethodGen.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/Logger.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/Logger.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/Logger.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/Logger.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/MacroContextHolder.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/MacroContextHolder.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/MacroContextHolder.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/MacroContextHolder.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/SelectionExtractor.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/SelectionExtractor.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/SelectionExtractor.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/SelectionExtractor.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/SerializeMethodGen.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/SerializeMethodGen.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/SerializeMethodGen.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/SerializeMethodGen.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/SerializerGen.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/SerializerGen.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/SerializerGen.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/SerializerGen.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/TreeGen.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/TreeGen.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/TreeGen.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/TreeGen.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/UDTAnalyzer.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/UDTAnalyzer.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/UDTAnalyzer.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/UDTAnalyzer.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/UDTDescriptors.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/UDTDescriptors.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/UDTDescriptors.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/UDTDescriptors.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/UDTGen.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/UDTGen.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/UDTGen.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/UDTGen.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/Util.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/Util.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/codegen/Util.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/codegen/Util.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/functions/CoGroupFunction.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/functions/CoGroupFunction.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/functions/CoGroupFunction.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/functions/CoGroupFunction.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/functions/CrossFunction.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/functions/CrossFunction.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/functions/CrossFunction.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/functions/CrossFunction.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/functions/DeserializingIterator.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/functions/DeserializingIterator.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/functions/DeserializingIterator.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/functions/DeserializingIterator.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/functions/JoinFunction.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/functions/JoinFunction.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/functions/JoinFunction.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/functions/JoinFunction.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/functions/MapFunction.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/functions/MapFunction.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/functions/MapFunction.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/functions/MapFunction.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/functions/ReduceFunction.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/functions/ReduceFunction.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/functions/ReduceFunction.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/functions/ReduceFunction.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/ClosureCleaner.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/operators/ClosureCleaner.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/ClosureCleaner.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/operators/ClosureCleaner.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/CoGroupOperator.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/operators/CoGroupOperator.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/CoGroupOperator.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/operators/CoGroupOperator.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/CopyOperator.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/operators/CopyOperator.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/CopyOperator.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/operators/CopyOperator.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/CrossOperator.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/operators/CrossOperator.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/CrossOperator.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/operators/CrossOperator.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/DataSinkMacros.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/operators/DataSinkMacros.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/DataSinkMacros.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/operators/DataSinkMacros.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/DataSourceMacros.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/operators/DataSourceMacros.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/DataSourceMacros.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/operators/DataSourceMacros.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/IterateOperators.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/operators/IterateOperators.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/IterateOperators.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/operators/IterateOperators.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/JoinOperator.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/operators/JoinOperator.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/JoinOperator.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/operators/JoinOperator.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/MapOperator.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/operators/MapOperator.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/MapOperator.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/operators/MapOperator.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/ReduceOperator.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/operators/ReduceOperator.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/ReduceOperator.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/operators/ReduceOperator.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/UnionOperator.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/operators/UnionOperator.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/UnionOperator.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/operators/UnionOperator.scala diff --git a/stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/package.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/operators/package.scala similarity index 100% rename from stratosphere-scala/src/main/scala/org/apache/flink/api/scala/operators/package.scala rename to flink-scala/src/main/scala/org/apache/flink/api/scala/operators/package.scala diff --git a/stratosphere-scala/src/test/scala/org/apache/flink/api/scala/CollectionDataSourceTest.scala b/flink-scala/src/test/scala/org/apache/flink/api/scala/CollectionDataSourceTest.scala similarity index 100% rename from stratosphere-scala/src/test/scala/org/apache/flink/api/scala/CollectionDataSourceTest.scala rename to flink-scala/src/test/scala/org/apache/flink/api/scala/CollectionDataSourceTest.scala diff --git a/stratosphere-test-utils/pom.xml b/flink-test-utils/pom.xml similarity index 60% rename from stratosphere-test-utils/pom.xml rename to flink-test-utils/pom.xml index 66cf5ef7995bc..c9c3f06b14cf6 100644 --- a/stratosphere-test-utils/pom.xml +++ b/flink-test-utils/pom.xml @@ -5,41 +5,41 @@ 4.0.0 - eu.stratosphere - stratosphere + org.apache.flink + flink-parent 0.6-SNAPSHOT .. - stratosphere-test-utils - stratosphere-test-utils + flink-test-utils + flink-test-utils jar - eu.stratosphere - stratosphere-core + org.apache.flink + flink-core ${project.version} - eu.stratosphere - stratosphere-compiler + org.apache.flink + flink-compiler ${project.version} - eu.stratosphere - stratosphere-runtime + org.apache.flink + flink-runtime ${project.version} - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients ${project.version} - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java ${project.version} diff --git a/stratosphere-test-utils/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java b/flink-test-utils/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java similarity index 100% rename from stratosphere-test-utils/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java rename to flink-test-utils/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java diff --git a/stratosphere-test-utils/src/main/java/org/apache/flink/test/compiler/util/OperatorResolver.java b/flink-test-utils/src/main/java/org/apache/flink/test/compiler/util/OperatorResolver.java similarity index 100% rename from stratosphere-test-utils/src/main/java/org/apache/flink/test/compiler/util/OperatorResolver.java rename to flink-test-utils/src/main/java/org/apache/flink/test/compiler/util/OperatorResolver.java diff --git a/stratosphere-test-utils/src/main/java/org/apache/flink/test/testdata/ConnectedComponentsData.java b/flink-test-utils/src/main/java/org/apache/flink/test/testdata/ConnectedComponentsData.java similarity index 100% rename from stratosphere-test-utils/src/main/java/org/apache/flink/test/testdata/ConnectedComponentsData.java rename to flink-test-utils/src/main/java/org/apache/flink/test/testdata/ConnectedComponentsData.java diff --git a/stratosphere-test-utils/src/main/java/org/apache/flink/test/testdata/EnumTriangleData.java b/flink-test-utils/src/main/java/org/apache/flink/test/testdata/EnumTriangleData.java similarity index 100% rename from stratosphere-test-utils/src/main/java/org/apache/flink/test/testdata/EnumTriangleData.java rename to flink-test-utils/src/main/java/org/apache/flink/test/testdata/EnumTriangleData.java diff --git a/stratosphere-test-utils/src/main/java/org/apache/flink/test/testdata/KMeansData.java b/flink-test-utils/src/main/java/org/apache/flink/test/testdata/KMeansData.java similarity index 100% rename from stratosphere-test-utils/src/main/java/org/apache/flink/test/testdata/KMeansData.java rename to flink-test-utils/src/main/java/org/apache/flink/test/testdata/KMeansData.java diff --git a/stratosphere-test-utils/src/main/java/org/apache/flink/test/testdata/PageRankData.java b/flink-test-utils/src/main/java/org/apache/flink/test/testdata/PageRankData.java similarity index 100% rename from stratosphere-test-utils/src/main/java/org/apache/flink/test/testdata/PageRankData.java rename to flink-test-utils/src/main/java/org/apache/flink/test/testdata/PageRankData.java diff --git a/stratosphere-test-utils/src/main/java/org/apache/flink/test/testdata/TransitiveClosureData.java b/flink-test-utils/src/main/java/org/apache/flink/test/testdata/TransitiveClosureData.java similarity index 100% rename from stratosphere-test-utils/src/main/java/org/apache/flink/test/testdata/TransitiveClosureData.java rename to flink-test-utils/src/main/java/org/apache/flink/test/testdata/TransitiveClosureData.java diff --git a/stratosphere-test-utils/src/main/java/org/apache/flink/test/testdata/WordCountData.java b/flink-test-utils/src/main/java/org/apache/flink/test/testdata/WordCountData.java similarity index 100% rename from stratosphere-test-utils/src/main/java/org/apache/flink/test/testdata/WordCountData.java rename to flink-test-utils/src/main/java/org/apache/flink/test/testdata/WordCountData.java diff --git a/stratosphere-test-utils/src/main/java/org/apache/flink/test/util/AbstractTestBase.java b/flink-test-utils/src/main/java/org/apache/flink/test/util/AbstractTestBase.java similarity index 100% rename from stratosphere-test-utils/src/main/java/org/apache/flink/test/util/AbstractTestBase.java rename to flink-test-utils/src/main/java/org/apache/flink/test/util/AbstractTestBase.java diff --git a/stratosphere-test-utils/src/main/java/org/apache/flink/test/util/JavaProgramTestBase.java b/flink-test-utils/src/main/java/org/apache/flink/test/util/JavaProgramTestBase.java similarity index 100% rename from stratosphere-test-utils/src/main/java/org/apache/flink/test/util/JavaProgramTestBase.java rename to flink-test-utils/src/main/java/org/apache/flink/test/util/JavaProgramTestBase.java diff --git a/stratosphere-test-utils/src/main/java/org/apache/flink/test/util/RecordAPITestBase.java b/flink-test-utils/src/main/java/org/apache/flink/test/util/RecordAPITestBase.java similarity index 100% rename from stratosphere-test-utils/src/main/java/org/apache/flink/test/util/RecordAPITestBase.java rename to flink-test-utils/src/main/java/org/apache/flink/test/util/RecordAPITestBase.java diff --git a/stratosphere-tests/pom.xml b/flink-tests/pom.xml similarity index 81% rename from stratosphere-tests/pom.xml rename to flink-tests/pom.xml index 300fa502c23ab..67c43b229c2db 100644 --- a/stratosphere-tests/pom.xml +++ b/flink-tests/pom.xml @@ -5,41 +5,41 @@ 4.0.0 - eu.stratosphere - stratosphere + org.apache.flink + flink-parent 0.6-SNAPSHOT .. - stratosphere-tests - stratosphere-tests + flink-tests + flink-tests jar - eu.stratosphere - stratosphere-core + org.apache.flink + flink-core ${project.version} - eu.stratosphere - stratosphere-compiler + org.apache.flink + flink-compiler ${project.version} - eu.stratosphere - stratosphere-runtime + org.apache.flink + flink-runtime ${project.version} - eu.stratosphere - stratosphere-clients + org.apache.flink + flink-clients ${project.version} - eu.stratosphere - stratosphere-java + org.apache.flink + flink-java ${project.version} @@ -48,26 +48,26 @@ 4.7 - eu.stratosphere - stratosphere-scala + org.apache.flink + flink-scala ${project.version} test - eu.stratosphere - stratosphere-test-utils + org.apache.flink + flink-test-utils ${project.version} test - eu.stratosphere - stratosphere-java-examples + org.apache.flink + flink-java-examples ${project.version} test - eu.stratosphere - stratosphere-scala-examples + org.apache.flink + flink-scala-examples ${project.version} test diff --git a/stratosphere-tests/src/test/assembly/test-assembly.xml b/flink-tests/src/test/assembly/test-assembly.xml similarity index 100% rename from stratosphere-tests/src/test/assembly/test-assembly.xml rename to flink-tests/src/test/assembly/test-assembly.xml diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java b/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorIterativeITCase.java b/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorIterativeITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorIterativeITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorIterativeITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/broadcastvars/BroadcastBranchingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/broadcastvars/BroadcastBranchingITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/broadcastvars/BroadcastBranchingITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/broadcastvars/BroadcastBranchingITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/broadcastvars/BroadcastVarsNepheleITCase.java b/flink-tests/src/test/java/org/apache/flink/test/broadcastvars/BroadcastVarsNepheleITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/broadcastvars/BroadcastVarsNepheleITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/broadcastvars/BroadcastVarsNepheleITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java b/flink-tests/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java rename to flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/cancelling/MapCancelingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/cancelling/MapCancelingITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/cancelling/MapCancelingITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/cancelling/MapCancelingITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/cancelling/MatchJoinCancelingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/cancelling/MatchJoinCancelingITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/cancelling/MatchJoinCancelingITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/cancelling/MatchJoinCancelingITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java b/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/compiler/examples/KMeansSingleStepTest.java b/flink-tests/src/test/java/org/apache/flink/test/compiler/examples/KMeansSingleStepTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/compiler/examples/KMeansSingleStepTest.java rename to flink-tests/src/test/java/org/apache/flink/test/compiler/examples/KMeansSingleStepTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/compiler/examples/RelationalQueryCompilerTest.java b/flink-tests/src/test/java/org/apache/flink/test/compiler/examples/RelationalQueryCompilerTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/compiler/examples/RelationalQueryCompilerTest.java rename to flink-tests/src/test/java/org/apache/flink/test/compiler/examples/RelationalQueryCompilerTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/compiler/examples/WordCountCompilerTest.java b/flink-tests/src/test/java/org/apache/flink/test/compiler/examples/WordCountCompilerTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/compiler/examples/WordCountCompilerTest.java rename to flink-tests/src/test/java/org/apache/flink/test/compiler/examples/WordCountCompilerTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/compiler/iterations/ConnectedComponentsCoGroupTest.java b/flink-tests/src/test/java/org/apache/flink/test/compiler/iterations/ConnectedComponentsCoGroupTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/compiler/iterations/ConnectedComponentsCoGroupTest.java rename to flink-tests/src/test/java/org/apache/flink/test/compiler/iterations/ConnectedComponentsCoGroupTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/compiler/iterations/ConnectedComponentsTest.java b/flink-tests/src/test/java/org/apache/flink/test/compiler/iterations/ConnectedComponentsTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/compiler/iterations/ConnectedComponentsTest.java rename to flink-tests/src/test/java/org/apache/flink/test/compiler/iterations/ConnectedComponentsTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/compiler/iterations/IterativeKMeansTest.java b/flink-tests/src/test/java/org/apache/flink/test/compiler/iterations/IterativeKMeansTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/compiler/iterations/IterativeKMeansTest.java rename to flink-tests/src/test/java/org/apache/flink/test/compiler/iterations/IterativeKMeansTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/compiler/iterations/MultipleJoinsWithSolutionSetCompilerTest.java b/flink-tests/src/test/java/org/apache/flink/test/compiler/iterations/MultipleJoinsWithSolutionSetCompilerTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/compiler/iterations/MultipleJoinsWithSolutionSetCompilerTest.java rename to flink-tests/src/test/java/org/apache/flink/test/compiler/iterations/MultipleJoinsWithSolutionSetCompilerTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/compiler/iterations/PageRankCompilerTest.java b/flink-tests/src/test/java/org/apache/flink/test/compiler/iterations/PageRankCompilerTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/compiler/iterations/PageRankCompilerTest.java rename to flink-tests/src/test/java/org/apache/flink/test/compiler/iterations/PageRankCompilerTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/compiler/plandump/DumpCompiledPlanTest.java b/flink-tests/src/test/java/org/apache/flink/test/compiler/plandump/DumpCompiledPlanTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/compiler/plandump/DumpCompiledPlanTest.java rename to flink-tests/src/test/java/org/apache/flink/test/compiler/plandump/DumpCompiledPlanTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java b/flink-tests/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java rename to flink-tests/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/distributedCache/DistributedCacheTest.java b/flink-tests/src/test/java/org/apache/flink/test/distributedCache/DistributedCacheTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/distributedCache/DistributedCacheTest.java rename to flink-tests/src/test/java/org/apache/flink/test/distributedCache/DistributedCacheTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/ConnectedComponentsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/ConnectedComponentsITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/ConnectedComponentsITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/ConnectedComponentsITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/EnumTriangleBasicITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/EnumTriangleBasicITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/EnumTriangleBasicITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/EnumTriangleBasicITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/EnumTriangleOptITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/EnumTriangleOptITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/EnumTriangleOptITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/EnumTriangleOptITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/PageRankITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/PageRankITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/PageRankITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/PageRankITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/TransitiveClosureITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/TransitiveClosureITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/TransitiveClosureITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/TransitiveClosureITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WebLogAnalysisITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WebLogAnalysisITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WebLogAnalysisITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WebLogAnalysisITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountPOJOITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountPOJOITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountPOJOITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountPOJOITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountWithCollectionITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountWithCollectionITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountWithCollectionITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleJavaPrograms/WordCountWithCollectionITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/ComputeEdgeDegreesITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/ComputeEdgeDegreesITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/ComputeEdgeDegreesITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/ComputeEdgeDegreesITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/ConnectedComponentsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/ConnectedComponentsITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/ConnectedComponentsITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/ConnectedComponentsITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/EnumTrianglesOnEdgesWithDegreesITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/EnumTrianglesOnEdgesWithDegreesITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/EnumTrianglesOnEdgesWithDegreesITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/EnumTrianglesOnEdgesWithDegreesITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/IterativeKMeansITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/IterativeKMeansITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/IterativeKMeansITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/IterativeKMeansITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/RelationalQueryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/RelationalQueryITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/RelationalQueryITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/RelationalQueryITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/TransitiveClosureNaiveITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/TransitiveClosureNaiveITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/TransitiveClosureNaiveITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/TransitiveClosureNaiveITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WebLogAnalysisITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WebLogAnalysisITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WebLogAnalysisITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WebLogAnalysisITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountPactValueITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountPactValueITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountPactValueITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountPactValueITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountWithCountFunctionITCase.java b/flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountWithCountFunctionITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountWithCountFunctionITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/exampleScalaPrograms/WordCountWithCountFunctionITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/failingPrograms/TaskFailureITCase.java b/flink-tests/src/test/java/org/apache/flink/test/failingPrograms/TaskFailureITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/failingPrograms/TaskFailureITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/failingPrograms/TaskFailureITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/BulkIterationWithAllReducerITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/BulkIterationWithAllReducerITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/BulkIterationWithAllReducerITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/BulkIterationWithAllReducerITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/CoGroupConnectedComponentsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/CoGroupConnectedComponentsITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/CoGroupConnectedComponentsITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/CoGroupConnectedComponentsITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/CoGroupConnectedComponentsSecondITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/CoGroupConnectedComponentsSecondITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/CoGroupConnectedComponentsSecondITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/CoGroupConnectedComponentsSecondITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsWithDeferredUpdateITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsWithDeferredUpdateITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsWithDeferredUpdateITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsWithDeferredUpdateITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsWithSolutionSetFirstITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsWithSolutionSetFirstITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsWithSolutionSetFirstITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsWithSolutionSetFirstITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/DanglingPageRankITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/DanglingPageRankITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/DanglingPageRankITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/DanglingPageRankITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/DeltaPageRankITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/DeltaPageRankITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/DeltaPageRankITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/DeltaPageRankITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/DependencyConnectedComponentsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/DependencyConnectedComponentsITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/DependencyConnectedComponentsITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/DependencyConnectedComponentsITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/IterationTerminationWithTerminationTail.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/IterationTerminationWithTerminationTail.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/IterationTerminationWithTerminationTail.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/IterationTerminationWithTerminationTail.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/IterationTerminationWithTwoTails.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/IterationTerminationWithTwoTails.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/IterationTerminationWithTwoTails.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/IterationTerminationWithTwoTails.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/IterationWithAllReducerITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/IterationWithAllReducerITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/IterationWithAllReducerITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/IterationWithAllReducerITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/IterationWithChainingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/IterationWithChainingITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/IterationWithChainingITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/IterationWithChainingITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/IterationWithUnionITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/IterationWithUnionITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/IterationWithUnionITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/IterationWithUnionITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/IterativeKMeansITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/IterativeKMeansITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/IterativeKMeansITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/IterativeKMeansITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/KMeansITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/KMeansITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/KMeansITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/KMeansITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/LineRankITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/LineRankITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/LineRankITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/LineRankITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/MultipleSolutionSetJoinsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/MultipleSolutionSetJoinsITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/MultipleSolutionSetJoinsITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/MultipleSolutionSetJoinsITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/PageRankITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/PageRankITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/PageRankITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/PageRankITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableConvergenceITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableConvergenceITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableConvergenceITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableConvergenceITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/ConfigUtils.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/ConfigUtils.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/ConfigUtils.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/ConfigUtils.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/ConnectedComponentsNepheleITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/ConnectedComponentsNepheleITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/ConnectedComponentsNepheleITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/ConnectedComponentsNepheleITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankNepheleITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankNepheleITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankNepheleITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankNepheleITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankWithCombinerNepheleITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankWithCombinerNepheleITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankWithCombinerNepheleITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankWithCombinerNepheleITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/IterationWithChainingNepheleITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/IterationWithChainingNepheleITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/IterationWithChainingNepheleITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/IterationWithChainingNepheleITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/JobGraphUtils.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/JobGraphUtils.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/JobGraphUtils.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/JobGraphUtils.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDanglingPageRank.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDanglingPageRank.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDanglingPageRank.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDanglingPageRank.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDanglingPageRankWithCombiner.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDanglingPageRankWithCombiner.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDanglingPageRankWithCombiner.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDanglingPageRankWithCombiner.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDotProductCoGroup.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDotProductCoGroup.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDotProductCoGroup.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDotProductCoGroup.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDotProductMatch.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDotProductMatch.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDotProductMatch.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatableDotProductMatch.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatingMap.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatingMap.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatingMap.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomCompensatingMap.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomImprovedAdjacencyListInputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomImprovedAdjacencyListInputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomImprovedAdjacencyListInputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomImprovedAdjacencyListInputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomImprovedDanglingPageRankInputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomImprovedDanglingPageRankInputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomImprovedDanglingPageRankInputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomImprovedDanglingPageRankInputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomPageWithRankOutFormat.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomPageWithRankOutFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomPageWithRankOutFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomPageWithRankOutFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomRankCombiner.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomRankCombiner.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomRankCombiner.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/CustomRankCombiner.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyList.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyList.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyList.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyList.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListComparator.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListComparator.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListComparator.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListComparator.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListComparatorFactory.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListComparatorFactory.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListComparatorFactory.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListComparatorFactory.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListSerializer.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListSerializer.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListSerializer.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListSerializer.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListSerializerFactory.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListSerializerFactory.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListSerializerFactory.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithAdjacencyListSerializerFactory.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRank.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRank.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRank.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRank.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDangling.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDangling.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDangling.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDangling.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingComparator.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingComparator.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingComparator.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingComparator.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingComparatorFactory.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingComparatorFactory.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingComparatorFactory.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingComparatorFactory.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingSerializer.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingSerializer.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingSerializer.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingSerializer.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingSerializerFactory.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingSerializerFactory.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingSerializerFactory.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankAndDanglingSerializerFactory.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankComparator.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankComparator.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankComparator.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankComparator.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankComparatorFactory.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankComparatorFactory.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankComparatorFactory.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankComparatorFactory.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankDanglingToVertexWithAdjacencyListPairComparatorFactory.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankDanglingToVertexWithAdjacencyListPairComparatorFactory.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankDanglingToVertexWithAdjacencyListPairComparatorFactory.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankDanglingToVertexWithAdjacencyListPairComparatorFactory.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankDanglingToVertexWithRankPairComparatorFactory.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankDanglingToVertexWithRankPairComparatorFactory.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankDanglingToVertexWithRankPairComparatorFactory.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankDanglingToVertexWithRankPairComparatorFactory.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankSerializer.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankSerializer.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankSerializer.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankSerializer.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankSerializerFactory.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankSerializerFactory.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankSerializerFactory.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/customdanglingpagerank/types/VertexWithRankSerializerFactory.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/AsciiLongArrayView.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/AsciiLongArrayView.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/AsciiLongArrayView.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/AsciiLongArrayView.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/BooleanValue.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/BooleanValue.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/BooleanValue.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/BooleanValue.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDanglingPageRank.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDanglingPageRank.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDanglingPageRank.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDanglingPageRank.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDotProductCoGroup.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDotProductCoGroup.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDotProductCoGroup.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDotProductCoGroup.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDotProductMatch.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDotProductMatch.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDotProductMatch.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatableDotProductMatch.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatingMap.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatingMap.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatingMap.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/CompensatingMap.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DanglingPageGenerateRankInputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DanglingPageGenerateRankInputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DanglingPageGenerateRankInputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DanglingPageGenerateRankInputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/ImprovedAdjacencyListInputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/ImprovedAdjacencyListInputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/ImprovedAdjacencyListInputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/ImprovedAdjacencyListInputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/ImprovedDanglingPageRankInputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/ImprovedDanglingPageRankInputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/ImprovedDanglingPageRankInputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/ImprovedDanglingPageRankInputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/LongArrayView.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/LongArrayView.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/LongArrayView.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/LongArrayView.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageRankStats.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageRankStats.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageRankStats.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageRankStats.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageRankStatsAggregator.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageRankStatsAggregator.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageRankStatsAggregator.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageRankStatsAggregator.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageWithRankOutFormat.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageWithRankOutFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageWithRankOutFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/PageWithRankOutFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/AggregateITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/AggregateITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/AggregateITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/AggregateITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/CoGroupITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/CoGroupITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/CoGroupITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/CoGroupITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/CrossITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/CrossITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/CrossITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/CrossITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/DistinctITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/DistinctITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/DistinctITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/DistinctITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/FilterITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/FilterITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/FilterITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/FilterITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/FlatMapITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/FlatMapITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/FlatMapITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/FlatMapITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/GroupReduceITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/GroupReduceITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/GroupReduceITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/GroupReduceITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/JoinITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/JoinITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/JoinITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/JoinITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/ProjectITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/ProjectITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/ProjectITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/ProjectITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/ReduceITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/ReduceITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/ReduceITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/ReduceITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/SumMinMaxITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/SumMinMaxITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/SumMinMaxITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/SumMinMaxITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/UnionITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/UnionITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/UnionITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/UnionITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/util/CollectionDataSets.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/util/CollectionDataSets.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/javaApiOperators/util/CollectionDataSets.java rename to flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/util/CollectionDataSets.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java b/flink-tests/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/operators/CoGroupITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/CoGroupITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/operators/CoGroupITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/operators/CoGroupITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/operators/CrossITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/CrossITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/operators/CrossITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/operators/CrossITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/operators/JoinITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/JoinITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/operators/JoinITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/operators/JoinITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/operators/MapITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/MapITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/operators/MapITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/operators/MapITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/operators/ReduceITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/ReduceITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/operators/ReduceITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/operators/ReduceITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/operators/UnionITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/UnionITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/operators/UnionITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/operators/UnionITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/operators/UnionSinkITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/UnionSinkITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/operators/UnionSinkITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/operators/UnionSinkITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java b/flink-tests/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java rename to flink-tests/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/CollectionSourceTest.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/CollectionSourceTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/CollectionSourceTest.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/CollectionSourceTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/CollectionValidationTest.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/CollectionValidationTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/CollectionValidationTest.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/CollectionValidationTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/ComputeEdgeDegreesITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/ComputeEdgeDegreesITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/ComputeEdgeDegreesITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/ComputeEdgeDegreesITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/EnumTrianglesOnEdgesWithDegreesITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/EnumTrianglesOnEdgesWithDegreesITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/EnumTrianglesOnEdgesWithDegreesITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/EnumTrianglesOnEdgesWithDegreesITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/EnumTrianglesRDFITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/EnumTrianglesRDFITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/EnumTrianglesRDFITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/EnumTrianglesRDFITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingMixedOrderITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingMixedOrderITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingMixedOrderITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingMixedOrderITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/GroupOrderReduceITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GroupOrderReduceITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/GroupOrderReduceITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GroupOrderReduceITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/MergeOnlyJoinITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/MergeOnlyJoinITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/MergeOnlyJoinITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/MergeOnlyJoinITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/PairwiseSPITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/PairwiseSPITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/PairwiseSPITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/PairwiseSPITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery10ITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery10ITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery10ITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery10ITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3ITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3ITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3ITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3ITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3WithUnionITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3WithUnionITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3WithUnionITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3WithUnionITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery4ITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery4ITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery4ITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery4ITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery9ITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery9ITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery9ITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery9ITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQueryAsterixITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQueryAsterixITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQueryAsterixITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQueryAsterixITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/TeraSortITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TeraSortITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/TeraSortITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TeraSortITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/WebLogAnalysisITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WebLogAnalysisITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/WebLogAnalysisITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WebLogAnalysisITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/WordCountITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WordCountITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/WordCountITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WordCountITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/WordCountUnionReduceITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WordCountUnionReduceITCase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobTests/WordCountUnionReduceITCase.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WordCountUnionReduceITCase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/ComputeEdgeDegrees.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/ComputeEdgeDegrees.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/ComputeEdgeDegrees.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/ComputeEdgeDegrees.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/ConnectedComponentsWithCoGroup.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/ConnectedComponentsWithCoGroup.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/ConnectedComponentsWithCoGroup.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/ConnectedComponentsWithCoGroup.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/DanglingPageRank.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/DanglingPageRank.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/DanglingPageRank.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/DanglingPageRank.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/DeltaPageRankWithInitialDeltas.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/DeltaPageRankWithInitialDeltas.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/DeltaPageRankWithInitialDeltas.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/DeltaPageRankWithInitialDeltas.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesOnEdgesWithDegrees.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesOnEdgesWithDegrees.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesOnEdgesWithDegrees.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesOnEdgesWithDegrees.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesRdfFoaf.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesRdfFoaf.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesRdfFoaf.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesRdfFoaf.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesWithDegrees.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesWithDegrees.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesWithDegrees.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/EnumTrianglesWithDegrees.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/PairwiseSP.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/PairwiseSP.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/PairwiseSP.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/PairwiseSP.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/SimplePageRank.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/SimplePageRank.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/SimplePageRank.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/SimplePageRank.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/WorksetConnectedComponents.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/WorksetConnectedComponents.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/WorksetConnectedComponents.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/WorksetConnectedComponents.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/AsciiLongArrayView.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/AsciiLongArrayView.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/AsciiLongArrayView.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/AsciiLongArrayView.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DanglingPageRankInputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DanglingPageRankInputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DanglingPageRankInputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DanglingPageRankInputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DotProductCoGroup.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DotProductCoGroup.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DotProductCoGroup.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DotProductCoGroup.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DotProductMatch.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DotProductMatch.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DotProductMatch.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DotProductMatch.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/ImprovedAdjacencyListInputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/ImprovedAdjacencyListInputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/ImprovedAdjacencyListInputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/ImprovedAdjacencyListInputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/LongArrayView.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/LongArrayView.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/LongArrayView.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/LongArrayView.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageRankStats.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageRankStats.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageRankStats.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageRankStats.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageRankStatsAggregator.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageRankStatsAggregator.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageRankStatsAggregator.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageRankStatsAggregator.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageWithRankOutFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageWithRankOutFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageWithRankOutFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/PageWithRankOutFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeInputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeInputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeInputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeInputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeWithDegreesInputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeWithDegreesInputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeWithDegreesInputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeWithDegreesInputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeWithDegreesOutputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeWithDegreesOutputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeWithDegreesOutputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/EdgeWithDegreesOutputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/TriangleOutputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/TriangleOutputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/TriangleOutputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/triangleEnumUtil/TriangleOutputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansBroadcast.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansBroadcast.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansBroadcast.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansBroadcast.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansCross.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansCross.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansCross.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansCross.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansSingleStep.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansSingleStep.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansSingleStep.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/KMeansSingleStep.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/ComputeDistance.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/ComputeDistance.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/ComputeDistance.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/ComputeDistance.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/ComputeDistanceParameterized.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/ComputeDistanceParameterized.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/ComputeDistanceParameterized.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/ComputeDistanceParameterized.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/CoordVector.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/CoordVector.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/CoordVector.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/CoordVector.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/FindNearestCenter.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/FindNearestCenter.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/FindNearestCenter.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/FindNearestCenter.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/PointInFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/PointInFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/PointInFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/PointInFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/PointOutFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/PointOutFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/PointOutFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/PointOutFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/RecomputeClusterCenter.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/RecomputeClusterCenter.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/RecomputeClusterCenter.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/kmeans/udfs/RecomputeClusterCenter.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/MergeOnlyJoin.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/MergeOnlyJoin.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/MergeOnlyJoin.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/MergeOnlyJoin.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery1.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery1.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery1.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery1.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery10.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery10.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery10.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery10.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery3.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery3.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery3.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery3.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery3Unioned.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery3Unioned.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery3Unioned.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery3Unioned.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQueryAsterix.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQueryAsterix.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQueryAsterix.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQueryAsterix.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/WebLogAnalysis.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/WebLogAnalysis.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/WebLogAnalysis.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/WebLogAnalysis.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/GroupByReturnFlag.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/GroupByReturnFlag.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/GroupByReturnFlag.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/GroupByReturnFlag.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/AmountAggregate.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/AmountAggregate.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/AmountAggregate.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/AmountAggregate.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/FilteredPartsJoin.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/FilteredPartsJoin.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/FilteredPartsJoin.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/FilteredPartsJoin.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/IntPair.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/IntPair.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/IntPair.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/IntPair.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/LineItemMap.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/LineItemMap.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/LineItemMap.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/LineItemMap.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/OrderMap.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/OrderMap.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/OrderMap.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/OrderMap.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/OrderedPartsJoin.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/OrderedPartsJoin.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/OrderedPartsJoin.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/OrderedPartsJoin.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartFilter.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartFilter.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartFilter.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartFilter.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartJoin.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartJoin.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartJoin.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartJoin.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartListJoin.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartListJoin.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartListJoin.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartListJoin.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartsuppMap.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartsuppMap.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartsuppMap.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/PartsuppMap.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/StringIntPair.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/StringIntPair.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/StringIntPair.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/StringIntPair.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/StringIntPairStringDataOutFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/StringIntPairStringDataOutFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/StringIntPairStringDataOutFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/StringIntPairStringDataOutFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/SupplierMap.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/SupplierMap.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/SupplierMap.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/SupplierMap.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/SuppliersJoin.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/SuppliersJoin.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/SuppliersJoin.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query9Util/SuppliersJoin.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/sort/ReduceGroupSort.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/sort/ReduceGroupSort.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/sort/ReduceGroupSort.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/sort/ReduceGroupSort.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/sort/TeraSort.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/sort/TeraSort.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/sort/TeraSort.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/sort/TeraSort.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraDistribution.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraDistribution.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraDistribution.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraDistribution.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraInputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraInputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraInputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraInputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraKey.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraKey.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraKey.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraKey.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraOutputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraOutputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraOutputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraOutputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraValue.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraValue.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraValue.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/sort/tsUtil/TeraValue.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/ConfigUtils.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/ConfigUtils.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/ConfigUtils.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/ConfigUtils.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/DiscardingOutputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/DiscardingOutputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/DiscardingOutputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/DiscardingOutputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/InfiniteIntegerInputFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/InfiniteIntegerInputFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/InfiniteIntegerInputFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/InfiniteIntegerInputFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/InfiniteIntegerInputFormatWithDelay.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/InfiniteIntegerInputFormatWithDelay.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/InfiniteIntegerInputFormatWithDelay.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/InfiniteIntegerInputFormatWithDelay.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/IntTupleDataInFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/IntTupleDataInFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/IntTupleDataInFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/IntTupleDataInFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/StringTupleDataOutFormat.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/StringTupleDataOutFormat.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/StringTupleDataOutFormat.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/StringTupleDataOutFormat.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/Tuple.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/Tuple.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/Tuple.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/Tuple.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/UniformIntInput.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/UniformIntInput.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/util/UniformIntInput.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/util/UniformIntInput.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/wordcount/WordCount.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/wordcount/WordCount.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/wordcount/WordCount.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/wordcount/WordCount.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/wordcount/WordCountAccumulators.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/wordcount/WordCountAccumulators.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/recordJobs/wordcount/WordCountAccumulators.java rename to flink-tests/src/test/java/org/apache/flink/test/recordJobs/wordcount/WordCountAccumulators.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java b/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java rename to flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/testPrograms/util/tests/IntTupleDataInFormatTest.java b/flink-tests/src/test/java/org/apache/flink/test/testPrograms/util/tests/IntTupleDataInFormatTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/testPrograms/util/tests/IntTupleDataInFormatTest.java rename to flink-tests/src/test/java/org/apache/flink/test/testPrograms/util/tests/IntTupleDataInFormatTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/testPrograms/util/tests/TupleTest.java b/flink-tests/src/test/java/org/apache/flink/test/testPrograms/util/tests/TupleTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/testPrograms/util/tests/TupleTest.java rename to flink-tests/src/test/java/org/apache/flink/test/testPrograms/util/tests/TupleTest.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/testdata/WebLogAnalysisData.java b/flink-tests/src/test/java/org/apache/flink/test/testdata/WebLogAnalysisData.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/testdata/WebLogAnalysisData.java rename to flink-tests/src/test/java/org/apache/flink/test/testdata/WebLogAnalysisData.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java rename to flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java diff --git a/stratosphere-tests/src/test/java/org/apache/flink/test/util/testjar/KMeansForTest.java b/flink-tests/src/test/java/org/apache/flink/test/util/testjar/KMeansForTest.java similarity index 100% rename from stratosphere-tests/src/test/java/org/apache/flink/test/util/testjar/KMeansForTest.java rename to flink-tests/src/test/java/org/apache/flink/test/util/testjar/KMeansForTest.java diff --git a/stratosphere-tests/src/test/resources/testdata/terainput.txt b/flink-tests/src/test/resources/testdata/terainput.txt similarity index 100% rename from stratosphere-tests/src/test/resources/testdata/terainput.txt rename to flink-tests/src/test/resources/testdata/terainput.txt diff --git a/pom.xml b/pom.xml index 4c29132b4f634..b062f11a9218f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,52 +3,49 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - org.sonatype.oss - oss-parent - 7 + org.apache + apache + 14 4.0.0 - eu.stratosphere - stratosphere + org.apache.flink + flink-parent 0.6-SNAPSHOT - stratosphere + flink pom - http://github.com/stratosphere/stratosphere - 2013 + http://flink.incubator.apache.org/ + 2014 The Apache Software License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt - stratosphere + repo - https://github.com/stratosphere/stratosphere - scm:git:git@github.com:stratosphere/stratosphere.git - scm:git:git@github.com:stratosphere/stratosphere.git + https://github.com/apache/incubator-flink + git@github.com:apache/incubator-flink.git + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-flink.git - - - - stratosphere-core - stratosphere-java - stratosphere-scala - stratosphere-runtime - stratosphere-compiler - stratosphere-examples - stratosphere-clients - stratosphere-tests - stratosphere-test-utils - stratosphere-addons - stratosphere-quickstart - stratosphere-dist + flink-core + flink-java + flink-scala + flink-runtime + flink-compiler + flink-examples + flink-clients + flink-tests + flink-test-utils + flink-addons + flink-quickstart + flink-dist @@ -58,9 +55,6 @@ 2.2.0 - - - commons-logging @@ -353,7 +347,7 @@ **/resources/** - **/stratosphere-bin/conf/slaves + **/flink-bin/conf/slaves **/README.md tools/checkstyle.xml diff --git a/stratosphere-dist/src/main/stratosphere-bin/NOTICE b/stratosphere-dist/src/main/stratosphere-bin/NOTICE deleted file mode 100644 index e9e906ffd164c..0000000000000 --- a/stratosphere-dist/src/main/stratosphere-bin/NOTICE +++ /dev/null @@ -1,13 +0,0 @@ -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. -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. diff --git a/stratosphere-quickstart/README.md b/stratosphere-quickstart/README.md deleted file mode 100644 index b679a3cde752d..0000000000000 --- a/stratosphere-quickstart/README.md +++ /dev/null @@ -1,89 +0,0 @@ -stratosphere-quickstart -======================= - -Two simple quickstart maven archetypes for Stratosphere. - -# Stratosphere Stable - -###Create an empty Java Stratosphere Job Project -Maven is required - -``` -curl https://raw.github.com/stratosphere/stratosphere-quickstart/master/quickstart.sh | bash -``` - -###Create a simple scala Stratosphere Job Project -Maven is required - -``` -curl https://raw.github.com/stratosphere/stratosphere-quickstart/master/quickstart-scala.sh | bash -``` - -When you import the scala project into eclipse you will also need the following plugins: - -Eclipse 4.x: - * scala-ide: http://download.scala-ide.org/sdk/e38/scala210/stable/site - * m2eclipse-scala: http://alchim31.free.fr/m2e-scala/update-site - * build-helper-maven-plugin: https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.15.0/N/0.15.0.201206251206/ - -Eclipse 3.7: - * scala-ide: http://download.scala-ide.org/sdk/e37/scala210/stable/site - * m2eclipse-scala: http://alchim31.free.fr/m2e-scala/update-site - * build-helper-maven-plugin: https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.14.0/N/0.14.0.201109282148/ - - - -###Generate project manually: -using this command. This call will ask you to name your newly created Job. -```bash -mvn archetype:generate \ - -DarchetypeGroupId=eu.stratosphere \ - -DarchetypeArtifactId=quickstart-java \ - -DarchetypeVersion=0.4 -``` - -###Generate scala project manually: -using this command. This call will ask you to name your newly created Job. -```bash -mvn archetype:generate \ - -DarchetypeGroupId=eu.stratosphere \ - -DarchetypeArtifactId=quickstart-scala \ - -DarchetypeVersion=0.4 -``` - - -# Stratosphere SNAPSHOT Archetypes - - - -# Repository Organization - -The quickstart bash scripts do not necessarily point to the most recent version in the code. Since the archetypes are versioned, the quickstarts usually differ by pointing to a specific version. - -The `quickstart.sh` script always points to the current stable release (v0.4, v0.5) -`-SNAPSHOT` points to the current snapshot version. - -Java: -``` -curl https://raw.github.com/stratosphere/stratosphere-quickstart/master/quickstart-SNAPSHOT.sh | bash -``` - -Manually: -``` -mvn archetype:generate \ - -DarchetypeGroupId=eu.stratosphere \ - -DarchetypeArtifactId=quickstart-java-SNAPSHOT \ - -DarchetypeVersion=0.5-SNAPSHOT \ - -DarchetypeCatalog=https://oss.sonatype.org/content/repositories/snapshots/ -``` - - -Scala: - -``` -curl https://raw.github.com/stratosphere/stratosphere-quickstart/master/quickstart-scala-SNAPSHOT.sh | bash -``` - -[![Build Status](https://travis-ci.org/stratosphere/stratosphere-quickstart.png?branch=master)](https://travis-ci.org/stratosphere/stratosphere-quickstart) - -(Use `-DarchetypeCatalog=local` for local testing during archetype development) diff --git a/stratosphere-quickstart/quickstart-SNAPSHOT.sh b/stratosphere-quickstart/quickstart-SNAPSHOT.sh deleted file mode 100755 index d26695fcf753e..0000000000000 --- a/stratosphere-quickstart/quickstart-SNAPSHOT.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash - -######################################################################################################################## -# Copyright (C) 2010-2013 by the Stratosphere project (http://stratosphere.eu) -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on -# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -# specific language governing permissions and limitations under the License. -######################################################################################################################## - -PACKAGE=quickstart - -mvn archetype:generate \ - -DarchetypeGroupId=eu.stratosphere \ - -DarchetypeArtifactId=quickstart-java \ - -DarchetypeVersion=0.6-SNAPSHOT \ - -DgroupId=eu.stratosphere \ - -DartifactId=$PACKAGE \ - -Dversion=0.1 \ - -Dpackage=eu.stratosphere.quickstart \ - -DinteractiveMode=false \ - -DarchetypeCatalog=https://oss.sonatype.org/content/repositories/snapshots/ - -# -# Give some guidance -# -echo -e "\\n\\n" -echo -e "\\tA sample quickstart Stratosphere Job has been created." -echo -e "\\tSwitch into the directory using" -echo -e "\\t\\t cd $PACKAGE" -echo -e "\\tImport the project there using your favorite IDE (Import it as a maven project)" -echo -e "\\tBuild a jar inside the directory using" -echo -e "\\t\\t mvn clean package" -echo -e "\\tYou will find the runnable jar in $PACKAGE/target" -echo -e "\\tConsult our mailing list if you have any troubles: https://groups.google.com/forum/#!forum/stratosphere-dev" -echo -e "\\n\\n" - - -# Use this command if you want to specify the coordinates of your generated artifact -# in an interactive menu: -# -# mvn archetype:generate \ -# -DarchetypeGroupId=eu.stratosphere \ -# -DarchetypeArtifactId=quickstart-java \ -# -DarchetypeVersion=0.4-SNAPSHOT \ -# -DarchetypeCatalog=https://oss.sonatype.org/content/repositories/snapshots/ diff --git a/stratosphere-quickstart/quickstart-scala-SNAPSHOT.sh b/stratosphere-quickstart/quickstart-scala-SNAPSHOT.sh deleted file mode 100755 index acdd3692984c3..0000000000000 --- a/stratosphere-quickstart/quickstart-scala-SNAPSHOT.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash - -######################################################################################################################## -# Copyright (C) 2010-2013 by the Stratosphere project (http://stratosphere.eu) -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on -# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -# specific language governing permissions and limitations under the License. -######################################################################################################################## - -PACKAGE=quickstart - -mvn archetype:generate \ - -DarchetypeGroupId=eu.stratosphere \ - -DarchetypeArtifactId=quickstart-scala \ - -DarchetypeVersion=0.6-SNAPSHOT \ - -DgroupId=eu.stratoshere \ - -DartifactId=$PACKAGE \ - -Dversion=0.1 \ - -Dpackage=eu.stratosphere.quickstart \ - -DinteractiveMode=false \ - -DarchetypeCatalog=https://oss.sonatype.org/content/repositories/snapshots/ - -# -# Give some guidance -# -echo -e "\\n\\n" -echo -e "\\tA sample quickstart Stratosphere Job has been created." -echo -e "\\tSwitch into the directory using" -echo -e "\\t\\t cd $PACKAGE" -echo -e "\\tImport the project there using your favorite IDE (Import it as a maven project)" -echo -e "\\tBuild a jar inside the directory using" -echo -e "\\t\\t mvn clean package" -echo -e "\\tYou will find the runnable jar in $PACKAGE/target" -echo -e "\\tConsult our mailing list if you have any troubles: https://groups.google.com/forum/#!forum/stratosphere-dev" -echo -e "\\n\\n" - - -# Use this command if you want to specify the coordinates of your generated artifact -# in an interactive menu: -# -# mvn archetype:generate \ -# -DarchetypeGroupId=eu.stratosphere \ -# -DarchetypeArtifactId=quickstart-scala \ -# -DarchetypeVersion=0.4-SNAPSHOT \ -# -DarchetypeCatalog=https://oss.sonatype.org/content/repositories/snapshots/ diff --git a/tools/generate_specific_pom.sh b/tools/generate_specific_pom.sh index 43ff43739411e..ddbe85a53bbf7 100755 --- a/tools/generate_specific_pom.sh +++ b/tools/generate_specific_pom.sh @@ -31,7 +31,7 @@ old_version="$1" new_version="$2" new_pom_name="$3" -# Get hadoop version from the new stratosphere version +# Get hadoop version from the new Flink version hadoop_version=`echo "$new_version" | sed -n 's/.*\(hadoop[12]\).*/\1/p'` if [[ -z $hadoop_version ]]; then usage ; fi @@ -45,7 +45,7 @@ if [ -z "$here" ] ; then # to the script (e.g. permissions re-evaled after suid) exit 1 # fail fi -stratosphere_home="`dirname \"$here\"`" +flink_home="`dirname \"$here\"`" hadoop1= @@ -72,7 +72,7 @@ if [[ -z "$new_pom_name" ]]; then fi echo "Using $nupom as name for the generated pom file." -poms=`find $stratosphere_home -name pom.xml` +poms=`find $flink_home -name pom.xml` for p in $poms; do # write into tmp file because in-place replacement is not possible (if nupom="pom.xml") tmp_nuname="`dirname $p`/__generate_specific_pom_tmp"