git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorvasary.daniel <TFS\vasary.daniel>
Mon, 8 Feb 2021 20:08:30 +0000 (20:08 +0000)
committervasary.daniel <TFS\vasary.daniel>
Mon, 8 Feb 2021 20:08:30 +0000 (20:08 +0000)
16 files changed:
server/-modules/pom.xml
server/-product/production/MEDIAVIVANTIS/settings/application.yaml [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-http.xml [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-https.xml [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl-context.xml [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl.xml [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty.xml [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/settings/log4j2.xml [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/settings/maestro.json [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/settings/mediacube.json [new file with mode: 0644]
server/user.jobengine.osgi.commons/src/user/commons/configuration/SystemConfiguration.java
server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
server/user.mediacube.gui/OSGI-INF/componentBinder.xml
server/user.mediacube.metadata/OSGI-INF/component.xml

index 6fe687f7aa9f7fdd2edd22f05e5f063926b2b422..0231adbf5ded7da5c95f5d6e5de63b884adb558c 100644 (file)
        </properties>\r
 \r
        <repositories>\r
-               <repository>\r
-                       <id>eclipse-neon</id>\r
-                       <url>http://download.eclipse.org/releases/neon</url>\r
-                       <layout>p2</layout>\r
-               </repository>\r
+<!--           <repository> -->\r
+<!--                   <id>eclipse-neon</id> -->\r
+<!--                   <url>http://download.eclipse.org/releases/neon</url> -->\r
+<!--                   <layout>p2</layout> -->\r
+<!--           </repository> -->\r
 \r
 <!--           <repository> -->\r
 <!--                   <id>mvn alternate</id> -->\r
                                                        <ws>gtk</ws>\r
                                                        <arch>x86_64</arch>\r
                                                </environment>\r
-                                               <environment>\r
-                                                       <os>win32</os>\r
-                                                       <ws>win32</ws>\r
-                                                       <arch>x86_64</arch>\r
-                                               </environment>\r
+<!--                                           <environment> -->\r
+<!--                                                   <os>win32</os> -->\r
+<!--                                                   <ws>win32</ws> -->\r
+<!--                                                   <arch>x86_64</arch> -->\r
+<!--                                           </environment> -->\r
                                                <!-- <environment> -->\r
                                                <!-- <os>aix</os> -->\r
                                                <!-- <ws>gtk</ws> -->\r
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/application.yaml b/server/-product/production/MEDIAVIVANTIS/settings/application.yaml
new file mode 100644 (file)
index 0000000..c584e2a
--- /dev/null
@@ -0,0 +1,63 @@
+datasource:\r
+   mediacube:\r
+      url: jdbc:db2://10.11.1.90:50000/mc\r
+      user: db2admin\r
+      password: password\r
+      external-indexer: false\r
+      simple-search: true\r
+      login-timeout: 3\r
+      pool-size: 10\r
+   mediacube-nosql:\r
+      url: jdbc:db2://10.11.1.90:50000/mc\r
+      user: db2admin\r
+      password: password\r
+      schema: test\r
+      login-timeout: 3\r
+   nexio: \r
+      url: jdbc:db2://10.11.1.90:50000/mc\r
+      user: db2admin\r
+      password: password\r
+   hsm: \r
+      url: jdbc:db2://10.11.1.89:51500/tsmdb1\r
+      user: tsminst1\r
+      password: tsminst1\r
+   planair: \r
+      url: jdbc:sqlserver://10.11.254.86;databaseName=PA_Vivantis;\r
+      user: MAM\r
+      password: VDani\r
+services:\r
+   ffmpeg:\r
+      execurable-location: /opt/ffmpeg/ffmpeg \r
+   peablebeach:\r
+      template-root: configuration/soap\r
+   mediacube:\r
+      proxy-root: /opt\r
+   nexio:\r
+      host: 10.10.1.55\r
+      collection-name: nexioclips\r
+      use-mos-gateway: true\r
+      disabled: true\r
+   octopus:\r
+      api:\r
+         address: http://10.10.1.11/api/v1\r
+         user: mama\r
+         password: napocska\r
+      rundowns-collection-name: rundowns\r
+      stories-collection-name: stories\r
+      folders-collection-name: storyfolders\r
+jobs:\r
+   nexio-track: false\r
+   randomize-archives: false\r
+   scheduled-execution: false\r
+   validate-transfers: false\r
+   copy-buffer-size: 32768\r
+   scheduled-execution-disabled: true\r
+   randomize-archives: false\r
+tsm:\r
+   randomize-archives: false \r
+   delimiter: /\r
+   node-name: JOBENGINE\r
+   fs-name: /JOBENGINE\r
+   alternate-fs-name: /JOBENGINE\r
+   hl-name: /JOBENGINE\r
+   
\ No newline at end of file
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-http.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-http.xml
new file mode 100644 (file)
index 0000000..95b6398
--- /dev/null
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding a HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+  <!-- =========================================================== -->
+  <!-- Add a HTTP Connector.                                       -->
+  <!-- Configure an o.e.j.server.ServerConnector with a single     -->
+  <!-- HttpConnectionFactory instance using the common httpConfig  -->
+  <!-- instance defined in jetty.xml                               -->
+  <!--                                                             -->
+  <!-- Consult the javadoc of o.e.j.server.ServerConnector and     -->
+  <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
+  <!-- that may be set here.                                       -->
+  <!-- =========================================================== -->
+  <Call name="addConnector">
+    <Arg>
+      <New class="org.eclipse.jetty.server.ServerConnector">
+        <Arg name="server"><Ref refid="Server" /></Arg>
+        <Arg name="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <Item>
+              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                <Arg name="config"><Ref refid="httpConfig" /></Arg>
+              </New>
+            </Item>
+          </Array>
+        </Arg>
+        <Set name="host"><Property name="jetty.http.host" /></Set>
+        <Set name="port"><Property name="jetty.http.port" default="8888" /></Set>
+        <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" default="30000"/></Set>
+      </New>
+    </Arg>
+  </Call>
+
+</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-https.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-https.xml
new file mode 100644 (file)
index 0000000..71a0837
--- /dev/null
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- ============================================================= -->
+<!-- Configure a HTTPS connector.                                  -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- and jetty-ssl.xml.                                            -->
+<!-- ============================================================= -->
+<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
+
+  <Call name="addIfAbsentConnectionFactory">
+    <Arg>
+      <New class="org.eclipse.jetty.server.SslConnectionFactory">
+        <Arg name="next">http/1.1</Arg>
+        <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg>
+      </New>
+    </Arg>
+  </Call>
+
+  <Call name="addConnectionFactory">
+    <Arg>
+      <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+        <Arg name="config"><Ref refid="sslHttpConfig" /></Arg>
+        <Arg name="compliance"><Call class="org.eclipse.jetty.http.HttpCompliance" name="valueOf"><Arg><Property name="jetty.http.compliance" default="RFC7230"/></Arg></Call></Arg>
+      </New>
+    </Arg>
+  </Call>
+  
+</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl-context.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl-context.xml
new file mode 100644 (file)
index 0000000..e1edaf0
--- /dev/null
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- ============================================================= -->
+<!-- SSL ContextFactory configuration                              -->
+<!-- ============================================================= -->
+
+<!-- 
+  To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at 
+     https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
+-->
+
+<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
+  <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="localhost.jks"/></Set>
+  <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="password"/></Set>
+  <Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="JKS"/></Set>
+  <Set name="KeyStoreProvider"><Property name="jetty.sslContext.keyStoreProvider"/></Set>
+  <Set name="KeyManagerPassword"><Property name="jetty.sslContext.keyManagerPassword" deprecated="jetty.keymanager.password" default="password"/></Set>
+  <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="localhost.jks"/></Set>
+  <Set name="TrustStorePassword"><Property name="jetty.sslContext.trustStorePassword" deprecated="jetty.truststore.password" default="password"/></Set>
+  <Set name="TrustStoreType"><Property name="jetty.sslContext.trustStoreType"/></Set>
+  <Set name="TrustStoreProvider"><Property name="jetty.sslContext.trustStoreProvider"/></Set>
+  <Set name="EndpointIdentificationAlgorithm"></Set>
+  <Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" deprecated="jetty.ssl.needClientAuth" default="false"/></Set>
+  <Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" deprecated="jetty.ssl.wantClientAuth" default="false"/></Set>
+  <Set name="useCipherSuitesOrder"><Property name="jetty.sslContext.useCipherSuitesOrder" default="true"/></Set>
+  <Set name="sslSessionCacheSize"><Property name="jetty.sslContext.sslSessionCacheSize" default="-1"/></Set>
+  <Set name="sslSessionTimeout"><Property name="jetty.sslContext.sslSessionTimeout" default="-1"/></Set>
+</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl.xml
new file mode 100644 (file)
index 0000000..a079c1f
--- /dev/null
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- ============================================================= -->
+<!-- Base SSL configuration                                        -->
+<!-- This configuration needs to be used together with 1 or more   -->
+<!-- of jetty-https.xml or jetty-http2.xml                         -->
+<!-- ============================================================= -->
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+  <!-- =========================================================== -->
+  <!-- Add a SSL Connector with no protocol factories              -->
+  <!-- =========================================================== -->
+  <Call  name="addConnector">
+    <Arg>
+      <New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
+        <Arg name="server"><Ref refid="Server" /></Arg>
+        <Arg name="acceptors" type="int"><Property name="jetty.ssl.acceptors" deprecated="ssl.acceptors" default="-1"/></Arg>
+        <Arg name="selectors" type="int"><Property name="jetty.ssl.selectors" deprecated="ssl.selectors" default="-1"/></Arg>
+        <Arg name="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <!-- uncomment to support proxy protocol
+            <Item>
+              <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/>
+            </Item>-->
+          </Array>
+        </Arg>
+
+        <Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host" /></Set>
+        <Set name="port"><Property name="jetty.ssl.port" deprecated="ssl.port" default="8443" /></Set>
+        <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" deprecated="ssl.timeout" default="30000"/></Set>
+        <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime" deprecated="ssl.soLingerTime" default="-1"/></Set>
+        <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" deprecated="ssl.acceptorPriorityDelta" default="0"/></Set>
+        <Set name="acceptQueueSize"><Property name="jetty.ssl.acceptQueueSize" deprecated="ssl.acceptQueueSize" default="0"/></Set>
+      </New>
+    </Arg>
+  </Call>
+
+  <!-- =========================================================== -->
+  <!-- Create a TLS specific HttpConfiguration based on the        -->
+  <!-- common HttpConfiguration defined in jetty.xml               -->
+  <!-- Add a SecureRequestCustomizer to extract certificate and    -->
+  <!-- session information                                         -->
+  <!-- =========================================================== -->
+  <New id="sslHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+    <Arg><Ref refid="httpConfig"/></Arg>
+    <Call name="addCustomizer">
+      <Arg>
+        <New class="org.eclipse.jetty.server.SecureRequestCustomizer">
+          <Arg name="sniHostCheck" type="boolean"><Property name="jetty.ssl.sniHostCheck" default="true"/></Arg>
+          <Arg name="stsMaxAgeSeconds" type="int"><Property name="jetty.ssl.stsMaxAgeSeconds" default="-1"/></Arg>
+          <Arg name="stsIncludeSubdomains" type="boolean"><Property name="jetty.ssl.stsIncludeSubdomains" default="false"/></Arg>
+        </New>
+      </Arg>
+    </Call>
+  </New>
+
+</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty.xml
new file mode 100644 (file)
index 0000000..0ba3838
--- /dev/null
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- =============================================================== -->
+<!-- Documentation of this file format can be found at:              -->
+<!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax        -->
+<!--                                                                 -->
+<!-- Additional configuration files are available in $JETTY_HOME/etc -->
+<!-- and can be mixed in. See start.ini file for the default         -->
+<!-- configuration files.                                            -->
+<!--                                                                 -->
+<!-- For a description of the configuration mechanism, see the       -->
+<!-- output of:                                                      -->
+<!--   java -jar start.jar -?                                        -->
+<!-- =============================================================== -->
+
+<!-- =============================================================== -->
+<!-- Configure a Jetty Server instance with an ID "Server"           -->
+<!-- Other configuration files may also configure the "Server"       -->
+<!-- ID, in which case they are adding configuration to the same     -->
+<!-- instance.  If other configuration have a different ID, they     -->
+<!-- will create and configure another instance of Jetty.            -->
+<!-- Consult the javadoc of o.e.j.server.Server for all              -->
+<!-- configuration that may be set here.                             -->
+<!-- =============================================================== -->
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+    <!-- =========================================================== -->
+    <!-- Configure the Server Thread Pool.                           -->
+    <!-- The server holds a common thread pool which is used by      -->
+    <!-- default as the executor used by all connectors and servlet  -->
+    <!-- dispatches.                                                 -->
+    <!--                                                             -->
+    <!-- Configuring a fixed thread pool is vital to controlling the -->
+    <!-- maximal memory footprint of the server and is a key tuning  -->
+    <!-- parameter for tuning.  In an application that rarely blocks -->
+    <!-- then maximal threads may be close to the number of 5*CPUs.  -->
+    <!-- In an application that frequently blocks, then maximal      -->
+    <!-- threads should be set as high as possible given the memory  -->
+    <!-- available.                                                  -->
+    <!--                                                             -->
+    <!-- Consult the javadoc of o.e.j.util.thread.QueuedThreadPool   -->
+    <!-- for all configuration that may be set here.                 -->
+    <!-- =========================================================== -->
+    <!-- uncomment to change type of threadpool
+    <Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg>
+    -->
+    <Get name="ThreadPool">
+      <Set name="minThreads" type="int"><Property name="jetty.threadPool.minThreads" deprecated="threads.min" default="10"/></Set>
+      <Set name="maxThreads" type="int"><Property name="jetty.threadPool.maxThreads" deprecated="threads.max" default="200"/></Set>
+      <Set name="idleTimeout" type="int"><Property name="jetty.threadPool.idleTimeout" deprecated="threads.timeout" default="60000"/></Set>
+      <Set name="detailedDump">false</Set>
+    </Get>
+
+    <!-- =========================================================== -->
+    <!-- Add shared Scheduler instance                               -->
+    <!-- =========================================================== -->
+    <Call name="addBean">
+      <Arg>
+        <New class="org.eclipse.jetty.util.thread.ScheduledExecutorScheduler"/>
+      </Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Http Configuration.                                         -->
+    <!-- This is a common configuration instance used by all         -->
+    <!-- connectors that can carry HTTP semantics (HTTP, HTTPS, etc.)-->
+    <!-- It configures the non wire protocol aspects of the HTTP     -->
+    <!-- semantic.                                                   -->
+    <!--                                                             -->
+    <!-- This configuration is only defined here and is used by      -->
+    <!-- reference from other XML files such as jetty-http.xml,      -->
+    <!-- jetty-https.xml and other configuration files which         -->
+    <!-- instantiate the connectors.                                 -->
+    <!--                                                             -->
+    <!-- Consult the javadoc of o.e.j.server.HttpConfiguration       -->
+    <!-- for all configuration that may be set here.                 -->
+    <!-- =========================================================== -->
+    <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+      <Set name="secureScheme"><Property name="jetty.httpConfig.secureScheme" default="https" /></Set>
+      <Set name="securePort"><Property name="jetty.httpConfig.securePort" deprecated="jetty.secure.port" default="8443" /></Set>
+      <Set name="outputBufferSize"><Property name="jetty.httpConfig.outputBufferSize" deprecated="jetty.output.buffer.size" default="32768" /></Set>
+      <Set name="outputAggregationSize"><Property name="jetty.httpConfig.outputAggregationSize" deprecated="jetty.output.aggregation.size" default="8192" /></Set>
+      <Set name="requestHeaderSize"><Property name="jetty.httpConfig.requestHeaderSize" deprecated="jetty.request.header.size" default="8192" /></Set>
+      <Set name="responseHeaderSize"><Property name="jetty.httpConfig.responseHeaderSize" deprecated="jetty.response.header.size" default="8192" /></Set>
+      <Set name="sendServerVersion"><Property name="jetty.httpConfig.sendServerVersion" deprecated="jetty.send.server.version" default="true" /></Set>
+      <Set name="sendDateHeader"><Property name="jetty.httpConfig.sendDateHeader" deprecated="jetty.send.date.header" default="false" /></Set>
+      <Set name="headerCacheSize"><Property name="jetty.httpConfig.headerCacheSize" default="512" /></Set>
+      <Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent" deprecated="jetty.delayDispatchUntilContent" default="true"/></Set>
+      <Set name="maxErrorDispatches"><Property name="jetty.httpConfig.maxErrorDispatches" default="10"/></Set>
+      <Set name="blockingTimeout"><Property name="jetty.httpConfig.blockingTimeout" default="-1"/></Set>
+      <Set name="persistentConnectionsEnabled"><Property name="jetty.httpConfig.persistentConnectionsEnabled" default="true"/></Set>
+    </New>
+
+    <!-- =========================================================== -->
+    <!-- Set the default handler structure for the Server            -->
+    <!-- A handler collection is used to pass received requests to   -->
+    <!-- both the ContextHandlerCollection, which selects the next   -->
+    <!-- handler by context path and virtual host, and the           -->
+    <!-- DefaultHandler, which handles any requests not handled by   -->
+    <!-- the context handlers.                                       -->
+    <!-- Other handlers may be added to the "Handlers" collection,   -->
+    <!-- for example the jetty-requestlog.xml file adds the          -->
+    <!-- RequestLogHandler after the default handler                 -->
+    <!-- =========================================================== -->
+    <Set name="handler">
+      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
+        <Set name="handlers">
+         <Array type="org.eclipse.jetty.server.Handler">
+           <Item>
+             <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
+           </Item>
+           <Item>
+             <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
+           </Item>
+         </Array>
+        </Set>
+      </New>
+    </Set>
+
+    <!-- =========================================================== -->
+    <!-- extra server options                                        -->
+    <!-- =========================================================== -->
+    <Set name="stopAtShutdown"><Property name="jetty.server.stopAtShutdown" default="true"/></Set>
+    <Set name="stopTimeout">5000</Set>
+    <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart" deprecated="jetty.dump.start" default="false"/></Set>
+    <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop" deprecated="jetty.dump.stop" default="false"/></Set>
+
+</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore b/server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore
new file mode 100644 (file)
index 0000000..95d7f4c
Binary files /dev/null and b/server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore differ
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks b/server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks
new file mode 100644 (file)
index 0000000..95d7f4c
Binary files /dev/null and b/server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks differ
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/log4j2.xml b/server/-product/production/MEDIAVIVANTIS/settings/log4j2.xml
new file mode 100644 (file)
index 0000000..62e8b78
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<Configuration status="ERROR" monitorInterval="10">\r
+       <Properties>\r
+               <Property name="fileName">log/mediacube.log</Property>\r
+               <Property name="filePattern">/opt/log/$${date:yyyy-MM}/mediacube-%d{MM-dd-yyyy}-%i.log.gz</Property>\r
+               <Property name="fileName.err">/opt/log/mediacube-err.log</Property>\r
+               <Property name="filePattern.err">/opt/log/$${date:yyyy-MM}/mediacube-err-%d{MM-dd-yyyy}-%i.log.gz</Property>\r
+       </Properties>\r
+       <Appenders>\r
+               <Console name="Console" target="SYSTEM_OUT">\r
+                       <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{2}.%M - %msg (%F:%L) %n" />\r
+               </Console>\r
+       </Appenders>\r
+       <Loggers>\r
+               <Root level="INFO">\r
+                       <AppenderRef ref="Console" />\r
+               </Root>\r
+               <Logger name="org.quartz" level="ERROR" additivity="false" />\r
+               <Logger name="org.zkoss" level="ERROR" additivity="false" />\r
+</Loggers>\r
+</Configuration>
\ No newline at end of file
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/maestro.json b/server/-product/production/MEDIAVIVANTIS/settings/maestro.json
new file mode 100644 (file)
index 0000000..aa7778a
--- /dev/null
@@ -0,0 +1,61 @@
+{
+       "sourceStoreUri": {
+               "name": "Default",
+               "protocol": "LOCAL",
+               "uri": "/mnt/NLE",
+               "fileFilter": "*.mxf",
+               "showDirectories": true
+       },
+       "alternateSourceStoreUris": 
+               [
+                       {
+                               "name": "NLE1",
+                               "protocol": "LOCAL",
+                               "uri": "/mnt/NLE/NLE1",
+                               "fileFilter": "*.mxf",
+                               "showDirectories": true
+                       },
+                       {
+                               "name": "NLE2",
+                               "protocol": "LOCAL",
+                               "uri": "/mnt/NLE/NLE2",
+                               "fileFilter": "*.mxf",
+                               "showDirectories": true
+                       },
+                       {
+                               "name": "NLE3",
+                               "protocol": "LOCAL",
+                               "uri": "/mnt/NLE/NLE3",
+                               "fileFilter": "*.mxf",
+                               "showDirectories": true
+                       },
+                       {
+                               "name": "NLE4",
+                               "protocol": "LOCAL",
+                               "uri": "/mnt/NLE/NLE4",
+                               "fileFilter": "*.mxf",
+                               "showDirectories": true
+                       },
+                       {
+                               "name": "POLC",
+                               "protocol": "LOCAL",
+                               "uri": "/mnt/POLC",
+                               "fileFilter": "*.mxf",
+                               "showDirectories": true
+                       }
+       ],
+       "targets": 
+       [
+               {
+                       "name": "FINISHED_SHOWS",
+                       "killDateDays": 7,
+                       "storeUri": {
+                               "protocol": "LOCAL",
+                               "uri": "/mnt/PROMISE/FINISHED_SHOWS"
+                       }
+               }
+       ]
+}
+
+
+
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/mediacube.json b/server/-product/production/MEDIAVIVANTIS/settings/mediacube.json
new file mode 100644 (file)
index 0000000..c01d31f
--- /dev/null
@@ -0,0 +1,107 @@
+{\r
+       "jobQueuePollInterval": 1000,\r
+       "topTypeFilters": [\r
+               {\r
+                       "name": "Hír bejátszó",\r
+                       "color": "RED200",\r
+                       "icon": "ic_language_black_18dp.png"\r
+               },\r
+               {\r
+                       "name": "Hír nyers",\r
+                       "color": "RED100",\r
+                       "icon": "ic_perm_camera_mic_black_18dp.png"\r
+               },\r
+               {\r
+                       "name": "Visszarögzített",\r
+                       "color": "BROWN100",\r
+                       "icon": "ic_group_work_black_18dp.png"\r
+               },\r
+               {\r
+                       "name": "Egyéb",\r
+                       "color": "YELLOW200",\r
+                       "icon": "ic_view_quilt_black_18dp.png"\r
+               }\r
+       ],\r
+       "bottomTypeFilters": [\r
+               {\r
+                       "name": "Műsor",\r
+                       "color": "TEAL200",\r
+                       "icon": "ic_theaters_black_18dp.png"\r
+               },\r
+               {\r
+                       "name": "Műsor nyers",\r
+                       "color": "TEAL100",\r
+                       "icon": "ic_invert_colors_black_18dp.png"\r
+               },\r
+               {\r
+                       "name": "Promo",\r
+                       "color": "INDIGO200",\r
+                       "icon": "ic_picture_in_picture_black_18dp.png"\r
+               },\r
+               {\r
+                       "name": "Promo nyers",\r
+                       "color": "INDIGO100",\r
+                       "icon": "ic_bug_report_black_18dp.png"\r
+               },\r
+               {\r
+                       "name": "Reklám",\r
+                       "color": "BLUE200",\r
+                       "icon": "ic_picture_in_picture_alt_black_18dp.png"\r
+               },\r
+               {\r
+                       "name": "Reklám nyers",\r
+                       "color": "BLUE100",\r
+                       "icon": "ic_settings_brightness_black_18dp.png"\r
+               }\r
+       ],\r
+       "authentication": {\r
+               "authEnabled": true,\r
+               "adHost": "intra.mediavivantis.hu",\r
+               "adNonSecurePort": 3268,\r
+               "adBaseDn": "DC=intra,DC=mediavivantis,DC=hu",\r
+               "adAdminMap": [\r
+                        "G_MV_U_MUSZAK",\r
+                        "G_MV_U_INGEST"\r
+               ],\r
+               "adSubmitterMap": [\r
+                       "G_ECH_U_INFORMATIKUSOK",\r
+                       "G_ECH_U_MUSZAKVEZETOK",\r
+                       "ECH-ISILON-ADMINS"\r
+               ],\r
+               "adEditorMap": [\r
+                       "G_ECH_U_INFORMATIKUSOK",\r
+                       "G_ECH_U_MUSZAKVEZETOK",\r
+                       "ECH-ISILON-ADMINS"\r
+               ],\r
+               "localAccounts": [\r
+                       {\r
+                               "user" : "user",\r
+                               "password" : "5F4DCC3B5AA765D61D8327DEB882CF99",\r
+                               "email" : null\r
+                       },\r
+                       {\r
+                               "user" : "lebony",\r
+                               "password" : "4E25B117B14D86D7DCECB4E433CF932C",\r
+                               "email" : null\r
+                       },\r
+                       {\r
+                               "user" : "root",\r
+                               "password" : "5F4DCC3B5AA765D61D8327DEB882CF99",\r
+                               "email" : "vasary@elgekko.net"\r
+                       }\r
+               ],\r
+               "localAdmins": [\r
+                       "root",\r
+                       "admin"\r
+               ],\r
+               "localSubmitters": [\r
+                       "lebony"\r
+               ],\r
+               "localEditors": [\r
+                       "editor"\r
+               ]\r
+       }\r
+}\r
+\r
+\r
+\r
index 42ef1c5422aac241c24ca8d49e1054e7f2686191..f068126639bdf6a508c440e86a5184290a202294 100644 (file)
@@ -28,7 +28,7 @@ public class SystemConfiguration implements IConfiguration {
 \r
        public SystemConfiguration() {\r
                try {\r
-                       load(getConfig("configuration/application.yaml"));\r
+                       load(getConfig("settings/application.yaml"));\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
                }\r
index f04e9f8d99e538fe420d91f6c6b43fa3469a945d..e3cfaccf9a6443144a3748a7eada4d3652e6bebb 100644 (file)
@@ -36,8 +36,8 @@ import user.jobengine.server.steps.IJobStep;
 \r
 public class JobEngineConfiguration implements IJobEngineConfiguration {\r
        private static final Logger logger = LogManager.getLogger();\r
-       public static final String CONF_MEDIACUBE = "configuration/mediacube.json";\r
-       public static final String CONF_MAESTRO = "configuration/maestro.json";\r
+       public static final String CONF_MEDIACUBE = "settings/mediacube.json";\r
+       public static final String CONF_MAESTRO = "settings/maestro.json";\r
        public static final String CONF_EXECUTORS = "jobs/executors.xml";\r
        public static final String CONF_SCHEDULES = "jobs/schedules.json";\r
        public static final String DIR_STEPS = "jobs/steps";\r
@@ -102,6 +102,7 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
                else\r
                        sj.setJobName(name);\r
 \r
+               sj.setJobEngine(jobEngine);\r
                sj.setTemplateName(template);\r
                sj.setCronExpressions(NoSQLUtils.asString(jobJSON, "cronexpression"));\r
                sj.setExecuteOnStartup(NoSQLUtils.asBool(jobJSON, "executeimmediate"));\r
index 720fd418febc20c22bcca53d40366c46cb6bb843..aa9e0487c66a6063f3401908c6024eeded9bb4e1 100644 (file)
@@ -2,7 +2,7 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="user.jobengine.gui.ComponentBinder">\r
        <implementation class="user.jobengine.gui.ComponentBinder"/>\r
        <reference bind="bindNexioService" unbind="unbindNexioService" cardinality="1..1" interface="user.commons.nexio.INexioAPI" name="INexioAPI" policy="static" />\r
-       <reference bind="bindMetadataProviderFactory" unbind="unbindMetadataProviderFactory" cardinality="0..1" interface="user.mediacube.metadata.interfaces.IMetadataProviderFactory" policy="static"/>\r
+       <reference bind="bindMetadataProviderFactory" unbind="unbindMetadataProviderFactory" cardinality="1..1" interface="user.mediacube.metadata.interfaces.IMetadataProviderFactory" policy="static"/>\r
        <reference bind="bindJobEngine" unbind="unbindJobEngine" cardinality="1..1" interface="user.jobengine.server.IJobEngine" name="IJobEngine" policy="static" />\r
        <reference bind="bindSystemConfiguration" cardinality="1..1" interface="user.commons.configuration.IConfiguration" policy="static"/>\r
 </scr:component>\r
index 63a74a6f4b86a9db94028f44aea9b6f2e50e1678..8d68619cdc9cd2291cf4af60cef0a555fbe4850d 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true">\r
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="user.mediacube.metadata.MetadataProviderFactory">\r
    <implementation class="user.mediacube.metadata.MetadataProviderFactory"/>\r
    <service>\r
       <provide interface="user.mediacube.metadata.interfaces.IMetadataProviderFactory"/>\r