diff --git a/dist/PluginApp.jar b/dist/PluginApp.jar index 811664d..199de0a 100644 Binary files a/dist/PluginApp.jar and b/dist/PluginApp.jar differ diff --git a/dist/libGstRTSP.so b/dist/libGstRTSP.so index 0875353..456d78b 100755 Binary files a/dist/libGstRTSP.so and b/dist/libGstRTSP.so differ diff --git a/pom.xml b/pom.xml index 7f2876a..f53c8ca 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,15 @@ - - - io.antmedia - parent - 2.6.3-SNAPSHOT - + + + io.antmedia + parent + 2.8.0-SNAPSHOT + + 4.0.0 io.antmedia.plugin - SamplePlugin + GST-Ant-Fusion jar Plugin Maven Webapp http://maven.apache.org @@ -279,12 +281,7 @@ ${spring.version} provided - - javax.servlet - servlet-api - ${servlet.version} - provided - + org.glassfish.jersey.media jersey-media-json-jackson @@ -292,11 +289,11 @@ provided - org.glassfish.jersey.ext - jersey-spring4 - ${jersey.version} - provided - + org.glassfish.jersey.ext + jersey-spring6 + ${jersey.version} + + junit junit diff --git a/redeploy.sh b/redeploy.sh index 5ae8f04..87f0617 100755 --- 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 index f03e0e8..83c58d6 100644 --- 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 index c9cc208..afd86c6 100644 --- 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"