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

diff --git a/server/-configuration/deploy-mediacube-product.launch b/server/-configuration/deploy-mediacube-product.launch
index 5436117eecd83c87fb9b1c930174f6880bb13888..acea32c8bc5574d479643e75c6e233e106bfc9ff 100644 (file)
--- a/server/-configuration/deploy-mediacube-product.launch
+++ b/server/-configuration/deploy-mediacube-product.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
 <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
-<stringAttribute key="M2_GOALS" value="deploy"/>\r
+<stringAttribute key="M2_GOALS" value="clean deploy"/>\r
 <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
 <booleanAttribute key="M2_OFFLINE" value="true"/>\r
 <stringAttribute key="M2_PROFILES" value=""/>\r

diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product
index e83589c6ad6929d9f47f5dcff499a707b93606ce..67ff3587e817b8968922aa06e1bc7cdcce0b8c6e 100644 (file)
--- a/server/-product/mediacube.product
+++ b/server/-product/mediacube.product
@@ -17,30 +17,49 @@
 -Djetty.home=./configuration/jetty\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
 -Dlog4j.configurationFile=./configuration/log4j2.xml\r
-\r
-#JobEngine\r
 -Djobengine.loglevel=INFO\r
 -Djobengine.jobsteps.root=./configuration/executors\r
 -Djobengine.jobtemplates.root=./configuration/templates\r
--Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true;\r
+-Djobengine.jobscheduling.config=./configuration/scheduledjobs.json\r
+      </vmArgs>\r
+      <vmArgsLin>#Database\r
+-Djobengine.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;\r
 -Djobengine.db.user=db2admin\r
 -Djobengine.db.password=password\r
+-Djobengine.nosql.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;\r
+-Djobengine.nosql.db.user=db2admin\r
+-Djobengine.nosql.db.password=password\r
+-Djobengine.nosql.db.schema=test\r
+\r
+#Octopus\r
 -Djobengine.octopus.api.address=http://10.10.1.21/api/v1\r
 -Djobengine.octopus.api.user=mam\r
 -Djobengine.octopus.api.password=napocska\r
+\r
+#Selenio\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
+      </vmArgsLin>\r
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts\r
+      </vmArgsMac>\r
+      <vmArgsWin>#Database\r
+-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true;\r
+-Djobengine.db.user=db2admin\r
+-Djobengine.db.password=password\r
 -Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true;\r
 -Djobengine.nosql.db.user=db2admin\r
 -Djobengine.nosql.db.password=password\r
 -Djobengine.nosql.db.schema=test\r
--Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;\r
--Djobengine.nexio.db.user=sa\r
--Djobengine.nexio.db.password=resolve\r
+\r
+#Octopus\r
+-Djobengine.octopus.api.address=http://10.10.1.21/api/v1\r
+-Djobengine.octopus.api.user=mam\r
+-Djobengine.octopus.api.password=napocska\r
+\r
+#Selenio\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=./configuration/scheduledjobs.json\r
-      </vmArgs>\r
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts\r
-      </vmArgsMac>\r
+      </vmArgsWin>\r
    </launcherArgs>\r
 \r
    <launcher name="mediacube">\r

diff --git a/server/-product/pom.xml b/server/-product/pom.xml
index a1747f037188fc4fccde0ced384bc62893845378..eb5d55d3099269f1f3386995ce404ec399b4abd3 100644 (file)
--- a/server/-product/pom.xml
+++ b/server/-product/pom.xml
@@ -237,9 +237,6 @@
                </plugins>\r
        </build>\r
        <properties>\r
-               <remote.address>scp://root:password@10.10.1.26</remote.address>\r
-               <remote.hostkey>ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4</remote.hostkey>\r
-               <local.location>${project.build.directory}/products/MediaCube/linux/gtk/x86_64</local.location>\r
                <remote.location>/opt/mediacube</remote.location>\r
        </properties>\r
 </project> \r

diff --git a/server/user.jobengine.executors/config/config.xml b/server/user.jobengine.executors/config/config.xml
index 1662a216c8cf896904e7a7ca843624b8c592c216..9ac90b92be6ba98f5fddef8ae0e04664ab8e6b15 100644 (file)
--- a/server/user.jobengine.executors/config/config.xml
+++ b/server/user.jobengine.executors/config/config.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <executors>\r
+       <executor className="user.jobengine.server.steps.ArchiveItemSubmitStep" maxConcurrent="1"/>\r
+       <executor className="user.jobengine.server.steps.ArchiveListBuilderStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.FakeStep" maxConcurrent="10"/>\r
-       <executor className="user.jobengine.server.steps.DownloadStep" maxConcurrent="1"/>\r
-       <executor className="user.jobengine.server.steps.TranscodeStep" maxConcurrent="1"/>\r
-       <executor className="user.jobengine.server.steps.MediaDBWriterStep" maxConcurrent="1"/>\r
+       <executor className="user.jobengine.server.steps.MetadataTransformStep" maxConcurrent="1"/>\r
+       <executor className="user.jobengine.server.steps.SelenioLowresTranscodeStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.TSMBackupStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.TSMRestoreStep" maxConcurrent="1"/>\r
-       <executor className="user.jobengine.server.steps.SetArchivedStep" maxConcurrent="1"/>\r
-       <executor className="user.jobengine.server.steps.MediaDownloadStep" maxConcurrent="1"/>\r
-       <executor className="user.jobengine.server.steps.MediaUploadStep" maxConcurrent="1"/>\r
-       <executor className="user.jobengine.server.steps.NexioDataMinerStep" maxConcurrent="1"/>\r
 </executors>
\ No newline at end of file