This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push: new 360da883e [OPENMEETINGS-2742] package is renamed 360da883e is described below commit 360da883ef3cf64db7e6d445cbaf378c5efb68fa Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Mon Jun 27 09:53:56 2022 +0700 [OPENMEETINGS-2742] package is renamed --- openmeetings-mediaserver/pom.xml | 2 +- .../mediaserver/{remote => }/AbstractStream.java | 2 +- .../mediaserver/{remote => }/IStreamProcessor.java | 2 +- .../openmeetings/mediaserver/{remote => }/KRoom.java | 6 +++--- .../openmeetings/mediaserver/{remote => }/KStream.java | 14 +++++++------- .../mediaserver/{remote => }/KTestStream.java | 14 +++++++------- .../mediaserver/{remote => }/KurentoHandler.java | 2 +- .../mediaserver/{remote => }/StreamProcessor.java | 8 ++++---- .../{remote => }/StreamProcessorActions.java | 6 +++--- .../mediaserver/{remote => }/TestStreamProcessor.java | 10 +++++----- .../mediaserver/{remote => }/BaseMockedTest.java | 18 +++++++++--------- .../{remote => }/TestNotConnectedMocked.java | 2 +- .../{remote => }/TestRecordingFlowMocked.java | 2 +- .../mediaserver/{remote => }/TestRoomFlowMocked.java | 2 +- .../mediaserver/{remote => }/TestSetupFlowMocked.java | 10 +++++----- .../web/admin/connection/ConnectionsPanel.java | 4 ++-- .../openmeetings/web/admin/connection/KStreamDto.java | 2 +- .../org/apache/openmeetings/web/app/Application.java | 2 +- .../org/apache/openmeetings/web/app/ClientManager.java | 2 +- .../org/apache/openmeetings/web/app/TimerService.java | 2 +- .../openmeetings/web/common/OmWebSocketPanel.java | 4 ++-- .../org/apache/openmeetings/web/room/RoomPanel.java | 6 +++--- .../openmeetings/web/room/menu/RoomMenuPanel.java | 4 ++-- .../openmeetings/web/room/sidebar/RoomSidebar.java | 2 +- .../openmeetings/web/room/wb/InterviewWbPanel.java | 2 +- 25 files changed, 65 insertions(+), 65 deletions(-) diff --git a/openmeetings-mediaserver/pom.xml b/openmeetings-mediaserver/pom.xml index fd0a0fe2a..2f725fdc7 100644 --- a/openmeetings-mediaserver/pom.xml +++ b/openmeetings-mediaserver/pom.xml @@ -31,7 +31,7 @@ <description>Module for OpenMeetings MediaServer classes and services</description> <properties> <site.basedir>${project.parent.basedir}</site.basedir> - <autoModuleName>apache.openmeetings.core</autoModuleName> + <autoModuleName>apache.openmeetings.mediaserver</autoModuleName> </properties> <dependencies> <dependency> diff --git a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/AbstractStream.java b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/AbstractStream.java similarity index 98% rename from openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/AbstractStream.java rename to openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/AbstractStream.java index 0dc76efc8..5a145f5ae 100644 --- a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/AbstractStream.java +++ b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/AbstractStream.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.mediaserver.remote; +package org.apache.openmeetings.mediaserver; import org.kurento.client.CertificateKeyType; import org.kurento.client.MediaPipeline; diff --git a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/IStreamProcessor.java b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/IStreamProcessor.java similarity index 94% rename from openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/IStreamProcessor.java rename to openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/IStreamProcessor.java index eacf0e402..6d6e65f96 100644 --- a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/IStreamProcessor.java +++ b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/IStreamProcessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.mediaserver.remote; +package org.apache.openmeetings.mediaserver; public interface IStreamProcessor { void release(AbstractStream stream, boolean releaseStream); diff --git a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/KRoom.java b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KRoom.java similarity index 97% rename from openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/KRoom.java rename to openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KRoom.java index 5409e243f..c91281f8b 100644 --- a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/KRoom.java +++ b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KRoom.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.mediaserver.remote; +package org.apache.openmeetings.mediaserver; import static java.util.UUID.randomUUID; import static org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.PARAM_ICE; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.newKurentoMsg; +import static org.apache.openmeetings.mediaserver.KurentoHandler.PARAM_ICE; +import static org.apache.openmeetings.mediaserver.KurentoHandler.newKurentoMsg; import java.util.Date; import java.util.Optional; diff --git a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/KStream.java b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KStream.java similarity index 97% rename from openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/KStream.java rename to openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KStream.java index 447209c9c..092d83602 100644 --- a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/KStream.java +++ b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KStream.java @@ -19,16 +19,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.mediaserver.remote; +package org.apache.openmeetings.mediaserver; import static java.util.UUID.randomUUID; import static java.util.concurrent.CompletableFuture.delayedExecutor; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.PARAM_CANDIDATE; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.PARAM_ICE; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.TAG_ROOM; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.TAG_STREAM_UID; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.getFlowoutTimeout; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.newKurentoMsg; +import static org.apache.openmeetings.mediaserver.KurentoHandler.PARAM_CANDIDATE; +import static org.apache.openmeetings.mediaserver.KurentoHandler.PARAM_ICE; +import static org.apache.openmeetings.mediaserver.KurentoHandler.TAG_ROOM; +import static org.apache.openmeetings.mediaserver.KurentoHandler.TAG_STREAM_UID; +import static org.apache.openmeetings.mediaserver.KurentoHandler.getFlowoutTimeout; +import static org.apache.openmeetings.mediaserver.KurentoHandler.newKurentoMsg; import static org.apache.openmeetings.util.OmFileHelper.getRecUri; import static org.apache.openmeetings.util.OmFileHelper.getRecordingChunk; diff --git a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/KTestStream.java b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KTestStream.java similarity index 93% rename from openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/KTestStream.java rename to openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KTestStream.java index 24ade96e7..3df66efce 100644 --- a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/KTestStream.java +++ b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KTestStream.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.mediaserver.remote; +package org.apache.openmeetings.mediaserver; import static java.util.UUID.randomUUID; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.MODE_TEST; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.PARAM_CANDIDATE; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.TAG_MODE; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.TAG_ROOM; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.sendError; -import static org.apache.openmeetings.mediaserver.remote.TestStreamProcessor.newTestKurentoMsg; +import static org.apache.openmeetings.mediaserver.KurentoHandler.MODE_TEST; +import static org.apache.openmeetings.mediaserver.KurentoHandler.PARAM_CANDIDATE; +import static org.apache.openmeetings.mediaserver.KurentoHandler.TAG_MODE; +import static org.apache.openmeetings.mediaserver.KurentoHandler.TAG_ROOM; +import static org.apache.openmeetings.mediaserver.KurentoHandler.sendError; +import static org.apache.openmeetings.mediaserver.TestStreamProcessor.newTestKurentoMsg; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_WEBM; import static org.apache.openmeetings.util.OmFileHelper.TEST_SETUP_PREFIX; import static org.apache.openmeetings.util.OmFileHelper.getStreamsDir; diff --git a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/KurentoHandler.java b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java similarity index 99% rename from openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/KurentoHandler.java rename to openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java index f13a18ced..13b01bf2f 100644 --- a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/KurentoHandler.java +++ b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.mediaserver.remote; +package org.apache.openmeetings.mediaserver; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/StreamProcessor.java b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/StreamProcessor.java similarity index 98% rename from openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/StreamProcessor.java rename to openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/StreamProcessor.java index 8d1e2d748..0c261ae4a 100644 --- a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/StreamProcessor.java +++ b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/StreamProcessor.java @@ -17,11 +17,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.mediaserver.remote; +package org.apache.openmeetings.mediaserver; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.PARAM_ICE; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.activityAllowed; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.newKurentoMsg; +import static org.apache.openmeetings.mediaserver.KurentoHandler.PARAM_ICE; +import static org.apache.openmeetings.mediaserver.KurentoHandler.activityAllowed; +import static org.apache.openmeetings.mediaserver.KurentoHandler.newKurentoMsg; import static org.apache.openmeetings.util.OpenmeetingsVariables.isRecordingsEnabled; import java.util.Collection; diff --git a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/StreamProcessorActions.java b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/StreamProcessorActions.java similarity index 95% rename from openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/StreamProcessorActions.java rename to openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/StreamProcessorActions.java index 5c4cb1b59..159e8ec1c 100644 --- a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/StreamProcessorActions.java +++ b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/StreamProcessorActions.java @@ -17,10 +17,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.mediaserver.remote; +package org.apache.openmeetings.mediaserver; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.PARAM_CANDIDATE; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.sendError; +import static org.apache.openmeetings.mediaserver.KurentoHandler.PARAM_CANDIDATE; +import static org.apache.openmeetings.mediaserver.KurentoHandler.sendError; import org.apache.openmeetings.core.util.WebSocketHelper; import org.apache.openmeetings.db.entity.basic.Client; diff --git a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/TestStreamProcessor.java b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/TestStreamProcessor.java similarity index 88% rename from openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/TestStreamProcessor.java rename to openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/TestStreamProcessor.java index e9a8faf50..eaa164282 100644 --- a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/remote/TestStreamProcessor.java +++ b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/TestStreamProcessor.java @@ -17,12 +17,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.mediaserver.remote; +package org.apache.openmeetings.mediaserver; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.MODE_TEST; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.PARAM_CANDIDATE; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.PARAM_ICE; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.TAG_MODE; +import static org.apache.openmeetings.mediaserver.KurentoHandler.MODE_TEST; +import static org.apache.openmeetings.mediaserver.KurentoHandler.PARAM_CANDIDATE; +import static org.apache.openmeetings.mediaserver.KurentoHandler.PARAM_ICE; +import static org.apache.openmeetings.mediaserver.KurentoHandler.TAG_MODE; import java.util.Map; import java.util.Map.Entry; diff --git a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/BaseMockedTest.java b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/BaseMockedTest.java similarity index 91% rename from openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/BaseMockedTest.java rename to openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/BaseMockedTest.java index a2d065013..05f721b5d 100644 --- a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/BaseMockedTest.java +++ b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/BaseMockedTest.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.mediaserver.remote; +package org.apache.openmeetings.mediaserver; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -41,14 +41,14 @@ import org.apache.openmeetings.db.dao.label.LabelDao; import org.apache.openmeetings.db.entity.basic.IWsClient; import org.apache.openmeetings.db.entity.label.OmLanguage; import org.apache.openmeetings.db.util.ApplicationHelper; -import org.apache.openmeetings.mediaserver.remote.AbstractStream; -import org.apache.openmeetings.mediaserver.remote.KRoom; -import org.apache.openmeetings.mediaserver.remote.KStream; -import org.apache.openmeetings.mediaserver.remote.KTestStream; -import org.apache.openmeetings.mediaserver.remote.KurentoHandler; -import org.apache.openmeetings.mediaserver.remote.StreamProcessor; -import org.apache.openmeetings.mediaserver.remote.StreamProcessorActions; -import org.apache.openmeetings.mediaserver.remote.TestStreamProcessor; +import org.apache.openmeetings.mediaserver.AbstractStream; +import org.apache.openmeetings.mediaserver.KRoom; +import org.apache.openmeetings.mediaserver.KStream; +import org.apache.openmeetings.mediaserver.KTestStream; +import org.apache.openmeetings.mediaserver.KurentoHandler; +import org.apache.openmeetings.mediaserver.StreamProcessor; +import org.apache.openmeetings.mediaserver.StreamProcessorActions; +import org.apache.openmeetings.mediaserver.TestStreamProcessor; import org.apache.wicket.injection.Injector; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/TestNotConnectedMocked.java b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestNotConnectedMocked.java similarity index 98% rename from openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/TestNotConnectedMocked.java rename to openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestNotConnectedMocked.java index 80a799807..76bd6dde8 100644 --- a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/TestNotConnectedMocked.java +++ b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestNotConnectedMocked.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.mediaserver.remote; +package org.apache.openmeetings.mediaserver; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/TestRecordingFlowMocked.java b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRecordingFlowMocked.java similarity index 99% rename from openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/TestRecordingFlowMocked.java rename to openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRecordingFlowMocked.java index 00aa5f8ad..c116d808b 100644 --- a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/TestRecordingFlowMocked.java +++ b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRecordingFlowMocked.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.mediaserver.remote; +package org.apache.openmeetings.mediaserver; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/TestRoomFlowMocked.java b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRoomFlowMocked.java similarity index 98% rename from openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/TestRoomFlowMocked.java rename to openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRoomFlowMocked.java index 3fd44cb87..df30d4151 100644 --- a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/TestRoomFlowMocked.java +++ b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRoomFlowMocked.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.mediaserver.remote; +package org.apache.openmeetings.mediaserver; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/TestSetupFlowMocked.java b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestSetupFlowMocked.java similarity index 90% rename from openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/TestSetupFlowMocked.java rename to openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestSetupFlowMocked.java index ebd151795..13711b71a 100644 --- a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/remote/TestSetupFlowMocked.java +++ b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestSetupFlowMocked.java @@ -17,11 +17,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.mediaserver.remote; +package org.apache.openmeetings.mediaserver; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.MODE_TEST; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.PARAM_CANDIDATE; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.TAG_MODE; +import static org.apache.openmeetings.mediaserver.KurentoHandler.MODE_TEST; +import static org.apache.openmeetings.mediaserver.KurentoHandler.PARAM_CANDIDATE; +import static org.apache.openmeetings.mediaserver.KurentoHandler.TAG_MODE; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -29,7 +29,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import org.apache.openmeetings.db.entity.basic.WsClient; -import org.apache.openmeetings.mediaserver.remote.KurentoHandler; +import org.apache.openmeetings.mediaserver.KurentoHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.kurento.client.MediaPipeline; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java index 5869cc044..1d3cf99db 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java @@ -46,8 +46,8 @@ import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.RepeatingView; import org.apache.wicket.model.ResourceModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import org.apache.openmeetings.mediaserver.remote.KurentoHandler; -import org.apache.openmeetings.mediaserver.remote.StreamProcessor; +import org.apache.openmeetings.mediaserver.KurentoHandler; +import org.apache.openmeetings.mediaserver.StreamProcessor; import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink; import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/KStreamDto.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/KStreamDto.java index fa42b5aa1..796d57d7e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/KStreamDto.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/KStreamDto.java @@ -23,7 +23,7 @@ import java.util.Date; import org.apache.openmeetings.db.entity.IDataProviderEntity; import org.apache.openmeetings.db.entity.basic.Client.StreamType; import org.apache.openmeetings.db.entity.record.RecordingChunk.Type; -import org.apache.openmeetings.mediaserver.remote.KStream; +import org.apache.openmeetings.mediaserver.KStream; /** * A KStream for the Wicket UI to display. This object can be serialized, otherwise diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index 916be049b..467b20f32 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java @@ -132,7 +132,7 @@ import org.apache.wicket.settings.ExceptionSettings; import org.apache.wicket.spring.injection.annot.SpringComponentInjector; import org.apache.wicket.util.string.Strings; import org.apache.wicket.validation.validator.UrlValidator; -import org.apache.openmeetings.mediaserver.remote.KStream; +import org.apache.openmeetings.mediaserver.KStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java index ab4f427a8..eff15eaef 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java @@ -42,7 +42,7 @@ import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.manager.IClientManager; import org.apache.openmeetings.db.util.ws.RoomMessage; import org.apache.openmeetings.db.util.ws.TextRoomMessage; -import org.apache.openmeetings.mediaserver.remote.KurentoHandler; +import org.apache.openmeetings.mediaserver.KurentoHandler; import org.apache.openmeetings.web.pages.auth.SignInPage; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.string.StringValue; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java index 1e94ec5f2..9349f6f09 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java @@ -38,7 +38,7 @@ import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.util.ws.RoomMessage; import org.apache.openmeetings.db.util.ws.TextRoomMessage; import org.apache.wicket.ThreadContext; -import org.apache.openmeetings.mediaserver.remote.KurentoHandler; +import org.apache.openmeetings.mediaserver.KurentoHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java index 4faed1687..819268af3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java @@ -19,7 +19,7 @@ package org.apache.openmeetings.web.common; import static org.apache.openmeetings.web.app.WebSession.getUserId; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.KURENTO_TYPE; +import static org.apache.openmeetings.mediaserver.KurentoHandler.KURENTO_TYPE; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; @@ -43,7 +43,7 @@ import org.apache.wicket.protocol.ws.api.message.ConnectedMessage; import org.apache.wicket.protocol.ws.api.message.ErrorMessage; import org.apache.wicket.protocol.ws.api.message.TextMessage; import org.apache.wicket.spring.injection.annot.SpringBean; -import org.apache.openmeetings.mediaserver.remote.KurentoHandler; +import org.apache.openmeetings.mediaserver.KurentoHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java index 198107737..1f01acd62 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java @@ -26,7 +26,7 @@ import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PDF; import static org.apache.openmeetings.web.app.WebSession.getDateFormat; import static org.apache.openmeetings.web.app.WebSession.getUserId; import static org.apache.openmeetings.web.room.wb.WbPanel.WB_JS_REFERENCE; -import static org.apache.openmeetings.mediaserver.remote.KurentoHandler.activityAllowed; +import static org.apache.openmeetings.mediaserver.KurentoHandler.activityAllowed; import java.io.IOException; import java.nio.file.Files; @@ -98,8 +98,8 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.apache.wicket.util.resource.FileResourceStream; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.string.Strings; -import org.apache.openmeetings.mediaserver.remote.KurentoHandler; -import org.apache.openmeetings.mediaserver.remote.StreamProcessor; +import org.apache.openmeetings.mediaserver.KurentoHandler; +import org.apache.openmeetings.mediaserver.StreamProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java index db54eebbb..4c0829b1c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java @@ -63,8 +63,8 @@ import org.apache.wicket.model.Model; import org.apache.wicket.request.flow.RedirectToUrlException; import org.apache.wicket.spring.injection.annot.SpringBean; import org.apache.wicket.util.string.Strings; -import org.apache.openmeetings.mediaserver.remote.KurentoHandler; -import org.apache.openmeetings.mediaserver.remote.StreamProcessor; +import org.apache.openmeetings.mediaserver.KurentoHandler; +import org.apache.openmeetings.mediaserver.StreamProcessor; import com.github.openjson.JSONObject; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java index c91659b8b..c7f5146a4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java @@ -39,7 +39,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.spring.injection.annot.SpringBean; import org.apache.wicket.util.string.Strings; -import org.apache.openmeetings.mediaserver.remote.StreamProcessor; +import org.apache.openmeetings.mediaserver.StreamProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java index 24e708d45..07cf5f811 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java @@ -26,7 +26,7 @@ import org.apache.openmeetings.db.entity.room.Room.Right; import org.apache.openmeetings.web.room.RoomPanel; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.spring.injection.annot.SpringBean; -import org.apache.openmeetings.mediaserver.remote.StreamProcessor; +import org.apache.openmeetings.mediaserver.StreamProcessor; import com.github.openjson.JSONObject;