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

diff --git a/server/-configuration/deploy-mediacube-product.launch b/server/-configuration/deploy-mediacube-product.launch
new file mode 100644 (file)
index 0000000..a0f9bd5
--- /dev/null
+++ b/server/-configuration/deploy-mediacube-product.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
+<stringAttribute key="M2_GOALS" value="deploy:exec"/>\r
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
+<booleanAttribute key="M2_OFFLINE" value="true"/>\r
+<stringAttribute key="M2_PROFILES" value=""/>\r
+<listAttribute key="M2_PROPERTIES"/>\r
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>\r
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>\r
+<intAttribute key="M2_THREADS" value="1"/>\r
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
+<stringAttribute key="M2_USER_SETTINGS" value=""/>\r
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
+</listAttribute>\r
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}/-product"/>\r
+</launchConfiguration>\r

diff --git a/server/-modules/pom.xml b/server/-modules/pom.xml
index 486788602d9d4c7462603fe7b07ee5d7efbbaa88..6a609046fc13b4e2e4cd5cc71df2db3710b0fcec 100644 (file)
--- a/server/-modules/pom.xml
+++ b/server/-modules/pom.xml
@@ -48,32 +48,6 @@
 \r
        <build>\r
                <plugins>\r
-                       <plugin>\r
-                               <groupId>org.codehaus.mojo</groupId>\r
-                               <artifactId>exec-maven-plugin</artifactId>\r
-                               <version>1.5.0</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>remote-deploy</id>\r
-                                               <phase>deploy</phase>\r
-                                               <goals>\r
-                                                       <goal>exec</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <workingDirectory>${project.build.directory}</workingDirectory>\r
-                                                       <executable>winscp.com</executable>\r
-                                                       <arguments>\r
-                                                               <argument>/command</argument>\r
-                                                               <argument>"open ${remote.address} -hostkey=""${remote.hostkey}"""</argument>\r
-                                                               <argument>"lcd ${local.location}"</argument>\r
-                                                               <argument>"cd ${remote.location}"</argument>\r
-                                                               <argument>"synchronize remote -filemask=*.jar|*/"</argument>\r
-                                                               <argument>"exit"</argument>\r
-                                                       </arguments>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
                        <plugin>\r
                                <groupId>org.eclipse.tycho</groupId>\r
                                <artifactId>tycho-packaging-plugin</artifactId>\r

diff --git a/server/-product/.tpignore b/server/-product/.tpignore
index 24d64373c408677a23eb135317b72ed0a0572d46..b92438d7d0ac3909994ed7e5fa3e37b3b9511d5c 100644 (file)
--- a/server/-product/.tpignore
+++ b/server/-product/.tpignore
@@ -1 +1 @@
-/target/\r
+\Q/target/\E.*\r

diff --git a/server/-product/pom.xml b/server/-product/pom.xml
index b2912cf3a4bc16f88e5ea3fc2f50b8ef68225b4f..a1747f037188fc4fccde0ced384bc62893845378 100644 (file)
--- a/server/-product/pom.xml
+++ b/server/-product/pom.xml
@@ -65,6 +65,25 @@
                                                        </resources>\r
                                                </configuration>\r
                                        </execution>\r
