subject:"oozie git commit\: OOZIE\-2751 LocalOozieClient is missing methods from OozieClient \(abhishekbafna via rkanter\)"

[4/9] oozie git commit: OOZIE-2751 LocalOozieClient is missing methods from OozieClient (abhishekbafna via rkanter)

2017-05-10 Thread gezapeti

http://git-wip-us.apache.org/repos/asf/oozie/blob/f5554dd3/core/src/main/java/org/apache/oozie/servlet/V1JobsServlet.java
--
diff --git a/core/src/main/java/org/apache/oozie/servlet/V1JobsServlet.java 
b/core/src/main/java/org/apache/oozie/servlet/V1JobsServlet.java
index 80c8ec4..9473821 100644
--- a/core/src/main/java/org/apache/oozie/servlet/V1JobsServlet.java
+++ b/core/src/main/java/org/apache/oozie/servlet/V1JobsServlet.java
@@ -30,27 +30,25 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.oozie.BaseEngineException;
 import org.apache.oozie.BulkResponseInfo;
-import org.apache.oozie.BundleJobBean;
+import org.apache.oozie.BundleEngine;
+import org.apache.oozie.BundleEngineException;
 import org.apache.oozie.BundleJobInfo;
 import org.apache.oozie.CoordinatorEngine;
-import org.apache.oozie.BundleEngine;
 import org.apache.oozie.CoordinatorEngineException;
-import org.apache.oozie.BundleEngineException;
-import org.apache.oozie.CoordinatorJobBean;
 import org.apache.oozie.CoordinatorJobInfo;
 import org.apache.oozie.DagEngine;
 import org.apache.oozie.DagEngineException;
 import org.apache.oozie.ErrorCode;
-import org.apache.oozie.WorkflowJobBean;
+import org.apache.oozie.OozieJsonFactory;
 import org.apache.oozie.WorkflowsInfo;
 import org.apache.oozie.cli.OozieCLI;
 import org.apache.oozie.client.OozieClient;
 import org.apache.oozie.client.rest.BulkResponseImpl;
 import org.apache.oozie.client.rest.JsonTags;
 import org.apache.oozie.client.rest.RestConstants;
+import org.apache.oozie.service.BundleEngineService;
 import org.apache.oozie.service.CoordinatorEngineService;
 import org.apache.oozie.service.DagEngineService;
-import org.apache.oozie.service.BundleEngineService;
 import org.apache.oozie.service.Services;
 import org.apache.oozie.util.XLog;
 import org.apache.oozie.util.XmlUtils;
