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

diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target
index 02402b93ce4bf5fe3344075b5d5e1235ed789172..62660c2016164b2762e059b59918fb26b69043e8 100644 (file)
--- a/server/-dependencies/jobengine.target
+++ b/server/-dependencies/jobengine.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<?pde version="3.8"?><target name="JobEngine" sequenceNumber="438">\r
+<?pde version="3.8"?><target name="JobEngine" sequenceNumber="442">\r
 <locations>\r
 <location path="${workspace_loc}/-dependencies/target/repository/plugins" type="Directory"/>\r
 </locations>\r
@@ -35,8 +35,8 @@
 <plugin id="org.apache.commons.lang"/>\r
 <plugin id="org.apache.commons.net"/>\r
 <plugin id="org.apache.felix.gogo.command"/>\r
-<plugin id="org.apache.felix.gogo.runtime" version="0.12.0"/>\r
-<plugin id="org.apache.felix.gogo.shell" version="0.12.0"/>\r
+<plugin id="org.apache.felix.gogo.runtime" version="0.10.0"/>\r
+<plugin id="org.apache.felix.gogo.shell" version="0.10.0"/>\r
 <plugin id="org.apache.httpcomponents.httpclient"/>\r
 <plugin id="org.apache.httpcomponents.httpcore"/>\r
 <plugin id="org.apache.logging.log4j.api"/>\r

diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml
index 74e937921690e901527b8d61fb6651d7585b7a85..c3263272ccf1e2fbbbca7700bb1d9e65cbbe793c 100644 (file)
--- a/server/-dependencies/pom.xml
+++ b/server/-dependencies/pom.xml
@@ -156,13 +156,13 @@
                                                                        <id>org.eclipse.jetty:jetty-server:9.3.9.v20160517</id>\r
                                                                </artifact>\r
                                                                <artifact>\r
-                                                                       <id>org.apache.felix:org.apache.felix.gogo.shell:0.12.0</id>\r
+                                                                       <id>org.apache.felix:org.apache.felix.gogo.shell:0.10.0</id>\r
                                                                </artifact>\r
                                                                <artifact>\r
-                                                                       <id>org.apache.felix:org.apache.felix.gogo.command:0.12.0</id>\r
+                                                                       <id>org.apache.felix:org.apache.felix.gogo.command:0.10.0</id>\r
                                                                </artifact>\r
                                                                <artifact>\r
-                                                                       <id>org.apache.felix:org.apache.felix.gogo.runtime:0.12.0</id>\r
+                                                                       <id>org.apache.felix:org.apache.felix.gogo.runtime:0.10.0</id>\r
                                                                </artifact>\r
                                                                <artifact>\r
                                                                        <id>commons-io:commons-io:2.2</id>\r

diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product
index bcfe6b220608ec8cb6f9c60fc6e46f26bd8a42cf..3f116596f99a07dd12e5d3d8cea88ade0b531ab4 100644 (file)
--- a/server/-product/mediacube.product
+++ b/server/-product/mediacube.product
@@ -157,7 +157,7 @@
       <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" version="3.2.100.v20100503"/>\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.jaxb-provider"/>\r

