git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Thu, 5 Oct 2017 15:16:34 +0000 (15:16 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Thu, 5 Oct 2017 15:16:34 +0000 (15:16 +0000)
15 files changed:
client/Maestro/Resources/configuration-unc.json
server/-configuration/log4j2.xml
server/-configuration/run-mediacube-server-bsh.launch
server/-configuration/run-mediacube-server-localhost.launch
server/-configuration/run-mediacube-server.launch
server/-configuration/scheduledjobs.json
server/-product/test1.product1 [new file with mode: 0644]
server/user.commons.log4j2/src/user/commons/log4j2/appender/SmtpManager.java
server/user.jobengine.executors/config/config.xml
server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml
server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java
server/user.jobengine.osgi.server/META-INF/MANIFEST.MF
server/user.jobengine.osgi.server/src/user/jobengine/server/steps/JobStep.java

index 60442871c147db90c45c37e624669d3a5a44df78..32c05da0056e7991721eb33dd9480ae63e109c07 100644 (file)
@@ -52,7 +52,7 @@
     {\r
       "label": "Archiválandó",\r
       "processor": "UNCTargetProcessor",\r
-      "outputFormat": "%ID%-%SOURCENAME%",\r
+      "outputFormat": "%ID%",\r
       "tag": "Archiválásra kijelöl",\r
       "useMetadata": true,\r
       "remote": {\r
index d83853a8a51a015fe6571e179fdce27cca931ed3..02af14987cdc24898b4e4cf051abf35a0ba56020 100644 (file)
@@ -9,25 +9,21 @@
        <Appenders>\r
                <Console name="Console" target="SYSTEM_OUT">\r
                        <Filters>\r
-                               <MarkerFilter marker="teszt1" onMatch="DENY" onMismatch="NEUTRAL" />\r
-                               <MarkerFilter marker="teszt2" onMatch="DENY" onMismatch="NEUTRAL" />\r
-                               <MarkerFilter marker="teszt3" onMatch="DENY" onMismatch="NEUTRAL" />\r
-                               <MarkerFilter marker="teszt4" onMatch="DENY" onMismatch="NEUTRAL" />\r
+                               <MarkerFilter marker="MEDIACUBE" onMatch="DENY" onMismatch="NEUTRAL" />\r
                        </Filters>\r
                        <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M - %msg (%F:%L) %n" />\r
                </Console>\r
                <Console name="MarkeredConsole" target="SYSTEM_ERR">\r
                        <Filters>\r
-                               <MarkerFilter marker="teszt1" onMatch="ACCEPT" onMismatch="NEUTRAL" />\r
-                               <MarkerFilter marker="teszt2" onMatch="ACCEPT" onMismatch="NEUTRAL" />\r
-                               <MarkerFilter marker="teszt3" onMatch="ACCEPT" onMismatch="NEUTRAL" />\r
-                               <MarkerFilter marker="teszt4" onMatch="ACCEPT" onMismatch="DENY" />\r
+                               <MarkerFilter marker="MEDIACUBE" onMatch="ACCEPT" onMismatch="DENY" />\r
                        </Filters>\r
-                       <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M - %marker - %msg (%F:%L) %n" />\r
+                       <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M - %markerSimpleName - %msg (%F:%L) %n" />\r
                </Console>\r
-               <HTMLMailAppender name="MarkeredMail" subject="MARKERED-INFO" to="vasary@elgekko.net" from="mediacubeserver@gmail.com" smtpHost="smtp.gmail.com"\r
+               <HTMLMailAppender name="MarkeredMail" subject="MEDIACUBE" to="vasary@elgekko.net" from="mediacubeserver@gmail.com" smtpHost="smtp.gmail.com"\r
                        smtpPort="465" smtpProtocol="smtps" smtpUsername="mediacubeserver@gmail.com" smtpPassword="salabakter" ignoreExceptions="false" bufferSize="1">\r
-                       <MarkerFilter marker="INFO-MARKER" onMatch="ACCEPT" onMismatch="DENY" />\r
+                       <Filters>\r
+                               <MarkerFilter marker="MEDIACUBE" onMatch="ACCEPT" onMismatch="DENY" />\r
+                       </Filters>\r
                        <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M - %msg (%F:%L) %n" />\r
                </HTMLMailAppender>\r
                <RollingFile name="RollingFile" fileName="${fileName}" filePattern="${filePattern}">\r
@@ -51,7 +47,7 @@
                        <AppenderRef ref="Console" />\r
                        <AppenderRef ref="MarkeredConsole" />\r
 <!--                   <AppenderRef ref="RollingFile" /> -->\r
-<!--                   <AppenderRef ref="MarkeredMail" /> -->\r
+                       <AppenderRef ref="MarkeredMail" />\r
                </Root>\r
                <Logger name="org.zkoss" level="ERROR" additivity="false" />\r
                <Logger name="org.quartz" level="ERROR" additivity="false" />\r
index 272a9a5cedb8c70eadbd0502c6eeb8f6d1dabc7e..84984baa0e9fa39a5791cc72125f93779c38d913 100644 (file)
@@ -22,7 +22,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-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.11/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.555"/>\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
+<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.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
 <booleanAttribute key="tracing" value="false"/>\r
 <booleanAttribute key="useCustomFeatures" value="false"/>\r
 <booleanAttribute key="useDefaultConfigArea" value="true"/>\r
index 2659d4f888587687bebc2b5f72be19d6f8ccec36..1cbf6e741506420386ebf2323d82dade61c5bee4 100644 (file)
@@ -22,7 +22,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-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;-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.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
+<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.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
 <booleanAttribute key="tracing" value="false"/>\r
 <booleanAttribute key="useCustomFeatures" value="false"/>\r
 <booleanAttribute key="useDefaultConfigArea" value="true"/>\r
index ac2b9795b30f2ec48da4d0b3219da548ba025fed..f7c8b51d15e60914fcf033ae56509daead6b8777 100644 (file)
@@ -22,7 +22,7 @@
 <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.228.198.1:50000/mediaarc: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;-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://10.228.198.1:50000/mccache: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
+<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.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
 <booleanAttribute key="tracing" value="false"/>\r
 <booleanAttribute key="useCustomFeatures" value="false"/>\r
 <booleanAttribute key="useDefaultConfigArea" value="true"/>\r
index fa37b2a7dd5d3c27e21d363706cc7c4a54fcabc3..199f396d09d2f7a5d9add5a095e8e2c6a35a23d3 100644 (file)
@@ -17,7 +17,7 @@
       "executeimmediate": true,\r
       "cronexpression": "0 0 0/1 1/1 * ? *",\r
       "parameters": [\r
-       {"name": "dbUrl", "value": "jdbc:sqlserver://folkloredb.hu\\sql08:33860;databaseName=CLArchiveTF_0;", "type": "java.lang.String"},\r
+       {"name": "dbUrl", "value": "jdbc:sqlserver://10.10.1.45\\sql16;databaseName=PA_Echo;", "type": "java.lang.String"},\r
        {"name": "userName", "value": "MAM", "type": "java.lang.String"},\r
        {"name": "password", "value": "Echotv.hu", "type": "java.lang.String"},\r
        {"name": "lookupDays", "value": 7, "type": "java.lang.Integer"},\r
diff --git a/server/-product/test1.product1 b/server/-product/test1.product1
new file mode 100644 (file)
index 0000000..51f3577
--- /dev/null
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<?pde version="3.5"?>\r
+\r
+<product application="org.eclipse.ui.ide.workbench" useFeatures="false" includeLaunchers="true">\r
+\r
+   <configIni use="default">\r
+   </configIni>\r
+\r
+   <launcherArgs>\r
+      <programArgs>-consoleLog -console\r
+      </programArgs>\r
+      <vmArgs>-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory\r
+-Dorg.eclipse.equinox.http.jetty.http.port=8080\r
+-Dorg.eclipse.epp.logging.aeri.skipReports=true \r
+-Declipse.ignoreApp=true \r
+-Dosgi.noShutdown=true\r
+-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;\r
+-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;\r
+-Djobengine.db.url=jdbc:db2://10.10.1.28:50000/mc:retrieveMessagesFromServerOnGetMessage=true;\r
+-Djobengine.db.user=db2admin\r
+-Djobengine.db.password=password\r
+-Djobengine.loglevel=INFO\r
+-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;\r
+-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;\r
+-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;\r
+-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\r
+-Djobengine.octopus.api.address=http://10.10.1.11/api/v1\r
+-Djobengine.octopus.api.user=mam\r
+-Djobengine.octopus.api.password=napocska\r
+-Djobengine.nosql.db.url=jdbc:db2://10.10.1.28:50000/mc:retrieveMessagesFromServerOnGetMessage=true;\r
+-Djobengine.nosql.db.user=db2admin\r
+-Djobengine.nosql.db.password=password\r
+-Djobengine.nosql.db.schema=test\r
+-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl\r
+-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium\r
+-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;\r
+-Dnexio.host=10.10.1.555\r
+      </vmArgs>\r
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts\r
+      </vmArgsMac>\r
+   </launcherArgs>\r
+\r
+   <vm>\r
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>\r
+   </vm>\r
+\r
+   <plugins>\r
+      <plugin id="cglib"/>\r
+      <plugin id="com.auth0.java-jwt"/>\r
+      <plugin id="com.fasterxml.jackson.core.jackson-annotations"/>\r
+      <plugin id="com.fasterxml.jackson.core.jackson-core"/>\r
+      <plugin id="com.fasterxml.jackson.core.jackson-databind"/>\r
+      <plugin id="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml"/>\r
+      <plugin id="com.fasterxml.jackson.datatype.jackson-datatype-joda"/>\r
+      <plugin id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base"/>\r
+      <plugin id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>\r
+      <plugin id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations"/>\r
+      <plugin id="com.google.guava"/>\r
+      <plugin id="com.ibm.db2jcc4"/>\r
+      <plugin id="com.ibm.nosql"/>\r
+      <plugin id="com.microsoft.sqlserver.sqljdbc"/>\r
+      <plugin id="com.sun.el.javax.el"/>\r
+      <plugin id="commons-logging"/>\r
+      <plugin id="javassist"/>\r
+      <plugin id="javax.annotation-api"/>\r
+      <plugin id="javax.inject"/>\r
+      <plugin id="javax.mail"/>\r
+      <plugin id="javax.servlet-api"/>\r
+      <plugin id="javax.servlet.jsp-api"/>\r
+      <plugin id="javax.validation.api"/>\r
+      <plugin id="javax.ws.rs-api"/>\r
+      <plugin id="jcifs"/>\r
+      <plugin id="joda-time"/>\r
+      <plugin id="org.apache.aries.spifly.dynamic.bundle"/>\r
+      <plugin id="org.apache.aries.util"/>\r
+      <plugin id="org.apache.commons.beanutils"/>\r
+      <plugin id="org.apache.commons.codec"/>\r
+      <plugin id="org.apache.commons.collections"/>\r
+      <plugin id="org.apache.commons.digester"/>\r
+      <plugin id="org.apache.commons.io"/>\r
+      <plugin id="org.apache.commons.lang"/>\r
+      <plugin id="org.apache.commons.lang3"/>\r
+      <plugin id="org.apache.commons.logging"/>\r
+      <plugin id="org.apache.commons.net"/>\r
+      <plugin id="org.apache.felix.gogo.command"/>\r
+      <plugin id="org.apache.felix.gogo.runtime"/>\r
+      <plugin id="org.apache.felix.gogo.shell"/>\r
+      <plugin id="org.apache.httpcomponents.httpclient"/>\r
+      <plugin id="org.apache.httpcomponents.httpcore"/>\r
+      <plugin id="org.apache.jasper.glassfish"/>\r
+      <plugin id="org.apache.logging.log4j.api"/>\r
+      <plugin id="org.apache.logging.log4j.core"/>\r
+      <plugin id="org.apache.logging.log4j.slf4j-impl"/>\r
+      <plugin id="org.apache.servicemix.bundles.quartz"/>\r
+      <plugin id="org.eclipse.equinox.common"/>\r
+      <plugin id="org.eclipse.equinox.console"/>\r
+      <plugin id="org.eclipse.equinox.ds"/>\r
+      <plugin id="org.eclipse.equinox.util"/>\r
+      <plugin id="org.eclipse.jdt.core.compiler.batch"/>\r
+      <plugin id="org.eclipse.jetty.client"/>\r
+      <plugin id="org.eclipse.jetty.deploy"/>\r
+      <plugin id="org.eclipse.jetty.http"/>\r
+      <plugin id="org.eclipse.jetty.io"/>\r
+      <plugin id="org.eclipse.jetty.jsp"/>\r
+      <plugin id="org.eclipse.jetty.osgi.boot"/>\r
+      <plugin id="org.eclipse.jetty.osgi.boot.jsp" fragment="true"/>\r
+      <plugin id="org.eclipse.jetty.schemas"/>\r
+      <plugin id="org.eclipse.jetty.security"/>\r
+      <plugin id="org.eclipse.jetty.server"/>\r
+      <plugin id="org.eclipse.jetty.servlet"/>\r
+      <plugin id="org.eclipse.jetty.util"/>\r
+      <plugin id="org.eclipse.jetty.webapp"/>\r
+      <plugin id="org.eclipse.jetty.websocket.api"/>\r
+      <plugin id="org.eclipse.jetty.websocket.client"/>\r
+      <plugin id="org.eclipse.jetty.websocket.common"/>\r
+      <plugin id="org.eclipse.jetty.websocket.server"/>\r
+      <plugin id="org.eclipse.jetty.websocket.servlet"/>\r
+      <plugin id="org.eclipse.jetty.xml"/>\r
+      <plugin id="org.eclipse.osgi"/>\r
+      <plugin id="org.eclipse.osgi.services"/>\r
+      <plugin id="org.hamcrest.core"/>\r
+      <plugin id="org.jboss.resteasy.client"/>\r
+      <plugin id="org.jboss.resteasy.jaxrs"/>\r
+      <plugin id="org.jmock"/>\r
+      <plugin id="org.jmock.junit4"/>\r
+      <plugin id="org.junit"/>\r
+      <plugin id="org.jvnet.mimepull"/>\r
+      <plugin id="org.objectweb.asm"/>\r
+      <plugin id="org.objectweb.asm.commons"/>\r
+      <plugin id="org.objectweb.asm.tree"/>\r
+      <plugin id="org.reflections"/>\r
+      <plugin id="slf4j.api"/>\r
+      <plugin id="slf4j.simple" fragment="true"/>\r
+      <plugin id="user.commons.log4j2" fragment="true"/>\r
+      <plugin id="user.jobengine.osgi.commons"/>\r
+      <plugin id="user.jobengine.osgi.db"/>\r
+      <plugin id="user.jobengine.osgi.server"/>\r
+      <plugin id="user.jobengine.osgi.services"/>\r
+      <plugin id="user.tsm.client"/>\r
+   </plugins>\r
+\r
+   <configurations>\r
+      <plugin id="org.apache.logging.log4j.api" autoStart="true" startLevel="1" />\r
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />\r
+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />\r
+      <plugin id="org.eclipse.jetty.osgi.boot" autoStart="true" startLevel="0" />\r
+      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />\r
+      <plugin id="user.jobengine.osgi.commons" autoStart="true" startLevel="0" />\r
+   </configurations>\r
+\r
+</product>\r
index a6bcba1c85ff9958390936e7df0b0deb14fc48ee..1bafe875742ecf83f08872ff1e85056b24b427e3 100644 (file)
@@ -21,6 +21,8 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Date;
 import java.util.Properties;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import javax.activation.DataSource;
 import javax.mail.Authenticator;
@@ -58,45 +60,103 @@ import org.apache.logging.log4j.util.Strings;
  * Manager for sending SMTP events.
  */
 public class SmtpManager extends AbstractManager {
-       private static final SMTPManagerFactory FACTORY = new SMTPManagerFactory();
+       /**
+        * Factory data.
+        */
+       private static class FactoryData {
+               private final String to;
+               private final String cc;
+               private final String bcc;
+               private final String from;
+               private final String replyto;
+               private final Serializer subject;
+               private final String protocol;
+               private final String host;
+               private final int port;
+               private final String username;
+               private final String password;
+               private final boolean isDebug;
+               private final int numElements;
 
-       private final Session session;
+               public FactoryData(final String to, final String cc, final String bcc, final String from, final String replyTo, final Serializer subjectSerializer,
+                               final String protocol, final String host, final int port, final String username, final String password, final boolean isDebug,
+                               final int numElements) {
+                       this.to = to;
+                       this.cc = cc;
+                       this.bcc = bcc;
+                       this.from = from;
+                       this.replyto = replyTo;
+                       this.subject = subjectSerializer;
+                       this.protocol = protocol;
+                       this.host = host;
+                       this.port = port;
+                       this.username = username;
+                       this.password = password;
+                       this.isDebug = isDebug;
+                       this.numElements = numElements;
+               }
+       }
 
-       private final CyclicBuffer<LogEvent> buffer;
+       /**
+        * Factory to create the SMTP Manager.
+        */
+       private static class SMTPManagerFactory implements ManagerFactory<SmtpManager, FactoryData> {
 
-       private volatile MimeMessage message;
+               private Authenticator buildAuthenticator(final String username, final String password) {
+                       if (null != password && null != username) {
+                               return new Authenticator() {
+                                       private final PasswordAuthentication passwordAuthentication = new PasswordAuthentication(username, password);
 
-       private final FactoryData data;
+                                       @Override
+                                       protected PasswordAuthentication getPasswordAuthentication() {
+                                               return passwordAuthentication;
+                                       }
+                               };
+                       }
+                       return null;
+               }
 
-       private static MimeMessage createMimeMessage(final FactoryData data, final Session session,
-                       final LogEvent appendEvent) throws MessagingException {
-               return new MimeMessageBuilder(session).setFrom(data.from).setReplyTo(data.replyto)
-                               .setRecipients(Message.RecipientType.TO, data.to).setRecipients(Message.RecipientType.CC, data.cc)
-                               .setRecipients(Message.RecipientType.BCC, data.bcc).setSubject(data.subject.toSerializable(appendEvent))
-                               .build();
-       }
+               @Override
+               public SmtpManager createManager(final String name, final FactoryData data) {
+                       final String prefix = "mail." + data.protocol;
 
-       protected SmtpManager(final String name, final Session session, final MimeMessage message, final FactoryData data) {
-               super(null, name);
-               this.session = session;
-               this.message = message;
-               this.data = data;
-               this.buffer = new CyclicBuffer<>(LogEvent.class, data.numElements);
-       }
+                       final Properties properties = PropertiesUtil.getSystemProperties();
+                       properties.put("mail.transport.protocol", data.protocol);
+                       if (properties.getProperty("mail.host") == null) {
+                               // Prevent an UnknownHostException in Java 7
+                               properties.put("mail.host", NetUtils.getLocalHostname());
+                       }
 
-       public void add(LogEvent event) {
-               if (event instanceof Log4jLogEvent && event.getMessage() instanceof ReusableMessage) {
-                       ((Log4jLogEvent) event).makeMessageImmutable();
-               } else if (event instanceof MutableLogEvent) {
-                       event = ((MutableLogEvent) event).createMemento();
+                       if (null != data.host) {
+                               properties.put(prefix + ".host", data.host);
+                       }
+                       if (data.port > 0) {
+                               properties.put(prefix + ".port", String.valueOf(data.port));
+                       }
+
+                       final Authenticator authenticator = buildAuthenticator(data.username, data.password);
+                       if (null != authenticator) {
+                               properties.put(prefix + ".auth", "true");
+                       }
+
+                       final Session session = Session.getInstance(properties, authenticator);
+                       session.setProtocolForAddress("rfc822", data.protocol);
+                       session.setDebug(data.isDebug);
+                       return new SmtpManager(name, session, null, data);
                }
-               buffer.add(event);
        }
 
-       public static SmtpManager getSmtpManager(final Configuration config, final String to, final String cc,
-                       final String bcc, final String from, final String replyTo, final String subject, String protocol,
-                       final String host, final int port, final String username, final String password, final boolean isDebug,
-                       final String filterName, final int numElements) {
+       private static final SMTPManagerFactory FACTORY = new SMTPManagerFactory();
+
+       private static MimeMessage createMimeMessage(final FactoryData data, final Session session, final LogEvent appendEvent) throws MessagingException {
+               return new MimeMessageBuilder(session).setFrom(data.from).setReplyTo(data.replyto).setRecipients(Message.RecipientType.TO, data.to)
+                               .setRecipients(Message.RecipientType.CC, data.cc).setRecipients(Message.RecipientType.BCC, data.bcc)
+                               .setSubject(data.subject.toSerializable(appendEvent)).build();
+       }
+
+       public static SmtpManager getSmtpManager(final Configuration config, final String to, final String cc, final String bcc, final String from,
+                       final String replyTo, final String subject, String protocol, final String host, final int port, final String username, final String password,
+                       final boolean isDebug, final String filterName, final int numElements) {
                if (Strings.isEmpty(protocol)) {
                        protocol = "smtp";
                }
@@ -138,98 +198,72 @@ public class SmtpManager extends AbstractManager {
                sb.append(filterName);
 
                final String name = "SMTP:" + NameUtil.md5(sb.toString());
-               final Serializer subjectSerializer = PatternLayout.newSerializerBuilder().setConfiguration(config)
-                               .setPattern(subject).build();
+               final Serializer subjectSerializer = PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(subject).build();
 
-               return getManager(name, FACTORY, new FactoryData(to, cc, bcc, from, replyTo, subjectSerializer, protocol, host,
-                               port, username, password, isDebug, numElements));
+               return getManager(name, FACTORY,
+                               new FactoryData(to, cc, bcc, from, replyTo, subjectSerializer, protocol, host, port, username, password, isDebug, numElements));
        }
 
-       /**
-        * Send the contents of the cyclic buffer as an e-mail message.
-        * @param layout The layout for formatting the events.
-        * @param appendEvent The event that triggered the send.
-        */
-       public void sendEvents(final Layout<?> layout, final LogEvent appendEvent) {
-               if (message == null) {
-                       connect(appendEvent);
-               }
-               try {
-                       final LogEvent[] priorEvents = buffer.removeAll();
-                       // LOG4J-310: log appendEvent even if priorEvents is empty
-
-                       final byte[] rawBytes = formatContentToBytes(priorEvents, appendEvent, layout);
+       private final Session session;
 
-                       final String contentType = layout.getContentType();
-                       final String encoding = getEncoding(rawBytes, contentType);
-                       final byte[] encodedBytes = encodeContentToBytes(rawBytes, encoding);
+       private final CyclicBuffer<LogEvent> buffer;
 
-                       final InternetHeaders headers = getHeaders(contentType, encoding);
-                       final MimeMultipart mp = getMimeMultipart(encodedBytes, headers);
+       private volatile MimeMessage message;
 
-                       sendMultipartMessage(message, mp);
-               } catch (final MessagingException | IOException | RuntimeException e) {
-                       logError("Caught exception while sending e-mail notification.", e);
-                       throw new LoggingException("Error occurred while sending email", e);
-               }
-       }
+       private final FactoryData data;
 
-       protected byte[] formatContentToBytes(final LogEvent[] priorEvents, final LogEvent appendEvent,
-                       final Layout<?> layout) throws IOException {
-               final ByteArrayOutputStream raw = new ByteArrayOutputStream();
-               writeContent(priorEvents, appendEvent, layout, raw);
-               return raw.toByteArray();
-       }
+       private final ExecutorService executor = Executors.newFixedThreadPool(5);
 
-       private void writeContent(final LogEvent[] priorEvents, final LogEvent appendEvent, final Layout<?> layout,
-                       final ByteArrayOutputStream out) throws IOException {
-               writeHeader(layout, out);
-               writeBuffer(priorEvents, appendEvent, layout, out);
-               writeFooter(layout, out);
+       protected SmtpManager(final String name, final Session session, final MimeMessage message, final FactoryData data) {
+               super(null, name);
+               this.session = session;
+               this.message = message;
+               this.data = data;
+               this.buffer = new CyclicBuffer<>(LogEvent.class, data.numElements);
        }
 
-       protected void writeHeader(final Layout<?> layout, final OutputStream out) throws IOException {
-               final byte[] header = layout.getHeader();
-               if (header != null) {
-                       out.write(header);
+       public void add(LogEvent event) {
+               if (event instanceof Log4jLogEvent && event.getMessage() instanceof ReusableMessage) {
+                       ((Log4jLogEvent) event).makeMessageImmutable();
+               } else if (event instanceof MutableLogEvent) {
+                       event = ((MutableLogEvent) event).createMemento();
                }
+               buffer.add(event);
        }
 
-       protected void writeBuffer(final LogEvent[] priorEvents, final LogEvent appendEvent, final Layout<?> layout,
-                       final OutputStream out) throws IOException {
-               //              for (final LogEvent priorEvent : priorEvents) {
-               //                      final byte[] bytes = layout.toByteArray(priorEvent);
-               //                      out.write(bytes);
-               //              }
-
-               final byte[] bytes = layout.toByteArray(appendEvent);
-               out.write(bytes);
-       }
-
-       protected void writeFooter(final Layout<?> layout, final OutputStream out) throws IOException {
-               final byte[] footer = layout.getFooter();
-               if (footer != null) {
-                       out.write(footer);
+       private synchronized void connect(final LogEvent appendEvent) {
+               if (message != null) {
+                       return;
+               }
+               try {
+                       message = createMimeMessage(data, session, appendEvent);
+               } catch (final MessagingException e) {
+                       logError("Could not set SmtpAppender message options", e);
+                       message = null;
                }
        }
 
-       protected String getEncoding(final byte[] rawBytes, final String contentType) {
-               final DataSource dataSource = new ByteArrayDataSource(rawBytes, contentType);
-               return MimeUtility.getEncoding(dataSource);
+       protected void encodeContent(final byte[] bytes, final String encoding, final ByteArrayOutputStream out) throws MessagingException, IOException {
+               try (final OutputStream encoder = MimeUtility.encode(out, encoding)) {
+                       encoder.write(bytes);
+               }
        }
 
-       protected byte[] encodeContentToBytes(final byte[] rawBytes, final String encoding)
-                       throws MessagingException, IOException {
+       protected byte[] encodeContentToBytes(final byte[] rawBytes, final String encoding) throws MessagingException, IOException {
                final ByteArrayOutputStream encoded = new ByteArrayOutputStream();
                encodeContent(rawBytes, encoding, encoded);
                return encoded.toByteArray();
        }
 
-       protected void encodeContent(final byte[] bytes, final String encoding, final ByteArrayOutputStream out)
-                       throws MessagingException, IOException {
-               try (final OutputStream encoder = MimeUtility.encode(out, encoding)) {
-                       encoder.write(bytes);
-               }
+       protected byte[] formatContentToBytes(final LogEvent[] priorEvents, final LogEvent appendEvent, final Layout<?> layout) throws IOException {
+               final ByteArrayOutputStream raw = new ByteArrayOutputStream();
+               writeContent(priorEvents, appendEvent, layout, raw);
+               return raw.toByteArray();
+       }
+
+       protected String getEncoding(final byte[] rawBytes, final String contentType) {
+               final DataSource dataSource = new ByteArrayDataSource(rawBytes, contentType);
+               return MimeUtility.getEncoding(dataSource);
        }
 
        protected InternetHeaders getHeaders(final String contentType, final String encoding) {
@@ -239,14 +273,51 @@ public class SmtpManager extends AbstractManager {
                return headers;
        }
 
-       protected MimeMultipart getMimeMultipart(final byte[] encodedBytes, final InternetHeaders headers)
-                       throws MessagingException {
+       protected MimeMultipart getMimeMultipart(final byte[] encodedBytes, final InternetHeaders headers) throws MessagingException {
                final MimeMultipart mp = new MimeMultipart();
                final MimeBodyPart part = new MimeBodyPart(headers, encodedBytes);
                mp.addBodyPart(part);
                return mp;
        }
 
+       /**
+        * Send the contents of the cyclic buffer as an e-mail message.
+        *
+        * @param layout
+        *            The layout for formatting the events.
+        * @param appendEvent
+        *            The event that triggered the send.
+        */
+       public void sendEvents(final Layout<?> layout, final LogEvent appendEvent) {
+               if (message == null) {
+                       connect(appendEvent);
+               }
+               try {
+                       final LogEvent[] priorEvents = buffer.removeAll();
+                       // LOG4J-310: log appendEvent even if priorEvents is empty
+
+                       final byte[] rawBytes = formatContentToBytes(priorEvents, appendEvent, layout);
+
+                       final String contentType = layout.getContentType();
+                       final String encoding = getEncoding(rawBytes, contentType);
+                       final byte[] encodedBytes = encodeContentToBytes(rawBytes, encoding);
+
+                       final InternetHeaders headers = getHeaders(contentType, encoding);
+                       final MimeMultipart mp = getMimeMultipart(encodedBytes, headers);
+
+                       executor.submit(() -> {
+                               try {
+                                       sendMultipartMessage(message, mp);
+                               } catch (MessagingException e) {
+                                       System.out.println(e.getMessage());
+                               }
+                       });
+               } catch (final MessagingException | IOException | RuntimeException e) {
+                       logError("Caught exception while sending e-mail notification.", e);
+                       throw new LoggingException("Error occurred while sending email", e);
+               }
+       }
+
        protected void sendMultipartMessage(final MimeMessage msg, final MimeMultipart mp) throws MessagingException {
                synchronized (msg) {
                        msg.setContent(mp);
@@ -255,102 +326,34 @@ public class SmtpManager extends AbstractManager {
                }
        }
 
-       /**
-        * Factory data.
-        */
-       private static class FactoryData {
-               private final String to;
-               private final String cc;
-               private final String bcc;
-               private final String from;
-               private final String replyto;
-               private final Serializer subject;
-               private final String protocol;
-               private final String host;
-               private final int port;
-               private final String username;
-               private final String password;
-               private final boolean isDebug;
-               private final int numElements;
+       protected void writeBuffer(final LogEvent[] priorEvents, final LogEvent appendEvent, final Layout<?> layout, final OutputStream out) throws IOException {
+               //              for (final LogEvent priorEvent : priorEvents) {
+               //                      final byte[] bytes = layout.toByteArray(priorEvent);
+               //                      out.write(bytes);
+               //              }
 
-               public FactoryData(final String to, final String cc, final String bcc, final String from, final String replyTo,
-                               final Serializer subjectSerializer, final String protocol, final String host, final int port,
-                               final String username, final String password, final boolean isDebug, final int numElements) {
-                       this.to = to;
-                       this.cc = cc;
-                       this.bcc = bcc;
-                       this.from = from;
-                       this.replyto = replyTo;
-                       this.subject = subjectSerializer;
-                       this.protocol = protocol;
-                       this.host = host;
-                       this.port = port;
-                       this.username = username;
-                       this.password = password;
-                       this.isDebug = isDebug;
-                       this.numElements = numElements;
-               }
+               final byte[] bytes = layout.toByteArray(appendEvent);
+               out.write(bytes);
        }
 
-       private synchronized void connect(final LogEvent appendEvent) {
-               if (message != null) {
-                       return;
-               }
-               try {
-                       message = createMimeMessage(data, session, appendEvent);
-               } catch (final MessagingException e) {
-                       logError("Could not set SmtpAppender message options", e);
-                       message = null;
-               }
+       private void writeContent(final LogEvent[] priorEvents, final LogEvent appendEvent, final Layout<?> layout, final ByteArrayOutputStream out)
+                       throws IOException {
+               writeHeader(layout, out);
+               writeBuffer(priorEvents, appendEvent, layout, out);
+               writeFooter(layout, out);
        }
 
-       /**
-        * Factory to create the SMTP Manager.
-        */
-       private static class SMTPManagerFactory implements ManagerFactory<SmtpManager, FactoryData> {
-
-               @Override
-               public SmtpManager createManager(final String name, final FactoryData data) {
-                       final String prefix = "mail." + data.protocol;
-
-                       final Properties properties = PropertiesUtil.getSystemProperties();
-                       properties.put("mail.transport.protocol", data.protocol);
-                       if (properties.getProperty("mail.host") == null) {
-                               // Prevent an UnknownHostException in Java 7
-                               properties.put("mail.host", NetUtils.getLocalHostname());
-                       }
-
-                       if (null != data.host) {
-                               properties.put(prefix + ".host", data.host);
-                       }
-                       if (data.port > 0) {
-                               properties.put(prefix + ".port", String.valueOf(data.port));
-                       }
-
-                       final Authenticator authenticator = buildAuthenticator(data.username, data.password);
-                       if (null != authenticator) {
-                               properties.put(prefix + ".auth", "true");
-                       }
-
-                       final Session session = Session.getInstance(properties, authenticator);
-                       session.setProtocolForAddress("rfc822", data.protocol);
-                       session.setDebug(data.isDebug);
-                       return new SmtpManager(name, session, null, data);
+       protected void writeFooter(final Layout<?> layout, final OutputStream out) throws IOException {
+               final byte[] footer = layout.getFooter();
+               if (footer != null) {
+                       out.write(footer);
                }
+       }
 
-               private Authenticator buildAuthenticator(final String username, final String password) {
-                       if (null != password && null != username) {
-                               return new Authenticator() {
-                                       private final PasswordAuthentication passwordAuthentication = new PasswordAuthentication(username,
-                                                       password);
-
-                                       @Override
-                                       protected PasswordAuthentication getPasswordAuthentication() {
-                                               return passwordAuthentication;
-                                       }
-                               };
-                       }
-                       return null;
+       protected void writeHeader(final Layout<?> layout, final OutputStream out) throws IOException {
+               final byte[] header = layout.getHeader();
+               if (header != null) {
+                       out.write(header);
                }
        }
 }
index d856098fa7de0590bd28e9a0982845411061c602..066dc7a48927db0172dec6fabe2a33df5aa22dc7 100644 (file)
@@ -3,7 +3,7 @@
        <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
-       <executor className="user.jobengine.server.steps.CheckMORPHEUSissingMaterialsStep" maxConcurrent="1"/>\r
+       <executor className="user.jobengine.server.steps.CheckMORPHEUSMissingMaterialsStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.DeleteMaterialsStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.DeleteNEXIOMaterialsStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.FakeStep" maxConcurrent="1"/>\r
index 693013ae6d7f5d078dbd136b3e095b3cfd4cebde..2e5682b97b8fcbfa30ce4f7fe614bf38ee1bdda2 100644 (file)
@@ -21,9 +21,6 @@
                                <input>\r
                                        <parameter name="password" />\r
                                </input>\r
-                               <input>\r
-                                       <parameter name="userName" />\r
-                               </input>\r
                                <input>\r
                                        <parameter name="lookupDays" />\r
                                </input>\r
index 274a5e168b9516c1f1122e0161c7fafa30946079..a5b9dc1bf6c5ee42c8f635007c9f72ac39dba574 100644 (file)
@@ -23,7 +23,7 @@ public class CheckTRAFFICMissingMaterialsStep extends JobStep {
        private static final String OUTPUT_PATH = "outputPath";\r
        private static final String MEDIA_CUBE_MEDIA = "mediaCubeMedia";\r
        private static final String SQLSERVER_JDBC_SQL_SERVER_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver";\r
-       private static final String SQL = "{call clIFsp_EC_MAM(1001, 40, Null,  Null, ?)}";\r
+       private static final String SQL = "{call dbo.clIFsp_EC_MAM(1001, 32, Null,  Null, ?)}";\r
        private static final String JOBTEMPLATE = "retrieve-material.xml";\r
 \r
        @StepEntry\r
@@ -35,12 +35,13 @@ public class CheckTRAFFICMissingMaterialsStep extends JobStep {
                        try (ResultSet rs = stmt.executeQuery()) {\r
                                while (rs.next()) {\r
                                        String trafficId = rs.getString(5);\r
-                                       if (StringUtils.isNotBlank(trafficId)) {\r
-                                               try {\r
-                                                       processTrafficId(trafficId, outputPath, jobEngine);\r
-                                               } catch (Exception e) {\r
-                                                       logger.error(getMarker(), "Hiba lépett fel az {} anyag visszatöltéskor. A rendszer hibaüzenete: {}", trafficId, e.getMessage());\r
-                                               }\r
+                                       if (StringUtils.isBlank(trafficId))\r
+                                               continue;\r
+\r
+                                       try {\r
+                                               processTrafficId(trafficId, outputPath, jobEngine);\r
+                                       } catch (Exception e) {\r
+                                               logger.error(getMarker(), "Hiba lépett fel az {} anyag visszatöltéskor. A rendszer hibaüzenete: {}", trafficId, e.getMessage());\r
                                        }\r
 \r
                                }\r
@@ -74,7 +75,7 @@ public class CheckTRAFFICMissingMaterialsStep extends JobStep {
                        return;\r
                }\r
 \r
-               if (medias.size() > 0) {\r
+               if (medias.size() > 1) {\r
                        logger.error(getMarker(), "Az {} anyagból egynél több található az archívumban.", trafficId);\r
                        return;\r
                }\r
index 393d6e11b73afee2dc35168761213c1cdac10fbf..1e1b33b26fe23d9b98b693730ea9711c092bd040 100644 (file)
@@ -55,7 +55,8 @@ public class TSMBackupStep extends JobStep {
                        String sourceFileName = inputFilePath.toFile().getName();\r
                        RemoteFile remoteFile = sourceUri.transferFrom(targetStoreUri, sourceFileName, sourceFileName);\r
 \r
-                       saveMetadata(mediaCubeMedia, sourceFileName);\r
+                       String name = getHouseId(archiveItem);\r
+                       saveMetadata(mediaCubeMedia, sourceFileName, name);\r
                        logger.info(getMarker(), "A {} állomány archiválása sikeres.", archiveItem.getMediaFile().toFile().getName());\r
 \r
                } catch (Exception e) {\r
@@ -67,11 +68,21 @@ public class TSMBackupStep extends JobStep {
                return null;\r
        }\r
 \r
-       private void saveMetadata(Media mediaCubeMedia, String sourceFileName) {\r
+       private String getHouseId(ArchiveItem archiveItem) {\r
+               String name = archiveItem.getMediaFile().toFile().getName();\r
+               int pos = name.lastIndexOf(".");\r
+               if (pos > 0) {\r
+                       name = name.substring(0, pos);\r
+               }\r
+               return name;\r
+       }\r
+\r
+       private void saveMetadata(Media mediaCubeMedia, String sourceFileName, String houseId) {\r
                MediaFile mediaFile = manager.createMediaFile(sourceFileName, fileType, targetStore, mediaCubeMedia);\r
                mediaFile.add();\r
                mediaCubeMedia.setPersister(manager);\r
                mediaCubeMedia.setArchived(new Timestamp(new Date().getTime()));\r
+               mediaCubeMedia.setHouseId(houseId);\r
                mediaCubeMedia.modify();\r
        }\r
 \r
index 1a745b5cdaf7a66b3138c4caf249615f0f933af2..cbe2fd76c83a02cb3acac7aa4b260d5134100bd3 100644 (file)
@@ -27,7 +27,7 @@ public class TSMRestoreStep extends JobStep {
        }\r
 \r
        @StepEntry\r
-       public Object[] execute(Media media, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
+       public Object[] execute(Media media, String outputPath, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
                RemoteFile result = null;\r
                final IJobRuntime runtime = jobRuntime;\r
                IItemManager manager = jobEngine.getItemManager();\r
@@ -57,6 +57,8 @@ public class TSMRestoreStep extends JobStep {
 \r
                StoreUri sourceUri = new StoreUri();\r
                sourceUri.setProtocol(RemoteStoreProtocol.TSM);\r
+\r
+               //TODO outputPath alapon!\r
                StoreUri target = systemStore.getTargetStoreUri(RemoteStoreProtocol.LOCAL);\r
                logger.info("Target is: " + target.getUri());\r
                sourceUri.addProgressListener(new IProgressEventListener() {\r
index abcec96b6f349ab0064d9de078cefd2c5c82ba3d..51e7912dd4c1f26883e8604af0d8aa6ce6bc50e1 100644 (file)
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Server
 Bundle-SymbolicName: user.jobengine.osgi.server;singleton:=true
 Bundle-Version: 1.0.0
-Service-Component: OSGI-INF/*.xml
+Service-Component: OSGI-INF/component.xml, OSGI-INF/ConsoleCommandProvider.xml
 Import-Package: javax.servlet;version="3.1.0",
  javax.servlet.http;version="3.1.0",
  org.apache.logging.log4j.core;version="2.8.2",
index 10098123b1c904063c450d75db5eff936dee30b9..15b8aa18d7b0198f54cdd55a5d1c74a82cab9397 100644 (file)
@@ -41,7 +41,10 @@ public class JobStep implements IJobStep {
        }\r
 \r
        protected Marker getMarker() {\r
-               return MarkerManager.getMarker(getRuntimeName());\r
+               Marker parentMarker = MarkerManager.getMarker("MEDIACUBE");\r
+               Marker result = MarkerManager.getMarker(getRuntimeName());\r
+               result.setParents(parentMarker);\r
+               return result;\r
        }\r
 \r
        protected String getRuntimeName() {\r