You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ry...@apache.org on 2013/06/13 01:17:37 UTC
svn commit: r1492478 [1/3] - in /oozie/trunk: ./
core/src/main/java/org/apache/oozie/
core/src/main/java/org/apache/oozie/action/oozie/
core/src/main/java/org/apache/oozie/client/rest/
core/src/main/java/org/apache/oozie/client/rest/sla/ core/src/main/...
Author: ryota
Date: Wed Jun 12 23:17:31 2013
New Revision: 1492478
URL: http://svn.apache.org/r1492478
Log:
OOZIE-1398 Reduce the number of CLOB columns used (ryota)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/BaseEngine.java
oozie/trunk/core/src/main/java/org/apache/oozie/BundleEngine.java
oozie/trunk/core/src/main/java/org/apache/oozie/BundleJobBean.java
oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java
oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java
oozie/trunk/core/src/main/java/org/apache/oozie/DagEngine.java
oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java
oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java
oozie/trunk/core/src/main/java/org/apache/oozie/action/oozie/SubWorkflowActionExecutor.java
oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonWorkflowAction.java
oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/sla/JsonSLARegistrationEvent.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitHiveXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitMRXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitPigXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitScriptLanguageXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/local/LocalOozie.java
oozie/trunk/core/src/main/java/org/apache/oozie/service/BundleEngineService.java
oozie/trunk/core/src/main/java/org/apache/oozie/service/CoordinatorEngineService.java
oozie/trunk/core/src/main/java/org/apache/oozie/service/DagEngineService.java
oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java
oozie/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java
oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
oozie/trunk/core/src/main/java/org/apache/oozie/servlet/BaseJobsServlet.java
oozie/trunk/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V0JobServlet.java
oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V0JobsServlet.java
oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V1JobServlet.java
oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V1JobsServlet.java
oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V2JobServlet.java
oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLASummaryBean.java
oozie/trunk/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java
oozie/trunk/core/src/main/java/org/apache/oozie/store/WorkflowStore.java
oozie/trunk/core/src/test/java/org/apache/oozie/TestBundleJobBean.java
oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java
oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorEngineStreamLog.java
oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorJobBean.java
oozie/trunk/core/src/test/java/org/apache/oozie/TestDagEngine.java
oozie/trunk/core/src/test/java/org/apache/oozie/TestWorkflowBean.java
oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/ActionExecutorTestCase.java
oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
oozie/trunk/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/TestPurgeXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/bundle/TestBundleJobSuspendXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/bundle/TestBundleKillXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/bundle/TestBundleStartXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/bundle/TestBundleSubmitXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestFutureActionsTimeOut.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestPastActionsTimeOut.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestSubmitHiveXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestSubmitMRXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestSubmitPigXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java
oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestBulkUpdateInsertForCoordActionStartJPAExecutor.java
oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestBulkUpdateInsertForCoordActionStatusJPAExecutor.java
oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestBulkUpdateInsertJPAExecutor.java
oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java
oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java
oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowIdGetForExternalIdJPAExecutor.java
oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobsGetForPurgeJPAExecutor.java
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestActionCheckerService.java
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestAuthorizationService.java
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestCoordMaterializeTriggerService.java
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestPurgeService.java
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java
oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java
oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockDagEngineService.java
oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestJobsServlet.java
oozie/trunk/core/src/test/java/org/apache/oozie/servlet/TestV1JobsServlet.java
oozie/trunk/core/src/test/java/org/apache/oozie/sla/TestSLAEventGeneration.java
oozie/trunk/core/src/test/java/org/apache/oozie/store/TestDBWorkflowStore.java
oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
oozie/trunk/release-log.txt
oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java
oozie/trunk/tools/src/test/java/org/apache/oozie/tools/TestOozieDBCLI.java
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/BaseEngine.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/BaseEngine.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/BaseEngine.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/BaseEngine.java Wed Jun 12 23:17:31 2013
@@ -31,7 +31,6 @@ public abstract class BaseEngine {
public static final String USE_XCOMMAND = "oozie.useXCommand";
protected String user;
- protected String authToken;
/**
* Return the user name.
@@ -43,15 +42,6 @@ public abstract class BaseEngine {
}
/**
- * Return the authentication token.
- *
- * @return the authentication token.
- */
- protected String getAuthToken() {
- return authToken;
- }
-
- /**
* Submit a job.
* <p/>
* It validates configuration properties.
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/BundleEngine.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/BundleEngine.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/BundleEngine.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/BundleEngine.java Wed Jun 12 23:17:31 2013
@@ -68,11 +68,9 @@ public class BundleEngine extends BaseEn
* Create a Bundle engine to perform operations on behave of a user.
*
* @param user user name.
- * @param authToken the authentication token.
*/
- public BundleEngine(String user, String authToken) {
+ public BundleEngine(String user) {
this.user = ParamChecker.notEmpty(user, "user");
- this.authToken = ParamChecker.notEmpty(authToken, "authToken");
}
/* (non-Javadoc)
@@ -94,7 +92,7 @@ public class BundleEngine extends BaseEn
*/
@Override
public String dryRunSubmit(Configuration conf) throws BundleEngineException {
- BundleSubmitXCommand submit = new BundleSubmitXCommand(true, conf, getAuthToken());
+ BundleSubmitXCommand submit = new BundleSubmitXCommand(true, conf);
try {
String jobId = submit.call();
return jobId;
@@ -264,7 +262,7 @@ public class BundleEngine extends BaseEn
@Override
public String submitJob(Configuration conf, boolean startJob) throws BundleEngineException {
try {
- String jobId = new BundleSubmitXCommand(conf, getAuthToken()).call();
+ String jobId = new BundleSubmitXCommand(conf).call();
if (startJob) {
start(jobId);
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/BundleJobBean.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/BundleJobBean.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/BundleJobBean.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/BundleJobBean.java Wed Jun 12 23:17:31 2013
@@ -40,7 +40,7 @@ import org.apache.openjpa.persistence.jd
@Entity
@NamedQueries( {
- @NamedQuery(name = "UPDATE_BUNDLE_JOB", query = "update BundleJobBean w set w.appName = :appName, w.appPath = :appPath, w.conf = :conf, w.externalId = :externalId, w.timeOut = :timeOut, w.authToken = :authToken, w.createdTimestamp = :createdTimestamp, w.endTimestamp = :endTimestamp, w.jobXml = :jobXml, w.lastModifiedTimestamp = :lastModifiedTimestamp, w.origJobXml = :origJobXml, w.startTimestamp = :startTimestamp, w.status = :status, w.timeUnitStr = :timeUnit, w.pending = :pending where w.id = :id"),
+ @NamedQuery(name = "UPDATE_BUNDLE_JOB", query = "update BundleJobBean w set w.appName = :appName, w.appPath = :appPath, w.conf = :conf, w.externalId = :externalId, w.timeOut = :timeOut, w.createdTimestamp = :createdTimestamp, w.endTimestamp = :endTimestamp, w.jobXml = :jobXml, w.lastModifiedTimestamp = :lastModifiedTimestamp, w.origJobXml = :origJobXml, w.startTimestamp = :startTimestamp, w.status = :status, w.timeUnitStr = :timeUnit, w.pending = :pending where w.id = :id"),
@NamedQuery(name = "UPDATE_BUNDLE_JOB_STATUS", query = "update BundleJobBean w set w.status = :status, w.lastModifiedTimestamp = :lastModifiedTimestamp, w.pending = :pending where w.id = :id"),
@@ -87,11 +87,6 @@ public class BundleJobBean extends JsonB
private String status = Job.Status.PREP.toString();
@Basic
- @Column(name = "auth_token")
- @Lob
- private String authToken = null;
-
- @Basic
@Column(name = "kickoff_time")
private java.sql.Timestamp kickoffTimestamp = null;
@@ -139,20 +134,6 @@ public class BundleJobBean extends JsonB
private String origJobXml = null;
/**
- * @return the authToken
- */
- public String getAuthToken() {
- return authToken;
- }
-
- /**
- * @param authToken the authToken to set
- */
- public void setAuthToken(String authToken) {
- this.authToken = authToken;
- }
-
- /**
* @return the kickoffTimestamp
*/
public java.sql.Timestamp getKickoffTimestamp() {
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java Wed Jun 12 23:17:31 2013
@@ -183,8 +183,8 @@ public class CoordinatorActionBean exten
@Column(name = "external_id")
private String externalId;
- @Column(name = "sla_xml")
- @Lob
+ @Basic
+ @Column(name = "sla_xml", length = 4000)
private String slaXml = null;
@Basic
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorEngine.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorEngine.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorEngine.java Wed Jun 12 23:17:31 2013
@@ -75,12 +75,10 @@ public class CoordinatorEngine extends B
* Create a Coordinator engine to perform operations on behave of a user.
*
* @param user user name.
- * @param authToken the authentication token.
*/
- public CoordinatorEngine(String user, String authToken) {
+ public CoordinatorEngine(String user) {
this();
this.user = ParamChecker.notEmpty(user, "user");
- this.authToken = ParamChecker.notEmpty(authToken, "authToken");
}
/*
@@ -376,8 +374,7 @@ public class CoordinatorEngine extends B
@Override
public String submitJob(Configuration conf, boolean startJob) throws CoordinatorEngineException {
try {
- CoordSubmitXCommand submit = new CoordSubmitXCommand(conf,
- getAuthToken());
+ CoordSubmitXCommand submit = new CoordSubmitXCommand(conf);
return submit.call();
}
catch (CommandException ex) {
@@ -394,8 +391,7 @@ public class CoordinatorEngine extends B
@Override
public String dryRunSubmit(Configuration conf) throws CoordinatorEngineException {
try {
- CoordSubmitXCommand submit = new CoordSubmitXCommand(true, conf,
- getAuthToken());
+ CoordSubmitXCommand submit = new CoordSubmitXCommand(true, conf);
return submit.call();
}
catch (CommandException ex) {
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java Wed Jun 12 23:17:31 2013
@@ -39,7 +39,7 @@ import org.apache.openjpa.persistence.jd
@Entity
@NamedQueries( {
- @NamedQuery(name = "UPDATE_COORD_JOB", query = "update CoordinatorJobBean w set w.appName = :appName, w.appPath = :appPath, w.concurrency = :concurrency, w.conf = :conf, w.externalId = :externalId, w.frequency = :frequency, w.lastActionNumber = :lastActionNumber, w.timeOut = :timeOut, w.timeZone = :timeZone, w.authToken = :authToken, w.createdTimestamp = :createdTime, w.endTimestamp = :endTime, w.execution = :execution, w.jobXml = :jobXml, w.lastActionTimestamp = :lastAction, w.lastModifiedTimestamp = :lastModifiedTime, w.nextMaterializedTimestamp = :nextMaterializedTime, w.origJobXml = :origJobXml, w.slaXml=:slaXml, w.startTimestamp = :startTime, w.status = :status, w.timeUnitStr = :timeUnit where w.id = :id"),
+ @NamedQuery(name = "UPDATE_COORD_JOB", query = "update CoordinatorJobBean w set w.appName = :appName, w.appPath = :appPath,w.concurrency = :concurrency, w.conf = :conf, w.externalId = :externalId, w.frequency = :frequency, w.lastActionNumber = :lastActionNumber, w.timeOut = :timeOut, w.timeZone = :timeZone, w.createdTimestamp = :createdTime, w.endTimestamp = :endTime, w.execution = :execution, w.jobXml = :jobXml, w.lastActionTimestamp = :lastAction, w.lastModifiedTimestamp = :lastModifiedTime, w.nextMaterializedTimestamp = :nextMaterializedTime, w.origJobXml = :origJobXml, w.slaXml=:slaXml, w.startTimestamp = :startTime, w.status = :status, w.timeUnitStr = :timeUnit where w.id = :id"),
@NamedQuery(name = "UPDATE_COORD_JOB_STATUS", query = "update CoordinatorJobBean w set w.status = :status, w.lastModifiedTimestamp = :lastModifiedTime where w.id = :id"),
@@ -88,11 +88,6 @@ public class CoordinatorJobBean extends
private String status = CoordinatorJob.Status.PREP.toString();
@Basic
- @Column(name = "auth_token")
- @Lob
- private String authToken = null;
-
- @Basic
@Column(name = "start_time")
private java.sql.Timestamp startTimestamp = null;
@@ -144,8 +139,8 @@ public class CoordinatorJobBean extends
@Lob
private String origJobXml = null;
- @Column(name = "sla_xml")
- @Lob
+ @Basic
+ @Column(name = "sla_xml", length = 4000)
private String slaXml = null;
@Basic
@@ -327,15 +322,6 @@ public class CoordinatorJobBean extends
}
/**
- * Set auth token
- *
- * @param authToken auth token
- */
- public void setAuthToken(String authToken) {
- this.authToken = authToken;
- }
-
- /**
* Set pending to true
*/
@Override
@@ -726,13 +712,4 @@ public class CoordinatorJobBean extends
return createdTimestamp;
}
- /**
- * Get auth token
- *
- * @return auth token
- */
- public String getAuthToken() {
- return this.authToken;
- }
-
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/DagEngine.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/DagEngine.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/DagEngine.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/DagEngine.java Wed Jun 12 23:17:31 2013
@@ -83,13 +83,11 @@ public class DagEngine extends BaseEngin
* Create a Dag engine to perform operations on behave of a user.
*
* @param user user name.
- * @param authToken the authentication token.
*/
- public DagEngine(String user, String authToken) {
+ public DagEngine(String user) {
this();
this.user = ParamChecker.notEmpty(user, "user");
- this.authToken = ParamChecker.notEmpty(authToken, "authToken");
}
/**
@@ -105,13 +103,13 @@ public class DagEngine extends BaseEngin
validateSubmitConfiguration(conf);
try {
- String jobId;
- SubmitXCommand submit = new SubmitXCommand(conf, getAuthToken());
- jobId = submit.call();
- if (startJob) {
- start(jobId);
- }
- return jobId;
+ String jobId;
+ SubmitXCommand submit = new SubmitXCommand(conf);
+ jobId = submit.call();
+ if (startJob) {
+ start(jobId);
+ }
+ return jobId;
}
catch (CommandException ex) {
throw new DagEngineException(ex);
@@ -135,13 +133,13 @@ public class DagEngine extends BaseEngin
String jobId;
SubmitHttpXCommand submit = null;
if (jobType.equals("pig")) {
- submit = new SubmitPigXCommand(conf, getAuthToken());
+ submit = new SubmitPigXCommand(conf);
}
else if (jobType.equals("mapreduce")) {
- submit = new SubmitMRXCommand(conf, getAuthToken());
+ submit = new SubmitMRXCommand(conf);
}
else if (jobType.equals("hive")) {
- submit = new SubmitHiveXCommand(conf, getAuthToken());
+ submit = new SubmitHiveXCommand(conf);
}
jobId = submit.call();
@@ -256,7 +254,7 @@ public class DagEngine extends BaseEngin
public void reRun(String jobId, Configuration conf) throws DagEngineException {
try {
validateReRunConfiguration(conf);
- new ReRunXCommand(jobId, conf, getAuthToken()).call();
+ new ReRunXCommand(jobId, conf).call();
start(jobId);
}
catch (CommandException ex) {
@@ -489,7 +487,7 @@ public class DagEngine extends BaseEngin
@Override
public String dryRunSubmit(Configuration conf) throws BaseEngineException {
try {
- SubmitXCommand submit = new SubmitXCommand(true, conf, getAuthToken());
+ SubmitXCommand submit = new SubmitXCommand(true, conf);
return submit.call();
} catch (CommandException ex) {
throw new DagEngineException(ex);
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowActionBean.java Wed Jun 12 23:17:31 2013
@@ -119,8 +119,8 @@ public class WorkflowActionBean extends
@Transient
private Date pendingAge;
- @Column(name = "sla_xml")
- @Lob
+ @Basic
+ @Column(name = "sla_xml", length = 4000)
private String slaXml = null;
/**
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java Wed Jun 12 23:17:31 2013
@@ -44,7 +44,7 @@ import org.apache.openjpa.persistence.jd
@Entity
@NamedQueries({
- @NamedQuery(name = "UPDATE_WORKFLOW", query = "update WorkflowJobBean w set w.appName = :appName, w.appPath = :appPath, w.conf = :conf, w.group = :groupName, w.run = :run, w.user = :user, w.authToken = :authToken, w.createdTimestamp = :createdTime, w.endTimestamp = :endTime, w.externalId = :externalId, w.lastModifiedTimestamp = :lastModTime, w.logToken = :logToken, w.protoActionConf = :protoActionConf, w.slaXml =:slaXml, w.startTimestamp = :startTime, w.status = :status, w.wfInstance = :wfInstance where w.id = :id"),
+ @NamedQuery(name = "UPDATE_WORKFLOW", query = "update WorkflowJobBean w set w.appName = :appName, w.appPath = :appPath, w.conf = :conf, w.group = :groupName, w.run = :run, w.user = :user, w.createdTimestamp = :createdTime, w.endTimestamp = :endTime, w.externalId = :externalId, w.lastModifiedTimestamp = :lastModTime,w.logToken = :logToken, w.protoActionConf = :protoActionConf, w.slaXml =:slaXml, w.startTimestamp = :startTime, w.status = :status, w.wfInstance = :wfInstance where w.id = :id"),
@NamedQuery(name = "DELETE_WORKFLOW", query = "delete from WorkflowJobBean w where w.id = :id"),
@@ -108,10 +108,6 @@ public class WorkflowJobBean extends Jso
@Column(name = "end_time")
private java.sql.Timestamp endTimestamp = null;
- @Column(name = "auth_token")
- @Lob
- private String authToken = null;
-
@Basic
@Index
@Column(name = "last_modified_time")
@@ -123,8 +119,8 @@ public class WorkflowJobBean extends Jso
@Lob
private byte[] wfInstance = null;
- @Column(name = "sla_xml")
- @Lob
+ @Basic
+ @Column(name = "sla_xml", length = 4000)
private String slaXml = null;
/**
@@ -153,7 +149,6 @@ public class WorkflowJobBean extends Jso
WritableUtils.writeStr(dataOutput, getUser());
WritableUtils.writeStr(dataOutput, getGroup());
dataOutput.writeInt(getRun());
- WritableUtils.writeStr(dataOutput, authToken);
WritableUtils.writeStr(dataOutput, logToken);
WritableUtils.writeStr(dataOutput, protoActionConf);
}
@@ -191,21 +186,12 @@ public class WorkflowJobBean extends Jso
setUser(WritableUtils.readStr(dataInput));
setGroup(WritableUtils.readStr(dataInput));
setRun(dataInput.readInt());
- authToken = WritableUtils.readStr(dataInput);
logToken = WritableUtils.readStr(dataInput);
protoActionConf = WritableUtils.readStr(dataInput);
setExternalId(getExternalId());
setProtoActionConf(protoActionConf);
}
- public String getAuthToken() {
- return authToken;
- }
-
- public void setAuthToken(String authToken) {
- this.authToken = authToken;
- }
-
public String getLogToken() {
return logToken;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/action/oozie/SubWorkflowActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/action/oozie/SubWorkflowActionExecutor.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/action/oozie/SubWorkflowActionExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/action/oozie/SubWorkflowActionExecutor.java Wed Jun 12 23:17:31 2013
@@ -76,8 +76,7 @@ public class SubWorkflowActionExecutor e
WorkflowJobBean workflow = (WorkflowJobBean) context.getWorkflow();
String user = workflow.getUser();
String group = workflow.getGroup();
- String authToken = workflow.getAuthToken();
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(user, authToken);
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(user);
oozieClient = new LocalOozieClient(dagEngine);
}
else {
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonWorkflowAction.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonWorkflowAction.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonWorkflowAction.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonWorkflowAction.java Wed Jun 12 23:17:31 2013
@@ -84,8 +84,7 @@ public class JsonWorkflowAction implemen
@Column(name = "transition")
private String transition = null;
- @Column(name = "data")
- @Lob
+ @Column(name = "data", length = 4000)
private String data = null;
@Column(name = "stats")
@@ -116,8 +115,7 @@ public class JsonWorkflowAction implemen
@Column(name = "error_code")
private String errorCode = null;
- @Column(name = "error_message")
- @Lob
+ @Column(name = "error_message", length = 4000)
private String errorMessage = null;
public JsonWorkflowAction() {
@@ -267,6 +265,9 @@ public class JsonWorkflowAction implemen
}
public void setData(String data) {
+ if( data != null && data.length() > 2000){
+ data = data.substring(0, 2000);
+ }
this.data = data;
}
@@ -328,6 +329,9 @@ public class JsonWorkflowAction implemen
public void setErrorInfo(String errorCode, String errorMessage) {
this.errorCode = errorCode;
+ if(errorMessage != null && errorMessage.length() > 2000){
+ errorMessage = errorMessage.substring(0, 2000);
+ }
this.errorMessage = errorMessage;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/sla/JsonSLARegistrationEvent.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/sla/JsonSLARegistrationEvent.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/sla/JsonSLARegistrationEvent.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/sla/JsonSLARegistrationEvent.java Wed Jun 12 23:17:31 2013
@@ -40,12 +40,10 @@ import org.json.simple.JSONObject;
@Entity
@Table(name = "SLA_REGISTRATION")
-@DiscriminatorColumn(name = "bean_type", discriminatorType = DiscriminatorType.STRING)
public class JsonSLARegistrationEvent extends SLAEvent implements JsonBean {
@Id
@Basic
- @Index
@Column(name = "job_id")
private String jobId;
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java Wed Jun 12 23:17:31 2013
@@ -269,7 +269,7 @@ public class BundleStartXCommand extends
Configuration coordConf = mergeConfig(coordElem);
coordConf.set(OozieClient.BUNDLE_ID, jobId);
- queue(new CoordSubmitXCommand(coordConf, bundleJob.getAuthToken(), bundleJob.getId(), name.getValue()));
+ queue(new CoordSubmitXCommand(coordConf, bundleJob.getId(), name.getValue()));
}
updateBundleAction();
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java Wed Jun 12 23:17:31 2013
@@ -75,7 +75,6 @@ import org.xml.sax.SAXException;
public class BundleSubmitXCommand extends SubmitTransitionXCommand {
private Configuration conf;
- private final String authToken;
public static final String CONFIG_DEFAULT = "bundle-config-default.xml";
public static final String BUNDLE_XML_FILE = "bundle.xml";
private final BundleJobBean bundleBean = new BundleJobBean();
@@ -102,12 +101,10 @@ public class BundleSubmitXCommand extend
* Constructor to create the bundle submit command.
*
* @param conf configuration for bundle job
- * @param authToken to be used for authentication
*/
- public BundleSubmitXCommand(Configuration conf, String authToken) {
+ public BundleSubmitXCommand(Configuration conf) {
super("bundle_submit", "bundle_submit", 1);
this.conf = ParamChecker.notNull(conf, "conf");
- this.authToken = ParamChecker.notEmpty(authToken, "authToken");
}
/**
@@ -115,10 +112,9 @@ public class BundleSubmitXCommand extend
*
* @param dryrun true if dryrun is enable
* @param conf configuration for bundle job
- * @param authToken to be used for authentication
*/
- public BundleSubmitXCommand(boolean dryrun, Configuration conf, String authToken) {
- this(conf, authToken);
+ public BundleSubmitXCommand(boolean dryrun, Configuration conf) {
+ this(conf);
this.dryrun = dryrun;
}
@@ -322,7 +318,6 @@ public class BundleSubmitXCommand extend
* @param appPath application path.
* @param user user name.
* @param group group name.
- * @param autToken authentication token.
* @return bundle definition.
* @throws BundleJobException thrown if the definition could not be read.
*/
@@ -401,7 +396,6 @@ public class BundleSubmitXCommand extend
jobId = Services.get().get(UUIDService.class).generateId(ApplicationType.BUNDLE);
bundleJob.setId(jobId);
- bundleJob.setAuthToken(this.authToken);
String name = XmlUtils.parseXml(bundleBean.getOrigJobXml()).getAttributeValue("name");
name = ELUtils.resolveAppName(name, conf);
bundleJob.setAppName(name);
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java Wed Jun 12 23:17:31 2013
@@ -97,7 +97,6 @@ public class CoordActionReadyXCommand ex
}
log.debug("Number of READY actions = " + actions.size());
String user = coordJob.getUser();
- String authToken = coordJob.getAuthToken();
// make sure auth token is not null
// log.denug("user=" + user + ", token=" + authToken);
int counter = 0;
@@ -109,7 +108,7 @@ public class CoordActionReadyXCommand ex
// change state of action to SUBMITTED
action.setStatus(CoordinatorAction.Status.SUBMITTED);
// queue action to start action
- queue(new CoordActionStartXCommand(action.getId(), user, coordJob.getAppName(), authToken,
+ queue(new CoordActionStartXCommand(action.getId(), user, coordJob.getAppName(),
action.getJobId()), 100);
try {
jpaService.execute(new org.apache.oozie.executor.jpa.CoordActionUpdateStatusJPAExecutor(action));
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java Wed Jun 12 23:17:31 2013
@@ -68,20 +68,18 @@ public class CoordActionStartXCommand ex
private String actionId = null;
private String user = null;
private String appName = null;
- private String authToken = null;
private CoordinatorActionBean coordAction = null;
private JPAService jpaService = null;
private String jobId = null;
private List<JsonBean> updateList = new ArrayList<JsonBean>();
private List<JsonBean> insertList = new ArrayList<JsonBean>();
- public CoordActionStartXCommand(String id, String user, String appName, String token, String jobId) {
+ public CoordActionStartXCommand(String id, String user, String appName, String jobId) {
//super("coord_action_start", "coord_action_start", 1, XLog.OPS);
super("coord_action_start", "coord_action_start", 1);
this.actionId = ParamChecker.notEmpty(id, "id");
this.user = ParamChecker.notEmpty(user, "user");
this.appName = ParamChecker.notEmpty(appName, "appName");
- this.authToken = ParamChecker.notEmpty(token, "token");
this.jobId = jobId;
}
@@ -156,7 +154,6 @@ public class CoordActionStartXCommand ex
String errCode = "";
String errMsg = "";
ParamChecker.notEmpty(user, "user");
- ParamChecker.notEmpty(authToken, "authToken");
log.debug("actionid=" + actionId + ", status=" + coordAction.getStatus());
if (coordAction.getStatus() == CoordinatorAction.Status.SUBMITTED) {
@@ -166,7 +163,7 @@ public class CoordActionStartXCommand ex
coordAction.setRunConf(XmlUtils.prettyPrint(runConf).toString());
// log.debug("%%% merged runconf=" +
// XmlUtils.prettyPrint(runConf).toString());
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(user, authToken);
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(user);
try {
boolean startJob = true;
Configuration conf = new XConfiguration(new StringReader(coordAction.getRunConf()));
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java Wed Jun 12 23:17:31 2013
@@ -96,7 +96,6 @@ import org.xml.sax.SAXException;
public class CoordSubmitXCommand extends SubmitTransitionXCommand {
private Configuration conf;
- private final String authToken;
private final String bundleId;
private final String coordName;
private boolean dryrun;
@@ -158,12 +157,10 @@ public class CoordSubmitXCommand extends
* Constructor to create the Coordinator Submit Command.
*
* @param conf : Configuration for Coordinator job
- * @param authToken : To be used for authentication
*/
- public CoordSubmitXCommand(Configuration conf, String authToken) {
+ public CoordSubmitXCommand(Configuration conf) {
super("coord_submit", "coord_submit", 1);
this.conf = ParamChecker.notNull(conf, "conf");
- this.authToken = ParamChecker.notEmpty(authToken, "authToken");
this.bundleId = null;
this.coordName = null;
}
@@ -172,14 +169,12 @@ public class CoordSubmitXCommand extends
* Constructor to create the Coordinator Submit Command by bundle job.
*
* @param conf : Configuration for Coordinator job
- * @param authToken : To be used for authentication
* @param bundleId : bundle id
* @param coordName : coord name
*/
- public CoordSubmitXCommand(Configuration conf, String authToken, String bundleId, String coordName) {
+ public CoordSubmitXCommand(Configuration conf, String bundleId, String coordName) {
super("coord_submit", "coord_submit", 1);
this.conf = ParamChecker.notNull(conf, "conf");
- this.authToken = ParamChecker.notEmpty(authToken, "authToken");
this.bundleId = ParamChecker.notEmpty(bundleId, "bundleId");
this.coordName = ParamChecker.notEmpty(coordName, "coordName");
}
@@ -189,10 +184,9 @@ public class CoordSubmitXCommand extends
*
* @param dryrun : if dryrun
* @param conf : Configuration for Coordinator job
- * @param authToken : To be used for authentication
*/
- public CoordSubmitXCommand(boolean dryrun, Configuration conf, String authToken) {
- this(conf, authToken);
+ public CoordSubmitXCommand(boolean dryrun, Configuration conf) {
+ this(conf);
this.dryrun = dryrun;
}
@@ -1085,7 +1079,6 @@ public class CoordSubmitXCommand extends
private String storeToDB(Element eJob, CoordinatorJobBean coordJob) throws CommandException {
String jobId = Services.get().get(UUIDService.class).generateId(ApplicationType.COORDINATOR);
coordJob.setId(jobId);
- coordJob.setAuthToken(this.authToken);
coordJob.setAppPath(conf.get(OozieClient.COORDINATOR_APP_PATH));
coordJob.setCreatedTime(new Date());
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java Wed Jun 12 23:17:31 2013
@@ -82,7 +82,6 @@ import org.jdom.JDOMException;
public class ReRunXCommand extends WorkflowXCommand<Void> {
private final String jobId;
private Configuration conf;
- private final String authToken;
private final Set<String> nodesToSkip = new HashSet<String>();
public static final String TO_SKIP = "TO_SKIP";
private WorkflowJobBean wfBean;
@@ -106,11 +105,10 @@ public class ReRunXCommand extends Workf
PropertiesUtils.createPropertySet(badDefaultProps, DISALLOWED_DEFAULT_PROPERTIES);
}
- public ReRunXCommand(String jobId, Configuration conf, String authToken) {
+ public ReRunXCommand(String jobId, Configuration conf) {
super("rerun", "rerun", 1);
this.jobId = ParamChecker.notEmpty(jobId, "jobId");
this.conf = ParamChecker.notNull(conf, "conf");
- this.authToken = ParamChecker.notEmpty(authToken, "authToken");
}
/* (non-Javadoc)
@@ -127,8 +125,8 @@ public class ReRunXCommand extends Workf
WorkflowAppService wps = Services.get().get(WorkflowAppService.class);
try {
XLog.Info.get().setParameter(DagXLogInfoService.TOKEN, conf.get(OozieClient.LOG_TOKEN));
- WorkflowApp app = wps.parseDef(conf, authToken);
- XConfiguration protoActionConf = wps.createProtoActionConf(conf, authToken, true);
+ WorkflowApp app = wps.parseDef(conf);
+ XConfiguration protoActionConf = wps.createProtoActionConf(conf, true);
WorkflowLib workflowLib = Services.get().get(WorkflowStoreService.class).getWorkflowLibWithNoDB();
appPath = conf.get(OozieClient.APP_PATH);
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitHiveXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitHiveXCommand.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitHiveXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitHiveXCommand.java Wed Jun 12 23:17:31 2013
@@ -22,8 +22,8 @@ import org.apache.oozie.client.XOozieCli
import org.jdom.Namespace;
public class SubmitHiveXCommand extends SubmitScriptLanguageXCommand {
- public SubmitHiveXCommand(Configuration conf, String authToken) {
- super("submitHive", "submitHive", conf, authToken);
+ public SubmitHiveXCommand(Configuration conf) {
+ super("submitHive", "submitHive", conf);
}
protected String getLanguageName(){
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java Wed Jun 12 23:17:31 2013
@@ -65,12 +65,10 @@ public abstract class SubmitHttpXCommand
}
private Configuration conf;
- private String authToken;
- public SubmitHttpXCommand(String name, String type, Configuration conf, String authToken) {
+ public SubmitHttpXCommand(String name, String type, Configuration conf) {
super(name, type, 1);
this.conf = ParamChecker.notNull(conf, "conf");
- this.authToken = ParamChecker.notEmpty(authToken, "authToken");
}
private static final Set<String> DISALLOWED_DEFAULT_PROPERTIES = new HashSet<String>();
@@ -109,7 +107,7 @@ public abstract class SubmitHttpXCommand
LOG.debug("workflow xml created on the server side is :\n");
LOG.debug(wfXml);
WorkflowApp app = wps.parseDef(wfXml, conf);
- XConfiguration protoActionConf = wps.createProtoActionConf(conf, authToken, false);
+ XConfiguration protoActionConf = wps.createProtoActionConf(conf, false);
WorkflowLib workflowLib = Services.get().get(WorkflowStoreService.class).getWorkflowLibWithNoDB();
PropertiesUtils.checkDisallowedProperties(conf, DISALLOWED_USER_PROPERTIES);
@@ -145,7 +143,6 @@ public abstract class SubmitHttpXCommand
workflow.setRun(0);
workflow.setUser(conf.get(OozieClient.USER_NAME));
workflow.setGroup(conf.get(OozieClient.GROUP_NAME));
- workflow.setAuthToken(authToken);
workflow.setWorkflowInstance(wfInstance);
workflow.setExternalId(conf.get(OozieClient.EXTERNAL_ID));
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitMRXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitMRXCommand.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitMRXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitMRXCommand.java Wed Jun 12 23:17:31 2013
@@ -35,8 +35,8 @@ public class SubmitMRXCommand extends Su
private static final Set<String> SKIPPED_CONFS = new HashSet<String>();
private static final Map<String, String> DEPRECATE_MAP = new HashMap<String, String>();
- public SubmitMRXCommand(Configuration conf, String authToken) {
- super("submitMR", "submitMR", conf, authToken);
+ public SubmitMRXCommand(Configuration conf) {
+ super("submitMR", "submitMR", conf);
}
static {
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitPigXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitPigXCommand.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitPigXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitPigXCommand.java Wed Jun 12 23:17:31 2013
@@ -21,8 +21,8 @@ import org.apache.hadoop.conf.Configurat
import org.apache.oozie.client.XOozieClient;
public class SubmitPigXCommand extends SubmitScriptLanguageXCommand {
- public SubmitPigXCommand(Configuration conf, String authToken) {
- super("submitPig", "submitPig", conf, authToken);
+ public SubmitPigXCommand(Configuration conf) {
+ super("submitPig", "submitPig", conf);
}
protected String getLanguageName(){
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitScriptLanguageXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitScriptLanguageXCommand.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitScriptLanguageXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitScriptLanguageXCommand.java Wed Jun 12 23:17:31 2013
@@ -29,8 +29,8 @@ import java.util.ArrayList;
import java.util.List;
public abstract class SubmitScriptLanguageXCommand extends SubmitHttpXCommand {
- public SubmitScriptLanguageXCommand(String name, String type, Configuration conf, String authToken) {
- super(name, type, conf, authToken);
+ public SubmitScriptLanguageXCommand(String name, String type, Configuration conf) {
+ super(name, type, conf);
}
protected abstract String getLanguageName();
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java Wed Jun 12 23:17:31 2013
@@ -74,7 +74,6 @@ public class SubmitXCommand extends Work
public static final String CONFIG_DEFAULT = "config-default.xml";
private Configuration conf;
- private String authToken;
private List<JsonBean> insertList = new ArrayList<JsonBean>();
/**
@@ -83,10 +82,9 @@ public class SubmitXCommand extends Work
* @param conf : Configuration for workflow job
* @param authToken : To be used for authentication
*/
- public SubmitXCommand(Configuration conf, String authToken) {
+ public SubmitXCommand(Configuration conf) {
super("submit", "submit", 1);
this.conf = ParamChecker.notNull(conf, "conf");
- this.authToken = ParamChecker.notEmpty(authToken, "authToken");
}
/**
@@ -96,8 +94,8 @@ public class SubmitXCommand extends Work
* @param conf : Configuration for workflow job
* @param authToken : To be used for authentication
*/
- public SubmitXCommand(boolean dryrun, Configuration conf, String authToken) {
- this(conf, authToken);
+ public SubmitXCommand(boolean dryrun, Configuration conf) {
+ this(conf);
this.dryrun = dryrun;
}
@@ -122,8 +120,8 @@ public class SubmitXCommand extends Work
WorkflowAppService wps = Services.get().get(WorkflowAppService.class);
try {
XLog.Info.get().setParameter(DagXLogInfoService.TOKEN, conf.get(OozieClient.LOG_TOKEN));
- WorkflowApp app = wps.parseDef(conf, authToken);
- XConfiguration protoActionConf = wps.createProtoActionConf(conf, authToken, true);
+ WorkflowApp app = wps.parseDef(conf);
+ XConfiguration protoActionConf = wps.createProtoActionConf(conf, true);
WorkflowLib workflowLib = Services.get().get(WorkflowStoreService.class).getWorkflowLibWithNoDB();
String user = conf.get(OozieClient.USER_NAME);
@@ -188,7 +186,6 @@ public class SubmitXCommand extends Work
workflow.setRun(0);
workflow.setUser(conf.get(OozieClient.USER_NAME));
workflow.setGroup(conf.get(OozieClient.GROUP_NAME));
- workflow.setAuthToken(authToken);
workflow.setWorkflowInstance(wfInstance);
workflow.setExternalId(conf.get(OozieClient.EXTERNAL_ID));
// Set parent id if it doesn't already have one (for subworkflows)
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/local/LocalOozie.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/local/LocalOozie.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/local/LocalOozie.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/local/LocalOozie.java Wed Jun 12 23:17:31 2013
@@ -161,7 +161,7 @@ public class LocalOozie {
throw new IllegalStateException("LocalOozie is not initialized");
}
ParamChecker.notEmpty(user, "user");
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(user, "undef");
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(user);
return new LocalOozieClient(dagEngine);
}
@@ -186,8 +186,7 @@ public class LocalOozie {
throw new IllegalStateException("LocalOozie is not initialized");
}
ParamChecker.notEmpty(user, "user");
- CoordinatorEngine coordEngine = Services.get().get(CoordinatorEngineService.class).getCoordinatorEngine(user,
- "undef");
+ CoordinatorEngine coordEngine = Services.get().get(CoordinatorEngineService.class).getCoordinatorEngine(user);
return new LocalOozieClientCoord(coordEngine);
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/service/BundleEngineService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/BundleEngineService.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/BundleEngineService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/BundleEngineService.java Wed Jun 12 23:17:31 2013
@@ -53,11 +53,10 @@ public class BundleEngineService impleme
* Return a Bundle engine.
*
* @param user user for the bundle engine.
- * @param authToken the authentication token.
* @return the bundle engine for the specified user.
*/
- public BundleEngine getBundleEngine(String user, String authToken) {
- return new BundleEngine(user, authToken);
+ public BundleEngine getBundleEngine(String user) {
+ return new BundleEngine(user);
}
/**
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/service/CoordinatorEngineService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/CoordinatorEngineService.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/CoordinatorEngineService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/CoordinatorEngineService.java Wed Jun 12 23:17:31 2013
@@ -53,11 +53,10 @@ public class CoordinatorEngineService im
* Return a Coordinator engine.
*
* @param user user for the coordinator engine.
- * @param authToken the authentication token.
* @return the coordinator engine for the specified user.
*/
- public CoordinatorEngine getCoordinatorEngine(String user, String authToken) {
- return new CoordinatorEngine(user, authToken);
+ public CoordinatorEngine getCoordinatorEngine(String user) {
+ return new CoordinatorEngine(user);
}
/**
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/service/DagEngineService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/DagEngineService.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/DagEngineService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/DagEngineService.java Wed Jun 12 23:17:31 2013
@@ -53,11 +53,10 @@ public class DagEngineService implements
* Return a Dag engine.
*
* @param user user for the dag engine.
- * @param authToken the authentication token.
* @return the dag engine for the specified user.
*/
- public DagEngine getDagEngine(String user, String authToken) {
- return new DagEngine(user, authToken);
+ public DagEngine getDagEngine(String user) {
+ return new DagEngine(user);
}
/**
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java Wed Jun 12 23:17:31 2013
@@ -35,10 +35,10 @@ public class LiteWorkflowAppService exte
* @param authToken authorization token.
* @return workflow application.
*/
- public WorkflowApp parseDef(Configuration jobConf, String authToken) throws WorkflowException {
+ public WorkflowApp parseDef(Configuration jobConf) throws WorkflowException {
String appPath = ParamChecker.notEmpty(jobConf.get(OozieClient.APP_PATH), OozieClient.APP_PATH);
String user = ParamChecker.notEmpty(jobConf.get(OozieClient.USER_NAME), OozieClient.USER_NAME);
- String workflowXml = readDefinition(appPath, user, authToken, jobConf);
+ String workflowXml = readDefinition(appPath, user, jobConf);
return parseDef(workflowXml, jobConf);
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java Wed Jun 12 23:17:31 2013
@@ -192,7 +192,7 @@ public class RecoveryService implements
if (name.getValue().equals(baction.getCoordName())) {
Configuration coordConf = mergeConfig(coordElem, bundleJob);
coordConf.set(OozieClient.BUNDLE_ID, baction.getBundleId());
- queueCallable(new CoordSubmitXCommand(coordConf, bundleJob.getAuthToken(),
+ queueCallable(new CoordSubmitXCommand(coordConf,
bundleJob.getId(), name.getValue()));
}
}
@@ -256,7 +256,7 @@ public class RecoveryService implements
CoordinatorJobBean coordJob = jpaService
.execute(new CoordJobGetJPAExecutor(caction.getJobId()));
queueCallable(new CoordActionStartXCommand(caction.getId(), coordJob.getUser(),
- coordJob.getAppName(), coordJob.getAuthToken(), caction.getJobId()));
+ coordJob.getAppName(), caction.getJobId()));
log.info("Recover a SUBMITTED coord action and resubmit CoordActionStartCommand :"
+ caction.getId());
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java Wed Jun 12 23:17:31 2013
@@ -107,11 +107,10 @@ public abstract class WorkflowAppService
*
* @param appPath application path.
* @param user user name.
- * @param autToken authentication token.
* @return workflow definition.
* @throws WorkflowException thrown if the definition could not be read.
*/
- protected String readDefinition(String appPath, String user, String autToken, Configuration conf)
+ protected String readDefinition(String appPath, String user, Configuration conf)
throws WorkflowException {
try {
URI uri = new URI(appPath);
@@ -158,12 +157,11 @@ public abstract class WorkflowAppService
* added to distributed cache. These paths include .jar,.so and the resource file paths.
*
* @param jobConf job configuration.
- * @param authToken authentication token.
* @param isWorkflowJob indicates if the job is a workflow job or not.
* @return proto configuration.
* @throws WorkflowException thrown if the proto action configuration could not be created.
*/
- public XConfiguration createProtoActionConf(Configuration jobConf, String authToken, boolean isWorkflowJob)
+ public XConfiguration createProtoActionConf(Configuration jobConf, boolean isWorkflowJob)
throws WorkflowException {
try {
HadoopAccessorService has = Services.get().get(HadoopAccessorService.class);
@@ -265,11 +263,10 @@ public abstract class WorkflowAppService
* Parse workflow definition.
*
* @param jobConf job configuration.
- * @param authToken authentication token.
* @return workflow application.
* @throws WorkflowException thrown if the workflow application could not be parsed.
*/
- public abstract WorkflowApp parseDef(Configuration jobConf, String authToken) throws WorkflowException;
+ public abstract WorkflowApp parseDef(Configuration jobConf) throws WorkflowException;
/**
* Parse workflow definition.
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/servlet/BaseJobsServlet.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/BaseJobsServlet.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/servlet/BaseJobsServlet.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/servlet/BaseJobsServlet.java Wed Jun 12 23:17:31 2013
@@ -70,7 +70,6 @@ public abstract class BaseJobsServlet ex
@SuppressWarnings("unchecked")
protected void doPost(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
- String authTok = getAuthToken(request);
/*
* Enumeration p = request.getAttributeNames();
* for(;p.hasMoreElements();){ String key = (String)p.nextElement();
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java Wed Jun 12 23:17:31 2013
@@ -527,17 +527,6 @@ public abstract class JsonRestServlet ex
protected static final String UNDEF = "?";
/**
- * Return the authentication token of the request if any.
- *
- * @param request request.
- * @return the authentication token, <code>null</code> if there is none.
- */
- protected String getAuthToken(HttpServletRequest request) {
- String authToken = (String) request.getAttribute(AUTH_TOKEN);
- return (authToken != null) ? authToken : UNDEF;
- }
-
- /**
* Return the user name of the request if any.
*
* @param request request.
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V0JobServlet.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V0JobServlet.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V0JobServlet.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V0JobServlet.java Wed Jun 12 23:17:31 2013
@@ -46,8 +46,7 @@ public class V0JobServlet extends BaseJo
@Override
protected void startJob(HttpServletRequest request, HttpServletResponse response) throws XServletException,
IOException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
String jobId = getResourceName(request);
try {
@@ -64,8 +63,7 @@ public class V0JobServlet extends BaseJo
@Override
protected void resumeJob(HttpServletRequest request, HttpServletResponse response) throws XServletException,
IOException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
String jobId = getResourceName(request);
try {
@@ -82,8 +80,7 @@ public class V0JobServlet extends BaseJo
@Override
protected void suspendJob(HttpServletRequest request, HttpServletResponse response) throws XServletException,
IOException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
String jobId = getResourceName(request);
try {
@@ -100,8 +97,7 @@ public class V0JobServlet extends BaseJo
@Override
protected void killJob(HttpServletRequest request, HttpServletResponse response) throws XServletException,
IOException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
String jobId = getResourceName(request);
try {
@@ -128,8 +124,7 @@ public class V0JobServlet extends BaseJo
@Override
protected JSONObject reRunJob(HttpServletRequest request, HttpServletResponse response, Configuration conf)
throws XServletException, IOException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
String jobId = getResourceName(request);
try {
@@ -147,8 +142,7 @@ public class V0JobServlet extends BaseJo
@Override
protected JsonBean getJob(HttpServletRequest request, HttpServletResponse response) throws XServletException,
IOException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
JsonBean jobBean = null;
String jobId = getResourceName(request);
@@ -168,8 +162,7 @@ public class V0JobServlet extends BaseJo
@Override
protected String getJobDefinition(HttpServletRequest request, HttpServletResponse response)
throws XServletException, IOException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
String wfDefinition = null;
String jobId = getResourceName(request);
@@ -188,8 +181,7 @@ public class V0JobServlet extends BaseJo
@Override
protected void streamJobLog(HttpServletRequest request, HttpServletResponse response) throws XServletException,
IOException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
String jobId = getResourceName(request);
try {
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V0JobsServlet.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V0JobsServlet.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V0JobsServlet.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V0JobsServlet.java Wed Jun 12 23:17:31 2013
@@ -60,7 +60,7 @@ public class V0JobsServlet extends BaseJ
}
boolean startJob = (action != null);
String user = conf.get(OozieClient.USER_NAME);
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(user, getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(user);
String id = dagEngine.submitJob(conf, startJob);
json.put(JsonTags.JOB_ID, id);
}
@@ -79,7 +79,7 @@ public class V0JobsServlet extends BaseJ
JSONObject json = new JSONObject();
try {
DagEngine dagEngine = Services.get().get(DagEngineService.class)
- .getDagEngine(getUser(request), getAuthToken(request));
+ .getDagEngine(getUser(request));
String jobId = dagEngine.getJobIdForExternalId(externalId);
json.put(JsonTags.JOB_ID, jobId);
}
@@ -105,7 +105,7 @@ public class V0JobsServlet extends BaseJ
int len = (lenStr != null) ? Integer.parseInt(lenStr) : 50;
len = (len < 1) ? 50 : len;
DagEngine dagEngine = Services.get().get(DagEngineService.class)
- .getDagEngine(getUser(request), getAuthToken(request));
+ .getDagEngine(getUser(request));
WorkflowsInfo jobs = dagEngine.getJobs(filter, start, len);
List<WorkflowJobBean> jsonWorkflows = jobs.getWorkflows();
json.put(JsonTags.WORKFLOWS_JOBS, WorkflowJobBean.toJSONArray(jsonWorkflows, "GMT"));
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V1JobServlet.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V1JobServlet.java?rev=1492478&r1=1492477&r2=1492478&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V1JobServlet.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V1JobServlet.java Wed Jun 12 23:17:31 2013
@@ -306,8 +306,7 @@ public class V1JobServlet extends BaseJo
* @throws XServletException
*/
private void startWorkflowJob(HttpServletRequest request, HttpServletResponse response) throws XServletException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
String jobId = getResourceName(request);
try {
@@ -326,8 +325,7 @@ public class V1JobServlet extends BaseJo
* @throws XServletException
*/
private void startBundleJob(HttpServletRequest request, HttpServletResponse response) throws XServletException {
- BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request),
- getAuthToken(request));
+ BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request));
String jobId = getResourceName(request);
try {
bundleEngine.start(jobId);
@@ -345,8 +343,7 @@ public class V1JobServlet extends BaseJo
* @throws XServletException
*/
private void resumeWorkflowJob(HttpServletRequest request, HttpServletResponse response) throws XServletException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
String jobId = getResourceName(request);
try {
@@ -365,8 +362,7 @@ public class V1JobServlet extends BaseJo
* @throws XServletException
*/
private void resumeBundleJob(HttpServletRequest request, HttpServletResponse response) throws XServletException {
- BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request),
- getAuthToken(request));
+ BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request));
String jobId = getResourceName(request);
try {
bundleEngine.resume(jobId);
@@ -388,7 +384,7 @@ public class V1JobServlet extends BaseJo
throws XServletException {
String jobId = getResourceName(request);
CoordinatorEngine coordEngine = Services.get().get(CoordinatorEngineService.class).getCoordinatorEngine(
- getUser(request), getAuthToken(request));
+ getUser(request));
try {
coordEngine.resume(jobId);
}
@@ -405,8 +401,7 @@ public class V1JobServlet extends BaseJo
* @throws XServletException
*/
private void suspendWorkflowJob(HttpServletRequest request, HttpServletResponse response) throws XServletException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
String jobId = getResourceName(request);
try {
@@ -425,8 +420,7 @@ public class V1JobServlet extends BaseJo
* @throws XServletException
*/
private void suspendBundleJob(HttpServletRequest request, HttpServletResponse response) throws XServletException {
- BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request),
- getAuthToken(request));
+ BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request));
String jobId = getResourceName(request);
try {
bundleEngine.suspend(jobId);
@@ -446,7 +440,7 @@ public class V1JobServlet extends BaseJo
private void suspendCoordinatorJob(HttpServletRequest request, HttpServletResponse response)
throws XServletException {
CoordinatorEngine coordEngine = Services.get().get(CoordinatorEngineService.class).getCoordinatorEngine(
- getUser(request), getAuthToken(request));
+ getUser(request));
String jobId = getResourceName(request);
try {
coordEngine.suspend(jobId);
@@ -463,8 +457,7 @@ public class V1JobServlet extends BaseJo
* @throws XServletException
*/
private void killWorkflowJob(HttpServletRequest request, HttpServletResponse response) throws XServletException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
String jobId = getResourceName(request);
try {
@@ -483,7 +476,7 @@ public class V1JobServlet extends BaseJo
*/
private void killCoordinatorJob(HttpServletRequest request, HttpServletResponse response) throws XServletException {
CoordinatorEngine coordEngine = Services.get().get(CoordinatorEngineService.class).getCoordinatorEngine(
- getUser(request), getAuthToken(request));
+ getUser(request));
String jobId = getResourceName(request);
try {
coordEngine.kill(jobId);
@@ -501,8 +494,7 @@ public class V1JobServlet extends BaseJo
* @throws XServletException
*/
private void killBundleJob(HttpServletRequest request, HttpServletResponse response) throws XServletException {
- BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request),
- getAuthToken(request));
+ BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request));
String jobId = getResourceName(request);
try {
bundleEngine.kill(jobId);
@@ -522,7 +514,7 @@ public class V1JobServlet extends BaseJo
private void changeCoordinatorJob(HttpServletRequest request, HttpServletResponse response)
throws XServletException {
CoordinatorEngine coordEngine = Services.get().get(CoordinatorEngineService.class).getCoordinatorEngine(
- getUser(request), getAuthToken(request));
+ getUser(request));
String jobId = getResourceName(request);
String changeValue = request.getParameter(RestConstants.JOB_CHANGE_VALUE);
try {
@@ -542,8 +534,7 @@ public class V1JobServlet extends BaseJo
*/
private void changeBundleJob(HttpServletRequest request, HttpServletResponse response)
throws XServletException {
- BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(
- getUser(request), getAuthToken(request));
+ BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request));
String jobId = getResourceName(request);
String changeValue = request.getParameter(RestConstants.JOB_CHANGE_VALUE);
try {
@@ -564,8 +555,7 @@ public class V1JobServlet extends BaseJo
*/
private void reRunWorkflowJob(HttpServletRequest request, HttpServletResponse response, Configuration conf)
throws XServletException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
String jobId = getResourceName(request);
try {
@@ -587,8 +577,7 @@ public class V1JobServlet extends BaseJo
private void rerunBundleJob(HttpServletRequest request, HttpServletResponse response, Configuration conf)
throws XServletException {
JSONObject json = new JSONObject();
- BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request),
- getAuthToken(request));
+ BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request));
String jobId = getResourceName(request);
String coordScope = request.getParameter(RestConstants.JOB_BUNDLE_RERUN_COORD_SCOPE_PARAM);
@@ -620,8 +609,7 @@ public class V1JobServlet extends BaseJo
private JSONObject reRunCoordinatorActions(HttpServletRequest request, HttpServletResponse response,
Configuration conf) throws XServletException {
JSONObject json = new JSONObject();
- CoordinatorEngine coordEngine = Services.get().get(CoordinatorEngineService.class).getCoordinatorEngine(getUser(request),
- getAuthToken(request));
+ CoordinatorEngine coordEngine = Services.get().get(CoordinatorEngineService.class).getCoordinatorEngine(getUser(request));
String jobId = getResourceName(request);
@@ -694,8 +682,7 @@ public class V1JobServlet extends BaseJo
start = (start < 1) ? 1 : start;
int len = (lenStr != null) ? Integer.parseInt(lenStr) : 0;
len = (len < 1) ? Integer.MAX_VALUE : len;
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
try {
jobBean = (JsonBean) dagEngine.getJob(jobId, start, len);
}
@@ -756,8 +743,7 @@ public class V1JobServlet extends BaseJo
protected JsonBean getWorkflowActionBean(HttpServletRequest request, HttpServletResponse response)
throws XServletException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
JsonBean actionBean = null;
String actionId = getResourceName(request);
@@ -783,7 +769,7 @@ public class V1JobServlet extends BaseJo
throws XServletException, BaseEngineException {
JsonBean jobBean = null;
CoordinatorEngine coordEngine = Services.get().get(CoordinatorEngineService.class).getCoordinatorEngine(
- getUser(request), getAuthToken(request));
+ getUser(request));
String jobId = getResourceName(request);
String startStr = request.getParameter(RestConstants.OFFSET_PARAM);
String lenStr = request.getParameter(RestConstants.LEN_PARAM);
@@ -819,8 +805,7 @@ public class V1JobServlet extends BaseJo
private JsonBean getBundleJob(HttpServletRequest request, HttpServletResponse response) throws XServletException,
BaseEngineException {
JsonBean jobBean = null;
- BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request),
- getAuthToken(request));
+ BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request));
String jobId = getResourceName(request);
try {
@@ -846,7 +831,7 @@ public class V1JobServlet extends BaseJo
throws XServletException, BaseEngineException {
JsonBean actionBean = null;
CoordinatorEngine coordEngine = Services.get().get(CoordinatorEngineService.class).getCoordinatorEngine(
- getUser(request), getAuthToken(request));
+ getUser(request));
String actionId = getResourceName(request);
try {
actionBean = coordEngine.getCoordAction(actionId);
@@ -868,8 +853,7 @@ public class V1JobServlet extends BaseJo
*/
private String getWorkflowJobDefinition(HttpServletRequest request, HttpServletResponse response)
throws XServletException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
String wfDefinition;
String jobId = getResourceName(request);
@@ -891,8 +875,7 @@ public class V1JobServlet extends BaseJo
* @throws XServletException
*/
private String getBundleJobDefinition(HttpServletRequest request, HttpServletResponse response) throws XServletException {
- BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request),
- getAuthToken(request));
+ BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request));
String bundleDefinition;
String jobId = getResourceName(request);
try {
@@ -916,7 +899,7 @@ public class V1JobServlet extends BaseJo
throws XServletException {
CoordinatorEngine coordEngine = Services.get().get(CoordinatorEngineService.class).getCoordinatorEngine(
- getUser(request), getAuthToken(request));
+ getUser(request));
String jobId = getResourceName(request);
@@ -940,8 +923,7 @@ public class V1JobServlet extends BaseJo
*/
private void streamWorkflowJobLog(HttpServletRequest request, HttpServletResponse response)
throws XServletException, IOException {
- DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request),
- getAuthToken(request));
+ DagEngine dagEngine = Services.get().get(DagEngineService.class).getDagEngine(getUser(request));
String jobId = getResourceName(request);
try {
dagEngine.streamLog(jobId, response.getWriter());
@@ -960,8 +942,7 @@ public class V1JobServlet extends BaseJo
*/
private void streamBundleJob(HttpServletRequest request, HttpServletResponse response)
throws XServletException, IOException {
- BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request),
- getAuthToken(request));
+ BundleEngine bundleEngine = Services.get().get(BundleEngineService.class).getBundleEngine(getUser(request));
String jobId = getResourceName(request);
try {
bundleEngine.streamLog(jobId, response.getWriter());
@@ -983,7 +964,7 @@ public class V1JobServlet extends BaseJo
throws XServletException, IOException {
CoordinatorEngine coordEngine = Services.get().get(CoordinatorEngineService.class).getCoordinatorEngine(
- getUser(request), getAuthToken(request));
+ getUser(request));
String jobId = getResourceName(request);
String logRetrievalScope = request.getParameter(RestConstants.JOB_LOG_SCOPE_PARAM);
String logRetrievalType = request.getParameter(RestConstants.JOB_LOG_TYPE_PARAM);