+                                       <execution>\r
+                                               <id>copy-resources-1-lnx</id>\r
+                                               <phase>install</phase>\r
+                                               <goals>\r
+                                                       <goal>copy-resources</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <outputDirectory>${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration</outputDirectory>\r
+                                                       <resources>\r
+                                                               <resource>\r
+                                                                       <directory>${basedir}/../-configuration</directory>\r
+                                                                       <includes>\r
+                                                                               <include>log4j2.xml</include>\r
+                                                                               <include>scheduledjobs.json</include>\r
+                                                                       </includes>\r
+                                                               </resource>\r
+                                                       </resources>\r
+                                               </configuration>\r
+                                       </execution>\r
                                        <execution>\r
                                                <id>copy-resources-2</id>\r
                                                <phase>install</phase>\r
@@ -80,6 +99,21 @@
                                                        </resources>\r
                                                </configuration>\r
                                        </execution>\r
+                                       <execution>\r
+                                               <id>copy-resources-2-lnx</id>\r
+                                               <phase>install</phase>\r
+                                               <goals>\r
+                                                       <goal>copy-resources</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <outputDirectory>${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration/executors</outputDirectory>\r
+                                                       <resources>\r
+                                                               <resource>\r
+                                                                       <directory>${basedir}/../user.jobengine.executors/config</directory>\r
+                                                               </resource>\r
+                                                       </resources>\r
+                                               </configuration>\r
+                                       </execution>\r
                                        <execution>\r
                                                <id>copy-resources-3</id>\r
                                                <phase>install</phase>\r
@@ -95,6 +129,21 @@
                                                        </resources>\r
                                                </configuration>\r
                                        </execution>\r
+                                       <execution>\r
+                                               <id>copy-resources-3-lnx</id>\r
+                                               <phase>install</phase>\r
+                                               <goals>\r
+                                                       <goal>copy-resources</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <outputDirectory>${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration/executors</outputDirectory>\r
+                                                       <resources>\r
+                                                               <resource>\r
+                                                                       <directory>${basedir}/../user.jobengine.executors/bin/user/jobengine/server/steps</directory>\r
+                                                               </resource>\r
+                                                       </resources>\r
+                                               </configuration>\r
+                                       </execution>\r
                                        <execution>\r
                                                <id>copy-resources-4</id>\r
                                                <phase>install</phase>\r
@@ -110,6 +159,21 @@
                                                        </resources>\r
                                                </configuration>\r
                                        </execution>\r
+                                       <execution>\r
+                                               <id>copy-resources-4-lnx</id>\r
+                                               <phase>install</phase>\r
+                                               <goals>\r
+                                                       <goal>copy-resources</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <outputDirectory>${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration/templates</outputDirectory>\r
+                                                       <resources>\r
+                                                               <resource>\r
+                                                                       <directory>${basedir}/../-configuration/jobtemplates</directory>\r
+                                                               </resource>\r
+                                                       </resources>\r
+                                               </configuration>\r
+                                       </execution>\r
                                        <execution>\r
                                                <id>copy-resources-5</id>\r
                                                <phase>install</phase>\r
@@ -125,6 +189,21 @@
                                                        </resources>\r
                                                </configuration>\r
                                        </execution>\r
+                                       <execution>\r
+                                               <id>copy-resources-5-lnx</id>\r
+                                               <phase>install</phase>\r
+                                               <goals>\r
+                                                       <goal>copy-resources</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <outputDirectory>${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration/jetty/etc</outputDirectory>\r
+                                                       <resources>\r
+                                                               <resource>\r
+                                                                       <directory>${basedir}/../-configuration/jetty/etc</directory>\r
+                                                               </resource>\r
+                                                       </resources>\r
+                                               </configuration>\r
+                                       </execution>\r
                                </executions>\r
                        </plugin>\r
                        <plugin>\r
@@ -139,11 +218,15 @@
                                                        <goal>exec</goal>\r
                                                </goals>\r
                                                <configuration>\r
-                                                       <workingDirectory>${project.build.directory}/products/MediaCube/win32/win32/x86_64/</workingDirectory>\r
-                                                       <executable>WinSCP.com</executable>\r
+                                                       <workingDirectory>${project.build.directory}</workingDirectory>\r
+                                                       <executable>winscp.com</executable>\r
                                                        <arguments>\r
                                                                <argument>/command</argument>\r
                                                                <argument>"open ${remote.address} -hostkey=""${remote.hostkey}"""</argument>\r
+                                                               <argument>"lcd ${local.location}"</argument>\r
+                                                               <argument>"cd ${remote.location}"</argument>\r
+                                                               <argument>"synchronize remote"</argument>\r
+                                                               <argument>"call chmod +x mediacube"</argument>\r
                                                                <argument>"exit"</argument>\r
                                                        </arguments>\r
                                                </configuration>\r
@@ -154,7 +237,9 @@
                </plugins>\r
        </build>\r
        <properties>\r
-               <remote.address>10.10.1.26</remote.address>\r
+               <remote.address>scp://root:password@10.10.1.26</remote.address>\r
                <remote.hostkey>ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4</remote.hostkey>\r
-       </properties>   \r
+               <local.location>${project.build.directory}/products/MediaCube/linux/gtk/x86_64</local.location>\r
+               <remote.location>/opt/mediacube</remote.location>\r
+       </properties>\r
 </project> \r

diff --git a/server/user.commons.log4j2/.tpignore b/server/user.commons.log4j2/.tpignore
index 24d64373c408677a23eb135317b72ed0a0572d46..b92438d7d0ac3909994ed7e5fa3e37b3b9511d5c 100644 (file)
--- a/server/user.commons.log4j2/.tpignore
+++ b/server/user.commons.log4j2/.tpignore
@@ -1 +1 @@
-/target/\r
+\Q/target/\E.*\r

diff --git a/server/user.jobengine.executors/.tpignore b/server/user.jobengine.executors/.tpignore
index 24d64373c408677a23eb135317b72ed0a0572d46..b92438d7d0ac3909994ed7e5fa3e37b3b9511d5c 100644 (file)
--- a/server/user.jobengine.executors/.tpignore
+++ b/server/user.jobengine.executors/.tpignore
@@ -1 +1 @@
-/target/\r
+\Q/target/\E.*\r

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 48dff6287743b0f56562fc334eb3a65ab713fc01..7998934d26c9c65af967cfc60c5b8342e78ab41f 100644 (file)
--- 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;\r
+package obsolate;\r
 \r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
@@ -8,6 +8,8 @@ import user.commons.remotestore.IProgressEventListener;
 import user.commons.remotestore.ProgressEvent;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.JobStep;\r
+import user.jobengine.server.steps.StepEntry;\r
 \r
 public class NexioDataMinerStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 a1503f41c837ad9f88fb5dfa704c4350a4fba806..df5a96ae4cabf995773c9e90f172d67f7346a1d5 100644 (file)
--- 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;\r
+package obsolate;\r
 \r
 import java.sql.Timestamp;\r
 import java.util.Date;\r
@@ -13,6 +13,8 @@ import user.jobengine.db.MediaFile;
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 import user.jobengine.server.JobEngineException;\r
+import user.jobengine.server.steps.JobStep;\r
+import user.jobengine.server.steps.StepEntry;\r
 \r
 public class SetArchivedStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 8a301201f69c7b21c8b6bf3955e7ec36960f22c7..fab52af5f56e8fb0a3aaa9210bc6870916a77b9a 100644 (file)
--- 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;\r
+package obsolate;\r
 \r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
@@ -16,6 +16,8 @@ import user.jobengine.db.MediaFile;
 import user.jobengine.db.Store;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.JobStep;\r
+import user.jobengine.server.steps.StepEntry;\r
 \r
 public class TSMBackupStep_orig extends JobStep {\r
        // @StepEntry\r

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 aedd21e7885c3a5e15cf38c741c2d243f14b0163..806e6d0942ec4ee3d847c1f232249cb5015839fe 100644 (file)
--- 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;\r
+package obsolate;\r
 \r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.JobStep;\r
+import user.jobengine.server.steps.StepEntry;\r
 \r
 public class TemplateStep extends JobStep {\r
 \r

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 d92312f790c96fe0cd97e2ccabd275da98d6c6f5..059d6d4483aec5627a053bea884b987ee1e22a3f 100644 (file)
--- 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;\r
+package obsolate;\r
 \r
 import java.util.ArrayList;\r
 import java.util.Date;\r
@@ -24,6 +24,8 @@ import user.jobengine.db.Store;
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 import user.jobengine.server.JobEngineException;\r
+import user.jobengine.server.steps.JobStep;\r
+import user.jobengine.server.steps.StepEntry;\r
 \r
 public class TranscodeStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

diff --git a/server/user.jobengine.osgi.commons/.tpignore b/server/user.jobengine.osgi.commons/.tpignore
index 24d64373c408677a23eb135317b72ed0a0572d46..b92438d7d0ac3909994ed7e5fa3e37b3b9511d5c 100644 (file)
--- a/server/user.jobengine.osgi.commons/.tpignore
+++ b/server/user.jobengine.osgi.commons/.tpignore
@@ -1 +1 @@
-/target/\r
+\Q/target/\E.*\r

diff --git a/server/user.jobengine.osgi.db/.tpignore b/server/user.jobengine.osgi.db/.tpignore
index 5f0c452fc54c594e19f35565165be5656e26a04d..2b4b3cf08ba7ba0a40923e50e3467d69f2ade82e 100644 (file)
--- a/server/user.jobengine.osgi.db/.tpignore
+++ b/server/user.jobengine.osgi.db/.tpignore
@@ -1,2 +1,2 @@
-/target/\r
 /user/jobengine/db/.*\r
+\Q/target/\E.*\r

diff --git a/server/user.jobengine.osgi.server/.tpignore b/server/user.jobengine.osgi.server/.tpignore
index 24d64373c408677a23eb135317b72ed0a0572d46..b92438d7d0ac3909994ed7e5fa3e37b3b9511d5c 100644 (file)
--- a/server/user.jobengine.osgi.server/.tpignore
+++ b/server/user.jobengine.osgi.server/.tpignore
@@ -1 +1 @@
-/target/\r
+\Q/target/\E.*\r

diff --git a/server/user.jobengine.osgi.services/.tpignore b/server/user.jobengine.osgi.services/.tpignore
index 24d64373c408677a23eb135317b72ed0a0572d46..b92438d7d0ac3909994ed7e5fa3e37b3b9511d5c 100644 (file)
--- a/server/user.jobengine.osgi.services/.tpignore
+++ b/server/user.jobengine.osgi.services/.tpignore
@@ -1 +1 @@
-/target/\r
+\Q/target/\E.*\r

diff --git a/server/user.jobengine.osgi.services/deploy.launch b/server/user.jobengine.osgi.services/deploy.launch
index 53f7f1247aa8df70f8e5740eae5df560a1b5c135..93a343096bed6c7fac6fb603d2c78ca6173cc1aa 100644 (file)
--- a/server/user.jobengine.osgi.services/deploy.launch
+++ b/server/user.jobengine.osgi.services/deploy.launch
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="true"/>\r
 <stringAttribute key="M2_GOALS" value="clean deploy"/>\r
 <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
 <booleanAttribute key="M2_OFFLINE" value="true"/>\r

diff --git a/server/user.jobengine.osgi.services/pom.xml b/server/user.jobengine.osgi.services/pom.xml
index 22d69ff73f3d1d9cd0a2f681967cca831ddcbcf4..6bb479962fa39147d75723724037b8608d56b5d6 100644 (file)
--- a/server/user.jobengine.osgi.services/pom.xml
+++ b/server/user.jobengine.osgi.services/pom.xml
@@ -42,10 +42,4 @@
                        </plugin>\r
                </plugins>\r
        </build>\r
-       <properties>\r
-               <remote.address>scp://root:password@10.10.1.26</remote.address>\r
-               <remote.hostkey>ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4</remote.hostkey>\r
-               <local.location>${project.build.directory}</local.location>\r
-               <remote.location>/opt/mediacube/plugins</remote.location>\r
-       </properties>\r
 </project>
\ 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 c2784a3c1d6cc591f9feb4ff9792b02d14e1fee6..4cccfac85dbed880d6fb060f233e5842f51b5b0c 100644 (file)
--- 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<Session> sessions = new ConcurrentHashSet<>();
-       //private NexioAPIServletMessagePool messagePool;
-       private NexioClipEventDispatcher dispatcher = null;
-       
+
        public static NexioWSServlet getInstance() {
                return instance;
        }
 
+       private Set<Session> 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<INexioChangeListener> 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<INexioChangeListener> 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 24d64373c408677a23eb135317b72ed0a0572d46..b92438d7d0ac3909994ed7e5fa3e37b3b9511d5c 100644 (file)
--- a/server/user.tsm.client/.tpignore
+++ b/server/user.tsm.client/.tpignore
@@ -1 +1 @@
-/target/\r
+\Q/target/\E.*\r