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

diff --git a/server/-configuration/log4j2-test.xml b/server/-configuration/log4j2-test.xml
index a076d04d21ccdf3894b14c821fb41996959dab75..367b2a6190784465d5060c0cdca739b49ff5cbf0 100644 (file)
--- a/server/-configuration/log4j2-test.xml
+++ b/server/-configuration/log4j2-test.xml
@@ -25,7 +25,7 @@
                <Root level="INFO">\r
                        <AppenderRef ref="Console" />\r
                        <AppenderRef ref="MarkeredConsole" />\r
-                       <AppenderRef ref="MarkeredMail" />\r
+<!--                   <AppenderRef ref="MarkeredMail" /> -->\r
                </Root>\r
        </Loggers>\r
 </Configuration>
\ No newline at end of file

diff --git a/server/-configuration/log4j2.xml b/server/-configuration/log4j2.xml
index f988a5e11fdc3b5ab3b21a16ebf5051f505965e2..7153ef31362ec60c3ec714f0f8f6f2d8b0d4bcaa 100644 (file)
--- a/server/-configuration/log4j2.xml
+++ b/server/-configuration/log4j2.xml
@@ -54,7 +54,7 @@
                        <AppenderRef ref="Console" />\r
                        <AppenderRef ref="MarkeredConsole" />\r
 <!--                   <AppenderRef ref="RollingFile" /> -->\r
-                       <AppenderRef ref="MarkeredMail" />\r
+<!--                   <AppenderRef ref="MarkeredMail" /> -->\r
 <!--                   <AppenderRef ref="MarkeredDB2" /> -->\r
                </Root>\r
                <Logger name="org.zkoss" level="trace" additivity="false" />\r

diff --git a/server/user.jobengine.executors/config/config.xml b/server/user.jobengine.executors/config/config.xml
index 49d708c03bfcc4144b77694366ccf26798e90713..2b3595c0132e349d530dbae792b7eed8bbc0ba10 100644 (file)
--- a/server/user.jobengine.executors/config/config.xml
+++ b/server/user.jobengine.executors/config/config.xml
@@ -7,6 +7,7 @@
        <executor className="MergeStep.java" maxConcurrent="20" isRemote="false" />\r
        <executor className="TestForkCancelableStep.java" maxConcurrent="10" isRemote="false" />\r
        <executor className="RegisterUserRestoreStep.java" maxConcurrent="3" isRemote="false" />\r
+       <executor className="user.jobengine.server.steps.RegisterVODRestoreStep" maxConcurrent="3" isRemote="false" />\r
        <executor className="user.jobengine.server.steps.ArchiveListBuilderStep" maxConcurrent="1" isRemote="false" />\r
        <executor className="user.jobengine.server.steps.ArchiveMaterialSubmitStep" maxConcurrent="1" isRemote="false" />\r
        <executor className="user.jobengine.server.steps.BatchRetrieveForkStep" maxConcurrent="10" isRemote="false" />\r