[2/2] flink git commit: [hotfix] Clean up CliFrontend after removing web client

[sewen]

[hotfix] Clean up CliFrontend after removing web client


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/17fa6a9b
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/17fa6a9b
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/17fa6a9b

Branch: refs/heads/master
Commit: 17fa6a9bc965eb4dcd64123b7d1c66a75c077db6
Parents: c0fd36b
Author: Stephan Ewen 
Authored: Fri Jan 15 18:36:13 2016 +0100
Committer: Stephan Ewen 
Committed: Sat Jan 16 15:46:56 2016 +0100

--
 .../org/apache/flink/client/CliFrontend.java| 125 ---
 .../flink/yarn/FlinkYarnSessionCliTest.java |  10 +-
 .../apache/flink/yarn/FlinkYarnClientBase.java  |   9 +-
 .../flink/yarn/ApplicationMasterBase.scala  |   8 +-
 4 files changed, 62 insertions(+), 90 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flink/blob/17fa6a9b/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java
--
diff --git 
a/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java 
b/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java
index 7e1cef7..4b9bd06 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java
@@ -19,13 +19,14 @@
 package org.apache.flink.client;
 
 import akka.actor.ActorSystem;
+
 import org.apache.commons.cli.CommandLine;
+
 import org.apache.flink.api.common.InvalidProgramException;
 import org.apache.flink.api.common.JobExecutionResult;
 import org.apache.flink.api.common.JobID;
 import org.apache.flink.api.common.JobSubmissionResult;
 import org.apache.flink.api.common.accumulators.AccumulatorHelper;
-import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.client.cli.CancelOptions;
 import org.apache.flink.client.cli.CliArgsException;
 import org.apache.flink.client.cli.CliFrontendParser;
@@ -65,8 +66,10 @@ import org.apache.flink.runtime.yarn.AbstractFlinkYarnClient;
 import org.apache.flink.runtime.yarn.AbstractFlinkYarnCluster;
 import org.apache.flink.runtime.yarn.FlinkYarnClusterStatus;
 import org.apache.flink.util.StringUtils;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import scala.Some;
 import scala.concurrent.Await;
 import scala.concurrent.Future;
@@ -87,6 +90,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -95,7 +99,6 @@ import java.util.concurrent.TimeUnit;
 import static 
org.apache.flink.runtime.messages.JobManagerMessages.DisposeSavepoint;
 import static 
org.apache.flink.runtime.messages.JobManagerMessages.DisposeSavepointFailure;
 import static 
org.apache.flink.runtime.messages.JobManagerMessages.TriggerSavepointFailure;
-import static 
org.apache.flink.runtime.messages.JobManagerMessages.getRequestRunningJobsStatus;
 
 /**
  * Implementation of a simple command line frontend for executing programs.
@@ -133,6 +136,7 @@ public class CliFrontend {
 
private static final Logger LOG = 
LoggerFactory.getLogger(CliFrontend.class);
 
+
private final Configuration config;
 
private final FiniteDuration askTimeout;
@@ -143,12 +147,6 @@ public class CliFrontend {
 
private AbstractFlinkYarnCluster yarnCluster;
 
-   static boolean webFrontend = false;
-
-   private FlinkPlan optimizedPlan;
-
-   private PackagedProgram packagedProgram;
-
/**
 *
 * @throws Exception Thrown if the configuration directory was not 
found, the configuration could not
@@ -222,9 +220,9 @@ public class CliFrontend {
 
// handle the YARN client's dynamic properties
String dynamicPropertiesEncoded = 
yarnProperties.getProperty(YARN_PROPERTIES_DYNAMIC_PROPERTIES_STRING);
-   List> dynamicProperties = 
getDynamicProperties(dynamicPropertiesEncoded);
-   for (Tuple2 dynamicProperty : 
dynamicProperties) {
-   this.config.setString(dynamicProperty.f0, 
dynamicProperty.f1);
+   Map dynamicProperties = 
getDynamicProperties(dynamicPropertiesEncoded);
+   for (Map.Entry dynamicProperty : 
dynamicProperties.entrySet()) {
+   this.config.setString(dynamicProperty.getKey(), 
dynamicProperty.getValue());
}
}
 
@@ -408,42 +406,34 @@ public class CliFrontend {
LOG.info("Creating program plan dump");
 
   

[1/2] flink git commit: [hotfix] Fix reference to batch Java examples in flink-java8

[sewen]

Repository: flink
Updated Branches:
  refs/heads/master c0fd36bac -> adbeec2f9


[hotfix] Fix reference to batch Java examples in flink-java8


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/adbeec2f
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/adbeec2f
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/adbeec2f

Branch: refs/heads/master
Commit: adbeec2f912289779e4561cfafda27e429eb1051
Parents: 17fa6a9
Author: Stephan Ewen 
Authored: Fri Jan 15 22:13:46 2016 +0100
Committer: Stephan Ewen 
Committed: Sat Jan 16 15:46:56 2016 +0100

--
 flink-java8/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/flink/blob/adbeec2f/flink-java8/pom.xml
--
diff --git a/flink-java8/pom.xml b/flink-java8/pom.xml
index 33ea929..b0f18c7 100644
--- a/flink-java8/pom.xml
+++ b/flink-java8/pom.xml
@@ -66,7 +66,7 @@ under the License.
 

org.apache.flink
-   flink-java-examples
+   flink-examples-batch
${project.version}