diff --git a/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java b/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java
index 017f58fe9382b528089c6c7d159384d7374e7132..52c90280413178250af2739f6b9c35d301d35ba5 100644 (file)
--- a/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java
+++ b/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java
@@ -16,6 +16,7 @@ import user.commons.mediatool.MediaInfo;
 public class PASAPOOLTransferToStep extends TransferStep {\r
        private static final Logger logger = LogManager.getLogger();\r
        private static final String CODEC_PROFILE_HIGH = "HIGH";\r
+       private static final String CODEC_PROFILE_MAIN = "MAIN";\r
        private static final String CODEC_PROFILE_422 = "4:2:2";\r
        private static final String DISPLAY_ASPECT_16_9 = "16:9";\r
        private static final String DISPLAY_ASPECT_4_3 = "4:3";\r
@@ -96,15 +97,21 @@ public class PASAPOOLTransferToStep extends TransferStep {
        //      aspect=4:3\r
        //      >SELENIOPOOL_4_3 | \\10.170.100.21\media\SelenioPool\4_3\r
        private boolean isSD_HIGH_4_3(MediaInfo mi) {\r
-               return mi.getHeight() < 650 && CODEC_PROFILE_HIGH.equals(mi.getCodecProfileName()) && DISPLAY_ASPECT_4_3.equals(mi.getDisplayAspect());\r
+               String codecProfileName = mi.getCodecProfileName();\r
+               if (codecProfileName != null)\r
+                       codecProfileName = codecProfileName.toUpperCase();\r
+               return mi.getHeight() < 650 && CODEC_PROFILE_HIGH.equals(codecProfileName) && DISPLAY_ASPECT_4_3.equals(mi.getDisplayAspect());\r
        }\r
 \r
        //      SD - MAIN/422@HIGH\r
        //      height < 650\r
-       //      profile=High || profile=4:2:2\r
+       //      profile=Main || profile=4:2:2\r
        //      >PEABLEBEACH | \\10.170.100.21\media\BeachPool\r
        private boolean isSD_MAIN_422(MediaInfo mi) {\r
-               return mi.getHeight() < 650 && (CODEC_PROFILE_HIGH.equals(mi.getCodecProfileName()) || CODEC_PROFILE_422.equals(mi.getCodecProfileName()));\r
+               String codecProfileName = mi.getCodecProfileName();\r
+               if (codecProfileName != null)\r
+                       codecProfileName = codecProfileName.toUpperCase();\r
+               return mi.getHeight() < 650 && (CODEC_PROFILE_MAIN.equals(codecProfileName) || CODEC_PROFILE_422.equals(mi.getCodecProfileName()));\r
        }\r
 \r
        protected void logMediaProfile() {\r

diff --git a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF
index c178cccf7d0dc2d92a26453e0999e274ff28cb01..3ef3e4ac0514ad40ce35a33660c494ad6406a472 100644 (file)
--- a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF
+++ b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5",
  junit.framework,
  org.apache.logging.log4j;version="2.8.2",
  org.apache.logging.log4j.message;version="2.8.2",
- org.hamcrest,
  org.jboss.resteasy.client.jaxrs,
  org.jboss.resteasy.plugins.providers,
  org.jboss.resteasy.spi,

diff --git a/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF
index 1cd481b6716f67563ab7d4be602add0dec4dc4f9..8248ed90bf56cbd80e2d4762c4136aa84895bb04 100644 (file)
--- a/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF
+++ b/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF
@@ -9,7 +9,9 @@ Require-Bundle: user.jobengine.osgi.commons;bundle-version="1.0.0",
  com.ibm.nosql;bundle-version="4.19.26";visibility:=reexport,
  org.jmock.junit4;bundle-version="2.6.0",
  org.jmock;bundle-version="2.6.0",
- com.ibm.db2.jcc;bundle-version="1.4.0"
+ com.ibm.db2.jcc;bundle-version="1.4.0",
+ org.hamcrest.core;bundle-version="1.3.0",
+ junit;bundle-version="4.12.0"
 Service-Component: OSGI-INF/component.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: com.fasterxml.jackson.annotation;version="2.4.5",
@@ -18,9 +20,6 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5",
  javax.ws.rs.core,
  org.apache.commons.io;version="2.2.0",
  org.apache.logging.log4j;version="2.8.2",
- org.hamcrest,
- org.junit,
- org.junit.runner,
  sqlj.runtime.ref
 Export-Package: user.jobengine.db,
  user.jobengine.search

diff --git a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF
index 0ed9c4d4b81ca02c3bcdad36d5f1574b806e8169..a427f2b0586227764dc95154daf85411d974f974 100644 (file)
--- a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF
+++ b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@ Import-Package: com.fasterxml.jackson.databind;version="2.4.5",
  org.apache.logging.log4j.message;version="2.8.2",
  org.eclipse.core.runtime.adaptor,
  org.eclipse.osgi.framework.console;version="1.1.0",
- org.hamcrest,
  org.jboss.resteasy.client.jaxrs,
  org.jboss.resteasy.spi,
  org.junit,
@@ -35,7 +34,8 @@ Require-Bundle: user.jobengine.osgi.db;bundle-version="1.0.0",
  org.apache.commons.lang;bundle-version="2.4.0";visibility:=reexport,
  org.jmock;bundle-version="2.6.0",
  org.jmock.junit4;bundle-version="2.6.0",
- org.apache.servicemix.bundles.quartz;bundle-version="2.2.2"
+ org.apache.servicemix.bundles.quartz;bundle-version="2.2.2",
+ org.hamcrest.core;bundle-version="1.3.0"
 Export-Package: user.jobengine.osgi.server,
  user.jobengine.server,
  user.jobengine.server.ast,