WS archive first look

diff --git a/client/Maestro/Configuration/dev-local.json b/client/Maestro/Configuration/dev-local.json
index 1e7e988ba4bee0a86564d0196d360a3d221ba08a..59793284d77238a20c216ccb4dbd29bd10611bc5 100644 (file)
--- a/client/Maestro/Configuration/dev-local.json
+++ b/client/Maestro/Configuration/dev-local.json
@@ -49,6 +49,10 @@
       "server": {\r
         "address": "http://localvm:9090/services/rest/jobengine/",\r
         "timeout": 1000\r
+      },\r
+      "wsArchiveServer": {\r
+        "address": "ws://localhost:9080/services/wsapi-archive",\r
+        "timeout": 1000\r
       }\r
     }\r
 \r
@@ -59,7 +63,8 @@
       "processor": "UNCTargetProcessor",\r
       "outputFormat": "%ID%",\r
       "remote": {\r
-        "address": "file://c:/_video/t1"\r
+        "address": "file://c:/_video/t1",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy"\r
       }\r
     },\r
     {\r

diff --git a/client/Maestro/MaestroForm.resx b/client/Maestro/MaestroForm.resx
index 7ca218c8a2bb3e746eeb1d7099c3949c9694015a..c3dcafe9feba2ff53be03ff3196730146f61ce4a 100644 (file)
--- a/client/Maestro/MaestroForm.resx
+++ b/client/Maestro/MaestroForm.resx
@@ -128,7 +128,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS\r
-        CAAAAk1TRnQBSQFMAgEBAgEAAdgBAgHYAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
+        CAAAAk1TRnQBSQFMAgEBAgEAAeABAgHgAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r

diff --git a/server/-configuration/run-mediacube-server.launch b/server/-configuration/run-mediacube-server.launch
index d8214b64e9a94eaa2813b260c3221c621a33c825..dc9e0b79c682c95c5e7d5006b843b9e3df9c594e 100644 (file)
--- a/server/-configuration/run-mediacube-server.launch
+++ b/server/-configuration/run-mediacube-server.launch
@@ -38,7 +38,6 @@
         <setEntry value="com.ibm.nosql@default:default"/>\r
         <setEntry value="com.microsoft.sqlserver.sqljdbc@default:default"/>\r
         <setEntry value="com.sun.jna@default:default"/>\r
-        <setEntry value="commons-logging@default:default"/>\r
         <setEntry value="groovy@default:default"/>\r
         <setEntry value="javax.annotation-api@default:default"/>\r
         <setEntry value="javax.mail@default:default"/>\r

diff --git a/server/user.jobengine.osgi.services/WEB-INF/web.xml b/server/user.jobengine.osgi.services/WEB-INF/web.xml
index f89da8674929410e9d44fb1184ce1200ce02375f..773a15518adf86d514bc604e2ba700052583993b 100644 (file)
--- a/server/user.jobengine.osgi.services/WEB-INF/web.xml
+++ b/server/user.jobengine.osgi.services/WEB-INF/web.xml
@@ -54,6 +54,17 @@
                <url-pattern>/wsapi/*</url-pattern>\r
        </servlet-mapping>\r
 \r
+       <servlet>\r
+               <servlet-name>WS-MEDIACUBEAPI-ARCHIVE</servlet-name>\r
+               <servlet-class>user.jobengine.osgi.ws.mediacube.MediaCubeAPIWSArchiveServlet</servlet-class>\r
+               <load-on-startup>1</load-on-startup>\r
+       </servlet>\r
+       <servlet-mapping>\r
+               <servlet-name>WS-MEDIACUBEAPI-ARCHIVE</servlet-name>\r
+               <url-pattern>/wsapi-archive/*</url-pattern>\r
+       </servlet-mapping>\r
+\r
+\r
        <servlet>\r
         <servlet-name>MEDIAFILE</servlet-name>\r
         <servlet-class>\r

diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/mediacube/MediaCubeAPIWSArchiveServlet.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/mediacube/MediaCubeAPIWSArchiveServlet.java
new file mode 100644 (file)
index 0000000..7886e6b
--- /dev/null
+++ b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/mediacube/MediaCubeAPIWSArchiveServlet.java
@@ -0,0 +1,21 @@
+package user.jobengine.osgi.ws.mediacube;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
+import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
+
+@SuppressWarnings("serial")
+public class MediaCubeAPIWSArchiveServlet extends WebSocketServlet {
+       private static final Logger logger = LogManager.getLogger();
+
+       public MediaCubeAPIWSArchiveServlet() {
+               logger.info("Created");
+       }
+
+       @Override
+       public void configure(WebSocketServletFactory factory) {
+               factory.register(MediaCubeAPIWSArchiveSocket.class);
+               // factory.getPolicy().setMaxBinaryMessageSize(110000);
+       }
+}

diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/mediacube/MediaCubeAPIWSArchiveSocket.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/mediacube/MediaCubeAPIWSArchiveSocket.java
new file mode 100644 (file)
index 0000000..a70e292
--- /dev/null
+++ b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/mediacube/MediaCubeAPIWSArchiveSocket.java
@@ -0,0 +1,44 @@
+package user.jobengine.osgi.ws.mediacube;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.WebSocketAdapter;
+
+public class MediaCubeAPIWSArchiveSocket extends WebSocketAdapter {
+       private static final Logger logger = LogManager.getLogger();
+
+       public MediaCubeAPIWSArchiveSocket() {
+               logger.info("EventSocket created");
+       }
+
+       @Override
+       public void onWebSocketClose(int statusCode, String reason) {
+               super.onWebSocketClose(statusCode, reason);
+               logger.info("Socket Closed: [{}]", reason);
+       }
+
+       @Override
+       public void onWebSocketConnect(Session sess) {
+               super.onWebSocketConnect(sess);
+               logger.info("Socket Connected: " + sess);
+       }
+
+       @Override
+       public void onWebSocketError(Throwable cause) {
+               super.onWebSocketError(cause);
+               logger.info("Error: [{}]", String.valueOf(cause.getMessage()));
+       }
+
+       @Override
+       public void onWebSocketBinary(byte[] payload, int offset, int len) {
+               super.onWebSocketBinary(payload, offset, len);
+               logger.info("Data len {}", len);
+       }
+
+       @Override
+       public void onWebSocketText(String message) {
+               logger.info("File name {}", message);
+       }
+
+}