git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/-configuration/install-mediacube-modules.launch b/server/-configuration/install-mediacube-modules.launch
new file mode 100644 (file)
index 0000000..9224ace
--- /dev/null
+++ b/server/-configuration/install-mediacube-modules.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
+<stringAttribute key="M2_GOALS" value="clean install"/>\r
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
+<booleanAttribute key="M2_OFFLINE" value="false"/>\r
+<stringAttribute key="M2_PROFILES" value=""/>\r
+<listAttribute key="M2_PROPERTIES"/>\r
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>\r
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>\r
+<intAttribute key="M2_THREADS" value="1"/>\r
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
+<stringAttribute key="M2_USER_SETTINGS" value=""/>\r
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
+</listAttribute>\r
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}/-modules"/>\r
+</launchConfiguration>\r

diff --git a/server/user.commons.log4j2/.classpath b/server/user.commons.log4j2/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..6e16b23d6951a66733f6bad1d440cc2b57c86122 100644 (file)
--- a/server/user.commons.log4j2/.classpath
+++ b/server/user.commons.log4j2/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/server/user.jobengine.executors/.classpath b/server/user.jobengine.executors/.classpath
index 1f733c4803467f986636a2f088da4b5403445cce..4848249846f9153775ed2f647f17ee59f78163ac 100644 (file)
--- a/server/user.jobengine.executors/.classpath
+++ b/server/user.jobengine.executors/.classpath
@@ -2,6 +2,6 @@
 <classpath>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/server/user.jobengine.executors/config/config.xml b/server/user.jobengine.executors/config/config.xml
index cd6c2e219fbf96931d68353829156a314662d63e..e482e38ca0cad3a4c2839810db42ac3b968df869 100644 (file)
--- a/server/user.jobengine.executors/config/config.xml
+++ b/server/user.jobengine.executors/config/config.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <executors>\r
-       <executor className="user.jobengine.server.steps.FakeStep" maxConcurrent="2"/>\r
+       <executor className="user.jobengine.server.steps.FakeStep" maxConcurrent="20"/>\r
+       <executor className="user.jobengine.server.steps.FakeNoParamsStep" maxConcurrent="20"/>\r
        <executor className="user.jobengine.server.steps.ArchiveMaterialSubmitStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.ArchiveListBuilderStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.CheckTRAFFICMissingMaterialsStep" maxConcurrent="1"/>\r

