Fix client and webclient for interactive mode of new java api.

stratosphere-clients/src/main/java/eu/stratosphere/client/program/Client.java

@@ -145,34 +145,21 @@ public class Client {
 		return getOptimizedPlan(prog.getPlan());
 	}
 	
-	/**
-	 * Creates the job-graph, which is ready for submission, from a compiled and optimized program.
-	 * The original program is required to access the original jar file.
-	 * 
-	 * @param prog The original program.
-	 * @param optPlan The optimized plan.
-	 * @return The nephele job graph, generated from the optimized plan.
-	 */
-	public JobGraph getJobGraph(JobWithJars prog, OptimizedPlan optPlan) throws ProgramInvocationException {
+	public JobGraph getJobGraph(PackagedProgram prog, OptimizedPlan optPlan) throws ProgramInvocationException {
+		return getJobGraph(optPlan, prog.getAllLibraries());
+	}
+	
+	private JobGraph getJobGraph(OptimizedPlan optPlan, List<File> jarFiles) {
 		NepheleJobGraphGenerator gen = new NepheleJobGraphGenerator();
 		JobGraph job = gen.compileJobGraph(optPlan);
 		
-		
-		try {
-			List<File> jarFiles = prog.getJarFiles();
-
-			for (File jar : jarFiles) {
-				job.addJar(new Path(jar.getAbsolutePath()));
-			}
-		}
-		catch (IOException ioex) {
-			throw new ProgramInvocationException("Could not extract the nested libraries: " + ioex.getMessage(), ioex);
+		for (File jar : jarFiles) {
+			job.addJar(new Path(jar.getAbsolutePath()));
 		}
 		
 		return job;
 	}
 	
-	
 	public JobExecutionResult run(PackagedProgram prog, boolean wait) throws ProgramInvocationException {
 		if (prog.isUsingProgramEntryPoint()) {
 			return run(prog.getPlanWithJars(), wait);
@@ -188,20 +175,9 @@ public class Client {
 		}
 	}
 	
-	/**
-	 * Runs a program on the nephele system whose job-manager is configured in this client's configuration.
-	 * This method involves all steps, from compiling, job-graph generation to submission.
-	 * 
-	 * @param prog The program to be executed.
-	 * @throws CompilerException Thrown, if the compiler encounters an illegal situation.
-	 * @throws ProgramInvocationException Thrown, if the program could not be instantiated from its jar file,
-	 *                                    or if the submission failed. That might be either due to an I/O problem,
-	 *                                    i.e. the job-manager is unreachable, or due to the fact that the execution
-	 *                                    on the nephele system failed.
-	 * @throws JobInstantiationException Thrown, if the plan assembler function causes an exception.
-	 */
-	public JobExecutionResult run(JobWithJars prog) throws CompilerException, ProgramInvocationException {
-		return run(prog, false);
+	public JobExecutionResult run(PackagedProgram prog, OptimizedPlan optimizedPlan, boolean wait) throws ProgramInvocationException {
+		return run(optimizedPlan, prog.getAllLibraries(), wait);
+
 	}
 	
 	/**
@@ -218,64 +194,16 @@ public class Client {
 	 * @throws JobInstantiationException Thrown, if the plan assembler function causes an exception.
 	 */
 	public JobExecutionResult run(JobWithJars prog, boolean wait) throws CompilerException, ProgramInvocationException {
-		return run(prog, getOptimizedPlan(prog), wait);
-	}
-	
-	/**
-	 * Submits the given program to the nephele job-manager for execution. The first step of the compilation process is skipped and
-	 * the given compiled plan is taken.
-	 * 
-	 * @param prog The original program.
-	 * @param compiledPlan The optimized plan.
-	 * @throws ProgramInvocationException Thrown, if the program could not be instantiated from its jar file,
-	 *                                    or if the submission failed. That might be either due to an I/O problem,
-	 *                                    i.e. the job-manager is unreachable, or due to the fact that the execution
-	 *                                    on the nephele system failed.
-	 */
-	public JobExecutionResult run(JobWithJars prog, OptimizedPlan compiledPlan) throws ProgramInvocationException {
-		return run(prog, compiledPlan, false);
+		return run(getOptimizedPlan(prog), prog.getJarFiles(), wait);
 	}
 	
-	/**
-	 * Submits the given program to the nephele job-manager for execution. The first step of the compilation process is skipped and
-	 * the given compiled plan is taken.
-	 * 
-	 * @param prog The original program.
-	 * @param compiledPlan The optimized plan.
-	 * @param wait A flag that indicates whether this function call should block until the program execution is done.
-	 * @throws ProgramInvocationException Thrown, if the program could not be instantiated from its jar file,
-	 *                                    or if the submission failed. That might be either due to an I/O problem,
-	 *                                    i.e. the job-manager is unreachable, or due to the fact that the execution
-	 *                                    on the nephele system failed.
-	 */
-	public JobExecutionResult run(JobWithJars prog, OptimizedPlan compiledPlan, boolean wait) throws ProgramInvocationException {
-		JobGraph job = getJobGraph(prog, compiledPlan);
-		return run(prog, job, wait);
-	}
 
-	/**
-	 * Submits the job-graph to the nephele job-manager for execution.
-	 * 
-	 * @param prog The program to be submitted.
-	 * @throws ProgramInvocationException Thrown, if the submission failed. That might be either due to an I/O problem,
-	 *                                    i.e. the job-manager is unreachable, or due to the fact that the execution
-	 *                                    on the nephele system failed.
-	 */
-	public JobExecutionResult run(JobWithJars program, JobGraph jobGraph) throws ProgramInvocationException {
-		return run(program, jobGraph, false);
+	public JobExecutionResult run(OptimizedPlan compiledPlan, List<File> libraries, boolean wait) throws ProgramInvocationException {
+		JobGraph job = getJobGraph(compiledPlan, libraries);
+		return run(job, wait);
 	}
-	/**
-	 * Submits the job-graph to the nephele job-manager for execution.
-	 * 
-	 * @param prog The program to be submitted.
-	 * @param wait Method will block until the job execution is finished if set to true. 
-	 *               If set to false, the method will directly return after the job is submitted. 
-	 * @throws ProgramInvocationException Thrown, if the submission failed. That might be either due to an I/O problem,
-	 *                                    i.e. the job-manager is unreachable, or due to the fact that the execution
-	 *                                    on the nephele system failed.
-	 */
-	public JobExecutionResult run(JobWithJars program, JobGraph jobGraph, boolean wait) throws ProgramInvocationException
-	{
+
+	public JobExecutionResult run(JobGraph jobGraph, boolean wait) throws ProgramInvocationException {
 		JobClient client;
 		try {
 			client = new JobClient(jobGraph, configuration);
@@ -344,12 +272,7 @@ public class Client {
 		}
 		
 		private void setAsContext() {
-			if (isContextEnvironmentSet()) {
-				throw new RuntimeException("The context environment has already been initialized.");
-			}
-			else {
-				initializeContextEnvironment(this);
-			}
+			initializeContextEnvironment(this);
 		}
 	}
 	

stratosphere-clients/src/main/java/eu/stratosphere/client/program/ContextEnvironment.java

@@ -63,11 +63,6 @@ public class ContextEnvironment extends ExecutionEnvironment {
 	}
 	
 	public void setAsContext() {
-		if (isContextEnvironmentSet()) {
-			throw new RuntimeException("The context environment has already been initialized.");
-		}
-		else {
-			initializeContextEnvironment(this);
-		}
+		initializeContextEnvironment(this);
 	}
 }

stratosphere-clients/src/main/java/eu/stratosphere/client/program/JobWithJars.java

@@ -68,7 +68,7 @@ public class JobWithJars {
 	/**
 	 * Returns list of jar files that need to be submitted with the plan.
 	 */
-	public List<File> getJarFiles() throws IOException {
+	public List<File> getJarFiles() {
 		return this.jarFiles;
 	}
 	

stratosphere-clients/src/main/java/eu/stratosphere/client/program/PackagedProgram.java

@@ -626,12 +626,7 @@ public class PackagedProgram {
 		}
 		
 		private void setAsContext() {
-			if (isContextEnvironmentSet()) {
-				throw new RuntimeException("The context environment has already been initialized.");
-			}
-			else {
-				initializeContextEnvironment(this);
-			}
+			initializeContextEnvironment(this);
 		}
 	}
 }

stratosphere-clients/src/main/java/eu/stratosphere/client/web/JobSubmissionServlet.java

@@ -77,7 +77,7 @@ public class JobSubmissionServlet extends HttpServlet {
 
 	private final File planDumpDirectory;				// the directory to dump the optimizer plans to
 
-	private final Map<Long, ProgramJobGraphPair> submittedJobs;	// map from UIDs to the running jobs
+	private final Map<Long, JobGraph> submittedJobs;	// map from UIDs to the running jobs
 
 	private final Random rand;							// random number generator for UIDs
 
@@ -89,7 +89,7 @@ public class JobSubmissionServlet extends HttpServlet {
 		this.jobStoreDirectory = jobDir;
 		this.planDumpDirectory = planDir;
 
-		this.submittedJobs = Collections.synchronizedMap(new HashMap<Long, ProgramJobGraphPair>());
+		this.submittedJobs = Collections.synchronizedMap(new HashMap<Long, JobGraph>());
 
 		this.rand = new Random(System.currentTimeMillis());
 	}
@@ -144,19 +144,19 @@ public class JobSubmissionServlet extends HttpServlet {
 				params.remove(0);
 			}
 
-			// create the pact plan
+			// create the plan
 			String[] options = params.isEmpty() ? new String[0] : (String[]) params.toArray(new String[params.size()]);
-			PackagedProgram pactProgram = null;
-			OptimizedPlan optPlan = null;
+			PackagedProgram program;
+			OptimizedPlan optPlan;
 			
 			try {
 				if (assemblerClass == null) {
-					pactProgram = new PackagedProgram(jarFile, options);
+					program = new PackagedProgram(jarFile, options);
 				} else {
-					pactProgram = new PackagedProgram(jarFile, assemblerClass, options);
+					program = new PackagedProgram(jarFile, assemblerClass, options);
 				}
 				
-				optPlan = client.getOptimizedPlan(pactProgram.getPlanWithJars());
+				optPlan = client.getOptimizedPlan(program);
 			}
 			catch (ProgramInvocationException e) {
 				// collect the stack trace
@@ -210,18 +210,17 @@ public class JobSubmissionServlet extends HttpServlet {
 				// submit the job only, if it should not be suspended
 				if (!suspend) {
 					try {
-						this.client.run(pactProgram.getPlanWithJars(), optPlan);
+						this.client.run(program, optPlan, false);
 					} catch (Throwable t) {
 						LOG.error("Error submitting job to the job-manager.", t);
 						showErrorPage(resp, t.getMessage());
 						return;
 					} finally {
-						pactProgram.deleteExtractedLibraries();
+						program.deleteExtractedLibraries();
 					}
 				} else {
 					try {
-						this.submittedJobs.put(uid, 
-							new ProgramJobGraphPair(pactProgram, this.client.getJobGraph(pactProgram.getPlanWithJars(), optPlan)));
+						this.submittedJobs.put(uid, this.client.getJobGraph(program, optPlan));
 					}
 					catch (ProgramInvocationException piex) {
 						LOG.error("Error creating JobGraph from optimized plan.", piex);
@@ -241,7 +240,7 @@ public class JobSubmissionServlet extends HttpServlet {
 				// don't show any plan. directly submit the job and redirect to the
 				// nephele runtime monitor
 				try {
-					client.run(pactProgram.getPlanWithJars());
+					client.run(program, false);
 				} catch (Exception ex) {
 					LOG.error("Error submitting job to the job-manager.", ex);
 					// HACK: Is necessary because Message contains whole stack trace
@@ -249,7 +248,7 @@ public class JobSubmissionServlet extends HttpServlet {
 					showErrorPage(resp, errorMessage);
 					return;
 				} finally {
-					pactProgram.deleteExtractedLibraries();
+					program.deleteExtractedLibraries();
 				}
 				resp.sendRedirect(START_PAGE_URL);
 			}
@@ -271,7 +270,7 @@ public class JobSubmissionServlet extends HttpServlet {
 			}
 
 			// get the retained job
-			ProgramJobGraphPair job = submittedJobs.remove(uid);
+			JobGraph job = submittedJobs.remove(uid);
 			if (job == null) {
 				resp.sendError(HttpServletResponse.SC_BAD_REQUEST,
 					"No job with the given uid was retained for later submission.");
@@ -280,7 +279,7 @@ public class JobSubmissionServlet extends HttpServlet {
 
 			// submit the job
 			try {
-				client.run(job.getProgram().getPlanWithJars(), job.getJobGraph());
+				client.run(job, false);
 			} catch (Exception ex) {
 				LOG.error("Error submitting job to the job-manager.", ex);
 				resp.setStatus(HttpServletResponse.SC_BAD_REQUEST);
@@ -289,8 +288,6 @@ public class JobSubmissionServlet extends HttpServlet {
 				resp.getWriter().print(errorMessage);
 				// resp.sendError(HttpServletResponse.SC_BAD_REQUEST, ex.getMessage());
 				return;
-			} finally {
-				job.getProgram().deleteExtractedLibraries();
 			}
 
 			// redirect to the start page
@@ -428,29 +425,5 @@ public class JobSubmissionServlet extends HttpServlet {
 		}
 
 		return list;
-	}
-	
-	// ============================================================================================
-	
-	private static final class ProgramJobGraphPair
-	{
-		private final PackagedProgram program;
-		
-		private final JobGraph jobGraph;
-
-		
-		public ProgramJobGraphPair(PackagedProgram program, JobGraph jobGraph) {
-			this.program = program;
-			this.jobGraph = jobGraph;
-		}
-
-		
-		public PackagedProgram getProgram() {
-			return program;
-		}
-
-		public JobGraph getJobGraph() {
-			return jobGraph;
-		}
 	}
 }

stratosphere-clients/src/main/java/eu/stratosphere/client/web/PactJobJSONServlet.java

@@ -109,10 +109,10 @@ public class PactJobJSONServlet extends HttpServlet {
 			}
 			if (programDescription != null) {
 				wrt.print(", \"description\": \"");
-				wrt.print(escapeString(programDescription));
+				wrt.print(escapeString(programDescription));
+				wrt.print("\"");
 			}
-			
-			wrt.print("\"");
+			
 			wrt.println("}");
 		}
 	}

stratosphere-clients/src/test/java/eu/stratosphere/client/program/ClientTest.java

@@ -113,7 +113,7 @@ public class ClientTest {
 		when(jobSubmissionResultMock.getReturnCode()).thenReturn(ReturnCode.SUCCESS);
 		
 		Client out = new Client(configMock);
-		out.run(program.getPlanWithJars());
+		out.run(program.getPlanWithJars(), false);
 		program.deleteExtractedLibraries();
 		
 		verify(this.compilerMock, times(1)).compile(planMock);
@@ -130,7 +130,7 @@ public class ClientTest {
 		when(jobSubmissionResultMock.getReturnCode()).thenReturn(ReturnCode.ERROR);
 		
 		Client out = new Client(configMock);
-		out.run(program.getPlanWithJars());
+		out.run(program.getPlanWithJars(), false);
 		program.deleteExtractedLibraries();
 		
 		verify(this.jobClientMock).submitJob();

stratosphere-java/src/main/java/eu/stratosphere/api/java/ExecutionEnvironment.java

@@ -293,9 +293,6 @@ public abstract class ExecutionEnvironment {
 	}
 	
 	protected static void initializeContextEnvironment(ExecutionEnvironment ctx) {
-		if (contextEnvironment != null)
-			throw new IllegalStateException("System context has already been initialized.");
-		
 		contextEnvironment = ctx;
 	}