java 17 updates

USAMAWIZARD · Dec 4, 2023 · 58237e7 · 58237e7
1 parent e5dffd9
commit 58237e7
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 35 deletions.
diff --git a/dist/PluginApp.jar b/dist/PluginApp.jar
diff --git a/dist/libGstRTSP.so b/dist/libGstRTSP.so
diff --git a/pom.xml b/pom.xml
@@ -1,13 +1,15 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>io.antmedia</groupId>
-		<artifactId>parent</artifactId>
-		<version>2.6.3-SNAPSHOT</version>
-	</parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/
+2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 h
+ttp://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>io.antmedia</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.8.0-SNAPSHOT</version>
+    </parent>
+
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.antmedia.plugin</groupId>
-	<artifactId>SamplePlugin</artifactId>
+	<artifactId>GST-Ant-Fusion</artifactId>
 	<packaging>jar</packaging>
 	<name>Plugin Maven Webapp</name>
 	<url>http://maven.apache.org</url>
@@ -279,24 +281,19 @@
 			<version>${spring.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>${servlet.version}</version>
-			<scope>provided</scope>
-		</dependency>
+
 		  <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
             <version>${jersey.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-    			<groupId>org.glassfish.jersey.ext</groupId>
-    			<artifactId>jersey-spring4</artifactId>
-    			<version>${jersey.version}</version>
-    			<scope>provided</scope>
-		</dependency>
+            <groupId>org.glassfish.jersey.ext</groupId>
+            <artifactId>jersey-spring6</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

diff --git a/redeploy.sh b/redeploy.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-AMS_DIR=/home/usama/test
+AMS_DIR=/usr/local/antmedia
 
 set -xe
 
@@ -17,7 +17,9 @@ if [ $OUT -ne 0 ]; then
     exit $OUT
 fi
 
-rm -r $AMS_DIR/plugins/PluginApp*
+if [ -e "$AMS_DIR/plugins/PluginApp*" ]; then
+	rm -r $AMS_DIR/plugins/PluginApp*
+fi
 cp target/PluginApp.jar $AMS_DIR/plugins/
 
 cp target/PluginApp.jar ./dist

diff --git a/src/main/java/io/antmedia/rest/RestService.java b/src/main/java/io/antmedia/rest/RestService.java
@@ -1,23 +1,22 @@
 package io.antmedia.rest;
 
-import javax.servlet.ServletContext;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.servlet.ServletContext;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.context.WebApplicationContext;
-import org.testcontainers.shaded.org.bouncycastle.cert.ocsp.Req;
 
 import com.google.gson.Gson;
 import com.mongodb.client.model.geojson.Point;

diff --git a/test/loadtest.sh b/test/loadtest.sh
@@ -1,7 +1,7 @@
 #Publish
 for i in {0..100};
 do
-	ffmpeg -stream_loop 12 -re -i ./test.mp4 -c:v copy -c:a aac -f flv "rtmp://localhost/LiveApp/myStream-$i" &
+	ffmpeg -stream_loop 500 -re -i ./test.mp4 -c:v copy -c:a aac -f flv "rtmp://localhost/LiveApp/myStream-$i" &
 done
 
 read -p "Press enter to Play"