diff --git a/server/user.jobengine.executors/config/scheduledjobs.json b/server/user.jobengine.executors/config/scheduledjobs.json
index 87fb76602a2766f87fa6c2f93d94f06aa027a11c..a3a950def90eb5e675611b8940407c8e566be5ff 100644 (file)
--- a/server/user.jobengine.executors/config/scheduledjobs.json
+++ b/server/user.jobengine.executors/config/scheduledjobs.json
@@ -24,7 +24,7 @@
       ]\r
        },\r
        {\r
-      "active": true,\r
+      "active": false,\r
       "executeimmediate": false,\r
          "name" : "Lejárt ISISLON/ARCHIVE anyagok törlése",\r
       "template": "delete-materials.xml",\r
@@ -34,16 +34,16 @@
       ]\r
        },      \r
        {\r
-      "active": false,\r
-      "executeimmediate": true,\r
+      "active": true,\r
+      "executeimmediate": false,\r
          "name" : "NEXIO anyagok másolása az ISILON/ARCHIVE mappába",\r
       "template": "copyforarchive-nexio-materials.xml",\r
-      "cronexpression": "0 0 0/1 1/1 * ? *",\r
+      "cronexpression": "0 0 10 * * ?",\r
       "parameters": [ \r
        {"name": "nexioPort", "value": 2098, "type": "java.lang.Integer"},\r
        {"name": "nexioUserName", "value": "administrator", "type": "java.lang.String"},\r
        {"name": "nexioPassword", "value": "system", "type": "java.lang.String"},\r
-       {"name": "archiveFtp", "value": "ftp://10.10.1.100/ARCHIVE/TEST", "type": "java.lang.String"},\r
+       {"name": "archiveFtp", "value": "ftp://10.10.1.100/ARCHIVE", "type": "java.lang.String"},\r
        {"name": "archiveUserName", "value": "mediacube", "type": "java.lang.String"},\r
        {"name": "archivePassword", "value": "Broadca5T", "type": "java.lang.String"},\r
        {"name": "daysBeforeNow", "value": 1, "type": "java.lang.Integer"},\r
@@ -53,20 +53,6 @@
        },      \r
        {\r
       "active": false,\r
-      "executeimmediate": true,\r
-         "name" : "Archiválás az ISILON/ARCHIVE/ONE mappából",\r
-      "template": "archive-ondemand.xml",\r
-      "cronexpression": "0 0 0/1 1/1 * ? *",\r
-      "parameters": [ \r
-       {"name": "sourcePath", "value": "/mnt/ISILON/ARCHIVE/ONE", "type": "java.lang.String"},\r
-       {"name": "globalSourcePath", "value": "\\\\10.10.1.100\\BRAAVOS\\ARCHIVE\\ONE", "type": "java.lang.String"},\r
-       {"name": "transcoderTargetPath", "value": "/mnt/SELENIO", "type": "java.lang.String"},\r
-       {"name": "webPath", "value": "/mediacube/data/lowres/www/video", "type": "java.lang.String"},\r
-       {"name": "killDateDays", "value": 1, "type": "java.lang.Integer"}\r
-      ]\r
-       },\r
-       {\r
-      "active": false,\r
       "executeimmediate": true,\r
          "name" : "TRAFFIC anyagok visszatöltése",\r
       "template": "retrieve-traffic-missing-materials.xml",\r
@@ -104,7 +90,7 @@
        },      \r
        {\r
       "active": false,\r
-      "executeimmediate": true,\r
+      "executeimmediate": false,\r
          "name" : "NEXIO anyagok törlése",\r
       "template": "delete-nexio-materials.xml",\r
       "cronexpression": "0 0 0/1 1/1 * ? *",\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeNoParamsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeNoParamsStep.java
index 915a19aac1a505c551d2f0c5f4a19497d95d24bb..ae1878d4bb91d072194dedfb07e8d5aa567b130e 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeNoParamsStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeNoParamsStep.java
@@ -11,15 +11,23 @@ public class FakeNoParamsStep extends JobStep {
        int count = 10;\r
 \r
        @StepEntry\r
-       public Object[] execute(IJobEngine jobEngine, IJobRuntime jobRuntime) {\r
-               try {\r
-                       logger.warn("| + | FakeNoParams step");\r
-                       jobRuntime.incrementProgress(50);\r
-                       Thread.sleep(15000);\r
-                       jobRuntime.incrementProgress(100);\r
-                       logger.warn("| - | FakeNoParams step");\r
-               } catch (Exception e) {\r
-                       logger.error(e.getMessage());\r
+       public Object[] execute(IJobEngine jobEngine, IJobRuntime jobRuntime) throws InterruptedException {\r
+               //              try {\r
+               //                      logger.warn("| + | FakeNoParams step");\r
+               //                      jobRuntime.incrementProgress(50);\r
+               //                      Thread.sleep(15000);\r
+               //                      jobRuntime.incrementProgress(100);\r
+               //                      logger.warn("| - | FakeNoParams step");\r
+               //              } catch (Exception e) {\r
+               //                      logger.error(e.getMessage());\r
+               //              }\r
+               for (int i = 0; i < count; i++) {\r
+                       if (!canContinue())\r
+                               break;\r
+                       jobRuntime.incrementProgress((i + 1) * count);\r
+                       Thread.sleep(5000);\r
+                       //logger.info(getMarker(), "Log markered");\r
+                       //logger.info("Progress {}", jobRuntime.getProgress());\r
                }\r
                return null;\r
        }\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java
index fd7c139fb8ed42e380d87f2ded576897d5045501..d9a4177c0d251844e3f9245469b5f84eac332da2 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java
@@ -19,7 +19,7 @@ public class FakeStep extends JobStep {
                                if (!canContinue())\r
                                        break;\r
                                jobRuntime.incrementProgress((i + 1) * count);\r
-                               Thread.sleep(1000);\r
+                               Thread.sleep(500);\r
                                //logger.info(getMarker(), "Log markered");\r
                                //logger.info("Progress {}", jobRuntime.getProgress());\r
                        }\r

diff --git a/server/user.jobengine.osgi.commons/.classpath b/server/user.jobengine.osgi.commons/.classpath
index 069739a58169f13cbea8308e8bf833abacf01b1b..5774abd31c5f7d9aea00f7b55e696fa50294cedc 100644 (file)
--- a/server/user.jobengine.osgi.commons/.classpath
+++ b/server/user.jobengine.osgi.commons/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="src" path="test"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/server/user.jobengine.osgi.db/.classpath b/server/user.jobengine.osgi.db/.classpath
index ad20a72aa507086e6229ecca6b487fe4e8fa997a..ff5393b6136a96e61d54508cf94f300302f0bd6c 100644 (file)
--- a/server/user.jobengine.osgi.db/.classpath
+++ b/server/user.jobengine.osgi.db/.classpath
@@ -4,6 +4,6 @@
        <classpathentry excluding="user/jobengine/remotefiles/jcifs/smb/" kind="src" path="src"/>\r
        <classpathentry kind="src" path="test"/>\r
        <classpathentry kind="src" path="generated"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/server/user.jobengine.osgi.server/deploy.launch b/server/user.jobengine.osgi.server/deploy.launch
index 21dbc5448a7229194117399474f37bb5c29b655b..e1c38a1c29b38e63fb36058f90b495110e15e6e0 100644 (file)
--- a/server/user.jobengine.osgi.server/deploy.launch
+++ b/server/user.jobengine.osgi.server/deploy.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
 <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
-<stringAttribute key="M2_GOALS" value="clean deploy -DdeploySingle"/>\r
+<stringAttribute key="M2_GOALS" value="clean install"/>\r
 <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
 <booleanAttribute key="M2_OFFLINE" value="false"/>\r
 <stringAttribute key="M2_PROFILES" value=""/>\r

diff --git a/server/user.jobengine.osgi.server/pages/joblist.zul b/server/user.jobengine.osgi.server/pages/joblist.zul
index a9ff3cb5f01b56577455cb283b37e437407c20b8..6d4c1725a26de0d8a7c8fffde6c05aca43031a0b 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/joblist.zul
+++ b/server/user.jobengine.osgi.server/pages/joblist.zul
@@ -18,7 +18,7 @@
        <custom-attributes org.zkoss.zul.listbox.preloadSize="50" />\r
        \r
        <div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('jlm') @init('user.jobengine.zk.model.JobListModel')" >\r
-               <timer id="timer" delay="100" repeats="true" onTimer="@command('refreshJobList')" />\r
+               <timer id="timer" delay="500" repeats="true" onTimer="@command('refreshJobList')" />\r
 \r
                <space bar="false" />\r
                \r
@@ -35,7 +35,7 @@
                <div height="100%" width="100%" style="background: #e3e3e3" align="left">\r
                        <groupbox height="94%" closable="false">\r
                                <caption sclass="boldfont" label="Aktív folyamatok" />\r
-                               <listbox id="lbJobList" sizedByContent="false" model="@load(jlm.jobList)" multiple="true" autopaging="false" mold="paging" vflex="true" checkmark="true" \r
+                               <listbox id="lbJobList" sizedByContent="false" model="@load(jlm.jobList)" multiple="true" pagingPosition="top" mold="paging" autopaging="false" vflex="true" checkmark="true" \r
                                        onSelect="@command('selectJob')" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" \r
                                        emptyMessage="Nincs futó folyamat.">\r
                                       <listhead sizable="true">\r

diff --git a/server/user.jobengine.osgi.server/pages/menu.zul b/server/user.jobengine.osgi.server/pages/menu.zul
index f97e93bc2472e06ffcbe892e5fd505319ae814ab..0cb794fba1f01b509b2fd5cc916fc2dd460bcad5 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/menu.zul
+++ b/server/user.jobengine.osgi.server/pages/menu.zul
@@ -60,8 +60,8 @@
                <menu sclass="whitemenu" label="Archívum" >\r
                        <menupopup>\r
                                <menuitem sclass="rozsda" label="Keresés" onClick='includeContent.src="/pages/search_items.zul"' disabled="false" />\r
-                               <menuitem sclass="rozsda" label="Statisztikák" onClick='includeContent.src="/pages/statistics.zul"' disabled="false" />\r
-                               <menuitem sclass="rozsda" label="Folyamatok" onClick='includeContent.src="/pages/joblist.zul"' disabled="false" />\r
+<!--                           <menuitem sclass="rozsda" label="Statisztikák" onClick='includeContent.src="/pages/statistics.zul"' disabled="false" /> -->\r
+<!--                           <menuitem sclass="rozsda" label="Folyamatok" onClick='includeContent.src="/pages/joblist.zul"' disabled="false" /> -->\r
                        </menupopup>\r
                </menu>\r
 \r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobListModel.java
index 010051c9246a46639fc29af58ad3b53965a03262..f298174d88256840ced50051e998f940413dbe6c 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobListModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobListModel.java
@@ -170,6 +170,18 @@ public class JobListModel extends BaseModel implements IJobChangedListener {
                }\r
        }\r
 \r
+       @Command\r
+       @NotifyChange({ "shutdownDisabled", "startupDisabled" })\r
+       public void restart() {\r
+               startupDisabled = true;\r
+               try {\r
+                       jobEngine.startup();\r
+               } catch (Exception e) {\r
+               }\r
+               shutdownDisabled = false;\r
+               initializeList();\r
+       }\r
+\r
        @Command\r
        @NotifyChange({ "updatePriorityDisabled" })\r
        public void selectJob() {\r
@@ -226,5 +238,4 @@ public class JobListModel extends BaseModel implements IJobChangedListener {
                shutdownDisabled = false;\r
                initializeList();\r
        }\r
-\r
 }\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobSelectorModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobSelectorModel.java
index 17d8c81e77da4eae91faa2005c99cd544371e937..47f00bf87c017651541f8777f9db82ddabbfa074 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobSelectorModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobSelectorModel.java
@@ -41,21 +41,30 @@ public class JobSelectorModel extends BaseModel {
        public void execute() {\r
                if (selectedJobElement == null)\r
                        return;\r
-               SchedulerService scheduler = jobEngine.getScheduler();\r
-               ScheduledJob scheduledJob = scheduler.createScheduledJob(selectedJobElement.getDbObject());\r
-               scheduledJob.setJobEngine(jobEngine);\r
-               for (int i = 0; i < 1; i++) {\r
-\r
-                       try {\r
-                               if (!scheduledJob.isActive())\r
-                                       scheduler.register(scheduledJob);\r
-                               scheduler.executeImmediate(scheduledJob.getJobId());\r
-                               Thread.sleep(100);\r
-                       } catch (Exception e) {\r
-                               Messagebox.show(e.getMessage());\r
+\r
+               Runnable r = new Runnable() {\r
+\r
+                       @Override\r
+                       public void run() {\r
+                               SchedulerService scheduler = jobEngine.getScheduler();\r
+                               ScheduledJob scheduledJob = scheduler.createScheduledJob(selectedJobElement.getDbObject());\r
+                               scheduledJob.setJobEngine(jobEngine);\r
+                               for (int i = 0; i < 1; i++) {\r
+\r
+                                       try {\r
+                                               if (!scheduledJob.isActive())\r
+                                                       scheduler.register(scheduledJob);\r
+                                               scheduler.executeImmediate(scheduledJob.getJobId());\r
+                                               Thread.sleep(300);\r
+                                       } catch (Exception e) {\r
+                                               Messagebox.show(e.getMessage());\r
+                                       }\r
+                               }\r
+\r
                        }\r
-               }\r
+               };\r
 \r
+               new Thread(r).start();\r
                close();\r
        }\r
 \r

diff --git a/server/user.jobengine.osgi.services/.classpath b/server/user.jobengine.osgi.services/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..6e16b23d6951a66733f6bad1d440cc2b57c86122 100644 (file)
--- a/server/user.jobengine.osgi.services/.classpath
+++ b/server/user.jobengine.osgi.services/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/server/user.tsm.client/.classpath b/server/user.tsm.client/.classpath
index b1dabee38291b97f08cc3a18bee4e65b1e550530..6e16b23d6951a66733f6bad1d440cc2b57c86122 100644 (file)
--- a/server/user.tsm.client/.classpath
+++ b/server/user.tsm.client/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r