You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/09/08 13:18:07 UTC
syncope git commit: [SYNCOPE-933] Removing status from JobTO
Repository: syncope
Updated Branches:
refs/heads/master 142467929 -> 35ae16a9c
[SYNCOPE-933] Removing status from JobTO
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/35ae16a9
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/35ae16a9
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/35ae16a9
Branch: refs/heads/master
Commit: 35ae16a9cd8d1bb890a274e9190bfc66cec81105
Parents: 1424679
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Thu Sep 8 15:17:51 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Thu Sep 8 15:18:00 2016 +0200
----------------------------------------------------------------------
.../client/cli/commands/report/ReportResultManager.java | 1 -
.../syncope/client/cli/commands/task/TaskResultManager.java | 1 -
.../org/apache/syncope/client/console/widgets/JobWidget.java | 2 --
.../main/java/org/apache/syncope/common/lib/to/JobTO.java | 8 --------
.../java/org/apache/syncope/core/logic/AbstractJobLogic.java | 1 -
5 files changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/35ae16a9/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java
index d33b84e..3176bef 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java
@@ -78,7 +78,6 @@ public class ReportResultManager extends CommonsResultManager {
public void printJobs(final List<JobTO> jobTOs) {
for (final JobTO jobTO : jobTOs) {
System.out.println(" REPORT: " + jobTO.getRefDesc());
- System.out.println(" status: " + jobTO.getStatus());
System.out.println(" start date: " + jobTO.getStart());
System.out.println(" running: " + jobTO.isRunning());
System.out.println(" scheduled: " + jobTO.isScheduled());
http://git-wip-us.apache.org/repos/asf/syncope/blob/35ae16a9/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java
index 05ef17e..dd98416 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java
@@ -214,7 +214,6 @@ public class TaskResultManager extends CommonsResultManager {
public void printJobs(final List<JobTO> jobTOs) {
for (final JobTO jobTO : jobTOs) {
System.out.println(" TASK: " + jobTO.getRefDesc());
- System.out.println(" status: " + jobTO.getStatus());
System.out.println(" start date: " + jobTO.getStart());
System.out.println(" running: " + jobTO.isRunning());
System.out.println(" scheduled: " + jobTO.isScheduled());
http://git-wip-us.apache.org/repos/asf/syncope/blob/35ae16a9/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
index 4f6d019..410d576 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
@@ -261,8 +261,6 @@ public class JobWidget extends BaseWidget {
columns.add(new DatePropertyColumn<JobTO>(new ResourceModel("start"), "start", "start"));
- columns.add(new PropertyColumn<JobTO, String>(new ResourceModel("status"), "status", "status"));
-
return columns;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/35ae16a9/common/lib/src/main/java/org/apache/syncope/common/lib/to/JobTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/JobTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/JobTO.java
index 69a339c..7838535 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/JobTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/JobTO.java
@@ -84,14 +84,6 @@ public class JobTO extends AbstractBaseBean {
this.scheduled = scheduled;
}
- public String getStatus() {
- return status;
- }
-
- public void setStatus(final String status) {
- this.status = status;
- }
-
public Date getStart() {
return start == null
? null
http://git-wip-us.apache.org/repos/asf/syncope/blob/35ae16a9/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractJobLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractJobLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractJobLogic.java
index 2473f6d..e189930 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractJobLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractJobLogic.java
@@ -67,7 +67,6 @@ abstract class AbstractJobLogic<T extends AbstractBaseBean> extends AbstractTran
} else {
jobTO.setScheduled(true);
jobTO.setStart(jobTriggers.get(0).getStartTime());
- jobTO.setStatus(scheduler.getScheduler().getTriggerState(jobTriggers.get(0).getKey()).name());
}
jobTO.setRunning(jobManager.isRunning(jobKey));