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/18 10:36:55 UTC
svn commit: r1494068 - in /oozie/trunk: ./
core/src/main/java/org/apache/oozie/client/rest/sla/
core/src/main/java/org/apache/oozie/executor/jpa/
core/src/main/java/org/apache/oozie/service/
core/src/main/java/org/apache/oozie/sla/ core/src/main/resour...
Author: ryota
Date: Tue Jun 18 08:36:54 2013
New Revision: 1494068
URL: http://svn.apache.org/r1494068
Log:
OOZIE-1422 fix bug in SLARegistrationBean and CoordActionsCountForJobIdJPAExecutor (ryota)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/sla/JsonSLARegistrationEvent.java
oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsCountForJobIdJPAExecutor.java
oozie/trunk/core/src/main/java/org/apache/oozie/service/JPAService.java
oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java
oozie/trunk/core/src/main/resources/META-INF/persistence.xml
oozie/trunk/release-log.txt
oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java
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=1494068&r1=1494067&r2=1494068&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 Tue Jun 18 08:36:54 2013
@@ -1,312 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.oozie.client.rest.sla;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.StringTokenizer;
-
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorType;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import org.apache.oozie.AppType;
-import org.apache.oozie.client.event.SLAEvent;
-import org.apache.oozie.client.rest.JsonBean;
-import org.apache.openjpa.persistence.jdbc.Index;
-import org.json.simple.JSONObject;
-
-@Entity
-@Table(name = "SLA_REGISTRATION")
-public class JsonSLARegistrationEvent extends SLAEvent implements JsonBean {
-
- @Id
- @Basic
- @Column(name = "job_id")
- private String jobId;
-
- @Transient
- private AppType appType = null;
-
- @Basic
- @Column(name = "app_name")
- private String appName = null;
-
- @Basic
- @Column(name = "user_name")
- private String user = null;
-
- @Transient
- private Date nominalTime = null;
-
- @Transient
- private Date expectedStart = null;
-
- @Transient
- private Date expectedEnd = null;
-
- @Basic
- @Column(name = "expected_duration")
- private long expectedDuration = 0;
-
- @Basic
- @Column(name = "job_data")
- private String jobData = null;
-
- @Basic
- @Column(name = "parent_id")
- private String parentId = null;
-
- @Basic
- @Column(name = "notification_msg")
- private String notificationMsg = null;
-
- @Basic
- @Column(name = "upstream_apps")
- private String upstreamApps = null;
-
- @Basic
- @Column(name = "sla_config")
- private String slaConfig = null;
-
- @Transient
- private Map<String, String> slaConfigMap;
- private final String ALERT_EVENTS = "alert_events";
- private final String ALERT_CONTACT = "alert_contact";
-
- public JsonSLARegistrationEvent() {
- slaConfigMap = new HashMap<String, String>();
- msgType = MessageType.SLA;
- }
-
- public JsonSLARegistrationEvent(JSONObject json) {
- this();
- // TODO read jsonobject
- }
-
- @Override
- public String getId() {
- return jobId;
- }
-
- public void setJobId(String jobId) {
- this.jobId = jobId;
- }
-
- @Override
- public AppType getAppType() {
- return appType;
- }
-
- public void setAppType(AppType appType) {
- this.appType = appType;
- }
-
- @Override
- public String getAppName() {
- return appName;
- }
-
- public void setAppName(String appName) {
- this.appName = appName;
- }
-
- @Override
- public String getUser() {
- return user;
- }
-
- public void setUser(String user) {
- this.user = user;
- }
-
- @Override
- public Date getNominalTime() {
- return nominalTime;
- }
-
- public void setNominalTime(Date nomTime) {
- this.nominalTime = nomTime;
- }
-
- @Override
- public Date getExpectedStart() {
- return expectedStart;
- }
-
- public void setExpectedStart(Date expectedStart) {
- this.expectedStart = expectedStart;
- }
-
- @Override
- public Date getExpectedEnd() {
- return expectedEnd;
- }
-
- public void setExpectedEnd(Date expectedEnd) {
- this.expectedEnd = expectedEnd;
- }
-
- @Override
- public long getExpectedDuration() {
- return expectedDuration;
- }
-
- public void setExpectedDuration(long expectedDuration) {
- this.expectedDuration = expectedDuration;
- }
-
- @Override
- public String getParentId() {
- return parentId;
- }
-
- public void setParentId(String parentId) {
- this.parentId = parentId;
- }
-
- @Override
- public String getNotificationMsg() {
- return notificationMsg;
- }
-
- public void setNotificationMsg(String notificationMsg) {
- this.notificationMsg = notificationMsg;
- }
-
- @Override
- public String getAlertEvents() {
- return slaConfigMap.get(ALERT_EVENTS);
- }
-
- public void setAlertEvents(String alertEvents) {
- slaConfigMap.put(ALERT_EVENTS, alertEvents);
- slaConfig = slaConfigMapToString();
- }
-
- @Override
- public String getAlertContact() {
- return slaConfigMap.get(ALERT_CONTACT);
- }
-
- public void setAlertContact(String alertContact) {
- slaConfigMap.put(ALERT_CONTACT, alertContact);
- slaConfig = slaConfigMapToString();
- }
-
- @Override
- public String getUpstreamApps() {
- return upstreamApps;
- }
-
- public void setUpstreamApps(String upstreamApps) {
- this.upstreamApps = upstreamApps;
- }
-
- @Override
- public String getJobData() {
- return jobData;
- }
-
- public void setJobData(String jobData) {
- this.jobData = jobData;
- }
-
- public Map<String, String> getSlaConfigMap() {
- return slaConfigMap;
- }
-
- @Override
- public String getSlaConfig() {
- return slaConfig;
- }
-
- public void setSlaConfig(String configStr) {
- this.slaConfig = configStr;
- slaConfigStringToMap();
- }
-
- @Override
- public SLAStatus getSLAStatus() {
- return null;
- }
-
- @Override
- public EventStatus getEventStatus() {
- return null;
- }
-
- @Override
- public Date getActualStart() {
- return null;
- }
-
- @Override
- public Date getActualEnd() {
- return null;
- }
-
- @Override
- public long getActualDuration() {
- return 0;
- }
-
- @Override
- public String getJobStatus() {
- return null;
- }
-
- private void slaConfigStringToMap() {
- StringTokenizer st = new StringTokenizer(slaConfig, "},");
- while (st.hasMoreTokens()) {
- String token = st.nextToken();
- String[] pair = token.split("=");
- if (pair.length == 2) {
- slaConfigMap.put(pair[0].substring(1), pair[1]);
- }
- }
- }
-
- public String slaConfigMapToString() {
- StringBuilder sb = new StringBuilder();
- for (Entry<String, String> e : slaConfigMap.entrySet()) {
- sb.append("{" + e.getKey() + "=" + e.getValue() + "},");
- }
- return sb.toString();
- }
-
- @Override
- public JSONObject toJSONObject() {
- // TODO
- return null;
- }
-
- @Override
- public JSONObject toJSONObject(String timeZoneId) {
- // TODO
- return null;
- }
-
-}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsCountForJobIdJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsCountForJobIdJPAExecutor.java?rev=1494068&r1=1494067&r2=1494068&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsCountForJobIdJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsCountForJobIdJPAExecutor.java Tue Jun 18 08:36:54 2013
@@ -37,7 +37,7 @@ public class CoordActionsCountForJobIdJP
@Override
public String getName() {
- return "CoordActionsCountJPAExecutor";
+ return "CoordActionsCountForJobIdJPAExecutor";
}
@Override
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/service/JPAService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/JPAService.java?rev=1494068&r1=1494067&r2=1494068&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/JPAService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/JPAService.java Tue Jun 18 08:36:54 2013
@@ -41,7 +41,6 @@ import org.apache.oozie.client.rest.Json
import org.apache.oozie.client.rest.JsonSLAEvent;
import org.apache.oozie.client.rest.JsonWorkflowAction;
import org.apache.oozie.client.rest.JsonWorkflowJob;
-import org.apache.oozie.client.rest.sla.JsonSLARegistrationEvent;
import org.apache.oozie.executor.jpa.JPAExecutor;
import org.apache.oozie.executor.jpa.JPAExecutorException;
import org.apache.oozie.sla.SLARegistrationBean;
@@ -174,7 +173,6 @@ public class JPAService implements Servi
entityManager.find(JsonBundleJob.class, 1);
entityManager.find(BundleActionBean.class, 1);
entityManager.find(SLARegistrationBean.class, 1);
- entityManager.find(JsonSLARegistrationEvent.class, 1);
entityManager.find(SLASummaryBean.class, 1);
LOG.info(XLog.STD, "All entities initialized");
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java?rev=1494068&r1=1494067&r2=1494068&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java Tue Jun 18 08:36:54 2013
@@ -17,36 +17,52 @@
*/
package org.apache.oozie.sla;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.Map.Entry;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.Id;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
+import javax.persistence.Table;
import javax.persistence.Transient;
-import org.apache.hadoop.io.Writable;
import org.apache.oozie.AppType;
-import org.apache.oozie.client.event.SLAEvent;
-import org.apache.oozie.client.rest.sla.JsonSLARegistrationEvent;
+import org.apache.oozie.client.event.Event.MessageType;
+import org.apache.oozie.client.rest.JsonBean;
import org.apache.oozie.util.DateUtils;
import org.apache.openjpa.persistence.jdbc.Index;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
@Entity
+@Table(name = "SLA_REGISTRATION")
@NamedQueries({
@NamedQuery(name = "GET_SLA_REG_ON_RESTART", query = "select w.notificationMsg, w.upstreamApps, w.slaConfig, w.jobData from SLARegistrationBean w where w.jobId = :id"),
@NamedQuery(name = "GET_SLA_REG_ALL", query = "select OBJECT(w) from SLARegistrationBean w where w.jobId = :id") })
-public class SLARegistrationBean extends JsonSLARegistrationEvent implements Writable {
+public class SLARegistrationBean implements JsonBean {
+
+ @Id
+ @Basic
+ @Column(name = "job_id")
+ private String jobId;
+
+ @Basic
+ @Column(name = "parent_id")
+ private String parentId = null;
+
+ @Basic
+ @Column(name = "app_name")
+ private String appName = null;
@Basic
@Column(name = "app_type")
@@ -65,81 +81,211 @@ public class SLARegistrationBean extends
@Column(name = "expected_end")
private java.sql.Timestamp expectedEndTS = null;
+ @Basic
+ @Column(name = "expected_duration")
+ private long expectedDuration = 0;
+
+ @Basic
+ @Column(name = "user_name")
+ private String user = null;
+
+ @Basic
+ @Column(name = "upstream_apps")
+ private String upstreamApps = null;
+
+ @Basic
+ @Column(name = "job_data")
+ private String jobData = null;
+
+ @Basic
+ @Column(name = "sla_config")
+ private String slaConfig = null;
+
+ @Basic
+ @Column(name = "notification_msg")
+ private String notificationMsg = null;
+
+ @Transient
+ private Map<String, String> slaConfigMap;
+
@Transient
- private long expectedDuration;
+ private MessageType msgType;
+
+ private final String ALERT_EVENTS = "alert_events";
+ private final String ALERT_CONTACT = "alert_contact";
public SLARegistrationBean() {
+ slaConfigMap = new HashMap<String, String>();
+ msgType = MessageType.SLA;
+ }
+
+ public SLARegistrationBean(JSONObject obj) {
+ // TODO use JSONObject
+ this();
+ }
+
+ public String getId() {
+ return jobId;
+ }
+
+ public void setJobId(String jobId) {
+ this.jobId = jobId;
+ }
+
+ public String getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(String parentId) {
+ this.parentId = parentId;
+ }
+
+ public String getAppName() {
+ return appName;
+ }
+
+ public void setAppName(String appName) {
+ this.appName = appName;
}
- @Override
public AppType getAppType() {
return AppType.valueOf(appType);
}
- @Override
public void setAppType(AppType appType) {
- super.setAppType(appType);
this.appType = appType.toString();
}
- @Override
public Date getNominalTime() {
return DateUtils.toDate(nominalTimeTS);
}
- @Override
public void setNominalTime(Date nominalTime) {
- super.setNominalTime(nominalTime);
this.nominalTimeTS = DateUtils.convertDateToTimestamp(nominalTime);
}
- @Override
public Date getExpectedStart() {
return DateUtils.toDate(expectedStartTS);
}
- @Override
public void setExpectedStart(Date expectedStart) {
- super.setExpectedStart(expectedStart);
this.expectedStartTS = DateUtils.convertDateToTimestamp(expectedStart);
}
- @Override
public Date getExpectedEnd() {
return DateUtils.toDate(expectedEndTS);
}
- @Override
public void setExpectedEnd(Date expectedEnd) {
- super.setExpectedEnd(expectedEnd);
this.expectedEndTS = DateUtils.convertDateToTimestamp(expectedEnd);
}
- @Override
public long getExpectedDuration() {
return expectedDuration;
}
- @Override
public void setExpectedDuration(long expectedDuration) {
- super.setExpectedDuration(expectedDuration);
this.expectedDuration = expectedDuration;
}
+ public String getUser() {
+ return user;
+ }
+
+ public void setUser(String user) {
+ this.user = user;
+ }
+
+ public String getUpstreamApps() {
+ return upstreamApps;
+ }
+
+ public void setUpstreamApps(String upstreamApps) {
+ this.upstreamApps = upstreamApps;
+ }
+
+ public String getJobData() {
+ return jobData;
+ }
+
+ public void setJobData(String jobData) {
+ this.jobData = jobData;
+ }
+
+ public String getSlaConfig() {
+ return slaConfig;
+ }
+
+ public void setSlaConfig(String configStr) {
+ this.slaConfig = configStr;
+ slaConfigStringToMap();
+ }
+
+ public String getNotificationMsg() {
+ return notificationMsg;
+ }
+
+ public void setNotificationMsg(String notificationMsg) {
+ this.notificationMsg = notificationMsg;
+ }
+
+ public String getAlertEvents() {
+ return slaConfigMap.get(ALERT_EVENTS);
+ }
+
+ public void setAlertEvents(String alertEvents) {
+ slaConfigMap.put(ALERT_EVENTS, alertEvents);
+ slaConfig = slaConfigMapToString();
+ }
+
+ public String getAlertContact() {
+ return slaConfigMap.get(ALERT_CONTACT);
+ }
+
+ public void setAlertContact(String alertContact) {
+ slaConfigMap.put(ALERT_CONTACT, alertContact);
+ slaConfig = slaConfigMapToString();
+ }
+
+ public Map<String, String> getSlaConfigMap() {
+ return slaConfigMap;
+ }
+
+ private void slaConfigStringToMap() {
+ StringTokenizer st = new StringTokenizer(slaConfig, "},");
+ while (st.hasMoreTokens()) {
+ String token = st.nextToken();
+ String[] pair = token.split("=");
+ if (pair.length == 2) {
+ slaConfigMap.put(pair[0].substring(1), pair[1]);
+ }
+ }
+ }
+
+ public String slaConfigMapToString() {
+ StringBuilder sb = new StringBuilder();
+ for (Entry<String, String> e : slaConfigMap.entrySet()) {
+ sb.append("{" + e.getKey() + "=" + e.getValue() + "},");
+ }
+ return sb.toString();
+ }
+
@Override
- public void write(DataOutput dataOut) throws IOException {
- // required?
+ public JSONObject toJSONObject() {
+ // TODO
+ return null;
}
@Override
- public void readFields(DataInput dataIn) throws IOException {
- // required?
+ public JSONObject toJSONObject(String timeZoneId) {
+ // TODO
+ return null;
}
/**
- * Convert a SLAEvent list into a JSONArray.
+ * Convert a SLARegistrationBean list into a JSONArray.
*
- * @param SLAEVent list.
+ * @param events SLARegistrationBean list.
* @param timeZoneId time zone to use for dates in the JSON array.
* @return the corresponding JSON array.
*/
@@ -147,7 +293,7 @@ public class SLARegistrationBean extends
public static JSONArray toJSONArray(List<? extends SLARegistrationBean> events, String timeZoneId) {
JSONArray array = new JSONArray();
if (events != null) {
- for (JsonSLARegistrationEvent node : events) {
+ for (SLARegistrationBean node : events) {
array.add(node.toJSONObject(timeZoneId));
}
}
@@ -155,17 +301,24 @@ public class SLARegistrationBean extends
}
/**
- * Convert a JSONArray into a SLAEvent list.
+ * Convert a JSONArray into a SLARegistrationBean list.
*
* @param array JSON array.
- * @return the corresponding SLA event list.
+ * @return the corresponding SLA SLARegistrationBean list.
*/
- public static List<SLAEvent> fromJSONArray(JSONArray array) {
- List<SLAEvent> list = new ArrayList<SLAEvent>();
+ public static List<SLARegistrationBean> fromJSONArray(JSONArray array) {
+ List<SLARegistrationBean> list = new ArrayList<SLARegistrationBean>();
for (Object obj : array) {
- list.add(new JsonSLARegistrationEvent((JSONObject) obj));
+ list.add(new SLARegistrationBean((JSONObject) obj));
}
return list;
}
+ public MessageType getMsgType(){
+ return this.msgType;
+ }
+
+ public void setMsgType(MessageType msgType){
+ this.msgType = msgType;
+ }
}
Modified: oozie/trunk/core/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/resources/META-INF/persistence.xml?rev=1494068&r1=1494067&r2=1494068&view=diff
==============================================================================
--- oozie/trunk/core/src/main/resources/META-INF/persistence.xml (original)
+++ oozie/trunk/core/src/main/resources/META-INF/persistence.xml Tue Jun 18 08:36:54 2013
@@ -33,14 +33,12 @@
<class>org.apache.oozie.BundleJobBean</class>
<class>org.apache.oozie.BundleActionBean</class>
<class>org.apache.oozie.sla.SLARegistrationBean</class>
- <class>org.apache.oozie.sla.SLACalculatorBean</class>
<class>org.apache.oozie.sla.SLASummaryBean</class>
<class>org.apache.oozie.client.rest.JsonWorkflowJob</class>
<class>org.apache.oozie.client.rest.JsonWorkflowAction</class>
<class>org.apache.oozie.client.rest.JsonCoordinatorJob</class>
<class>org.apache.oozie.client.rest.JsonCoordinatorAction</class>
<class>org.apache.oozie.client.rest.JsonSLAEvent</class>
- <class>org.apache.oozie.client.rest.sla.JsonSLARegistrationEvent</class>
<class>org.apache.oozie.client.rest.JsonBundleJob</class>
<class>org.apache.oozie.util.db.ValidateConnectionBean</class>
@@ -58,10 +56,8 @@
org.apache.oozie.BundleJobBean;
org.apache.oozie.BundleActionBean;
org.apache.oozie.sla.SLARegistrationBean;
- org.apache.oozie.sla.SLACalculatorBean;
org.apache.oozie.sla.SLASummaryBean;
org.apache.oozie.client.rest.JsonSLAEvent;
- org.apache.oozie.client.rest.sla.JsonSLARegistrationEvent;
org.apache.oozie.client.rest.JsonWorkflowJob;
org.apache.oozie.client.rest.JsonWorkflowAction;
org.apache.oozie.client.rest.JsonCoordinatorJob;
@@ -96,14 +92,12 @@
<class>org.apache.oozie.BundleJobBean</class>
<class>org.apache.oozie.BundleActionBean</class>
<class>org.apache.oozie.sla.SLARegistrationBean</class>
- <class>org.apache.oozie.sla.SLACalculatorBean</class>
<class>org.apache.oozie.sla.SLASummaryBean</class>
<class>org.apache.oozie.client.rest.JsonWorkflowJob</class>
<class>org.apache.oozie.client.rest.JsonWorkflowAction</class>
<class>org.apache.oozie.client.rest.JsonCoordinatorJob</class>
<class>org.apache.oozie.client.rest.JsonCoordinatorAction</class>
<class>org.apache.oozie.client.rest.JsonSLAEvent</class>
- <class>org.apache.oozie.client.rest.sla.JsonSLARegistrationEvent</class>
<class>org.apache.oozie.client.rest.JsonBundleJob</class>
<class>org.apache.oozie.util.db.ValidateConnectionBean</class>
@@ -121,10 +115,8 @@
org.apache.oozie.BundleJobBean;
org.apache.oozie.BundleActionBean;
org.apache.oozie.sla.SLARegistrationBean;
- org.apache.oozie.sla.SLACalculatorBean;
org.apache.oozie.sla.SLASummaryBean;
org.apache.oozie.client.rest.JsonSLAEvent;
- org.apache.oozie.client.rest.sla.JsonSLARegistrationEvent;
org.apache.oozie.client.rest.JsonWorkflowJob;
org.apache.oozie.client.rest.JsonWorkflowAction;
org.apache.oozie.client.rest.JsonCoordinatorJob;
@@ -160,14 +152,12 @@
<class>org.apache.oozie.BundleJobBean</class>
<class>org.apache.oozie.BundleActionBean</class>
<class>org.apache.oozie.sla.SLARegistrationBean</class>
- <class>org.apache.oozie.sla.SLACalculatorBean</class>
<class>org.apache.oozie.sla.SLASummaryBean</class>
<class>org.apache.oozie.client.rest.JsonWorkflowJob</class>
<class>org.apache.oozie.client.rest.JsonWorkflowAction</class>
<class>org.apache.oozie.client.rest.JsonCoordinatorJob</class>
<class>org.apache.oozie.client.rest.JsonCoordinatorAction</class>
<class>org.apache.oozie.client.rest.JsonSLAEvent</class>
- <class>org.apache.oozie.client.rest.sla.JsonSLARegistrationEvent</class>
<class>org.apache.oozie.client.rest.JsonBundleJob</class>
<class>org.apache.oozie.util.db.ValidateConnectionBean</class>
@@ -185,10 +175,8 @@
org.apache.oozie.BundleJobBean;
org.apache.oozie.BundleActionBean;
org.apache.oozie.sla.SLARegistrationBean;
- org.apache.oozie.sla.SLACalculatorBean;
org.apache.oozie.sla.SLASummaryBean;
org.apache.oozie.client.rest.JsonSLAEvent;
- org.apache.oozie.client.rest.sla.JsonSLARegistrationEvent;
org.apache.oozie.client.rest.JsonWorkflowJob;
org.apache.oozie.client.rest.JsonWorkflowAction;
org.apache.oozie.client.rest.JsonCoordinatorJob;
@@ -223,14 +211,12 @@
<class>org.apache.oozie.BundleJobBean</class>
<class>org.apache.oozie.BundleActionBean</class>
<class>org.apache.oozie.sla.SLARegistrationBean</class>
- <class>org.apache.oozie.sla.SLACalculatorBean</class>
<class>org.apache.oozie.sla.SLASummaryBean</class>
<class>org.apache.oozie.client.rest.JsonWorkflowJob</class>
<class>org.apache.oozie.client.rest.JsonWorkflowAction</class>
<class>org.apache.oozie.client.rest.JsonCoordinatorJob</class>
<class>org.apache.oozie.client.rest.JsonCoordinatorAction</class>
<class>org.apache.oozie.client.rest.JsonSLAEvent</class>
- <class>org.apache.oozie.client.rest.sla.JsonSLARegistrationEvent</class>
<class>org.apache.oozie.client.rest.JsonBundleJob</class>
<class>org.apache.oozie.util.db.ValidateConnectionBean</class>
@@ -248,10 +234,8 @@
org.apache.oozie.BundleJobBean;
org.apache.oozie.BundleActionBean;
org.apache.oozie.sla.SLARegistrationBean;
- org.apache.oozie.sla.SLACalculatorBean;
org.apache.oozie.sla.SLASummaryBean;
org.apache.oozie.client.rest.JsonSLAEvent;
- org.apache.oozie.client.rest.sla.JsonSLARegistrationEvent;
org.apache.oozie.client.rest.JsonWorkflowJob;
org.apache.oozie.client.rest.JsonWorkflowAction;
org.apache.oozie.client.rest.JsonCoordinatorJob;
@@ -287,14 +271,12 @@
<class>org.apache.oozie.BundleJobBean</class>
<class>org.apache.oozie.BundleActionBean</class>
<class>org.apache.oozie.sla.SLARegistrationBean</class>
- <class>org.apache.oozie.sla.SLACalculatorBean</class>
<class>org.apache.oozie.sla.SLASummaryBean</class>
<class>org.apache.oozie.client.rest.JsonWorkflowJob</class>
<class>org.apache.oozie.client.rest.JsonWorkflowAction</class>
<class>org.apache.oozie.client.rest.JsonCoordinatorJob</class>
<class>org.apache.oozie.client.rest.JsonCoordinatorAction</class>
<class>org.apache.oozie.client.rest.JsonSLAEvent</class>
- <class>org.apache.oozie.client.rest.sla.JsonSLARegistrationEvent</class>
<class>org.apache.oozie.client.rest.JsonBundleJob</class>
<class>org.apache.oozie.util.db.ValidateConnectionBean</class>
@@ -312,10 +294,8 @@
org.apache.oozie.BundleJobBean;
org.apache.oozie.BundleActionBean;
org.apache.oozie.sla.SLARegistrationBean;
- org.apache.oozie.sla.SLACalculatorBean;
org.apache.oozie.sla.SLASummaryBean;
org.apache.oozie.client.rest.JsonSLAEvent;
- org.apache.oozie.client.rest.sla.JsonSLARegistrationEvent;
org.apache.oozie.client.rest.JsonWorkflowJob;
org.apache.oozie.client.rest.JsonWorkflowAction;
org.apache.oozie.client.rest.JsonCoordinatorJob;
Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1494068&r1=1494067&r2=1494068&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Tue Jun 18 08:36:54 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1422 fix bug in SLARegistrationBean and CoordActionsCountForJobIdJPAExecutor (ryota)
OOZIE-1408 Change column type of "frequency" from int to varchar for coordinators (rkanter)
OOZIE-1420 OOZIE-1365 breaks the action popup in the Web UI (michalisk via rkanter)
OOZIE-1418 Fix bugs around ActionKillX not setting end time, V2SLAServlet and exception handling for event threads (mona)
Modified: oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java
URL: http://svn.apache.org/viewvc/oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java?rev=1494068&r1=1494067&r2=1494068&view=diff
==============================================================================
--- oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java (original)
+++ oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java Tue Jun 18 08:36:54 2013
@@ -893,7 +893,6 @@ public class OozieDBCLI {
args.add("org.apache.oozie.CoordinatorActionBean");
args.add("org.apache.oozie.client.rest.JsonSLAEvent");
args.add("org.apache.oozie.SLAEventBean");
- args.add("org.apache.oozie.client.rest.sla.JsonSLARegistrationEvent");
args.add("org.apache.oozie.sla.SLARegistrationBean");
args.add("org.apache.oozie.client.rest.JsonBundleJob");
args.add("org.apache.oozie.BundleJobBean");