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

diff --git a/server/user.jobengine.osgi.server/WEB-INF/web.xml b/server/user.jobengine.osgi.server/WEB-INF/web.xml
index 1ffb79237d47371cbf979ec596c2c49b96699894..92710e54bf31090a7625509d08decdd40ff92f14 100644 (file)
--- a/server/user.jobengine.osgi.server/WEB-INF/web.xml
+++ b/server/user.jobengine.osgi.server/WEB-INF/web.xml
@@ -7,9 +7,9 @@
                <listener-class>org.zkoss.zk.ui.http.HttpSessionListener</listener-class>\r
        </listener>\r
 \r
-<!--   <listener> -->\r
-<!--           <listener-class>user.generali.archivum.zkclient.util.SessionListener</listener-class> -->\r
-<!--   </listener> -->\r
+       <listener>\r
+               <listener-class>user.jobengine.zk.util.SessionListener</listener-class>\r
+       </listener>\r
 \r
        <!-- ZK -->\r
        <servlet>\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 f298174d88256840ced50051e998f940413dbe6c..d3a066a596e6e921d261ea79c05f9db9482c2353 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
@@ -21,6 +21,7 @@ import user.jobengine.server.IJobEngine;
 import user.jobengine.server.IJobRuntime;\r
 import user.jobengine.server.JobChangedEvent;\r
 import user.jobengine.server.JobEngine;\r
+import user.jobengine.zk.util.SessionUtil;\r
 \r
 public class JobListModel extends BaseModel implements IJobChangedListener {\r
        private class EnableServerStart {\r
@@ -87,7 +88,10 @@ public class JobListModel extends BaseModel implements IJobChangedListener {
                                throw new Exception("Internal error! JobEngine instance unavailable.");\r
                        setShutdownDisabled(!jobEngine.isRunning());\r
                        setStartupDisabled(jobEngine.isRunning());\r
+                       \r
                        this.jobEngine.addJobChangedEventListener(this);\r
+                       SessionUtil.addJobChangedListener(this);                        //sessionlistener fog leiratkozni\r
+                       \r
                        initializeList();\r
 \r
                } catch (Exception exc) {\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
index 0625e90fc8e6dc332569a21a70dd42d57f45cad2..2b89f5869a612423e1cfe19944451548d3fbbb03 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
@@ -2,6 +2,7 @@ package user.jobengine.zk.util;
 \r
 import java.io.FileInputStream;\r
 import java.io.InputStream;\r
+import java.util.ArrayList;\r
 import java.util.Properties;\r
 \r
 import javax.servlet.http.HttpSession;\r
@@ -12,6 +13,8 @@ import org.apache.logging.log4j.Logger;
 import org.zkoss.zk.ui.Session;\r
 import org.zkoss.zk.ui.Sessions;\r
 \r
+import user.jobengine.server.IJobChangedListener;\r
+\r
 public class SessionUtil {\r
        private static Logger logger = LogManager.getLogger();\r
        private static final String AUTH_ENABLED = "auth_enabled";\r
@@ -20,6 +23,7 @@ public class SessionUtil {
        private static final String LOCAL_JOBSUBMITTERS = "local_jobsubmitters";\r
        private static final String USERPRINCIPAL = "userPrincipal";\r
        private static final String AUTH_LOCATION = "mediacube.auth.location";\r
+       public static  final String JOBLISTENERLIST = "joblistenerlist";\r
 \r
        public static boolean authenticate(String account, String password) {\r
                Properties cfg = getConfiguration();\r
@@ -121,4 +125,18 @@ public class SessionUtil {
                        session.setAttribute(name, obj);\r
        }\r
 \r
+\r
+       static public void addJobChangedListener(IJobChangedListener listener){\r
+               ArrayList<IJobChangedListener> list = (ArrayList<IJobChangedListener>)getAttribute(JOBLISTENERLIST);\r
+               if(list == null){\r
+                       list = new ArrayList<IJobChangedListener>();\r
+                       setAttribute(JOBLISTENERLIST, list);\r
+               }\r
+               if(!list.contains(listener)){\r
+                       list.add(listener);\r
+               }\r
+       }\r
+       \r
+       \r
+               \r
 }
\ No newline at end of file