git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Mon, 2 Oct 2017 08:07:28 +0000 (08:07 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Mon, 2 Oct 2017 08:07:28 +0000 (08:07 +0000)
17 files changed:
client/Maestro/Resources/configuration-nexio.json
client/Maestro/Resources/configuration-unc.json
server/-configuration/run-mediacube-server-bsh.launch
server/-configuration/run-mediacube-server-localhost.launch
server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveItemSubmitStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteMaterialsStep.java [new file with mode: 0644]
server/user.jobengine.executors/src/user/jobengine/server/steps/NexioDeleteMaterialsStep.java [new file with mode: 0644]
server/user.jobengine.osgi.commons/src/user/commons/RemoteFile.java
server/user.jobengine.osgi.commons/src/user/commons/remotestore/FtpDirectoryLister.java
server/user.jobengine.osgi.commons/src/user/commons/remotestore/IDirectoryLister.java
server/user.jobengine.osgi.commons/src/user/commons/remotestore/LocalDirectoryLister.java
server/user.jobengine.osgi.commons/src/user/commons/remotestore/SambaDirectoryLister.java
server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMLister.java
server/user.jobengine.osgi.server/pages/search_items.zul
server/user.jobengine.osgi.server/src/user/jobengine/osgi/server/ConsoleCommandProvider.java
server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java

index 1aa547719bffd24137ffbcb3f45fb89c8c89cd36..fc4a75a759955da65432e50312487926641187b6 100644 (file)
@@ -1,6 +1,6 @@
 {\r
   "title": "PLAYOUT",\r
-  "active": true,\r
+  "active": false,\r
   "startInTray": false,\r
   "enableNameOverride": false,\r
   "player": {\r
@@ -32,7 +32,7 @@
     {\r
       "$type": "TrafficMetadata",\r
       "server": {\r
-        "address": "Data Source=folkloredb.hu\\sql08,33860;Initial Catalog=CLArchiveTF_0;Persist Security Info=True;",\r
+        "address": "Data Source=10.10.1.45\\sql16;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
         "userName": "MAM",\r
         "password": "Echotv.hu",\r
         "timeout": 5\r
index 36d46875b5d1b18b39d8b14f51af34a6e8d34dd4..921c004e1a31029b4a95f0cd98a94cd983aa2066 100644 (file)
   "source": {\r
     "$type": "UNCSource",\r
     "local": {\r
-      "address": "file://localhost/watch"\r
+      "address": "file://10.10.1.100/BRAAVOS/_TEST_/_ECHO/hirado/170901"\r
     },\r
     "remote": {\r
-      "address": "ftp://localhost:21/watch",\r
-      "userName": "dani",\r
-      "password": "dani"\r
+      "address": "ftp://10.10.1.100:21/_TEST_/_ECHO/hirado/170901",\r
+      "userName": "mediacube",\r
+      "password": "Broadca5T"\r
     }\r
   },\r
   "metadatas": [\r
@@ -41,9 +41,9 @@
     {\r
       "$type": "MediaCubeMetadata",\r
       "server": {\r
-        "address": "http://localhost:8080/services/rest/jobengine/",\r
-        "userName": "dani",\r
-        "password": "dani"\r
+        "address": "http://10.10.1.28:8080/services/rest/jobengine/",\r
+        "userName": "-",\r
+        "password": "-"\r
       }\r
     }\r
   ],\r
@@ -54,7 +54,7 @@
       "outputFormat": "{0}-{1}",\r
       "killDateDays": 1,\r
       "remote": {\r
-        "address": "ftp://localhost:21/out",\r
+        "address": "ftp://10.10.1.100:21/ARCHIVE",\r
         "userName": "dani",\r
         "password": "dani"\r
       }\r
@@ -69,7 +69,7 @@
          "createSubFolder": true,\r
          "useMetadata": true,\r
       "remote": {\r
-        "address": "ftp://localhost:21/out",\r
+        "address": "ftp://10.10.1.100:21/READY",\r
         "userName": "dani",\r
         "password": "dani"\r
       }\r
index 1dec536d9a5923c7a2adf78ac2e66a7a21c84f2f..0cef7afc6fd000316c7c75f97e732c0fc063438d 100644 (file)
@@ -19,7 +19,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.10.1.26:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=password&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.21/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.10.1.26:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=password&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Dnexio.host=10.10.1.55"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.10.1.28:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=password&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.21/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.10.1.28:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=password&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Dnexio.host=10.10.1.55"/>\r
 <stringAttribute key="pde.version" value="3.3"/>\r
 <booleanAttribute key="show_selected_only" value="false"/>\r
 <stringAttribute key="target_bundles" value="cglib@default:default,com.auth0.java-jwt@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,commons-logging@default:default,javassist@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.jvnet.mimepull@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.reflections@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
index f4c11208b43ed6071685630480a33c4e60b6f3ed..232365c4f45e0ce7b02747712a5aff1cc1dc9222 100644 (file)
@@ -19,7 +19,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=salabakter&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Djobengine.rcc.host=localhost&#13;&#10;-Djobengine.rcc.defaultlowresprofile=&quot;WindowsMedia - Web Streaming - DSL or Cable Modem&quot;&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#13;&#10;-Djetty.home=&quot;${workspace_loc:-configuration}/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.21/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=salabakter&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=salabakter&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Djobengine.rcc.host=localhost&#13;&#10;-Djobengine.rcc.defaultlowresprofile=&quot;WindowsMedia - Web Streaming - DSL or Cable Modem&quot;&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#13;&#10;-Djetty.home=&quot;${workspace_loc:-configuration}/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.21/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=salabakter&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Dnexio.host=10.10.1.55"/>\r
 <stringAttribute key="pde.version" value="3.3"/>\r
 <booleanAttribute key="show_selected_only" value="false"/>\r
 <stringAttribute key="target_bundles" value="cglib@default:default,com.auth0.java-jwt@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,commons-logging@default:default,javassist@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.jvnet.mimepull@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.reflections@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
index afb60e8079810fa9f48abdbdd193a3d86542c5d2..bbcaaf34844df51a409ad47554f27f7c0dd046cc 100644 (file)
@@ -1,7 +1,5 @@
 package user.jobengine.server.steps;\r
 \r
-import java.io.File;\r
-import java.nio.file.Path;\r
 import java.util.ArrayList;\r
 \r
 import org.apache.logging.log4j.LogManager;\r
@@ -32,22 +30,14 @@ public class ArchiveItemSubmitStep extends JobStep {
                                                        ListUtils.asMap(ARCHIVE_ITEM, archiveItem, GLOBAL_INPUT_FOLDER, globalInputFolder));\r
                                } catch (Exception e) {\r
                                        if (archiveItem != null)\r
-                                               removeCatchedFile(archiveItem.getCatchedFile());\r
+                                               archiveItem.removeCatchedFile();\r
                                        throw e;\r
                                }\r
                        }\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
                }\r
-               return new Object[] {};\r
-       }\r
-\r
-       private void removeCatchedFile(Path catchedFilePath) {\r
-               if (catchedFilePath != null) {\r
-                       File catchedFile = catchedFilePath.toFile();\r
-                       if (catchedFile.exists())\r
-                               catchedFile.delete();\r
-               }\r
+               return null;\r
        }\r
 \r
 }\r
