From 3072e232d143d51ef3ef97deadb9678e86eec494 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Fri, 13 Jul 2018 08:28:33 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31159 --- .../UJ-configuration-tqc-check.json | 4 +- client/Maestro/Properties/AssemblyInfo.cs | 4 +- .../MaestroShared/Properties/AssemblyInfo.cs | 4 +- .../Targets/FTPTargetProcessor.cs | 8 +- .../Targets/UNCTargetProcessor.cs | 8 +- server/user.jobengine.osgi.server/index.jsp | 10 +- .../pages/index.zul | 17 +- .../pages/joblist.zul | 3 - .../pages/login.jsp | 14 +- .../user.jobengine.osgi.server/pages/menu.zul | 151 +++++++++--------- .../pages/missingmaterials.zul | 3 - .../pages/newshistory.zul | 1 - 12 files changed, 122 insertions(+), 105 deletions(-) diff --git a/client/Maestro/Configuration/UJ-configuration-tqc-check.json b/client/Maestro/Configuration/UJ-configuration-tqc-check.json index 112396ab..765596cc 100644 --- a/client/Maestro/Configuration/UJ-configuration-tqc-check.json +++ b/client/Maestro/Configuration/UJ-configuration-tqc-check.json @@ -12,7 +12,7 @@ "$type": "UNCSource", "filter": "avi,wav,mxf", "local": { - "address": "file://10.10.1.100/BRAAVOS/TQC/CHECK", + "address": "file://c:/_video", "userName": "mediacube", "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", "timeout": 1000 @@ -89,7 +89,7 @@ "disableFileVersioning": true, "enableOverride": true, "remote": { - "address": "ftp://10.10.1.100/ARCHIVE", + "address": "file://10.10.1.100/BRAAVOS/ARCHIVE", "userName": "mediacube", "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", "timeout": 1000 diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs index f1fcb969..c0e44fb6 100644 --- a/client/Maestro/Properties/AssemblyInfo.cs +++ b/client/Maestro/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.8.2")] -[assembly: AssemblyFileVersion("2.0.8.2")] +[assembly: AssemblyVersion("2.0.8.3")] +[assembly: AssemblyFileVersion("2.0.8.3")] diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs index 876860ff..c4425a14 100644 --- a/client/MaestroShared/Properties/AssemblyInfo.cs +++ b/client/MaestroShared/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.7.8")] -[assembly: AssemblyFileVersion("2.0.7.8")] +[assembly: AssemblyVersion("2.0.8.3")] +[assembly: AssemblyFileVersion("2.0.8.3")] diff --git a/client/MaestroShared/Targets/FTPTargetProcessor.cs b/client/MaestroShared/Targets/FTPTargetProcessor.cs index 5c304895..6778ff72 100644 --- a/client/MaestroShared/Targets/FTPTargetProcessor.cs +++ b/client/MaestroShared/Targets/FTPTargetProcessor.cs @@ -89,10 +89,10 @@ namespace MaestroShared.Targets { FtpReply reply = targetFTP.GetReply(); if (!reply.Success || !_226.Equals(reply.Code)) throw new Exception(UPLOAD_ERROR); - long sourceSize = inputFile.Length; - long uploadedSize = targetFTP.GetFileSize(OutputName); - if (sourceSize != uploadedSize) - throw new Exception(UPLOAD_SIZE_ERROR); + //long sourceSize = inputFile.Length; + //long uploadedSize = targetFTP.GetFileSize(OutputName); + //if (sourceSize != uploadedSize) + // throw new Exception(UPLOAD_SIZE_ERROR); } protected override void UploadContent(string outputPath, byte[] content) { diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs index 455fafbc..a151ac04 100644 --- a/client/MaestroShared/Targets/UNCTargetProcessor.cs +++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs @@ -382,10 +382,10 @@ namespace MaestroShared.Targets { protected virtual void UploadFile() { int pbCancel = 0; Win32File.CopyFileEx(Input, Output, new CopyProgressRoutine(this.CopyProgressHandler), IntPtr.Zero, ref pbCancel, CopyFileFlags.COPY_FILE_RESTARTABLE); - long sourceSize = inputFile.Length; - long uploadedSize = new FileInfo(Output).Length; - if (sourceSize != uploadedSize) - throw new Exception(COPY_SIZE_ERROR); + //long sourceSize = inputFile.Length; + //long uploadedSize = new FileInfo(Output).Length; + //if (sourceSize != uploadedSize) + // throw new Exception(COPY_SIZE_ERROR); } protected virtual string GetOutputFilePath(string path, string fileName) { diff --git a/server/user.jobengine.osgi.server/index.jsp b/server/user.jobengine.osgi.server/index.jsp index 3fd615c7..07d46254 100644 --- a/server/user.jobengine.osgi.server/index.jsp +++ b/server/user.jobengine.osgi.server/index.jsp @@ -1,6 +1,10 @@ -<%@ page import="java.util.*, java.io.*, java.net.*, user.jobengine.zk.util.SessionUtil"%> +<%@ page import="java.util.*, java.io.*, java.net.*, user.jobengine.zk.util.SessionUtil, org.apache.logging.log4j.*"%> <% - String action = request.getParameter("action"); - pageContext.forward("/pages/index.zul?action=" + action); + String targetPath = "/pages/index.zul"; + String queryString = request.getQueryString(); + if (queryString != null) + targetPath += "?" + queryString; + LogManager.getLogger().info("Forwaring to {}", targetPath); + pageContext.forward(targetPath); %> \ No newline at end of file diff --git a/server/user.jobengine.osgi.server/pages/index.zul b/server/user.jobengine.osgi.server/pages/index.zul index fa02bd7a..fbb56375 100644 --- a/server/user.jobengine.osgi.server/pages/index.zul +++ b/server/user.jobengine.osgi.server/pages/index.zul @@ -21,9 +21,21 @@ } } ]]> - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/server/user.jobengine.osgi.server/pages/missingmaterials.zul b/server/user.jobengine.osgi.server/pages/missingmaterials.zul index 1addebe6..54555544 100644 --- a/server/user.jobengine.osgi.server/pages/missingmaterials.zul +++ b/server/user.jobengine.osgi.server/pages/missingmaterials.zul @@ -2,9 +2,6 @@ - diff --git a/server/user.jobengine.osgi.server/pages/newshistory.zul b/server/user.jobengine.osgi.server/pages/newshistory.zul index 6b59d67e..76de84ab 100644 --- a/server/user.jobengine.osgi.server/pages/newshistory.zul +++ b/server/user.jobengine.osgi.server/pages/newshistory.zul @@ -1,7 +1,6 @@