assembleSchedulesJson-ban új objektum összeállítása

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
index 29ab9bcd7618d913a63d2ead630c945935305172..eb1d55046aae256fa78ff64ecf41336629648c6a 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
@@ -423,14 +423,22 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
                BasicDBObject dbo = new BasicDBObject();\r
                BasicDBList jobList = new BasicDBList();\r
                for (int i = 0; i < schedules.size(); i++) {\r
-                       BasicDBObject temp = schedules.get(i).getValue();\r
-                       temp.remove("xml");\r
-                       temp.remove("nextTime");\r
-                       if (temp.get("active") == null) {\r
-                               temp.remove("active");\r
+                       BasicDBObject temp= new BasicDBObject();\r
+                       if (schedules.get(i).getValue().get("name") != null) {\r
+                               temp.append("name", schedules.get(i).getValue().get("name"));\r
                        }\r
-                       if (temp.get("executeimmediate") == null) {\r
-                               temp.remove("executeimmediate");\r
+                       temp.append("template", schedules.get(i).getValue().get("template"));\r
+                       if (schedules.get(i).getValue().get("active") != null) {\r
+                               temp.append("active", schedules.get(i).getValue().get("active"));\r
+                       }\r
+                       if (schedules.get(i).getValue().get("executeimmediate") != null) {\r
+                               temp.append("executeimmediate", schedules.get(i).getValue().get("executeimmediate"));\r
+                       }\r
+                       if (schedules.get(i).getValue().get("cronexpression") != null) {\r
+                               temp.append("cronexpression", schedules.get(i).getValue().get("cronexpression"));\r
+                       }\r
+                       if (schedules.get(i).getValue().get("parameters") != null) {\r
+                               temp.append("parameters", new BasicDBList(schedules.get(i).getValue().get("parameters")));\r
                        }\r
                        jobList.add(temp);\r
                }\r