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

diff --git a/server/-configuration/run-mediacube-server.launch b/server/-configuration/run-mediacube-server.launch
index b2f6cc98a7b493156e087699a6ce88c97240281d..a7e5cc81deffdea455474e438ddf07107724a720 100644 (file)
--- a/server/-configuration/run-mediacube-server.launch
+++ b/server/-configuration/run-mediacube-server.launch
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-\r
 <launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">\r
     <booleanAttribute key="append.args" value="true"/>\r
     <booleanAttribute key="automaticAdd" value="false"/>\r
@@ -25,8 +24,7 @@
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#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/&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;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#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.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.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Djobengine.maestro.config=&quot;${workspace_loc}/-configuration/maestro.json&quot;&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Djobengine.planair.db.url=jdbc:sqlserver://10.10.1.45;databaseName=PA_Echo;&#13;&#10;-Djobengine.planair.db.user=MAM&#13;&#10;-Djobengine.planair.db.password=Echotv.hu&#13;&#10;-Dnexio.host=192.168.0.12&#13;&#10;-Djobengine.nexio.name=testnexioclips&#13;&#10;-Dnexio.useMOSGateway=false&#13;&#10;-Dnexio.disable=true&#13;&#10;-Dgui.statistics.disable=true&#13;&#10;-Dgui.help.disable=true&#13;&#10;-Dgui.editor.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=rundowns181026&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders181026&#13;&#10;-Djobengine.octopus.stories.name=stories181026&#13;&#10;-Djobengine.mediafinder.external=false&#13;&#10;-Djobengine.mediafinder.external.url=localhost&#13;&#10;-Dmediacube.auth.location=&quot;${workspace_loc}/-configuration/mediacube-auth.properties&quot;"/>\r
     <stringAttribute key="pde.version" value="3.3"/>\r
     <setAttribute key="selected_target_bundles">\r
-        <setEntry value="com.sun.jna*4.5.1.v20190425-1842@default:default"/>\r
-        <setEntry value="com.sun.jna*5.8.0.v20210503-0343@default:default"/>\r
+        <setEntry value="com.sun.jna@default:default"/>\r
         <setEntry value="javax.mail@default:default"/>\r
         <setEntry value="org.apache.commons.collections@default:default"/>\r
         <setEntry value="org.apache.commons.io@default:default"/>\r
@@ -54,7 +52,6 @@
         <setEntry value="org.objectweb.asm@default:default"/>\r
     </setAttribute>\r
     <setAttribute key="selected_workspace_bundles">\r
-        <setEntry value="user.commons.log4j2@default:false"/>\r
         <setEntry value="user.jobengine.osgi.commons@default:true"/>\r
         <setEntry value="user.jobengine.osgi.db@default:default"/>\r
         <setEntry value="user.jobengine.osgi.server@default:default"/>\r

diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
index 8a6630c90d8a548fc4c2c65db7f4eea52be1c1a3..8427465ed10a74f276fdc22afe986516c11d2527 100644 (file)
--- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
+++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
@@ -1515,8 +1515,40 @@ public class SmallTests {
 //                     System.out.println(i.getKey() + " " + i.getValue());\r
 //             });\r
 \r
-               String mediaHouseId = "XX-1";\r
-               System.out.println(mediaHouseId.substring(0, mediaHouseId.length() - 2));\r
+//             String mediaHouseId = "XX-1";\r
+//             System.out.println(mediaHouseId.substring(0, mediaHouseId.length() - 2));\r
+\r
+//             char alpha = 'J';\r
+//\r
+//             char a = 65, b = 66, c = 67;\r
+//             System.out.println(alpha); // prints J\r
+//\r
+//             System.out.println(a); // Displays 65\r
+//             System.out.println(b); // Displays 66\r
+//             System.out.println(c); // Displays 67\r
+\r
+               int[] input = { 1, 2, 3 };\r
+               reverse(input);\r
+               for (int i = 0; i < input.length; i++)\r
+                       System.out.println(input[i]);\r
+\r
+//             Stack<Integer> stack = new Stack<Integer>();\r
+//             stack.push(1);\r
+//             stack.push(2);\r
+//             stack.push(3);\r
+//\r
+//             System.out.println(stack.get(2));\r
+\r
+       }\r
+\r
+       void reverse(int[] input) {\r
+               input[0] = 100;\r
+//             for (int i = 0; i < input.length; i++) {\r
+//                     int x = input[i];\r
+//                     int y = input.length - (1 + i);\r
+//                     input[i] = input[y];\r
+//                     input[y] = x;\r
+//             }\r
        }\r
 \r
 }\r

diff --git a/server/hu.user.mediacube.indexer/pom.xml b/server/hu.user.mediacube.indexer/pom.xml
index b234384d005de0330b5f4d36b32f09bdf0f7c960..39c942268245402b62125414a52fb489cbd27715 100644 (file)
--- a/server/hu.user.mediacube.indexer/pom.xml
+++ b/server/hu.user.mediacube.indexer/pom.xml
@@ -128,7 +128,6 @@
                        <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-resources-plugin</artifactId>\r
-                               <version>3.1.0</version>\r
                                <configuration>\r
                                        <archive>\r
                                                <manifest>\r