From: Vásáry Dániel Date: Thu, 28 Sep 2017 07:40:23 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=b49c38f395356e72a9eaf53792fe510fa52e4cdc;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30478 --- diff --git a/server/-configuration/deploy-mediacube-product.launch b/server/-configuration/deploy-mediacube-product.launch new file mode 100644 index 00000000..a0f9bd5b --- /dev/null +++ b/server/-configuration/deploy-mediacube-product.launch @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/server/-modules/pom.xml b/server/-modules/pom.xml index 48678860..6a609046 100644 --- a/server/-modules/pom.xml +++ b/server/-modules/pom.xml @@ -48,32 +48,6 @@ - - org.codehaus.mojo - exec-maven-plugin - 1.5.0 - - - remote-deploy - deploy - - exec - - - ${project.build.directory} - winscp.com - - /command - "open ${remote.address} -hostkey=""${remote.hostkey}""" - "lcd ${local.location}" - "cd ${remote.location}" - "synchronize remote -filemask=*.jar|*/" - "exit" - - - - - org.eclipse.tycho tycho-packaging-plugin diff --git a/server/-product/.tpignore b/server/-product/.tpignore index 24d64373..b92438d7 100644 --- a/server/-product/.tpignore +++ b/server/-product/.tpignore @@ -1 +1 @@ -/target/ +\Q/target/\E.* diff --git a/server/-product/pom.xml b/server/-product/pom.xml index b2912cf3..a1747f03 100644 --- a/server/-product/pom.xml +++ b/server/-product/pom.xml @@ -65,6 +65,25 @@ + + copy-resources-1-lnx + install + + copy-resources + + + ${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration + + + ${basedir}/../-configuration + + log4j2.xml + scheduledjobs.json + + + + + copy-resources-2 install @@ -80,6 +99,21 @@ + + copy-resources-2-lnx + install + + copy-resources + + + ${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration/executors + + + ${basedir}/../user.jobengine.executors/config + + + + copy-resources-3 install @@ -95,6 +129,21 @@ + + copy-resources-3-lnx + install + + copy-resources + + + ${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration/executors + + + ${basedir}/../user.jobengine.executors/bin/user/jobengine/server/steps + + + + copy-resources-4 install @@ -110,6 +159,21 @@ + + copy-resources-4-lnx + install + + copy-resources + + + ${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration/templates + + + ${basedir}/../-configuration/jobtemplates + + + + copy-resources-5 install @@ -125,6 +189,21 @@ + + copy-resources-5-lnx + install + + copy-resources + + + ${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration/jetty/etc + + + ${basedir}/../-configuration/jetty/etc + + + + @@ -139,11 +218,15 @@ exec - ${project.build.directory}/products/MediaCube/win32/win32/x86_64/ - WinSCP.com + ${project.build.directory} + winscp.com /command "open ${remote.address} -hostkey=""${remote.hostkey}""" + "lcd ${local.location}" + "cd ${remote.location}" + "synchronize remote" + "call chmod +x mediacube" "exit" @@ -154,7 +237,9 @@ - 10.10.1.26 + scp://root:password@10.10.1.26 ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4 - + ${project.build.directory}/products/MediaCube/linux/gtk/x86_64 + /opt/mediacube + diff --git a/server/user.commons.log4j2/.tpignore b/server/user.commons.log4j2/.tpignore index 24d64373..b92438d7 100644 --- a/server/user.commons.log4j2/.tpignore +++ b/server/user.commons.log4j2/.tpignore @@ -1 +1 @@ -/target/ +\Q/target/\E.* diff --git a/server/user.jobengine.executors/.tpignore b/server/user.jobengine.executors/.tpignore index 24d64373..b92438d7 100644 --- a/server/user.jobengine.executors/.tpignore +++ b/server/user.jobengine.executors/.tpignore @@ -1 +1 @@ -/target/ +\Q/target/\E.* diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/NexioDataMinerStep.java b/server/user.jobengine.executors/src/obsolate/NexioDataMinerStep.java similarity index 89% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/NexioDataMinerStep.java rename to server/user.jobengine.executors/src/obsolate/NexioDataMinerStep.java index 48dff628..7998934d 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/NexioDataMinerStep.java +++ b/server/user.jobengine.executors/src/obsolate/NexioDataMinerStep.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package obsolate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -8,6 +8,8 @@ import user.commons.remotestore.IProgressEventListener; import user.commons.remotestore.ProgressEvent; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.JobStep; +import user.jobengine.server.steps.StepEntry; public class NexioDataMinerStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/SetArchivedStep.java b/server/user.jobengine.executors/src/obsolate/SetArchivedStep.java similarity index 90% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/SetArchivedStep.java rename to server/user.jobengine.executors/src/obsolate/SetArchivedStep.java index a1503f41..df5a96ae 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/SetArchivedStep.java +++ b/server/user.jobengine.executors/src/obsolate/SetArchivedStep.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package obsolate; import java.sql.Timestamp; import java.util.Date; @@ -13,6 +13,8 @@ import user.jobengine.db.MediaFile; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; import user.jobengine.server.JobEngineException; +import user.jobengine.server.steps.JobStep; +import user.jobengine.server.steps.StepEntry; public class SetArchivedStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep_orig.java b/server/user.jobengine.executors/src/obsolate/TSMBackupStep_orig.java similarity index 95% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep_orig.java rename to server/user.jobengine.executors/src/obsolate/TSMBackupStep_orig.java index 8a301201..fab52af5 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep_orig.java +++ b/server/user.jobengine.executors/src/obsolate/TSMBackupStep_orig.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package obsolate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -16,6 +16,8 @@ import user.jobengine.db.MediaFile; import user.jobengine.db.Store; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.JobStep; +import user.jobengine.server.steps.StepEntry; public class TSMBackupStep_orig extends JobStep { // @StepEntry diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TemplateStep.java b/server/user.jobengine.executors/src/obsolate/TemplateStep.java similarity index 70% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/TemplateStep.java rename to server/user.jobengine.executors/src/obsolate/TemplateStep.java index aedd21e7..806e6d09 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TemplateStep.java +++ b/server/user.jobengine.executors/src/obsolate/TemplateStep.java @@ -1,7 +1,9 @@ -package user.jobengine.server.steps; +package obsolate; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.JobStep; +import user.jobengine.server.steps.StepEntry; public class TemplateStep extends JobStep { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeStep.java b/server/user.jobengine.executors/src/obsolate/TranscodeStep.java similarity index 95% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeStep.java rename to server/user.jobengine.executors/src/obsolate/TranscodeStep.java index d92312f7..059d6d44 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeStep.java +++ b/server/user.jobengine.executors/src/obsolate/TranscodeStep.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package obsolate; import java.util.ArrayList; import java.util.Date; @@ -24,6 +24,8 @@ import user.jobengine.db.Store; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; import user.jobengine.server.JobEngineException; +import user.jobengine.server.steps.JobStep; +import user.jobengine.server.steps.StepEntry; public class TranscodeStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.osgi.commons/.tpignore b/server/user.jobengine.osgi.commons/.tpignore index 24d64373..b92438d7 100644 --- a/server/user.jobengine.osgi.commons/.tpignore +++ b/server/user.jobengine.osgi.commons/.tpignore @@ -1 +1 @@ -/target/ +\Q/target/\E.* diff --git a/server/user.jobengine.osgi.db/.tpignore b/server/user.jobengine.osgi.db/.tpignore index 5f0c452f..2b4b3cf0 100644 --- a/server/user.jobengine.osgi.db/.tpignore +++ b/server/user.jobengine.osgi.db/.tpignore @@ -1,2 +1,2 @@ -/target/ /user/jobengine/db/.* +\Q/target/\E.* diff --git a/server/user.jobengine.osgi.server/.tpignore b/server/user.jobengine.osgi.server/.tpignore index 24d64373..b92438d7 100644 --- a/server/user.jobengine.osgi.server/.tpignore +++ b/server/user.jobengine.osgi.server/.tpignore @@ -1 +1 @@ -/target/ +\Q/target/\E.* diff --git a/server/user.jobengine.osgi.services/.tpignore b/server/user.jobengine.osgi.services/.tpignore index 24d64373..b92438d7 100644 --- a/server/user.jobengine.osgi.services/.tpignore +++ b/server/user.jobengine.osgi.services/.tpignore @@ -1 +1 @@ -/target/ +\Q/target/\E.* diff --git a/server/user.jobengine.osgi.services/deploy.launch b/server/user.jobengine.osgi.services/deploy.launch index 53f7f124..93a34309 100644 --- a/server/user.jobengine.osgi.services/deploy.launch +++ b/server/user.jobengine.osgi.services/deploy.launch @@ -1,6 +1,6 @@ - + diff --git a/server/user.jobengine.osgi.services/pom.xml b/server/user.jobengine.osgi.services/pom.xml index 22d69ff7..6bb47996 100644 --- a/server/user.jobengine.osgi.services/pom.xml +++ b/server/user.jobengine.osgi.services/pom.xml @@ -42,10 +42,4 @@ - - scp://root:password@10.10.1.26 - ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4 - ${project.build.directory} - /opt/mediacube/plugins - \ No newline at end of file diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/nexio/NexioWSServlet.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/nexio/NexioWSServlet.java index c2784a3c..4cccfac8 100644 --- a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/nexio/NexioWSServlet.java +++ b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/nexio/NexioWSServlet.java @@ -8,9 +8,6 @@ import org.eclipse.jetty.util.ConcurrentHashSet; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.servlet.WebSocketServlet; import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; -import org.osgi.framework.ServiceRegistration; import com.ibm.nosql.json.api.BasicDBObject; @@ -24,14 +21,16 @@ public class NexioWSServlet extends WebSocketServlet implements INexioChangeList private static final String CREATE = "create"; private static final Logger logger = LogManager.getLogger(); private static NexioWSServlet instance; - private Set sessions = new ConcurrentHashSet<>(); - //private NexioAPIServletMessagePool messagePool; - private NexioClipEventDispatcher dispatcher = null; - + public static NexioWSServlet getInstance() { return instance; } + private Set sessions = new ConcurrentHashSet<>(); + + //private NexioAPIServletMessagePool messagePool; + private NexioClipEventDispatcher dispatcher = null; + public NexioWSServlet() { logger.info("NexioAPIServlet created"); // messagePool = new NexioAPIServletMessagePool(3, sessions); @@ -39,21 +38,19 @@ public class NexioWSServlet extends WebSocketServlet implements INexioChangeList this.dispatcher = new NexioClipEventDispatcher(); this.dispatcher.setNexioChangeListener(this); logger.info("NexioWSServlet has been initialized."); -/* - BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext(); - if (bundleContext != null) { - ServiceRegistration registerService = bundleContext - .registerService(INexioChangeListener.class, this, null); - - logger.info("{} successfully registered", INexioChangeListener.class.getSimpleName()); - } -*/ + /* + BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext(); + if (bundleContext != null) { + ServiceRegistration registerService = bundleContext + .registerService(INexioChangeListener.class, this, null); + + logger.info("{} successfully registered", INexioChangeListener.class.getSimpleName()); + } + */ } - @Override - public void destroy() { - super.destroy(); - // messagePool.shutdownNow(); + public void addSession(Session session) { + sessions.add(session); } @Override @@ -61,13 +58,10 @@ public class NexioWSServlet extends WebSocketServlet implements INexioChangeList factory.register(NexioWSSocket.class); } - public void addSession(Session session) { - sessions.add(session); - } - - public void removeSession(Session session) { - if (sessions.contains(session)) - sessions.remove(session); + @Override + public void destroy() { + super.destroy(); + // messagePool.shutdownNow(); } @Override @@ -96,10 +90,15 @@ public class NexioWSServlet extends WebSocketServlet implements INexioChangeList try { NexioWSSocket.asyncSendResponse(session, message); } catch (Exception e) { - // TODO remove closed + // TODO remove closed logger.error(e); } } } + public void removeSession(Session session) { + if (sessions.contains(session)) + sessions.remove(session); + } + } diff --git a/server/user.tsm.client/.tpignore b/server/user.tsm.client/.tpignore index 24d64373..b92438d7 100644 --- a/server/user.tsm.client/.tpignore +++ b/server/user.tsm.client/.tpignore @@ -1 +1 @@ -/target/ +\Q/target/\E.*