From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Tue, 13 Feb 2018 23:28:27 +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=1a5a793cd1178b36384398a4a5928407621648db;p=mediacube.git

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

diff --git a/server/-configuration/deploy-bkup-mediacube-plugins.launch b/server/-configuration/deploy-bkup-mediacube-plugins.launch
new file mode 100644
index 00000000..664347a5
--- /dev/null
+++ b/server/-configuration/deploy-bkup-mediacube-plugins.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean deploy -Dremote.address=scp://root:password@10.10.1.29 -Dremote.location=/opt/test-mediacube -P plugins"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}/-modules"/>
+</launchConfiguration>
diff --git a/server/-product/pom.xml b/server/-product/pom.xml
index 35d23307..86ba36fb 100644
--- a/server/-product/pom.xml
+++ b/server/-product/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<relativePath>../-modules</relativePath>
@@ -33,12 +33,12 @@
 							<goal>materialize-products</goal>
 						</goals>
 					</execution>
-<!-- 					<execution> -->
-<!-- 						<id>archive-products</id> -->
-<!-- 						<goals> -->
-<!-- 							<goal>archive-products</goal> -->
-<!-- 						</goals> -->
-<!-- 					</execution> -->
+					<!-- <execution> -->
+					<!-- <id>archive-products</id> -->
+					<!-- <goals> -->
+					<!-- <goal>archive-products</goal> -->
+					<!-- </goals> -->
+					<!-- </execution> -->
 				</executions>
 			</plugin>
 			<plugin>
@@ -164,48 +164,92 @@
 							</resources>
 						</configuration>
 					</execution>
-					
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.5.0</version>
-				<executions>
-					<execution>
-						<id>remote-deploy</id>
-						<phase>deploy</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<workingDirectory>${project.build.directory}</workingDirectory>
-							<executable>winscp.com</executable>
-							<arguments>
-								<argument>/command</argument>
-								<argument>"echo STARTING DEPLOY TO: ${remote.address}"</argument>
-								<argument>"open ${remote.address} -hostkey=""${remote.hostkey}"""</argument>
-<!-- 								<argument>"call pcs resource disable mediacube_script"</argument> -->
-<!-- 								<argument>"call sleep 5"</argument> -->
-								<argument>"call rm -rf ${remote.location}"</argument>
-								<argument>"call mkdir ${remote.location}"</argument>
-								<argument>"lcd ${local.location}"</argument>
-								<argument>"cd ${remote.location}"</argument>
-								<argument>"synchronize remote"</argument>
-								<argument>"mkdir log"</argument>
-								<argument>"call chmod +x mediacube"</argument>
-								<argument>"call chmod +x start-mediacube.sh"</argument>
-								<argument>"call chmod +x stop-mediacube.sh"</argument>
-<!-- 								<argument>"call pcs resource enable mediacube_script"</argument> -->
-								<argument>"exit"</argument>
-							</arguments>
-						</configuration>
-					</execution>
+
 				</executions>
 			</plugin>
 
 		</plugins>
 	</build>
+
+	<profiles>
+		<profile>
+			<id>full</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+						<version>1.5.0</version>
+						<executions>
+							<execution>
+								<id>remote-deploy</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>exec</goal>
+								</goals>
+								<configuration>
+									<workingDirectory>${project.build.directory}</workingDirectory>
+									<executable>winscp.com</executable>
+									<arguments>
+										<argument>/command</argument>
+										<argument>"echo STARTING DEPLOY TO: ${remote.address}"</argument>
+										<argument>"open ${remote.address} -hostkey=""${remote.hostkey}"""</argument>
+										<argument>"call rm -rf ${remote.location}"</argument>
+										<argument>"call mkdir ${remote.location}"</argument>
+										<argument>"lcd ${local.location}"</argument>
+										<argument>"cd ${remote.location}"</argument>
+										<argument>"synchronize remote"</argument>
+										<argument>"mkdir log"</argument>
+										<argument>"mkdir tmp"</argument>
+										<argument>"call chmod +w tmp"</argument>
+										<argument>"call chmod +x mediacube"</argument>
+										<argument>"call chmod +x start-mediacube.sh"</argument>
+										<argument>"call chmod +x stop-mediacube.sh"</argument>
+										<argument>"exit"</argument>
+									</arguments>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>plugins</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+						<version>1.5.0</version>
+						<executions>
+							<execution>
+								<id>remote-deploy</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>exec</goal>
+								</goals>
+								<configuration>
+									<workingDirectory>${project.build.directory}</workingDirectory>
+									<executable>winscp.com</executable>
+									<arguments>
+										<argument>/command</argument>
+										<argument>"echo STARTING DEPLOY TO: ${remote.address}"</argument>
+										<argument>"open ${remote.address} -hostkey=""${remote.hostkey}"""</argument>
+										<argument>"lcd ${local.location}/plugins"</argument>
+										<argument>"cd ${remote.location}/plugins"</argument>
+										<argument>"synchronize remote"</argument>
+										<argument>"exit"</argument>
+									</arguments>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+
+		</profile>
+	</profiles>
 	<properties>
 		<local.location>${project.build.directory}/products/MediaCube/linux/gtk/x86_64</local.location>
 	</properties>
diff --git a/server/user.jobengine.osgi.services/echo.bat b/server/user.jobengine.osgi.services/echo.bat
new file mode 100644
index 00000000..cf913799
--- /dev/null
+++ b/server/user.jobengine.osgi.services/echo.bat
@@ -0,0 +1 @@
+echo %1
\ No newline at end of file
diff --git a/server/user.jobengine.osgi.services/pom.xml b/server/user.jobengine.osgi.services/pom.xml
index 7c73ea01..787546d8 100644
--- a/server/user.jobengine.osgi.services/pom.xml
+++ b/server/user.jobengine.osgi.services/pom.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<parent>
 		<relativePath>../-modules</relativePath>
 		<groupId>user.jobengine</groupId>
@@ -12,4 +11,63 @@
 	<artifactId>user.jobengine.osgi.services</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<version>1.0.0</version>
+	<profiles>
+		<profile>
+			<id>profile-1</id>
+
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+						<version>1.5.0</version>
+						<executions>
+							<execution>
+								<id>install</id>
+								<phase>install</phase>
+								<goals>
+									<goal>exec</goal>
+								</goals>
+								<configuration>
+									<executable>echo</executable>
+									<arguments>
+										<argument>xxx</argument>
+									</arguments>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+
+				</plugins>
+			</build>
+
+		</profile>
+	</profiles>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.5.0</version>
+				<executions>
+					<execution>
+						<id>install</id>
+						<phase>install</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<executable>echo</executable>
+							<arguments>
+								<argument>yyy</argument>
+							</arguments>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+		</plugins>
+	</build>
+
 </project>
\ No newline at end of file
diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/jobengine/JobengineService.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/jobengine/JobengineService.java
index c2a98113..edd1fc5a 100644
--- a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/jobengine/JobengineService.java
+++ b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/jobengine/JobengineService.java
@@ -31,6 +31,20 @@ public class JobengineService {
 		//logger.info("Created");
 	}
 
+	@GET
+	@Path("/check")
+	@Consumes({ MediaType.APPLICATION_JSON })
+	@Produces({ MediaType.APPLICATION_JSON })
+	public Response check() {
+		Response result = null;
+		try {
+			result = Response.ok().build();
+		} catch (Exception e) {
+			result = Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
+		}
+		return result;
+	}
+
 	@POST
 	@Path("/create")
 	@Consumes({ MediaType.APPLICATION_JSON })