@@ -308,12 +306,12 @@ public class V1JobsServlet extends BaseJobsServlet {
  * request object
  */
 private JSONObject getWorkflowJobs(HttpServletRequest request) throws 
XServletException {
-JSONObject json = new JSONObject();
+JSONObject json;
 try {
 String filter = 
request.getParameter(RestConstants.JOBS_FILTER_PARAM);
 String startStr = request.getParameter(RestConstants.OFFSET_PARAM);
 String lenStr = request.getParameter(RestConstants.LEN_PARAM);
-String timeZoneId = 
request.getParameter(RestConstants.TIME_ZONE_PARAM) == null 
+String timeZoneId = 
request.getParameter(RestConstants.TIME_ZONE_PARAM) == null
 ? "GMT" : 
request.getParameter(RestConstants.TIME_ZONE_PARAM);
 int start = (startStr != null) ? Integer.parseInt(startStr) : 1;
 start = (start < 1) ? 1 : start;
@@ -321,12 +319,7 @@ public class V1JobsServlet extends BaseJobsServlet {
 len = (len < 1) ? 50 : len;
 DagEngine dagEngine = 
Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
 WorkflowsInfo jobs = dagEngine.getJobs(filter, start, len);
-List jsonWorkflows = jobs.getWorkflows();
-json.put(JsonTags.WORKFLOWS_JOBS, 
WorkflowJobBean.toJSONArray(jsonWorkflows, timeZoneId));
-json.put(JsonTags.WORKFLOWS_TOTAL, jobs.getTotal());
-json.put(JsonTags.WORKFLOWS_OFFSET, jobs.getStart());
-json.put(JsonTags.WORKFLOWS_LEN, jobs.getLen());
-
+json = OozieJsonFactory.getWFJSONObject(jobs, timeZoneId);
 }
 catch (DagEngineException ex) {
 throw new XServletException(HttpServletResponse.SC_BAD_REQUEST, 
ex);
@@ -341,12 +334,12 @@ public class V1JobsServlet extends BaseJobsServlet {
  */
 @SuppressWarnings("unchecked")
 private JSONObject getCoordinatorJobs(HttpServletRequest request) throws 
XServletException {
-JSONObject json = new JSONObject();
+JSONObject json;
 try {
 String filter = 
request.getParameter(RestConstants.JOBS_FILTER_PARAM);
 String startStr = request.getParameter(RestConstants.OFFSET_PARAM);
 String lenStr = request.getParameter(RestConstants.LEN_PARAM);
-String timeZoneId = 
request.getParameter(RestConstants.TIME_ZONE_PARAM) == null 
+String timeZoneId = 
request.getParameter(RestConstants.TIME_ZONE_PARAM) == null
 ? "GMT" : 
request.getParameter(RestConstants.TIME_ZONE_PARAM);
 int start = (startStr != null) ? Integer.parseInt(startStr) : 1;
 start = (start < 1) ? 1 : start;
@@ -355,12 +348,7 @@ public class V1JobsServlet extends BaseJobsServlet {
 CoordinatorEngine coordEngine = 
Services.get().get(CoordinatorEngineService.class).getCoordinatorEngine(
 getUser(request));
 CoordinatorJobInfo jobs =

[3/3] oozie git commit: OOZIE-2751 LocalOozieClient is missing methods from OozieClient (abhishekbafna via rkanter)

2017-05-08 Thread rkanter

OOZIE-2751 LocalOozieClient is missing methods from OozieClient (abhishekbafna 
via rkanter)


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

Branch: refs/heads/master
Commit: f5554dd315c730286edbb333b4008e48620e2acc
Parents: ffd9951
Author: Robert Kanter 
Authored: Mon May 8 15:44:53 2017 -0700
Committer: Robert Kanter 
Committed: Mon May 8 15:44:53 2017 -0700

--
 .../org/apache/oozie/client/OozieClient.java|   4 +-
 .../apache/oozie/client/rest/RestConstants.java |   2 +-
 .../main/java/org/apache/oozie/BaseEngine.java  |  18 +-
 .../org/apache/oozie/BaseLocalOozieClient.java  | 601 +++
 .../java/org/apache/oozie/LocalOozieClient.java | 245 +---
 .../apache/oozie/LocalOozieClientBundle.java|  93 +++
 .../org/apache/oozie/LocalOozieClientCoord.java | 328 ++
 .../oozie/OozieClientOperationHandler.java  | 173 ++
 .../java/org/apache/oozie/OozieJsonFactory.java |  55 ++
 .../java/org/apache/oozie/local/LocalOozie.java |  93 ++-
 .../org/apache/oozie/servlet/V0JobsServlet.java |  12 +-
 .../org/apache/oozie/servlet/V1JobsServlet.java | 184 ++
 .../apache/oozie/TestLocalOozieClientCoord.java |  72 ++-
 release-log.txt |   1 +
 14 files changed, 1233 insertions(+), 648 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/f5554dd3/client/src/main/java/org/apache/oozie/client/OozieClient.java
--
diff --git a/client/src/main/java/org/apache/oozie/client/OozieClient.java 
b/client/src/main/java/org/apache/oozie/client/OozieClient.java
index 7370808..dbb7cbd 100644
--- a/client/src/main/java/org/apache/oozie/client/OozieClient.java
+++ b/client/src/main/java/org/apache/oozie/client/OozieClient.java
@@ -66,7 +66,7 @@ import org.codehaus.jackson.type.TypeReference;
 
 
 /**
- * Client API to submit and manage Oozie workflow jobs against an Oozie 
intance.
+ * Client API to submit and manage Oozie workflow jobs against an Oozie 
instance.
  * 
  * This class is thread safe.
  * 
@@ -1978,7 +1978,7 @@ public class OozieClient {
  * @param map the map
  * @return the string
  */
-private String mapToString(Map map) {
+protected String mapToString(Map map) {
 StringBuilder sb = new StringBuilder();
 Iterator> it = map.entrySet().iterator();
 while (it.hasNext()) {

http://git-wip-us.apache.org/repos/asf/oozie/blob/f5554dd3/client/src/main/java/org/apache/oozie/client/rest/RestConstants.java
--
diff --git 
a/client/src/main/java/org/apache/oozie/client/rest/RestConstants.java 
b/client/src/main/java/org/apache/oozie/client/rest/RestConstants.java
index f477531..74843dc 100644
--- a/client/src/main/java/org/apache/oozie/client/rest/RestConstants.java
+++ b/client/src/main/java/org/apache/oozie/client/rest/RestConstants.java
@@ -221,7 +221,7 @@ public interface RestConstants {
 
 String USER_PARAM = "user";
 
-public static final String COORD_ACTION_MISSING_DEPENDENCIES = 
"missing-dependencies";
+String COORD_ACTION_MISSING_DEPENDENCIES = "missing-dependencies";
 
 String ADMIN_PURGE = "purge";
 String PURGE_WF_AGE = "wf";

http://git-wip-us.apache.org/repos/asf/oozie/blob/f5554dd3/core/src/main/java/org/apache/oozie/BaseEngine.java
--
diff --git a/core/src/main/java/org/apache/oozie/BaseEngine.java 
b/core/src/main/java/org/apache/oozie/BaseEngine.java
index 2780ec2..6a8ebff 100644
--- a/core/src/main/java/org/apache/oozie/BaseEngine.java
+++ b/core/src/main/java/org/apache/oozie/BaseEngine.java
@@ -24,6 +24,7 @@ import java.util.Map;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.oozie.client.CoordinatorJob;
+import org.apache.oozie.client.OozieClientException;
 import org.apache.oozie.client.WorkflowJob;
 import org.apache.oozie.command.CommandException;
 import org.apache.oozie.executor.jpa.JPAExecutorException;
@@ -320,7 +321,7 @@ public abstract class BaseEngine {
 /**
  * Stream job log.
  *
- * @param xLogStreamer the log streamer
+ * @param logStreamer the log streamer
  * @param jobId the job id
  * @param writer the writer
  * @throws IOException Signals that an I/O exception has occurred.
@@ -329,4 +330,19 @@ public abstract class BaseEngine {
 protected abstract void streamJobLog(XLogStreamer logStreamer, String 
jobId, Writer writer) throws IOException,

oozie git commit: OOZIE-2751 LocalOozieClient is missing methods from OozieClient (abhishekbafna via rkanter)

2017-05-08 Thread rkanter

Repository: oozie
Updated Branches:
  refs/heads/master 3026e5aeb -> 30e673e60


OOZIE-2751 LocalOozieClient is missing methods from OozieClient (abhishekbafna 
via rkanter)


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

Branch: refs/heads/master
Commit: 30e673e60a746f855f50bf03b74810e19130e422
Parents: 3026e5a
Author: Robert Kanter 
Authored: Mon May 8 15:38:51 2017 -0700
Committer: Robert Kanter 
Committed: Mon May 8 15:38:51 2017 -0700

--
 docs/src/site/twiki/DG_QuickStart.twiki | 6 +++---
 docs/src/site/twiki/ENG_Building.twiki  | 6 +++---
 pom.xml | 6 +++---
 release-log.txt | 1 +
 4 files changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/30e673e6/docs/src/site/twiki/DG_QuickStart.twiki
--
diff --git a/docs/src/site/twiki/DG_QuickStart.twiki 
b/docs/src/site/twiki/DG_QuickStart.twiki
index fdc8374..7ea87c7 100644
--- a/docs/src/site/twiki/DG_QuickStart.twiki
+++ b/docs/src/site/twiki/DG_QuickStart.twiki
@@ -16,7 +16,7 @@ For detailed install and configuration instructions refer to 
[[AG_Install][Oozie
* Unix box (tested on Mac OS X and Linux)
* Java JDK 1.7+
* Maven 3.0.1+
-   * Hadoop 0.20.2+
+   * Hadoop 2.6.0+
* Pig 0.7+
 
 JDK commands (java, javac) must be in the command path.
@@ -45,7 +45,7 @@ available to customise the versions of the dependencies:
 profile depending on the hadoop version used.
 -Ptez - Bundle tez jars in hive and pig sharelibs. Useful if you want to use 
tez
 +as the execution engine for those applications.
--Dhadoop.version= - default 1.2.1 for hadoop-1, 2.4.0 for hadoop-2 
and 3.0.0-SNAPSHOT for hadoop-3
+-Dhadoop.version= - default 1.2.1 for hadoop-1, 2.6.0 for hadoop-2 
and 3.0.0-SNAPSHOT for hadoop-3
 -Dhadoop.auth.version= - defaults to hadoop version
 -Ddistcp.version= - defaults to hadoop version
 -Dpig.version= - default 0.16.0
@@ -70,7 +70,7 @@ More details on building Oozie can be found on the 
[[ENG_Building][Building Oozi
* Unix (tested in Linux and Mac OS X)
* Java 1.7+
* Hadoop
-  * [[http://hadoop.apache.org][Apache Hadoop]] (tested with 1.2.1 & 
2.4.0+)
+  * [[http://hadoop.apache.org][Apache Hadoop]] (tested with 1.2.1 & 
2.6.0+)
* ExtJS library (optional, to enable Oozie webconsole)
   * [[http://archive.cloudera.com/gplextras/misc/ext-2.2.zip][ExtJS 2.2]]
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/30e673e6/docs/src/site/twiki/ENG_Building.twiki
--
diff --git a/docs/src/site/twiki/ENG_Building.twiki 
b/docs/src/site/twiki/ENG_Building.twiki
index 019f8f1..535f1b0 100644
--- a/docs/src/site/twiki/ENG_Building.twiki
+++ b/docs/src/site/twiki/ENG_Building.twiki
@@ -11,7 +11,7 @@
* Unix box (tested on Mac OS X and Linux)
* Java JDK 1.7+
* [[http://maven.apache.org/][Maven 3.0.1+]]
-   * [[http://hadoop.apache.org/core/releases.html][Hadoop 0.20.2+]]
+   * [[http://hadoop.apache.org/core/releases.html][Hadoop 2.6.0+]]
* [[http://hadoop.apache.org/pig/releases.html][Pig 0.7+]]
 
 JDK commands (java, javac) must be in the command path.
@@ -114,7 +114,7 @@ specified in the =test.properties= file (which is loaded by 
the =XTestCase= clas
 
 *hadoop.version* =(*)=: indicates the Hadoop version(Hadoop-1 or Hadoop-2) you 
wish to build Oozie against specifically. It will
 substitute this value in the Oozie POM properties and pull the corresponding 
Hadoop artifacts from Maven. Default version is 1.2.1
-for Hadoop-1 (the most common case). For Hadoop-2, the version you can pass is 
*2.4.0*.
+for Hadoop-1 (the most common case). For Hadoop-2, the version you can pass is 
*2.6.0*.
 
 *generateSite* (*): generates Oozie documentation, default is undefined (no 
documentation is generated)
 
@@ -215,7 +215,7 @@ the versions of the dependencies:
 profile depending on the hadoop version used.
 -Ptez - Bundle tez jars in hive and pig sharelibs. Useful if you want to use 
tez
 as the execution engine for those applications.
--Dhadoop.version= - default 1.2.1 for hadoop-1, 2.4.0 for hadoop-2 
and 3.0.0-SNAPSHOT for hadoop-3
+-Dhadoop.version= - default 1.2.1 for hadoop-1, 2.6.0 for hadoop-2 
and 3.0.0-SNAPSHOT for hadoop-3
 -Dhadoop.auth.version= - defaults to hadoop version
 -Ddistcp.version= - defaults to hadoop version
 -Dpig.version= - default 0.16.0

http://git-wip-us.apache.org/repos/asf/oozie/blob/30e673e6/pom.xml
--

[4/9] oozie git commit: OOZIE-2751 LocalOozieClient is missing methods from OozieClient (abhishekbafna via rkanter)

[3/3] oozie git commit: OOZIE-2751 LocalOozieClient is missing methods from OozieClient (abhishekbafna via rkanter)

oozie git commit: OOZIE-2751 LocalOozieClient is missing methods from OozieClient (abhishekbafna via rkanter)

3 matches

Site Navigation

Mail list logo

Footer information