index 4df08f341fe6a9f8d5e870ebb7a8f952c202c606..950d0230200e1d19f74e43fa88eada3e2a15462f 100644 (file)
@@ -27,9 +27,9 @@ import user.jobengine.server.IJobRuntime;
  */\r
 public class ArchiveListBuilderStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
-       private static final String UTF8 = "utf-8";\r
+       //      private static final String UTF8 = "utf-8";\r
        private static final String CATCHED = "catched";\r
-       private static final String STOREFOLDER = ".STORE";\r
+       private static final String STATUSFOLDER = ".STATUS";\r
        private static final String MEDIAEXT = ".mxf";\r
        private static final String JSONEXT = ".json";\r
        private static final String CATCHEDEXT = ".catched";\r
@@ -109,7 +109,7 @@ public class ArchiveListBuilderStep extends JobStep {
                        return;\r
                }\r
 \r
-               Path dotStorePath = Paths.get(mediaFilePath.getParent().toString(), STOREFOLDER);\r
+               Path dotStorePath = Paths.get(mediaFilePath.getParent().toString(), STATUSFOLDER);\r
                Path catchedFilePath = Paths.get(dotStorePath.toString(), mediaFile.getName() + CATCHEDEXT);\r
                File catchedFile = catchedFilePath.toFile();\r
                if (catchedFile.exists()) {\r
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteMaterialsStep.java
new file mode 100644 (file)
index 0000000..78385b9
--- /dev/null
@@ -0,0 +1,48 @@
+package user.jobengine.server.steps;\r
+\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
+\r
+import user.commons.RemoteFile;\r
+import user.commons.StoreUri;\r
+import user.commons.remotestore.RemoteStoreProtocol;\r
+import user.jobengine.db.IItemManager;\r
+import user.jobengine.server.IJobEngine;\r
+import user.jobengine.server.IJobRuntime;\r
+\r
+public class DeleteMaterialsStep extends JobStep {\r
+       private static final Logger logger = LogManager.getLogger();\r
+       private static final String UTF8 = "utf-8";\r
+       private static final String STATUSFOLDER = ".STATUS";\r
+       private static final String MEDIAEXT = ".mxf";\r
+       private static final String KILLDATE = ".catched";\r
+\r
+       @StepEntry\r
+       public Object[] execute(String inputFolder, String userName, String password, IJobEngine jobEngine, IJobRuntime jobRuntime) {\r
+               //"\\\\10.10.1.100\\BRAAVOS\\ARCHIVE"\r
+               //"mediacube"\r
+               //"Broadca5T"\r
+               IItemManager manager = jobEngine.getItemManager();\r
+               StoreUri sourceUri = manager.createStoreUri(RemoteStoreProtocol.SMB, inputFolder);\r
+               sourceUri.setUserName(userName);\r
+               sourceUri.setPassword(password);\r
+               try {\r
+                       sourceUri.getRemoteFiles(f -> processPathItem(f));\r
+               } catch (Exception e) {\r
+                       logger.error("", e);\r
+               } finally {\r
+               }\r
+               return null;\r
+       }\r
+\r
+       private boolean processPathItem(RemoteFile remoteFile) {\r
+               //KILLDATE\r
+               //{0}.{1}.KILLDATE\r
+\r
+               //MODIFIED\r
+\r
+               //NAME PATTERN\r
+\r
+               return true;\r
+       }\r
+}\r
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/NexioDeleteMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/NexioDeleteMaterialsStep.java
new file mode 100644 (file)
index 0000000..007aa43
--- /dev/null
@@ -0,0 +1,33 @@
+package user.jobengine.server.steps;\r
+\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
+\r
+import user.commons.RemoteFile;\r
+import user.jobengine.server.IJobEngine;\r
+import user.jobengine.server.IJobRuntime;\r
+\r
+public class NexioDeleteMaterialsStep extends JobStep {\r
+       private static final Logger logger = LogManager.getLogger();\r
+\r
+       @StepEntry\r
+       public Object[] execute(String inputFolder, IJobEngine jobEngine, IJobRuntime jobRuntime) {\r
+\r
+               try {\r
+               } catch (Exception e) {\r
+                       logger.error("", e);\r
+               } finally {\r
+               }\r
+               return null;\r
+       }\r
+\r
+       private boolean processPathItem(RemoteFile remoteFile) {\r
+               //MODIFIED\r
+\r
+               //NAME PATTERN\r
+\r
+               //AGENCY\r
+\r
+               return true;\r
+       }\r
+}\r
index 32cf46a47d97fb790ed3f393ae401a766069b987..fd810710cdac95755b5d68d5fa75f1c903f95243 100644 (file)
@@ -12,12 +12,22 @@ public class RemoteFile extends EntityBase implements Serializable {
        private Timestamp modify;\r
        private long size;\r
        private boolean isFolder = false;;\r
+       private Object sourceObject = null;\r
 \r
        @XmlJavaTypeAdapter(TimestampAdapter.class)\r
        public Timestamp getCreated() {\r
                return created;\r
        }\r
 \r
+       public String getExtension() {\r
+               String result = null;\r
+               if (name != null) {\r
+                       if (name.contains("."))\r
+                               result = name.substring(name.lastIndexOf(".") + 1);\r
+               }\r
+               return result;\r
+       }\r
+\r
        public boolean getIsFolder() {\r
                return isFolder;\r
        }\r
@@ -35,6 +45,10 @@ public class RemoteFile extends EntityBase implements Serializable {
                return size;\r
        }\r
 \r
+       public Object getSourceObject() {\r
+               return sourceObject;\r
+       }\r
+\r
        public void setCreated(Timestamp created) {\r
                this.created = created;\r
        }\r
@@ -55,12 +69,7 @@ public class RemoteFile extends EntityBase implements Serializable {
                this.size = size;\r
        }\r
 \r
-       public String getExtension() {\r
-               String result = null;\r
-               if (name != null) {\r
-                       if (name.contains("."))\r
-                               result = name.substring(name.lastIndexOf(".") + 1);\r
-               }\r
-               return result;\r
+       public void setSourceObject(Object sourceObject) {\r
+               this.sourceObject = sourceObject;\r
        }\r
 }\r
index 6fa2d189b058856c37746f9c7328af1b6bb19136..d6edd1c049a141b834a4fed086a3e923be31280c 100644 (file)
@@ -97,6 +97,12 @@ public class FtpDirectoryLister implements IDirectoryLister {
                }\r
        }\r
 \r
+       @Override\r
+       public void delete(RemoteFile remoteFile) {\r
+               // TODO Auto-generated method stub\r
+\r
+       }\r
+\r
        @Override\r
        public RemoteFile get(String fileName) throws Exception {\r
                RemoteFile result = null;\r
index 02f716ecd444b656bf33a768230017307355c375..8b61253c8eb071503f0fc20ea2c630e2d13eea80 100644 (file)
@@ -13,6 +13,8 @@ public interface IDirectoryLister {
 \r
        void cleanUp() throws Exception;\r
 \r
+       void delete(RemoteFile remoteFile) throws Exception;\r
+\r
        RemoteFile get(String fileName) throws Exception;\r
 \r
        InputStream getInputStream(RemoteFile remoteFile) throws Exception;\r
index 3e2ff7b5c65e0c49c5ef7ce8553aba8ea535780c..bc431906e9fa0122389cb11b6aca55afcbdc5496 100644 (file)
@@ -38,6 +38,12 @@ public class LocalDirectoryLister implements IDirectoryLister {
        public void cleanUp() {\r
        }\r
 \r
+       @Override\r
+       public void delete(RemoteFile remoteFile) {\r
+               // TODO Auto-generated method stub\r
+\r
+       }\r
+\r
        @Override\r
        public RemoteFile get(String fileName) throws Exception {\r
                String path = storeUri.toString(true);\r
index b594c197054dbeef808834eecec358c0501d8a3b..3ae29850223e52337bd4426517c3396213ad5813 100644 (file)
@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.List;\r
 \r
 import jcifs.smb.NtlmPasswordAuthentication;\r
+import jcifs.smb.SmbException;\r
 import jcifs.smb.SmbFile;\r
 import user.commons.IRemoteFileListCallback;\r
 import user.commons.RemoteFile;\r
@@ -35,6 +36,18 @@ public class SambaDirectoryLister implements IDirectoryLister {
        public void cleanUp() throws Exception {\r
        }\r
 \r
+       @Override\r
+       public void delete(RemoteFile remoteFile) throws Exception {\r
+               if (remoteFile.getSourceObject() instanceof SmbFile) {\r
+                       SmbFile smbFile = (SmbFile) remoteFile.getSourceObject();\r
+                       try {\r
+                               smbFile.delete();\r
+                       } catch (SmbException e) {\r
+                               throw new Exception("Can not delete file.", e);\r
+                       }\r
+               }\r
+       }\r
+\r
        @Override\r
        public RemoteFile get(String fileName) throws Exception {\r
                RemoteFile result = null;\r
@@ -98,6 +111,7 @@ public class SambaDirectoryLister implements IDirectoryLister {
                result.setModify(new Timestamp(file.getLastModified()));\r
                result.setIsFolder((file.getAttributes() & SmbFile.ATTR_DIRECTORY) == SmbFile.ATTR_DIRECTORY);\r
                result.setSize(file.length());\r
+               result.setSourceObject(file);\r
                return result;\r
        }\r
 }\r
index 6b7a9b0e0b8c9eee40cee4dda07862cc3f8b8d22..a763786e7f0719f38a0efec36f801149711c0d24 100644 (file)
@@ -40,6 +40,12 @@ public class TSMLister implements IDirectoryLister {
                client.disconnect();\r
        }\r
 \r
+       @Override\r
+       public void delete(RemoteFile remoteFile) {\r
+               // TODO Auto-generated method stub\r
+\r
+       }\r
+\r
        @Override\r
        public RemoteFile get(String fileName) throws Exception {\r
                RemoteFile result = null;\r
index f50c30bad64608eef91879073749bd49b836467c..3ead3e66ec61560232c998a39a0724ce1116a41b 100644 (file)
@@ -7,82 +7,86 @@
        <custom-attributes org.zkoss.zul.listbox.rod="true" />\r
        <custom-attributes org.zkoss.zul.listbox.initRodSize="50" />\r
        <custom-attributes org.zkoss.zul.listbox.preloadSize="50" />\r
-       \r
-       <div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('svm') @init('user.jobengine.zk.model.SearchModel')" >\r
-       \r
+\r
+       <div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('svm') @init('user.jobengine.zk.model.SearchModel')">\r
+\r
 \r
                <borderlayout>\r
                        <west border="none" size="25%" splittable="true" minsize="250">\r
                                <div height="100%" width="100%">\r
                                        <groupbox vflex="min" closable="false">\r
-                                               <caption sclass="boldfont" label="Kereső kifejezés:" />\r
-                                               <!-- label sclass="boldfont" value="Itemek keresése:" width="180px" / -->\r
-                                               <textbox style="border:none" instant="true" value="@bind(svm.searchValue)"  width="300px"  tooltiptext="Keresőérték"/>\r
-                                               <button sclass="buttonboldfont" label="${labels.button_search}" onClick="@command('doSearch')" autodisable="self" />\r
+                                               <caption sclass="boldfont" label="Kereső" />\r
+                                               <textbox style="border:none" instant="true" value="@bind(svm.searchValue)" width="100%" tooltiptext="Keresőérték"\r
+                                                       onOK="@command('doSearch')" />\r
+                                               <!--                                            <button sclass="buttonboldfont" label="${labels.button_search}" onClick="@command('doSearch')" autodisable="self" /> -->\r
                                        </groupbox>\r
-                                       \r
-                                       <listbox id="itemResults" model="@load(svm.searchResult)" multiple="false" autopaging="true" mold="paging" vflex="true" \r
-                                               selectedItem="@bind(svm.selectedItem)" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" >\r
-                                       <listhead>\r
-                                               <listheader label="Id" width="70px" sort="auto(id)" align="left"/>\r
-                                               <listheader label="Cím" width="120px" sort="auto(status)" align="left"/>\r
-                                               <listheader label="Leírás" width="120px" sort="auto(tipus)" align="left"/>\r
-                                       </listhead>\r
-                                       \r
-                                       <template name="model">\r
-                                           <listitem>\r
-                                               <listcell label="@load(each.id)"/>\r
-                                               <listcell label="@load(each.title)"/>\r
-                                               <listcell label="@load(each.description)"/>\r
-                                           </listitem>\r
-                                       </template>\r
-                                   </listbox>\r
-                       \r
-                                       <!-- label sclass="boldfont" value="Media list: " width="180px" / -->\r
+\r
                                        <groupbox vflex="true" closable="false">\r
-                                               <caption sclass="boldfont" label="Media list:" />\r
-                                       \r
-                                               <listbox id="mediaList" onSelect="@command('onSelectMedia', media=event.reference.value)" model="@load(svm.selectedItem.medias)" multiple="false" vflex="true"\r
-                                                       selectedItem="@bind(svm.selectedMedia)" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" >\r
-                                               <listhead>\r
-                                                       <listheader label="Id" width="70px" sort="auto(id)" align="left"/>\r
-                                                       <listheader label="Cím" width="120px" sort="auto(status)" align="left"/>\r
-                                                       <listheader label="Leírás" width="120px" sort="auto(tipus)" align="left"/>\r
-                                               </listhead>\r
-                                               \r
-                                               <template name="model">\r
-                                                   <listitem>\r
-                                                       <listcell label="@load(each.id)"/>\r
-                                                       <listcell label="@load(each.title)"/>\r
-                                                       <listcell label="@load(each.description)"/>\r
-                                                   </listitem>\r
-                                               </template>\r
-                                           </listbox>\r
+                                               <caption sclass="boldfont" label="Találatok" />\r
+                                               <listbox id="itemResults" model="@load(svm.searchResult)" multiple="false" autopaging="true" mold="paging" vflex="true"\r
+                                                       selectedItem="@bind(svm.selectedItem)" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style"\r
+                                                       sclass="listbox-normal-style">\r
+                                                       <listhead>\r
+                                                               <listheader label="Id" width="70px" sort="auto(id)" align="left" />\r
+                                                               <listheader label="Cím" width="120px" sort="auto(status)" align="left" />\r
+                                                               <listheader label="Leírás" width="120px" sort="auto(tipus)" align="left" />\r
+                                                       </listhead>\r
+\r
+                                                       <template name="model">\r
+                                                               <listitem>\r
+                                                                       <listcell label="@load(each.id)" />\r
+                                                                       <listcell label="@load(each.title)" />\r
+                                                                       <listcell label="@load(each.description)" />\r
+                                                               </listitem>\r
+                                                       </template>\r
+                                               </listbox>\r
                                        </groupbox>\r
-                                       \r
+\r
+                                       <groupbox vflex="true" closable="false">\r
+                                               <caption sclass="boldfont" label="Kapcsolódó anyagok" />\r
+\r
+                                               <listbox id="mediaList" onSelect="@command('onSelectMedia', media=event.reference.value)" model="@load(svm.selectedItem.medias)"\r
+                                                       multiple="false" vflex="true" selectedItem="@bind(svm.selectedMedia)" style="border: none; background: #e3e3e3 !important;"\r
+                                                       oddRowSclass="listbox-odd-style" sclass="listbox-normal-style">\r
+                                                       <listhead>\r
+                                                               <listheader label="Id" width="70px" sort="auto(id)" align="left" />\r
+                                                               <listheader label="Cím" width="120px" sort="auto(status)" align="left" />\r
+                                                               <listheader label="Leírás" width="120px" sort="auto(tipus)" align="left" />\r
+                                                       </listhead>\r
+\r
+                                                       <template name="model">\r
+                                                               <listitem>\r
+                                                                       <listcell label="@load(each.id)" />\r
+                                                                       <listcell label="@load(each.title)" />\r
+                                                                       <listcell label="@load(each.description)" />\r
+                                                               </listitem>\r
+                                                       </template>\r
+                                               </listbox>\r
+                                       </groupbox>\r
+\r
                                </div>\r
                        </west>\r
                        <!-- media player -->\r
                        <center border="none">\r
-                               \r
+\r
                                <borderlayout height="100%" width="100%">\r
                                        <north border="none" size="90%" splittable="true">\r
                                                <div align="center" height="100%" width="100%" visible="@load(svm.hasLowresMediaFile)">\r
-                                                       <label value="@bind(svm.selectedMedia.description)"  />\r
-                                                       <iframe id="mediaPlayer" height="100%" width="100%" autohide="false" src="@load(svm.lowresMediaFilePath)">\r
-                                                       </iframe>\r
+                                                       <label value="@bind(svm.selectedMedia.description)" />\r
+                                                       <iframe id="mediaPlayer" height="100%" width="100%" autohide="false" src="@load(svm.lowresMediaFilePath)"></iframe>\r
                                                </div>\r
                                        </north>\r
                                        <south border="none" size="10%">\r
                                                <div align="center" height="100%" width="100%" visible="@load(svm.hasTSMMediaFile)">\r
-                                                       <button label="Visszatöltés" onClick="@command('downloadMedia')" autodisable="self" disabled="@load(not svm.hasTSMMediaFile)" sclass="buttonboldfont" />\r
+                                                       <button label="Visszatöltés" onClick="@command('downloadMedia')" autodisable="self" disabled="@load(not svm.hasTSMMediaFile)"\r
+                                                               sclass="buttonboldfont" />\r
                                                </div>\r
                                        </south>\r
                                </borderlayout>\r
-                               \r
+\r
                        </center>\r
                </borderlayout>\r
 \r
-               \r
+\r
        </div>\r
 </zk>
\ No newline at end of file
index 34970877ae756d57d4a79a147104c13b69c4dbea..8a7e92ee999e2a8f025e87fe5a8c1316a4353be4 100644 (file)
@@ -2,13 +2,8 @@ package user.jobengine.osgi.server;
 \r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
-import org.eclipse.core.runtime.adaptor.EclipseStarter;\r
 import org.eclipse.osgi.framework.console.CommandInterpreter;\r
 import org.eclipse.osgi.framework.console.CommandProvider;\r
-import org.osgi.framework.Bundle;\r
-import org.osgi.framework.BundleContext;\r
-import org.osgi.framework.FrameworkUtil;\r
-import org.osgi.framework.wiring.BundleRevision;\r
 \r
 public class ConsoleCommandProvider implements CommandProvider {\r
        private static final Logger logger = LogManager.getLogger();\r
@@ -16,33 +11,34 @@ public class ConsoleCommandProvider implements CommandProvider {
        @SuppressWarnings("restriction")\r
        public Object _halt(CommandInterpreter intp) {\r
                StringBuffer buffer = new StringBuffer();\r
-               Thread shutdownThread = new Thread(() -> {\r
-                       try {\r
-                               Thread.sleep(1000);\r
-                               BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();\r
-                               if (bundleContext != null) {\r
-                                       Bundle[] bundles = bundleContext.getBundles();\r
-                                       for (Bundle b : bundles) {\r
-                                               if ((b.adapt(BundleRevision.class).getTypes() & BundleRevision.TYPE_FRAGMENT) != 0)\r
-                                                       continue;\r
-                                               if ("org.eclipse.equinox.ds".equals(b.getSymbolicName()))\r
-                                                       continue;\r
-                                               if ("user.jobengine.osgi.commons".equals(b.getSymbolicName()))\r
-                                                       continue;\r
-\r
-                                               logger.info("Stopping {} ", b.getSymbolicName());\r
-                                               b.stop();\r
-                                       }\r
-                               }\r
-                               EclipseStarter.shutdown();\r
-\r
-                               System.exit(0);\r
-                       } catch (Exception e) {\r
-                               logger.error("Error:", e);\r
-                       }\r
-               });\r
-               buffer.append("Shutdown initiated");\r
-               shutdownThread.start();\r
+               //              Thread shutdownThread = new Thread(() -> {\r
+               //                      try {\r
+               //                              Thread.sleep(1000);\r
+               //                              BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();\r
+               //                              if (bundleContext != null) {\r
+               //                                      Bundle[] bundles = bundleContext.getBundles();\r
+               //                                      for (Bundle b : bundles) {\r
+               //                                              if ((b.adapt(BundleRevision.class).getTypes() & BundleRevision.TYPE_FRAGMENT) != 0)\r
+               //                                                      continue;\r
+               //                                              if ("org.eclipse.equinox.ds".equals(b.getSymbolicName()))\r
+               //                                                      continue;\r
+               //                                              if ("user.jobengine.osgi.commons".equals(b.getSymbolicName()))\r
+               //                                                      continue;\r
+               //\r
+               //                                              logger.info("Stopping {} ", b.getSymbolicName());\r
+               //                                              b.stop();\r
+               //                                      }\r
+               //                              }\r
+               //                              EclipseStarter.shutdown();\r
+               //\r
+               //                              System.exit(0);\r
+               //                      } catch (Exception e) {\r
+               //                              logger.error("Error:", e);\r
+               //                      }\r
+               //              });\r
+               //              shutdownThread.start();\r
+               //              buffer.append("Shutdown initiated");\r
+               buffer.append("...and catch fire!");\r
                return buffer.toString();\r
        }\r
 \r
index cf789dd234e5c2a00b73176e5a08fb99a8781de7..8ab91193be261db73b6d3df93e672bae84764a04 100644 (file)
@@ -93,9 +93,12 @@ public class SearchModel extends BaseModel {
                                        //protocol + address + relativepath\r
                                        //store.getStoreUris().get(0).getProtocol().getValue()\r
                                        ret = Paths.get(store.getStoreUris().get(0).toString(false), mf.getRelativePath()).toString();\r
+                                       break;\r
                                }\r
                        }\r
                }\r
+\r
+               ret = "http://10.10.1.28:90/";\r
                return ret;\r
        }\r
 \r
@@ -132,7 +135,7 @@ public class SearchModel extends BaseModel {
                        }\r
                        return ret;\r
                }\r
-\r
+       \r
                public boolean getHasSelectedMediaFile(){\r
                        String mediaFilePath =getMediaFilePath();\r
                        return (mediaFilePath != null && !"".equals(mediaFilePath));\r
@@ -154,7 +157,7 @@ public class SearchModel extends BaseModel {
        }\r
 \r
        @Command\r
-       @NotifyChange({ "mediaFilePath", "hasSelectedMediaFile", "hasLowresMediaFile" })\r
+       @NotifyChange({ "mediaFilePath", "hasSelectedMediaFile", "hasLowresMediaFile", "lowresMediaFilePath", "hasTSMMediaFile" })\r
        public void onSelectMedia(@BindingParam("media") Media m) {\r
                this.selectedMedia = m;\r
        }\r