diff --git a/README.md b/README.md index 566a86b4..a93f6c68 100644 --- a/README.md +++ b/README.md @@ -185,8 +185,8 @@ A Java package that wraps the HTTP REST operations for making them even easier - Maven dependency ```xml - org.openvidu - openvidu-backend-client + io.openvidu + openvidu-java-client ... ``` @@ -199,7 +199,7 @@ The usage is quite simple: import OpenVidu package and get an **OpenVidu** objec ```java -import org.openvidu.client.OpenVidu; +import io.openvidu.java.client.OpenVidu; OpenVidu openVidu = new OpenVidu(OPENVIDU_SERVER_IP, YOUR_SECRET); diff --git a/openvidu-backend-client/pom.xml b/openvidu-backend-client/pom.xml deleted file mode 100644 index df1ee630..00000000 --- a/openvidu-backend-client/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - 4.0.0 - - - org.openvidu - openvidu - 0.0.1-SNAPSHOT - - - openvidu-backend-client - jar - - OpenVidu Java Backend Client - http://maven.apache.org - - - UTF-8 - 1.8 - 1.8 - 1.8 - - - - - - junit - junit - test - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.apache.httpcomponents - httpclient - - - - com.googlecode.json-simple - json-simple - - - - diff --git a/openvidu-backend-client/target/openvidu-backend-client.jar b/openvidu-backend-client/target/openvidu-backend-client.jar deleted file mode 100644 index e9366c1d..00000000 Binary files a/openvidu-backend-client/target/openvidu-backend-client.jar and /dev/null differ diff --git a/openvidu-browser/pom.xml b/openvidu-browser/pom.xml index a5f62e41..8545f6ee 100644 --- a/openvidu-browser/pom.xml +++ b/openvidu-browser/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.openvidu + io.openvidu openvidu 0.0.1-SNAPSHOT @@ -39,10 +39,10 @@ - openvidu.org - -openvidu.org Community - OpenVidu.org - https://github.com/OpenVidu/openvidu + openvidu.io + -openvidu.io Community + OpenVidu + http://openvidu.io diff --git a/openvidu-client/pom.xml b/openvidu-client/pom.xml index 27055fef..b16101ac 100644 --- a/openvidu-client/pom.xml +++ b/openvidu-client/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.openvidu + io.openvidu openvidu 0.0.1-SNAPSHOT @@ -39,10 +39,10 @@ - openvidu.org - -openvidu.org Community - OpenVidu.org - https://github.com/OpenVidu/openvidu + openvidu.io + -openvidu.io Community + OpenVidu + http://openvidu.io @@ -52,7 +52,7 @@ kurento-jsonrpc-client diff --git a/openvidu-client/src/main/java/org/openvidu/client/OpenViduClient.java b/openvidu-client/src/main/java/io/openvidu/client/OpenViduClient.java similarity index 72% rename from openvidu-client/src/main/java/org/openvidu/client/OpenViduClient.java rename to openvidu-client/src/main/java/io/openvidu/client/OpenViduClient.java index 1bae6db6..e5a5f99a 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/OpenViduClient.java +++ b/openvidu-client/src/main/java/io/openvidu/client/OpenViduClient.java @@ -14,37 +14,37 @@ * limitations under the License. */ -package org.openvidu.client; +package io.openvidu.client; -import static org.openvidu.client.internal.ProtocolElements.CUSTOMREQUEST_METHOD; -import static org.openvidu.client.internal.ProtocolElements.JOINROOM_DATACHANNELS_PARAM; -import static org.openvidu.client.internal.ProtocolElements.JOINROOM_METHOD; -import static org.openvidu.client.internal.ProtocolElements.JOINROOM_PEERID_PARAM; -import static org.openvidu.client.internal.ProtocolElements.JOINROOM_PEERSTREAMID_PARAM; -import static org.openvidu.client.internal.ProtocolElements.JOINROOM_PEERSTREAMS_PARAM; -import static org.openvidu.client.internal.ProtocolElements.JOINROOM_ROOM_PARAM; -import static org.openvidu.client.internal.ProtocolElements.JOINROOM_USER_PARAM; -import static org.openvidu.client.internal.ProtocolElements.LEAVEROOM_METHOD; -import static org.openvidu.client.internal.ProtocolElements.ONICECANDIDATE_CANDIDATE_PARAM; -import static org.openvidu.client.internal.ProtocolElements.ONICECANDIDATE_EPNAME_PARAM; -import static org.openvidu.client.internal.ProtocolElements.ONICECANDIDATE_METHOD; -import static org.openvidu.client.internal.ProtocolElements.ONICECANDIDATE_SDPMIDPARAM; -import static org.openvidu.client.internal.ProtocolElements.ONICECANDIDATE_SDPMLINEINDEX_PARAM; -import static org.openvidu.client.internal.ProtocolElements.PUBLISHVIDEO_DOLOOPBACK_PARAM; -import static org.openvidu.client.internal.ProtocolElements.PUBLISHVIDEO_METHOD; -import static org.openvidu.client.internal.ProtocolElements.PUBLISHVIDEO_SDPANSWER_PARAM; -import static org.openvidu.client.internal.ProtocolElements.PUBLISHVIDEO_SDPOFFER_PARAM; -import static org.openvidu.client.internal.ProtocolElements.RECEIVEVIDEO_METHOD; -import static org.openvidu.client.internal.ProtocolElements.RECEIVEVIDEO_SDPANSWER_PARAM; -import static org.openvidu.client.internal.ProtocolElements.RECEIVEVIDEO_SDPOFFER_PARAM; -import static org.openvidu.client.internal.ProtocolElements.RECEIVEVIDEO_SENDER_PARAM; -import static org.openvidu.client.internal.ProtocolElements.SENDMESSAGE_MESSAGE_PARAM; -import static org.openvidu.client.internal.ProtocolElements.SENDMESSAGE_ROOM_METHOD; -import static org.openvidu.client.internal.ProtocolElements.SENDMESSAGE_ROOM_PARAM; -import static org.openvidu.client.internal.ProtocolElements.SENDMESSAGE_USER_PARAM; -import static org.openvidu.client.internal.ProtocolElements.UNPUBLISHVIDEO_METHOD; -import static org.openvidu.client.internal.ProtocolElements.UNSUBSCRIBEFROMVIDEO_METHOD; -import static org.openvidu.client.internal.ProtocolElements.UNSUBSCRIBEFROMVIDEO_SENDER_PARAM; +import static io.openvidu.client.internal.ProtocolElements.CUSTOMREQUEST_METHOD; +import static io.openvidu.client.internal.ProtocolElements.JOINROOM_DATACHANNELS_PARAM; +import static io.openvidu.client.internal.ProtocolElements.JOINROOM_METHOD; +import static io.openvidu.client.internal.ProtocolElements.JOINROOM_PEERID_PARAM; +import static io.openvidu.client.internal.ProtocolElements.JOINROOM_PEERSTREAMID_PARAM; +import static io.openvidu.client.internal.ProtocolElements.JOINROOM_PEERSTREAMS_PARAM; +import static io.openvidu.client.internal.ProtocolElements.JOINROOM_ROOM_PARAM; +import static io.openvidu.client.internal.ProtocolElements.JOINROOM_USER_PARAM; +import static io.openvidu.client.internal.ProtocolElements.LEAVEROOM_METHOD; +import static io.openvidu.client.internal.ProtocolElements.ONICECANDIDATE_CANDIDATE_PARAM; +import static io.openvidu.client.internal.ProtocolElements.ONICECANDIDATE_EPNAME_PARAM; +import static io.openvidu.client.internal.ProtocolElements.ONICECANDIDATE_METHOD; +import static io.openvidu.client.internal.ProtocolElements.ONICECANDIDATE_SDPMIDPARAM; +import static io.openvidu.client.internal.ProtocolElements.ONICECANDIDATE_SDPMLINEINDEX_PARAM; +import static io.openvidu.client.internal.ProtocolElements.PUBLISHVIDEO_DOLOOPBACK_PARAM; +import static io.openvidu.client.internal.ProtocolElements.PUBLISHVIDEO_METHOD; +import static io.openvidu.client.internal.ProtocolElements.PUBLISHVIDEO_SDPANSWER_PARAM; +import static io.openvidu.client.internal.ProtocolElements.PUBLISHVIDEO_SDPOFFER_PARAM; +import static io.openvidu.client.internal.ProtocolElements.RECEIVEVIDEO_METHOD; +import static io.openvidu.client.internal.ProtocolElements.RECEIVEVIDEO_SDPANSWER_PARAM; +import static io.openvidu.client.internal.ProtocolElements.RECEIVEVIDEO_SDPOFFER_PARAM; +import static io.openvidu.client.internal.ProtocolElements.RECEIVEVIDEO_SENDER_PARAM; +import static io.openvidu.client.internal.ProtocolElements.SENDMESSAGE_MESSAGE_PARAM; +import static io.openvidu.client.internal.ProtocolElements.SENDMESSAGE_ROOM_METHOD; +import static io.openvidu.client.internal.ProtocolElements.SENDMESSAGE_ROOM_PARAM; +import static io.openvidu.client.internal.ProtocolElements.SENDMESSAGE_USER_PARAM; +import static io.openvidu.client.internal.ProtocolElements.UNPUBLISHVIDEO_METHOD; +import static io.openvidu.client.internal.ProtocolElements.UNSUBSCRIBEFROMVIDEO_METHOD; +import static io.openvidu.client.internal.ProtocolElements.UNSUBSCRIBEFROMVIDEO_SENDER_PARAM; import java.io.IOException; import java.util.ArrayList; @@ -57,8 +57,6 @@ import org.eclipse.jetty.util.ssl.SslContextFactory; import org.kurento.jsonrpc.client.JsonRpcClient; import org.kurento.jsonrpc.client.JsonRpcClientWebSocket; import org.kurento.jsonrpc.client.JsonRpcWSConnectionListener; -import org.openvidu.client.internal.JsonRoomUtils; -import org.openvidu.client.internal.Notification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,6 +64,9 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import io.openvidu.client.internal.JsonRoomUtils; +import io.openvidu.client.internal.Notification; + /** * Java client for the room server. * diff --git a/openvidu-backend-client/src/main/java/org/openvidu/client/OpenViduException.java b/openvidu-client/src/main/java/io/openvidu/client/OpenViduException.java similarity index 98% rename from openvidu-backend-client/src/main/java/org/openvidu/client/OpenViduException.java rename to openvidu-client/src/main/java/io/openvidu/client/OpenViduException.java index ee9703b4..94e4d270 100644 --- a/openvidu-backend-client/src/main/java/org/openvidu/client/OpenViduException.java +++ b/openvidu-client/src/main/java/io/openvidu/client/OpenViduException.java @@ -15,7 +15,7 @@ * */ -package org.openvidu.client; +package io.openvidu.client; public class OpenViduException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/openvidu-client/src/main/java/org/openvidu/client/ServerJsonRpcHandler.java b/openvidu-client/src/main/java/io/openvidu/client/ServerJsonRpcHandler.java similarity index 91% rename from openvidu-client/src/main/java/org/openvidu/client/ServerJsonRpcHandler.java rename to openvidu-client/src/main/java/io/openvidu/client/ServerJsonRpcHandler.java index 2078f47e..d6e74ba1 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/ServerJsonRpcHandler.java +++ b/openvidu-client/src/main/java/io/openvidu/client/ServerJsonRpcHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.client; +package io.openvidu.client; import java.util.ArrayList; import java.util.Iterator; @@ -25,19 +25,6 @@ import java.util.concurrent.BlockingQueue; import org.kurento.jsonrpc.DefaultJsonRpcHandler; import org.kurento.jsonrpc.Transaction; import org.kurento.jsonrpc.message.Request; -import org.openvidu.client.internal.IceCandidate; -import org.openvidu.client.internal.IceCandidateInfo; -import org.openvidu.client.internal.JsonRoomUtils; -import org.openvidu.client.internal.MediaErrorInfo; -import org.openvidu.client.internal.Notification; -import org.openvidu.client.internal.ParticipantEvictedInfo; -import org.openvidu.client.internal.ParticipantJoinedInfo; -import org.openvidu.client.internal.ParticipantLeftInfo; -import org.openvidu.client.internal.ParticipantPublishedInfo; -import org.openvidu.client.internal.ParticipantUnpublishedInfo; -import org.openvidu.client.internal.ProtocolElements; -import org.openvidu.client.internal.RoomClosedInfo; -import org.openvidu.client.internal.SendMessageInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,6 +32,20 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import io.openvidu.client.internal.IceCandidate; +import io.openvidu.client.internal.IceCandidateInfo; +import io.openvidu.client.internal.JsonRoomUtils; +import io.openvidu.client.internal.MediaErrorInfo; +import io.openvidu.client.internal.Notification; +import io.openvidu.client.internal.ParticipantEvictedInfo; +import io.openvidu.client.internal.ParticipantJoinedInfo; +import io.openvidu.client.internal.ParticipantLeftInfo; +import io.openvidu.client.internal.ParticipantPublishedInfo; +import io.openvidu.client.internal.ParticipantUnpublishedInfo; +import io.openvidu.client.internal.ProtocolElements; +import io.openvidu.client.internal.RoomClosedInfo; +import io.openvidu.client.internal.SendMessageInfo; + /** * Service that handles server JSON-RPC events. * diff --git a/openvidu-client/src/main/java/org/openvidu/client/internal/IceCandidate.java b/openvidu-client/src/main/java/io/openvidu/client/internal/IceCandidate.java similarity index 94% rename from openvidu-client/src/main/java/org/openvidu/client/internal/IceCandidate.java rename to openvidu-client/src/main/java/io/openvidu/client/internal/IceCandidate.java index 40508018..42564b1d 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/internal/IceCandidate.java +++ b/openvidu-client/src/main/java/io/openvidu/client/internal/IceCandidate.java @@ -1,4 +1,4 @@ -package org.openvidu.client.internal; +package io.openvidu.client.internal; public class IceCandidate { diff --git a/openvidu-client/src/main/java/org/openvidu/client/internal/IceCandidateInfo.java b/openvidu-client/src/main/java/io/openvidu/client/internal/IceCandidateInfo.java similarity index 98% rename from openvidu-client/src/main/java/org/openvidu/client/internal/IceCandidateInfo.java rename to openvidu-client/src/main/java/io/openvidu/client/internal/IceCandidateInfo.java index 89279f4d..9c2e738a 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/internal/IceCandidateInfo.java +++ b/openvidu-client/src/main/java/io/openvidu/client/internal/IceCandidateInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.client.internal; +package io.openvidu.client.internal; /** * @see Notification diff --git a/openvidu-client/src/main/java/org/openvidu/client/internal/JsonRoomUtils.java b/openvidu-client/src/main/java/io/openvidu/client/internal/JsonRoomUtils.java similarity index 96% rename from openvidu-client/src/main/java/org/openvidu/client/internal/JsonRoomUtils.java rename to openvidu-client/src/main/java/io/openvidu/client/internal/JsonRoomUtils.java index bcdeb0a4..de821d89 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/internal/JsonRoomUtils.java +++ b/openvidu-client/src/main/java/io/openvidu/client/internal/JsonRoomUtils.java @@ -14,16 +14,17 @@ * limitations under the License. */ -package org.openvidu.client.internal; +package io.openvidu.client.internal; import org.kurento.jsonrpc.message.Request; -import org.openvidu.client.OpenViduException; -import org.openvidu.client.OpenViduException.Code; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import io.openvidu.client.OpenViduException; +import io.openvidu.client.OpenViduException.Code; + /** * JSON tools for extracting info from request or response elements. * diff --git a/openvidu-client/src/main/java/org/openvidu/client/internal/MediaErrorInfo.java b/openvidu-client/src/main/java/io/openvidu/client/internal/MediaErrorInfo.java similarity index 97% rename from openvidu-client/src/main/java/org/openvidu/client/internal/MediaErrorInfo.java rename to openvidu-client/src/main/java/io/openvidu/client/internal/MediaErrorInfo.java index f5dd5bf9..64ceb1f0 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/internal/MediaErrorInfo.java +++ b/openvidu-client/src/main/java/io/openvidu/client/internal/MediaErrorInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.client.internal; +package io.openvidu.client.internal; /** * diff --git a/openvidu-client/src/main/java/org/openvidu/client/internal/Notification.java b/openvidu-client/src/main/java/io/openvidu/client/internal/Notification.java similarity index 98% rename from openvidu-client/src/main/java/org/openvidu/client/internal/Notification.java rename to openvidu-client/src/main/java/io/openvidu/client/internal/Notification.java index 67ac77bf..ed7deebc 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/internal/Notification.java +++ b/openvidu-client/src/main/java/io/openvidu/client/internal/Notification.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.client.internal; +package io.openvidu.client.internal; /** * Wrapper for server events. diff --git a/openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantEvictedInfo.java b/openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantEvictedInfo.java similarity index 95% rename from openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantEvictedInfo.java rename to openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantEvictedInfo.java index fd9251df..57d558d3 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantEvictedInfo.java +++ b/openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantEvictedInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.client.internal; +package io.openvidu.client.internal; /** * @see Notification diff --git a/openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantJoinedInfo.java b/openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantJoinedInfo.java similarity index 97% rename from openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantJoinedInfo.java rename to openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantJoinedInfo.java index 500b0b65..ad3f5e3f 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantJoinedInfo.java +++ b/openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantJoinedInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.client.internal; +package io.openvidu.client.internal; /** * @see Notification diff --git a/openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantLeftInfo.java b/openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantLeftInfo.java similarity index 97% rename from openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantLeftInfo.java rename to openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantLeftInfo.java index 481b0a0a..fa099810 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantLeftInfo.java +++ b/openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantLeftInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.client.internal; +package io.openvidu.client.internal; /** * @see Notification diff --git a/openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantPublishedInfo.java b/openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantPublishedInfo.java similarity index 97% rename from openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantPublishedInfo.java rename to openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantPublishedInfo.java index e1aeb714..922f42bc 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantPublishedInfo.java +++ b/openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantPublishedInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.client.internal; +package io.openvidu.client.internal; import java.util.List; diff --git a/openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantUnpublishedInfo.java b/openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantUnpublishedInfo.java similarity index 97% rename from openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantUnpublishedInfo.java rename to openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantUnpublishedInfo.java index e379189c..502c41c8 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/internal/ParticipantUnpublishedInfo.java +++ b/openvidu-client/src/main/java/io/openvidu/client/internal/ParticipantUnpublishedInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.client.internal; +package io.openvidu.client.internal; /** * @see Notification diff --git a/openvidu-client/src/main/java/org/openvidu/client/internal/ProtocolElements.java b/openvidu-client/src/main/java/io/openvidu/client/internal/ProtocolElements.java similarity index 99% rename from openvidu-client/src/main/java/org/openvidu/client/internal/ProtocolElements.java rename to openvidu-client/src/main/java/io/openvidu/client/internal/ProtocolElements.java index b45cebcf..1b05f48b 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/internal/ProtocolElements.java +++ b/openvidu-client/src/main/java/io/openvidu/client/internal/ProtocolElements.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.client.internal; +package io.openvidu.client.internal; /** * This class defines constant values of client-server messages and their parameters. diff --git a/openvidu-client/src/main/java/org/openvidu/client/internal/RoomClosedInfo.java b/openvidu-client/src/main/java/io/openvidu/client/internal/RoomClosedInfo.java similarity index 97% rename from openvidu-client/src/main/java/org/openvidu/client/internal/RoomClosedInfo.java rename to openvidu-client/src/main/java/io/openvidu/client/internal/RoomClosedInfo.java index 15f9eef1..757fbc96 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/internal/RoomClosedInfo.java +++ b/openvidu-client/src/main/java/io/openvidu/client/internal/RoomClosedInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.client.internal; +package io.openvidu.client.internal; /** * @see Notification diff --git a/openvidu-client/src/main/java/org/openvidu/client/internal/SendMessageInfo.java b/openvidu-client/src/main/java/io/openvidu/client/internal/SendMessageInfo.java similarity index 98% rename from openvidu-client/src/main/java/org/openvidu/client/internal/SendMessageInfo.java rename to openvidu-client/src/main/java/io/openvidu/client/internal/SendMessageInfo.java index f4ea8acd..c856fd5b 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/internal/SendMessageInfo.java +++ b/openvidu-client/src/main/java/io/openvidu/client/internal/SendMessageInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.client.internal; +package io.openvidu.client.internal; /** * @see Notification diff --git a/openvidu-client/src/test/java/org/openvidu/client/test/OpenViduClientTest.java b/openvidu-client/src/test/java/io/openvidu/client/test/OpenViduClientTest.java similarity index 91% rename from openvidu-client/src/test/java/org/openvidu/client/test/OpenViduClientTest.java rename to openvidu-client/src/test/java/io/openvidu/client/test/OpenViduClientTest.java index 98300db2..fe603938 100644 --- a/openvidu-client/src/test/java/org/openvidu/client/test/OpenViduClientTest.java +++ b/openvidu-client/src/test/java/io/openvidu/client/test/OpenViduClientTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.client.test; +package io.openvidu.client.test; +import static io.openvidu.client.internal.ProtocolElements.*; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.openvidu.client.internal.ProtocolElements.*; import java.io.IOException; import java.util.HashMap; @@ -29,12 +29,13 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; import org.kurento.jsonrpc.client.JsonRpcClient; -import org.openvidu.client.OpenViduClient; -import org.openvidu.client.ServerJsonRpcHandler; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import io.openvidu.client.OpenViduClient; +import io.openvidu.client.ServerJsonRpcHandler; + /** * Unit tests for the room client protocol. * diff --git a/openvidu-demo/pom.xml b/openvidu-demo/pom.xml index 6e4deb6b..debe8e0d 100644 --- a/openvidu-demo/pom.xml +++ b/openvidu-demo/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.openvidu + io.openvidu openvidu 0.0.1-SNAPSHOT @@ -46,12 +46,12 @@ - org.openvidu.demo.OpenViduSampleApp + io.openvidu.demo.OpenViduSampleApp - org.openvidu + io.openvidu openvidu-server @@ -61,11 +61,11 @@ - org.openvidu + io.openvidu openvidu-browser - org.openvidu + io.openvidu openvidu-test test diff --git a/openvidu-demo/src/main/java/org/openvidu/demo/ClientConfig.java b/openvidu-demo/src/main/java/io/openvidu/demo/ClientConfig.java similarity index 98% rename from openvidu-demo/src/main/java/org/openvidu/demo/ClientConfig.java rename to openvidu-demo/src/main/java/io/openvidu/demo/ClientConfig.java index 8a0c1cad..9be28a0f 100644 --- a/openvidu-demo/src/main/java/org/openvidu/demo/ClientConfig.java +++ b/openvidu-demo/src/main/java/io/openvidu/demo/ClientConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.demo; +package io.openvidu.demo; class ClientConfig { private boolean loopbackRemote; diff --git a/openvidu-demo/src/main/java/org/openvidu/demo/DemoController.java b/openvidu-demo/src/main/java/io/openvidu/demo/DemoController.java similarity index 95% rename from openvidu-demo/src/main/java/org/openvidu/demo/DemoController.java rename to openvidu-demo/src/main/java/io/openvidu/demo/DemoController.java index b01d652a..23ff4a53 100644 --- a/openvidu-demo/src/main/java/org/openvidu/demo/DemoController.java +++ b/openvidu-demo/src/main/java/io/openvidu/demo/DemoController.java @@ -14,11 +14,12 @@ * limitations under the License. * */ -package org.openvidu.demo; +package io.openvidu.demo; import org.kurento.commons.PropertiesManager; -import org.openvidu.client.OpenViduException; -import org.openvidu.server.core.NotificationRoomManager; +import io.openvidu.client.OpenViduException; +import io.openvidu.server.core.NotificationRoomManager; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/openvidu-demo/src/main/java/org/openvidu/demo/DemoJsonRpcUserControl.java b/openvidu-demo/src/main/java/io/openvidu/demo/DemoJsonRpcUserControl.java similarity index 96% rename from openvidu-demo/src/main/java/org/openvidu/demo/DemoJsonRpcUserControl.java rename to openvidu-demo/src/main/java/io/openvidu/demo/DemoJsonRpcUserControl.java index 45c18dd5..b0917807 100644 --- a/openvidu-demo/src/main/java/org/openvidu/demo/DemoJsonRpcUserControl.java +++ b/openvidu-demo/src/main/java/io/openvidu/demo/DemoJsonRpcUserControl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.demo; +package io.openvidu.demo; import java.io.IOException; import java.util.SortedMap; @@ -23,14 +23,15 @@ import org.kurento.client.FaceOverlayFilter; import org.kurento.client.MediaElement; import org.kurento.jsonrpc.Transaction; import org.kurento.jsonrpc.message.Request; -import org.openvidu.server.core.NotificationRoomManager; -import org.openvidu.server.core.api.pojo.ParticipantRequest; -import org.openvidu.server.rpc.JsonRpcUserControl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.gson.JsonObject; +import io.openvidu.server.core.NotificationRoomManager; +import io.openvidu.server.core.api.pojo.ParticipantRequest; +import io.openvidu.server.rpc.JsonRpcUserControl; + /** * User control that applies a media filter when publishing video. * diff --git a/openvidu-demo/src/main/java/org/openvidu/demo/DemoNotificationRoomHandler.java b/openvidu-demo/src/main/java/io/openvidu/demo/DemoNotificationRoomHandler.java similarity index 92% rename from openvidu-demo/src/main/java/org/openvidu/demo/DemoNotificationRoomHandler.java rename to openvidu-demo/src/main/java/io/openvidu/demo/DemoNotificationRoomHandler.java index 8241a93a..698cef41 100644 --- a/openvidu-demo/src/main/java/org/openvidu/demo/DemoNotificationRoomHandler.java +++ b/openvidu-demo/src/main/java/io/openvidu/demo/DemoNotificationRoomHandler.java @@ -1,14 +1,15 @@ -package org.openvidu.demo; +package io.openvidu.demo; import java.util.SortedMap; import org.kurento.client.Continuation; import org.kurento.client.Filter; import org.kurento.module.markerdetector.ArMarkerdetector; -import org.openvidu.client.internal.ProtocolElements; -import org.openvidu.server.core.api.UserNotificationService; -import org.openvidu.server.core.internal.DefaultNotificationRoomHandler; -import org.openvidu.server.core.internal.Participant; +import io.openvidu.client.internal.ProtocolElements; +import io.openvidu.server.core.api.UserNotificationService; +import io.openvidu.server.core.internal.DefaultNotificationRoomHandler; +import io.openvidu.server.core.internal.Participant; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openvidu-demo/src/main/java/org/openvidu/demo/FixedNKmsManager.java b/openvidu-demo/src/main/java/io/openvidu/demo/FixedNKmsManager.java similarity index 91% rename from openvidu-demo/src/main/java/org/openvidu/demo/FixedNKmsManager.java rename to openvidu-demo/src/main/java/io/openvidu/demo/FixedNKmsManager.java index aba764b6..d6dea920 100644 --- a/openvidu-demo/src/main/java/org/openvidu/demo/FixedNKmsManager.java +++ b/openvidu-demo/src/main/java/io/openvidu/demo/FixedNKmsManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.demo; +package io.openvidu.demo; import java.util.List; import java.util.regex.Matcher; @@ -22,13 +22,14 @@ import java.util.regex.Pattern; import org.kurento.client.KurentoClient; import org.kurento.jsonrpc.Session; -import org.openvidu.client.OpenViduException; -import org.openvidu.server.core.internal.DefaultKurentoClientSessionInfo; -import org.openvidu.server.kms.Kms; -import org.openvidu.server.kms.KmsManager; -import org.openvidu.server.kms.MaxWebRtcLoadManager; -import org.openvidu.server.rpc.JsonRpcNotificationService; -import org.openvidu.server.rpc.ParticipantSession; +import io.openvidu.client.OpenViduException; +import io.openvidu.server.core.internal.DefaultKurentoClientSessionInfo; +import io.openvidu.server.kms.Kms; +import io.openvidu.server.kms.KmsManager; +import io.openvidu.server.kms.MaxWebRtcLoadManager; +import io.openvidu.server.rpc.JsonRpcNotificationService; +import io.openvidu.server.rpc.ParticipantSession; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/openvidu-demo/src/main/java/org/openvidu/demo/KmsFilterType.java b/openvidu-demo/src/main/java/io/openvidu/demo/KmsFilterType.java similarity index 98% rename from openvidu-demo/src/main/java/org/openvidu/demo/KmsFilterType.java rename to openvidu-demo/src/main/java/io/openvidu/demo/KmsFilterType.java index e4ef2b57..116f4f76 100644 --- a/openvidu-demo/src/main/java/org/openvidu/demo/KmsFilterType.java +++ b/openvidu-demo/src/main/java/io/openvidu/demo/KmsFilterType.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.openvidu.demo; +package io.openvidu.demo; /** * @author Radu Tom Vlad (radutom.vlad@gmail.com) diff --git a/openvidu-demo/src/main/java/org/openvidu/demo/OpenViduSampleApp.java b/openvidu-demo/src/main/java/io/openvidu/demo/OpenViduSampleApp.java similarity index 96% rename from openvidu-demo/src/main/java/org/openvidu/demo/OpenViduSampleApp.java rename to openvidu-demo/src/main/java/io/openvidu/demo/OpenViduSampleApp.java index c141049b..036f14b0 100644 --- a/openvidu-demo/src/main/java/org/openvidu/demo/OpenViduSampleApp.java +++ b/openvidu-demo/src/main/java/io/openvidu/demo/OpenViduSampleApp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.demo; +package io.openvidu.demo; import java.util.List; import java.util.Map.Entry; @@ -24,10 +24,6 @@ import java.util.TreeMap; import org.kurento.commons.ConfigFileManager; import org.kurento.commons.PropertiesManager; import org.kurento.jsonrpc.JsonUtils; -import org.openvidu.server.OpenViduServer; -import org.openvidu.server.core.NotificationRoomManager; -import org.openvidu.server.kms.KmsManager; -import org.openvidu.server.rpc.JsonRpcUserControl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; @@ -37,6 +33,11 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import io.openvidu.server.OpenViduServer; +import io.openvidu.server.core.NotificationRoomManager; +import io.openvidu.server.kms.KmsManager; +import io.openvidu.server.rpc.JsonRpcUserControl; + import static org.kurento.commons.PropertiesManager.getPropertyJson; /** diff --git a/openvidu-demo/src/main/resources/static/angular/services/Participants.js b/openvidu-demo/src/main/resources/static/angular/services/Participants.js index d4738bc1..8ee58c78 100644 --- a/openvidu-demo/src/main/resources/static/angular/services/Participants.js +++ b/openvidu-demo/src/main/resources/static/angular/services/Participants.js @@ -1,5 +1,5 @@ /* - * (C) Copyright 2016 OpenVidu (http://openVidu.org/) + * (C) Copyright 2016 OpenVidu (http://openvidu.io/) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openvidu-demo/src/test/java/org/openvidu/test/demo/AddRemoveUsersDemoTest.java b/openvidu-demo/src/test/java/io/openvidu/demo/test/AddRemoveUsersDemoTest.java similarity index 94% rename from openvidu-demo/src/test/java/org/openvidu/test/demo/AddRemoveUsersDemoTest.java rename to openvidu-demo/src/test/java/io/openvidu/demo/test/AddRemoveUsersDemoTest.java index b3f27925..05e2f14c 100644 --- a/openvidu-demo/src/test/java/org/openvidu/test/demo/AddRemoveUsersDemoTest.java +++ b/openvidu-demo/src/test/java/io/openvidu/demo/test/AddRemoveUsersDemoTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.demo; +package io.openvidu.demo.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.AddRemoveUsers; + +import io.openvidu.test.browser.AddRemoveUsers; /** * @see AddRemoveUsers diff --git a/openvidu-demo/src/test/java/org/openvidu/test/demo/AddRemoveUsersNoSinkVerifyDemoTest.java b/openvidu-demo/src/test/java/io/openvidu/demo/test/AddRemoveUsersNoSinkVerifyDemoTest.java similarity index 93% rename from openvidu-demo/src/test/java/org/openvidu/test/demo/AddRemoveUsersNoSinkVerifyDemoTest.java rename to openvidu-demo/src/test/java/io/openvidu/demo/test/AddRemoveUsersNoSinkVerifyDemoTest.java index 9b6622de..85ddfb0b 100644 --- a/openvidu-demo/src/test/java/org/openvidu/test/demo/AddRemoveUsersNoSinkVerifyDemoTest.java +++ b/openvidu-demo/src/test/java/io/openvidu/demo/test/AddRemoveUsersNoSinkVerifyDemoTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.demo; +package io.openvidu.demo.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.AddRemoveUsersNoSinkVerify; + +import io.openvidu.test.browser.AddRemoveUsersNoSinkVerify; /** * @see AddRemoveUsersNoSinkVerify diff --git a/openvidu-demo/src/test/java/org/openvidu/test/demo/NUsersEqualLifetimeDemoTest.java b/openvidu-demo/src/test/java/io/openvidu/demo/test/NUsersEqualLifetimeDemoTest.java similarity index 93% rename from openvidu-demo/src/test/java/org/openvidu/test/demo/NUsersEqualLifetimeDemoTest.java rename to openvidu-demo/src/test/java/io/openvidu/demo/test/NUsersEqualLifetimeDemoTest.java index 267163c4..be47fbee 100644 --- a/openvidu-demo/src/test/java/org/openvidu/test/demo/NUsersEqualLifetimeDemoTest.java +++ b/openvidu-demo/src/test/java/io/openvidu/demo/test/NUsersEqualLifetimeDemoTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.demo; +package io.openvidu.demo.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.NUsersEqualLifetime; + +import io.openvidu.test.browser.NUsersEqualLifetime; /** * @see NUsersEqualLifetime diff --git a/openvidu-demo/src/test/java/org/openvidu/test/demo/OneUserQuickReentryDemoTest.java b/openvidu-demo/src/test/java/io/openvidu/demo/test/OneUserQuickReentryDemoTest.java similarity index 93% rename from openvidu-demo/src/test/java/org/openvidu/test/demo/OneUserQuickReentryDemoTest.java rename to openvidu-demo/src/test/java/io/openvidu/demo/test/OneUserQuickReentryDemoTest.java index 173fcc0d..8ab481ea 100644 --- a/openvidu-demo/src/test/java/org/openvidu/test/demo/OneUserQuickReentryDemoTest.java +++ b/openvidu-demo/src/test/java/io/openvidu/demo/test/OneUserQuickReentryDemoTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.demo; +package io.openvidu.demo.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.OneUserQuickReentry; + +import io.openvidu.test.browser.OneUserQuickReentry; /** * @see OneUserQuickReentry diff --git a/openvidu-demo/src/test/java/org/openvidu/test/demo/SeqAddRemoveUserDemoTest.java b/openvidu-demo/src/test/java/io/openvidu/demo/test/SeqAddRemoveUserDemoTest.java similarity index 93% rename from openvidu-demo/src/test/java/org/openvidu/test/demo/SeqAddRemoveUserDemoTest.java rename to openvidu-demo/src/test/java/io/openvidu/demo/test/SeqAddRemoveUserDemoTest.java index dbc290c5..34007ea2 100644 --- a/openvidu-demo/src/test/java/org/openvidu/test/demo/SeqAddRemoveUserDemoTest.java +++ b/openvidu-demo/src/test/java/io/openvidu/demo/test/SeqAddRemoveUserDemoTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.demo; +package io.openvidu.demo.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.SeqAddRemoveUser; + +import io.openvidu.test.browser.SeqAddRemoveUser; /** * @see SeqAddRemoveUser diff --git a/openvidu-demo/src/test/java/org/openvidu/test/demo/SeqNUsersEqualLifetimeDemoTest.java b/openvidu-demo/src/test/java/io/openvidu/demo/test/SeqNUsersEqualLifetimeDemoTest.java similarity index 93% rename from openvidu-demo/src/test/java/org/openvidu/test/demo/SeqNUsersEqualLifetimeDemoTest.java rename to openvidu-demo/src/test/java/io/openvidu/demo/test/SeqNUsersEqualLifetimeDemoTest.java index fe47c5be..714a2ef9 100644 --- a/openvidu-demo/src/test/java/org/openvidu/test/demo/SeqNUsersEqualLifetimeDemoTest.java +++ b/openvidu-demo/src/test/java/io/openvidu/demo/test/SeqNUsersEqualLifetimeDemoTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.demo; +package io.openvidu.demo.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.SeqNUsersEqualLifetime; + +import io.openvidu.test.browser.SeqNUsersEqualLifetime; /** * @see SeqNUsersEqualLifetime diff --git a/openvidu-demo/src/test/java/org/openvidu/test/demo/TwoUsersEqualLifetimeDemoTest.java b/openvidu-demo/src/test/java/io/openvidu/demo/test/TwoUsersEqualLifetimeDemoTest.java similarity index 93% rename from openvidu-demo/src/test/java/org/openvidu/test/demo/TwoUsersEqualLifetimeDemoTest.java rename to openvidu-demo/src/test/java/io/openvidu/demo/test/TwoUsersEqualLifetimeDemoTest.java index 70424a3e..1ddbc09a 100644 --- a/openvidu-demo/src/test/java/org/openvidu/test/demo/TwoUsersEqualLifetimeDemoTest.java +++ b/openvidu-demo/src/test/java/io/openvidu/demo/test/TwoUsersEqualLifetimeDemoTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.demo; +package io.openvidu.demo.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.TwoUsersEqualLifetime; + +import io.openvidu.test.browser.TwoUsersEqualLifetime; /** * @see TwoUsersEqualLifetime diff --git a/openvidu-demo/src/test/java/org/openvidu/test/demo/UnpublishMediaDemoTest.java b/openvidu-demo/src/test/java/io/openvidu/demo/test/UnpublishMediaDemoTest.java similarity index 94% rename from openvidu-demo/src/test/java/org/openvidu/test/demo/UnpublishMediaDemoTest.java rename to openvidu-demo/src/test/java/io/openvidu/demo/test/UnpublishMediaDemoTest.java index 3a8fdd7f..60139419 100644 --- a/openvidu-demo/src/test/java/org/openvidu/test/demo/UnpublishMediaDemoTest.java +++ b/openvidu-demo/src/test/java/io/openvidu/demo/test/UnpublishMediaDemoTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.demo; +package io.openvidu.demo.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.UnpublishMedia; + +import io.openvidu.test.browser.UnpublishMedia; /** * @see UnpublishMedia diff --git a/openvidu-demo/src/test/java/org/openvidu/test/demo/UnsubscribeFromMediaDemoTest.java b/openvidu-demo/src/test/java/io/openvidu/demo/test/UnsubscribeFromMediaDemoTest.java similarity index 93% rename from openvidu-demo/src/test/java/org/openvidu/test/demo/UnsubscribeFromMediaDemoTest.java rename to openvidu-demo/src/test/java/io/openvidu/demo/test/UnsubscribeFromMediaDemoTest.java index cfc7776b..dd904538 100644 --- a/openvidu-demo/src/test/java/org/openvidu/test/demo/UnsubscribeFromMediaDemoTest.java +++ b/openvidu-demo/src/test/java/io/openvidu/demo/test/UnsubscribeFromMediaDemoTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.demo; +package io.openvidu.demo.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.UnsubscribeFromMedia; + +import io.openvidu.test.browser.UnsubscribeFromMedia; /** * @see UnsubscribeFromMedia diff --git a/openvidu-demo/src/test/java/org/openvidu/test/demo/WebAppAvailabilityDemoTest.java b/openvidu-demo/src/test/java/io/openvidu/demo/test/WebAppAvailabilityDemoTest.java similarity index 93% rename from openvidu-demo/src/test/java/org/openvidu/test/demo/WebAppAvailabilityDemoTest.java rename to openvidu-demo/src/test/java/io/openvidu/demo/test/WebAppAvailabilityDemoTest.java index ec005803..7892d927 100644 --- a/openvidu-demo/src/test/java/org/openvidu/test/demo/WebAppAvailabilityDemoTest.java +++ b/openvidu-demo/src/test/java/io/openvidu/demo/test/WebAppAvailabilityDemoTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.demo; +package io.openvidu.demo.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.WebAppAvailability; + +import io.openvidu.test.browser.WebAppAvailability; /** * @author Radu Tom Vlad (rvlad@naevatec.com) diff --git a/openvidu-demo/src/test/java/org/openvidu/test/demo/fake/ExtraKmsFakeUsersDemoTest.java b/openvidu-demo/src/test/java/io/openvidu/demo/test/fake/ExtraKmsFakeUsersDemoTest.java similarity index 93% rename from openvidu-demo/src/test/java/org/openvidu/test/demo/fake/ExtraKmsFakeUsersDemoTest.java rename to openvidu-demo/src/test/java/io/openvidu/demo/test/fake/ExtraKmsFakeUsersDemoTest.java index 699426a7..6037a0cb 100644 --- a/openvidu-demo/src/test/java/org/openvidu/test/demo/fake/ExtraKmsFakeUsersDemoTest.java +++ b/openvidu-demo/src/test/java/io/openvidu/demo/test/fake/ExtraKmsFakeUsersDemoTest.java @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test.demo.fake; +package io.openvidu.demo.test.fake; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.fake.ExtraKmsFakeUsers; + +import io.openvidu.test.fake.ExtraKmsFakeUsers; /** * @see ExtraKmsFakeUsers diff --git a/openvidu-demo/src/test/java/org/openvidu/test/demo/fake/MixedUsersDemoTest.java b/openvidu-demo/src/test/java/io/openvidu/demo/test/fake/MixedUsersDemoTest.java similarity index 94% rename from openvidu-demo/src/test/java/org/openvidu/test/demo/fake/MixedUsersDemoTest.java rename to openvidu-demo/src/test/java/io/openvidu/demo/test/fake/MixedUsersDemoTest.java index 8af1c636..f81326b9 100644 --- a/openvidu-demo/src/test/java/org/openvidu/test/demo/fake/MixedUsersDemoTest.java +++ b/openvidu-demo/src/test/java/io/openvidu/demo/test/fake/MixedUsersDemoTest.java @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test.demo.fake; +package io.openvidu.demo.test.fake; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.fake.MixedUsers; + +import io.openvidu.test.fake.MixedUsers; /** * @see MixedUsers diff --git a/openvidu-demo/src/test/java/org/openvidu/test/demo/fake/ParallelNFakeUsersDemoTest.java b/openvidu-demo/src/test/java/io/openvidu/demo/test/fake/ParallelNFakeUsersDemoTest.java similarity index 93% rename from openvidu-demo/src/test/java/org/openvidu/test/demo/fake/ParallelNFakeUsersDemoTest.java rename to openvidu-demo/src/test/java/io/openvidu/demo/test/fake/ParallelNFakeUsersDemoTest.java index 505331e2..785fe985 100644 --- a/openvidu-demo/src/test/java/org/openvidu/test/demo/fake/ParallelNFakeUsersDemoTest.java +++ b/openvidu-demo/src/test/java/io/openvidu/demo/test/fake/ParallelNFakeUsersDemoTest.java @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test.demo.fake; +package io.openvidu.demo.test.fake; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.fake.ParallelNFakeUsers; + +import io.openvidu.test.fake.ParallelNFakeUsers; /** * @see ParallelNFakeUsers diff --git a/openvidu-backend-client/create-jar-package.sh b/openvidu-java-client/create-jar-package.sh similarity index 100% rename from openvidu-backend-client/create-jar-package.sh rename to openvidu-java-client/create-jar-package.sh diff --git a/openvidu-java-client/pom.xml b/openvidu-java-client/pom.xml new file mode 100644 index 00000000..6a96b122 --- /dev/null +++ b/openvidu-java-client/pom.xml @@ -0,0 +1,118 @@ + + 4.0.0 + + + io.openvidu + openvidu + 0.0.1-SNAPSHOT + + + openvidu-java-client + jar + + OpenVidu Java Client + OpenVidu client for your Java backend: get sessionId's and tokens easily from your OpenVidu server + http://openvidu.io + + + + Apache 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + OpenVidu + http://openvidu.io + + + + https://github.com/OpenVidu/openvidu.git + scm:git:https://github.com/OpenVidu/openvidu.git + scm:git:https://github.com/OpenVidu/openvidu.git + develop + + + + + openvidu.io + -openvidu.io Community + openvidu.io + http://openvidu.io + + + + + UTF-8 + 1.8 + 1.8 + 1.8 + + + + + + junit + junit + test + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.apache.httpcomponents + httpclient + + + + com.googlecode.json-simple + json-simple + + + + + + + release-sign-artifacts + + + performRelease + true + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + ossrh + https://oss.sonatype.org/ + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + diff --git a/openvidu-java-client/release.properties b/openvidu-java-client/release.properties new file mode 100644 index 00000000..4b5d3e6f --- /dev/null +++ b/openvidu-java-client/release.properties @@ -0,0 +1,12 @@ +#release configuration +#Tue Jun 06 11:42:44 CEST 2017 +scm.tagNameFormat=@{project.artifactId}-@{project.version} +pushChanges=false +scm.url=scm\:git\:https\://github.com/OpenVidu/openvidu.git +preparationGoals=versions\:use-releases +remoteTagging=true +projectVersionPolicyId=default +scm.commentPrefix=[maven-release-plugin] +exec.additionalArguments=-Pkurento-release +exec.snapshotReleasePluginAllowed=false +completedPhase=check-poms diff --git a/openvidu-backend-client/src/main/java/org/openvidu/client/OpenVidu.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenVidu.java similarity index 98% rename from openvidu-backend-client/src/main/java/org/openvidu/client/OpenVidu.java rename to openvidu-java-client/src/main/java/io/openvidu/java/client/OpenVidu.java index 319d05ee..9b383ebf 100644 --- a/openvidu-backend-client/src/main/java/org/openvidu/client/OpenVidu.java +++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenVidu.java @@ -1,4 +1,4 @@ -package org.openvidu.client; +package io.openvidu.java.client; import java.security.KeyManagementException; import java.security.KeyStoreException; diff --git a/openvidu-client/src/main/java/org/openvidu/client/OpenViduException.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduException.java similarity index 98% rename from openvidu-client/src/main/java/org/openvidu/client/OpenViduException.java rename to openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduException.java index ee9703b4..efb962ee 100644 --- a/openvidu-client/src/main/java/org/openvidu/client/OpenViduException.java +++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduException.java @@ -15,7 +15,7 @@ * */ -package org.openvidu.client; +package io.openvidu.java.client; public class OpenViduException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/openvidu-backend-client/src/main/java/org/openvidu/client/OpenViduRole.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduRole.java similarity index 67% rename from openvidu-backend-client/src/main/java/org/openvidu/client/OpenViduRole.java rename to openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduRole.java index 4788dd5b..652f263f 100644 --- a/openvidu-backend-client/src/main/java/org/openvidu/client/OpenViduRole.java +++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduRole.java @@ -1,4 +1,4 @@ -package org.openvidu.client; +package io.openvidu.java.client; public enum OpenViduRole { SUBSCRIBER, diff --git a/openvidu-backend-client/src/main/java/org/openvidu/client/Session.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java similarity index 97% rename from openvidu-backend-client/src/main/java/org/openvidu/client/Session.java rename to openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java index 958d2502..fcfc94b5 100644 --- a/openvidu-backend-client/src/main/java/org/openvidu/client/Session.java +++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java @@ -1,4 +1,4 @@ -package org.openvidu.client; +package io.openvidu.java.client; import java.io.BufferedReader; import java.io.IOException; @@ -12,7 +12,8 @@ import org.apache.http.entity.StringEntity; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import org.openvidu.client.OpenViduException.Code; + +import io.openvidu.java.client.OpenViduException.Code; public class Session { diff --git a/openvidu-backend-client/src/main/java/org/openvidu/client/TokenOptions.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/TokenOptions.java similarity index 95% rename from openvidu-backend-client/src/main/java/org/openvidu/client/TokenOptions.java rename to openvidu-java-client/src/main/java/io/openvidu/java/client/TokenOptions.java index 68daa95b..597056ee 100644 --- a/openvidu-backend-client/src/main/java/org/openvidu/client/TokenOptions.java +++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/TokenOptions.java @@ -1,4 +1,4 @@ -package org.openvidu.client; +package io.openvidu.java.client; public class TokenOptions { diff --git a/openvidu-backend-client/src/test/java/org/openvidu/client/OpenViduTest.java b/openvidu-java-client/src/test/java/io/openvidu/java/client/test/OpenViduTest.java similarity index 94% rename from openvidu-backend-client/src/test/java/org/openvidu/client/OpenViduTest.java rename to openvidu-java-client/src/test/java/io/openvidu/java/client/test/OpenViduTest.java index 1fe468e3..d83352ca 100644 --- a/openvidu-backend-client/src/test/java/org/openvidu/client/OpenViduTest.java +++ b/openvidu-java-client/src/test/java/io/openvidu/java/client/test/OpenViduTest.java @@ -1,4 +1,4 @@ -package org.openvidu.client; +package io.openvidu.java.client.test; import junit.framework.Test; import junit.framework.TestCase; diff --git a/openvidu-sample-app/pom.xml b/openvidu-sample-app/pom.xml index 3c5bf47c..2b790b6b 100644 --- a/openvidu-sample-app/pom.xml +++ b/openvidu-sample-app/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - openvidu + io.openvidu openvidu-sample-app 0.0.1-SNAPSHOT war @@ -138,8 +138,8 @@ - org.openvidu - openvidu-backend-client + io.openvidu + openvidu-java-client 0.0.1-SNAPSHOT diff --git a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/session_manager/SessionController.java b/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/session_manager/SessionController.java index f8e4ecee..11508e6f 100644 --- a/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/session_manager/SessionController.java +++ b/openvidu-sample-app/src/main/java/openvidu/openvidu_sample_app/session_manager/SessionController.java @@ -6,10 +6,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.json.simple.JSONObject; -import org.openvidu.client.OpenVidu; -import org.openvidu.client.Session; -import org.openvidu.client.TokenOptions; -import org.openvidu.client.OpenViduRole; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; @@ -19,6 +15,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import io.openvidu.java.client.OpenVidu; +import io.openvidu.java.client.Session; +import io.openvidu.java.client.TokenOptions; +import io.openvidu.java.client.OpenViduRole; + import openvidu.openvidu_sample_app.lesson.Lesson; import openvidu.openvidu_sample_app.lesson.LessonRepository; import openvidu.openvidu_sample_app.user.User; diff --git a/openvidu-server/pom.xml b/openvidu-server/pom.xml index 253c4497..af16b2d3 100644 --- a/openvidu-server/pom.xml +++ b/openvidu-server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.openvidu + io.openvidu openvidu 0.0.1-SNAPSHOT @@ -39,16 +39,16 @@ - openvidu.org - -openvidu.org Community - OpenVidu.org - https://github.com/OpenVidu/openvidu + openvidu.io + -openvidu.io Community + OpenVidu + http://openvidu.io - org.openvidu.server.OpenViduServer + io.openvidu.server.OpenViduServer @@ -108,12 +108,12 @@ - org.openvidu + io.openvidu openvidu-test test - org.openvidu + io.openvidu openvidu-client diff --git a/openvidu-server/src/main/java/org/openvidu/server/AutodiscoveryKurentoClientProvider.java b/openvidu-server/src/main/java/io/openvidu/server/AutodiscoveryKurentoClientProvider.java similarity index 85% rename from openvidu-server/src/main/java/org/openvidu/server/AutodiscoveryKurentoClientProvider.java rename to openvidu-server/src/main/java/io/openvidu/server/AutodiscoveryKurentoClientProvider.java index 0770ce1e..099dacf9 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/AutodiscoveryKurentoClientProvider.java +++ b/openvidu-server/src/main/java/io/openvidu/server/AutodiscoveryKurentoClientProvider.java @@ -14,13 +14,14 @@ * limitations under the License. * */ -package org.openvidu.server; +package io.openvidu.server; import org.kurento.client.KurentoClient; import org.kurento.client.Properties; -import org.openvidu.client.OpenViduException; -import org.openvidu.server.core.api.KurentoClientProvider; -import org.openvidu.server.core.api.KurentoClientSessionInfo; + +import io.openvidu.client.OpenViduException; +import io.openvidu.server.core.api.KurentoClientProvider; +import io.openvidu.server.core.api.KurentoClientSessionInfo; public class AutodiscoveryKurentoClientProvider implements KurentoClientProvider { diff --git a/openvidu-server/src/main/java/org/openvidu/server/InfoHandler.java b/openvidu-server/src/main/java/io/openvidu/server/InfoHandler.java similarity index 98% rename from openvidu-server/src/main/java/org/openvidu/server/InfoHandler.java rename to openvidu-server/src/main/java/io/openvidu/server/InfoHandler.java index 4f962e3f..13ea7949 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/InfoHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/InfoHandler.java @@ -1,4 +1,4 @@ -package org.openvidu.server; +package io.openvidu.server; import java.io.IOException; import java.util.Map; diff --git a/openvidu-server/src/main/java/org/openvidu/server/InfoSocketConfig.java b/openvidu-server/src/main/java/io/openvidu/server/InfoSocketConfig.java similarity index 96% rename from openvidu-server/src/main/java/org/openvidu/server/InfoSocketConfig.java rename to openvidu-server/src/main/java/io/openvidu/server/InfoSocketConfig.java index db433735..4eef928a 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/InfoSocketConfig.java +++ b/openvidu-server/src/main/java/io/openvidu/server/InfoSocketConfig.java @@ -1,4 +1,4 @@ -package org.openvidu.server; +package io.openvidu.server; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/openvidu-server/src/main/java/org/openvidu/server/OpenViduServer.java b/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java similarity index 84% rename from openvidu-server/src/main/java/org/openvidu/server/OpenViduServer.java rename to openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java index 82bb1a44..d03c7701 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/OpenViduServer.java +++ b/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.server; +package io.openvidu.server; import static org.kurento.commons.PropertiesManager.getPropertyJson; @@ -23,14 +23,6 @@ import org.kurento.jsonrpc.JsonUtils; import org.kurento.jsonrpc.internal.server.config.JsonRpcConfiguration; import org.kurento.jsonrpc.server.JsonRpcConfigurer; import org.kurento.jsonrpc.server.JsonRpcHandlerRegistry; -import org.openvidu.server.core.NotificationRoomManager; -import org.openvidu.server.core.RoomManager; -import org.openvidu.server.core.api.KurentoClientProvider; -import org.openvidu.server.core.api.NotificationRoomHandler; -import org.openvidu.server.core.internal.DefaultNotificationRoomHandler; -import org.openvidu.server.kms.FixedOneKmsManager; -import org.openvidu.server.rpc.JsonRpcNotificationService; -import org.openvidu.server.rpc.JsonRpcUserControl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -45,6 +37,16 @@ import org.springframework.web.socket.server.standard.ServletServerContainerFact import com.google.gson.Gson; import com.google.gson.JsonArray; +import io.openvidu.server.core.NotificationRoomManager; +import io.openvidu.server.core.RoomManager; +import io.openvidu.server.core.api.KurentoClientProvider; +import io.openvidu.server.core.api.NotificationRoomHandler; +import io.openvidu.server.core.internal.DefaultNotificationRoomHandler; +import io.openvidu.server.kms.FixedOneKmsManager; +import io.openvidu.server.rest.NgrokController; +import io.openvidu.server.rpc.JsonRpcNotificationService; +import io.openvidu.server.rpc.JsonRpcUserControl; + /** * Room server application. * @@ -144,6 +146,17 @@ public class OpenViduServer implements JsonRpcConfigurer { public static void main(String[] args) throws Exception { start(args); + try { + NgrokController ngrok = new NgrokController(); + log.info(""); + log.info(" PUBLIC IP "); + log.info("-------------------------"); + log.info(ngrok.getNgrokPublicUrl()); + log.info("-------------------------"); + log.info(""); + } catch(Exception e) { + System.out.println("No ngrok connection"); + } } public static ConfigurableApplicationContext start(String[] args) { diff --git a/openvidu-server/src/main/java/org/openvidu/server/RoomJsonRpcHandler.java b/openvidu-server/src/main/java/io/openvidu/server/RoomJsonRpcHandler.java similarity index 93% rename from openvidu-server/src/main/java/org/openvidu/server/RoomJsonRpcHandler.java rename to openvidu-server/src/main/java/io/openvidu/server/RoomJsonRpcHandler.java index c56aac22..e998de7a 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/RoomJsonRpcHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/RoomJsonRpcHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.server; +package io.openvidu.server; import java.util.Arrays; import java.util.List; @@ -22,17 +22,18 @@ import org.kurento.jsonrpc.DefaultJsonRpcHandler; import org.kurento.jsonrpc.Session; import org.kurento.jsonrpc.Transaction; import org.kurento.jsonrpc.message.Request; -import org.openvidu.client.internal.ProtocolElements; -import org.openvidu.server.core.api.pojo.ParticipantRequest; -import org.openvidu.server.rpc.JsonRpcNotificationService; -import org.openvidu.server.rpc.JsonRpcUserControl; -import org.openvidu.server.rpc.ParticipantSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import com.google.gson.JsonObject; +import io.openvidu.client.internal.ProtocolElements; +import io.openvidu.server.core.api.pojo.ParticipantRequest; +import io.openvidu.server.rpc.JsonRpcNotificationService; +import io.openvidu.server.rpc.JsonRpcUserControl; +import io.openvidu.server.rpc.ParticipantSession; + /** * @author Ivan Gracia (izanmail@gmail.com) * @author Micael Gallego (micael.gallego@gmail.com) diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/NotificationRoomManager.java b/openvidu-server/src/main/java/io/openvidu/server/core/NotificationRoomManager.java similarity index 96% rename from openvidu-server/src/main/java/org/openvidu/server/core/NotificationRoomManager.java rename to openvidu-server/src/main/java/io/openvidu/server/core/NotificationRoomManager.java index 037b81db..d837d4aa 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/NotificationRoomManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/NotificationRoomManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.core; +package io.openvidu.server.core; import javax.annotation.PreDestroy; @@ -23,20 +23,21 @@ import java.util.Set; import org.kurento.client.MediaElement; import org.kurento.client.MediaPipeline; import org.kurento.client.MediaType; -import org.openvidu.client.OpenViduException; -import org.openvidu.client.OpenViduException.Code; -import org.openvidu.server.core.RoomManager.JoinRoomReturnValue; -import org.openvidu.server.core.api.KurentoClientSessionInfo; -import org.openvidu.server.core.api.MutedMediaType; -import org.openvidu.server.core.api.NotificationRoomHandler; -import org.openvidu.server.core.api.pojo.ParticipantRequest; -import org.openvidu.server.core.api.pojo.UserParticipant; -import org.openvidu.server.core.internal.DefaultKurentoClientSessionInfo; -import org.openvidu.server.security.ParticipantRole; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import io.openvidu.client.OpenViduException; +import io.openvidu.client.OpenViduException.Code; +import io.openvidu.server.core.RoomManager.JoinRoomReturnValue; +import io.openvidu.server.core.api.KurentoClientSessionInfo; +import io.openvidu.server.core.api.MutedMediaType; +import io.openvidu.server.core.api.NotificationRoomHandler; +import io.openvidu.server.core.api.pojo.ParticipantRequest; +import io.openvidu.server.core.api.pojo.UserParticipant; +import io.openvidu.server.core.internal.DefaultKurentoClientSessionInfo; +import io.openvidu.server.security.ParticipantRole; + /** * The Kurento room manager represents an SDK for any developer that wants to implement the Room * server-side application. They can build their application on top of the manager's Java API and diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/RoomManager.java b/openvidu-server/src/main/java/io/openvidu/server/core/RoomManager.java similarity index 98% rename from openvidu-server/src/main/java/org/openvidu/server/core/RoomManager.java rename to openvidu-server/src/main/java/io/openvidu/server/core/RoomManager.java index afda14e5..cd5914c5 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/RoomManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/RoomManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.core; +package io.openvidu.server.core; import javax.annotation.PreDestroy; @@ -34,24 +34,25 @@ import org.kurento.client.MediaPipeline; import org.kurento.client.MediaType; import org.kurento.client.RtpEndpoint; import org.kurento.client.WebRtcEndpoint; -import org.openvidu.client.OpenViduException; -import org.openvidu.client.OpenViduException.Code; -import org.openvidu.server.InfoHandler; -import org.openvidu.server.core.api.KurentoClientProvider; -import org.openvidu.server.core.api.KurentoClientSessionInfo; -import org.openvidu.server.core.api.MutedMediaType; -import org.openvidu.server.core.api.RoomHandler; -import org.openvidu.server.core.api.pojo.UserParticipant; -import org.openvidu.server.core.endpoint.SdpType; -import org.openvidu.server.core.internal.Participant; -import org.openvidu.server.core.internal.Room; -import org.openvidu.server.security.ParticipantRole; -import org.openvidu.server.security.Token; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import io.openvidu.client.OpenViduException; +import io.openvidu.client.OpenViduException.Code; +import io.openvidu.server.InfoHandler; +import io.openvidu.server.core.api.KurentoClientProvider; +import io.openvidu.server.core.api.KurentoClientSessionInfo; +import io.openvidu.server.core.api.MutedMediaType; +import io.openvidu.server.core.api.RoomHandler; +import io.openvidu.server.core.api.pojo.UserParticipant; +import io.openvidu.server.core.endpoint.SdpType; +import io.openvidu.server.core.internal.Participant; +import io.openvidu.server.core.internal.Room; +import io.openvidu.server.security.ParticipantRole; +import io.openvidu.server.security.Token; + /** * The Kurento room manager represents an SDK for any developer that wants to implement the Room * server-side application. They can build their application on top of the manager's Java API and diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/api/KurentoClientProvider.java b/openvidu-server/src/main/java/io/openvidu/server/core/api/KurentoClientProvider.java similarity index 95% rename from openvidu-server/src/main/java/org/openvidu/server/core/api/KurentoClientProvider.java rename to openvidu-server/src/main/java/io/openvidu/server/core/api/KurentoClientProvider.java index 7c152f90..af54d49e 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/api/KurentoClientProvider.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/api/KurentoClientProvider.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.openvidu.server.core.api; +package io.openvidu.server.core.api; import org.kurento.client.KurentoClient; -import org.openvidu.client.OpenViduException; + +import io.openvidu.client.OpenViduException; /** * This service interface was designed so that the room manager could obtain a {@link KurentoClient} diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/api/KurentoClientSessionInfo.java b/openvidu-server/src/main/java/io/openvidu/server/core/api/KurentoClientSessionInfo.java similarity index 96% rename from openvidu-server/src/main/java/org/openvidu/server/core/api/KurentoClientSessionInfo.java rename to openvidu-server/src/main/java/io/openvidu/server/core/api/KurentoClientSessionInfo.java index f879d2c0..fddc8aab 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/api/KurentoClientSessionInfo.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/api/KurentoClientSessionInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.core.api; +package io.openvidu.server.core.api; import org.kurento.client.KurentoClient; diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/api/MutedMediaType.java b/openvidu-server/src/main/java/io/openvidu/server/core/api/MutedMediaType.java similarity index 94% rename from openvidu-server/src/main/java/org/openvidu/server/core/api/MutedMediaType.java rename to openvidu-server/src/main/java/io/openvidu/server/core/api/MutedMediaType.java index b236f909..c286168e 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/api/MutedMediaType.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/api/MutedMediaType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.core.api; +package io.openvidu.server.core.api; public enum MutedMediaType { ALL, VIDEO, AUDIO; diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/api/NotificationRoomHandler.java b/openvidu-server/src/main/java/io/openvidu/server/core/api/NotificationRoomHandler.java similarity index 97% rename from openvidu-server/src/main/java/org/openvidu/server/core/api/NotificationRoomHandler.java rename to openvidu-server/src/main/java/io/openvidu/server/core/api/NotificationRoomHandler.java index 3ea70b24..428361ab 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/api/NotificationRoomHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/api/NotificationRoomHandler.java @@ -14,15 +14,16 @@ * limitations under the License. */ -package org.openvidu.server.core.api; +package io.openvidu.server.core.api; import java.util.Set; import org.kurento.client.MediaElement; -import org.openvidu.client.OpenViduException; -import org.openvidu.server.core.NotificationRoomManager; -import org.openvidu.server.core.api.pojo.ParticipantRequest; -import org.openvidu.server.core.api.pojo.UserParticipant; + +import io.openvidu.client.OpenViduException; +import io.openvidu.server.core.NotificationRoomManager; +import io.openvidu.server.core.api.pojo.ParticipantRequest; +import io.openvidu.server.core.api.pojo.UserParticipant; /** * Through this interface, the room API passes the execution result of client-originated requests to diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/api/RoomHandler.java b/openvidu-server/src/main/java/io/openvidu/server/core/api/RoomHandler.java similarity index 95% rename from openvidu-server/src/main/java/org/openvidu/server/core/api/RoomHandler.java rename to openvidu-server/src/main/java/io/openvidu/server/core/api/RoomHandler.java index f91e7d6b..aa35248d 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/api/RoomHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/api/RoomHandler.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.openvidu.server.core.api; +package io.openvidu.server.core.api; import java.util.Set; import org.kurento.client.IceCandidate; -import org.openvidu.server.InfoHandler; -import org.openvidu.server.core.internal.Participant; + +import io.openvidu.server.InfoHandler; +import io.openvidu.server.core.internal.Participant; /** * Handler for events triggered from media objects. diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/api/UserNotificationService.java b/openvidu-server/src/main/java/io/openvidu/server/core/api/UserNotificationService.java similarity index 94% rename from openvidu-server/src/main/java/org/openvidu/server/core/api/UserNotificationService.java rename to openvidu-server/src/main/java/io/openvidu/server/core/api/UserNotificationService.java index c1f13203..0ddf1f70 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/api/UserNotificationService.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/api/UserNotificationService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.openvidu.server.core.api; +package io.openvidu.server.core.api; -import org.openvidu.client.OpenViduException; -import org.openvidu.server.core.api.pojo.ParticipantRequest; -import org.openvidu.server.core.internal.DefaultNotificationRoomHandler; +import io.openvidu.client.OpenViduException; +import io.openvidu.server.core.api.pojo.ParticipantRequest; +import io.openvidu.server.core.internal.DefaultNotificationRoomHandler; /** * This specification was designed so that the room manager could send notifications or responses diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/api/pojo/ParticipantRequest.java b/openvidu-server/src/main/java/io/openvidu/server/core/api/pojo/ParticipantRequest.java similarity index 98% rename from openvidu-server/src/main/java/org/openvidu/server/core/api/pojo/ParticipantRequest.java rename to openvidu-server/src/main/java/io/openvidu/server/core/api/pojo/ParticipantRequest.java index 0100cf46..409c53ba 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/api/pojo/ParticipantRequest.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/api/pojo/ParticipantRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.core.api.pojo; +package io.openvidu.server.core.api.pojo; /** * This POJO uniquely identifies a participant's request. diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/api/pojo/UserParticipant.java b/openvidu-server/src/main/java/io/openvidu/server/core/api/pojo/UserParticipant.java similarity index 99% rename from openvidu-server/src/main/java/org/openvidu/server/core/api/pojo/UserParticipant.java rename to openvidu-server/src/main/java/io/openvidu/server/core/api/pojo/UserParticipant.java index abec06a8..fcb7af2b 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/api/pojo/UserParticipant.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/api/pojo/UserParticipant.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.core.api.pojo; +package io.openvidu.server.core.api.pojo; /** * This POJO holds information about a room participant. diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/endpoint/MediaEndpoint.java b/openvidu-server/src/main/java/io/openvidu/server/core/endpoint/MediaEndpoint.java similarity index 98% rename from openvidu-server/src/main/java/org/openvidu/server/core/endpoint/MediaEndpoint.java rename to openvidu-server/src/main/java/io/openvidu/server/core/endpoint/MediaEndpoint.java index 6f488250..142d1cc8 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/endpoint/MediaEndpoint.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/endpoint/MediaEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.core.endpoint; +package io.openvidu.server.core.endpoint; import java.util.LinkedList; import java.util.Map; @@ -33,13 +33,14 @@ import org.kurento.client.OnIceCandidateEvent; import org.kurento.client.RtpEndpoint; import org.kurento.client.SdpEndpoint; import org.kurento.client.WebRtcEndpoint; -import org.openvidu.client.OpenViduException; -import org.openvidu.client.OpenViduException.Code; -import org.openvidu.server.core.api.MutedMediaType; -import org.openvidu.server.core.internal.Participant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import io.openvidu.client.OpenViduException; +import io.openvidu.client.OpenViduException.Code; +import io.openvidu.server.core.api.MutedMediaType; +import io.openvidu.server.core.internal.Participant; + /** * {@link WebRtcEndpoint} wrapper that supports buffering of {@link IceCandidate}s until the * {@link WebRtcEndpoint} is created. Connections to other peers are opened using the corresponding diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/endpoint/PublisherEndpoint.java b/openvidu-server/src/main/java/io/openvidu/server/core/endpoint/PublisherEndpoint.java similarity index 98% rename from openvidu-server/src/main/java/org/openvidu/server/core/endpoint/PublisherEndpoint.java rename to openvidu-server/src/main/java/io/openvidu/server/core/endpoint/PublisherEndpoint.java index 503b2a5e..6803fdbf 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/endpoint/PublisherEndpoint.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/endpoint/PublisherEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.core.endpoint; +package io.openvidu.server.core.endpoint; import java.util.Collection; import java.util.HashMap; @@ -29,13 +29,14 @@ import org.kurento.client.MediaPipeline; import org.kurento.client.MediaType; import org.kurento.client.PassThrough; import org.kurento.client.WebRtcEndpoint; -import org.openvidu.client.OpenViduException; -import org.openvidu.client.OpenViduException.Code; -import org.openvidu.server.core.api.MutedMediaType; -import org.openvidu.server.core.internal.Participant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import io.openvidu.client.OpenViduException; +import io.openvidu.client.OpenViduException.Code; +import io.openvidu.server.core.api.MutedMediaType; +import io.openvidu.server.core.internal.Participant; + /** * Publisher aspect of the {@link MediaEndpoint}. * diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/endpoint/SdpType.java b/openvidu-server/src/main/java/io/openvidu/server/core/endpoint/SdpType.java similarity index 93% rename from openvidu-server/src/main/java/org/openvidu/server/core/endpoint/SdpType.java rename to openvidu-server/src/main/java/io/openvidu/server/core/endpoint/SdpType.java index 9851f3e5..fcc45f99 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/endpoint/SdpType.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/endpoint/SdpType.java @@ -15,7 +15,7 @@ * */ -package org.openvidu.server.core.endpoint; +package io.openvidu.server.core.endpoint; public enum SdpType { OFFER, ANSWER; diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/endpoint/SubscriberEndpoint.java b/openvidu-server/src/main/java/io/openvidu/server/core/endpoint/SubscriberEndpoint.java similarity index 91% rename from openvidu-server/src/main/java/org/openvidu/server/core/endpoint/SubscriberEndpoint.java rename to openvidu-server/src/main/java/io/openvidu/server/core/endpoint/SubscriberEndpoint.java index d79e9269..c169400e 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/endpoint/SubscriberEndpoint.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/endpoint/SubscriberEndpoint.java @@ -14,17 +14,18 @@ * limitations under the License. */ -package org.openvidu.server.core.endpoint; +package io.openvidu.server.core.endpoint; import org.kurento.client.MediaPipeline; import org.kurento.client.MediaType; -import org.openvidu.client.OpenViduException; -import org.openvidu.client.OpenViduException.Code; -import org.openvidu.server.core.api.MutedMediaType; -import org.openvidu.server.core.internal.Participant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import io.openvidu.client.OpenViduException; +import io.openvidu.client.OpenViduException.Code; +import io.openvidu.server.core.api.MutedMediaType; +import io.openvidu.server.core.internal.Participant; + /** * Subscriber aspect of the {@link MediaEndpoint}. * diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/internal/DefaultKurentoClientSessionInfo.java b/openvidu-server/src/main/java/io/openvidu/server/core/internal/DefaultKurentoClientSessionInfo.java similarity index 93% rename from openvidu-server/src/main/java/org/openvidu/server/core/internal/DefaultKurentoClientSessionInfo.java rename to openvidu-server/src/main/java/io/openvidu/server/core/internal/DefaultKurentoClientSessionInfo.java index dcea1eb6..03ea6478 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/internal/DefaultKurentoClientSessionInfo.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/internal/DefaultKurentoClientSessionInfo.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openvidu.server.core.internal; +package io.openvidu.server.core.internal; -import org.openvidu.server.core.api.KurentoClientSessionInfo; +import io.openvidu.server.core.api.KurentoClientSessionInfo; /** * Default implementation of the session info interface, contains a participant's id and the room's diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/internal/DefaultNotificationRoomHandler.java b/openvidu-server/src/main/java/io/openvidu/server/core/internal/DefaultNotificationRoomHandler.java similarity index 96% rename from openvidu-server/src/main/java/org/openvidu/server/core/internal/DefaultNotificationRoomHandler.java rename to openvidu-server/src/main/java/io/openvidu/server/core/internal/DefaultNotificationRoomHandler.java index 3cfaa20a..e3de1f20 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/internal/DefaultNotificationRoomHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/internal/DefaultNotificationRoomHandler.java @@ -14,23 +14,24 @@ * limitations under the License. */ -package org.openvidu.server.core.internal; +package io.openvidu.server.core.internal; import java.util.Set; import org.kurento.client.IceCandidate; -import org.openvidu.client.OpenViduException; -import org.openvidu.client.internal.ProtocolElements; -import org.openvidu.server.InfoHandler; -import org.openvidu.server.core.api.NotificationRoomHandler; -import org.openvidu.server.core.api.UserNotificationService; -import org.openvidu.server.core.api.pojo.ParticipantRequest; -import org.openvidu.server.core.api.pojo.UserParticipant; import org.springframework.beans.factory.annotation.Autowired; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import io.openvidu.client.OpenViduException; +import io.openvidu.client.internal.ProtocolElements; +import io.openvidu.server.InfoHandler; +import io.openvidu.server.core.api.NotificationRoomHandler; +import io.openvidu.server.core.api.UserNotificationService; +import io.openvidu.server.core.api.pojo.ParticipantRequest; +import io.openvidu.server.core.api.pojo.UserParticipant; + /** * Default implementation that assumes that JSON-RPC messages specification was used for the * client-server communications. diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/internal/Participant.java b/openvidu-server/src/main/java/io/openvidu/server/core/internal/Participant.java similarity index 98% rename from openvidu-server/src/main/java/org/openvidu/server/core/internal/Participant.java rename to openvidu-server/src/main/java/io/openvidu/server/core/internal/Participant.java index 0323e76d..dc68e6a6 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/internal/Participant.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/internal/Participant.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.core.internal; +package io.openvidu.server.core.internal; import java.util.HashSet; import java.util.Set; @@ -32,17 +32,18 @@ import org.kurento.client.MediaPipeline; import org.kurento.client.MediaType; import org.kurento.client.SdpEndpoint; import org.kurento.client.internal.server.KurentoServerException; -import org.openvidu.client.OpenViduException; -import org.openvidu.client.OpenViduException.Code; -import org.openvidu.server.InfoHandler; -import org.openvidu.server.core.api.MutedMediaType; -import org.openvidu.server.core.endpoint.MediaEndpoint; -import org.openvidu.server.core.endpoint.PublisherEndpoint; -import org.openvidu.server.core.endpoint.SdpType; -import org.openvidu.server.core.endpoint.SubscriberEndpoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import io.openvidu.client.OpenViduException; +import io.openvidu.client.OpenViduException.Code; +import io.openvidu.server.InfoHandler; +import io.openvidu.server.core.api.MutedMediaType; +import io.openvidu.server.core.endpoint.MediaEndpoint; +import io.openvidu.server.core.endpoint.PublisherEndpoint; +import io.openvidu.server.core.endpoint.SdpType; +import io.openvidu.server.core.endpoint.SubscriberEndpoint; + /** * @author Ivan Gracia (izanmail@gmail.com) * @author Micael Gallego (micael.gallego@gmail.com) diff --git a/openvidu-server/src/main/java/org/openvidu/server/core/internal/Room.java b/openvidu-server/src/main/java/io/openvidu/server/core/internal/Room.java similarity index 97% rename from openvidu-server/src/main/java/org/openvidu/server/core/internal/Room.java rename to openvidu-server/src/main/java/io/openvidu/server/core/internal/Room.java index 90ee1c6f..6f298a8c 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/core/internal/Room.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/internal/Room.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.core.internal; +package io.openvidu.server.core.internal; import java.util.Collection; import java.util.Set; @@ -30,14 +30,15 @@ import org.kurento.client.EventListener; import org.kurento.client.IceCandidate; import org.kurento.client.KurentoClient; import org.kurento.client.MediaPipeline; -import org.openvidu.client.OpenViduException; -import org.openvidu.client.OpenViduException.Code; -import org.openvidu.server.InfoHandler; -import org.openvidu.server.core.api.RoomHandler; -import org.openvidu.server.core.api.pojo.UserParticipant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import io.openvidu.client.OpenViduException; +import io.openvidu.client.OpenViduException.Code; +import io.openvidu.server.InfoHandler; +import io.openvidu.server.core.api.RoomHandler; +import io.openvidu.server.core.api.pojo.UserParticipant; + /** * @author Ivan Gracia (izanmail@gmail.com) * @author Micael Gallego (micael.gallego@gmail.com) diff --git a/openvidu-server/src/main/java/org/openvidu/server/internal/ThreadLogUtils.java b/openvidu-server/src/main/java/io/openvidu/server/internal/ThreadLogUtils.java similarity index 95% rename from openvidu-server/src/main/java/org/openvidu/server/internal/ThreadLogUtils.java rename to openvidu-server/src/main/java/io/openvidu/server/internal/ThreadLogUtils.java index ef6d7ccc..4ecb3676 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/internal/ThreadLogUtils.java +++ b/openvidu-server/src/main/java/io/openvidu/server/internal/ThreadLogUtils.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.openvidu.server.internal; +package io.openvidu.server.internal; public class ThreadLogUtils { diff --git a/openvidu-server/src/main/java/org/openvidu/server/kms/FixedOneKmsManager.java b/openvidu-server/src/main/java/io/openvidu/server/kms/FixedOneKmsManager.java similarity index 96% rename from openvidu-server/src/main/java/org/openvidu/server/kms/FixedOneKmsManager.java rename to openvidu-server/src/main/java/io/openvidu/server/kms/FixedOneKmsManager.java index b6069bbb..71c76844 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/kms/FixedOneKmsManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kms/FixedOneKmsManager.java @@ -15,7 +15,7 @@ * */ -package org.openvidu.server.kms; +package io.openvidu.server.kms; import org.kurento.client.KurentoClient; diff --git a/openvidu-server/src/main/java/org/openvidu/server/kms/Kms.java b/openvidu-server/src/main/java/io/openvidu/server/kms/Kms.java similarity index 97% rename from openvidu-server/src/main/java/org/openvidu/server/kms/Kms.java rename to openvidu-server/src/main/java/io/openvidu/server/kms/Kms.java index 97458fb7..cfae4253 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/kms/Kms.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kms/Kms.java @@ -15,7 +15,7 @@ * */ -package org.openvidu.server.kms; +package io.openvidu.server.kms; import org.kurento.client.KurentoClient; diff --git a/openvidu-server/src/main/java/org/openvidu/server/kms/KmsManager.java b/openvidu-server/src/main/java/io/openvidu/server/kms/KmsManager.java similarity index 90% rename from openvidu-server/src/main/java/org/openvidu/server/kms/KmsManager.java rename to openvidu-server/src/main/java/io/openvidu/server/kms/KmsManager.java index 2791650b..a5b3de2a 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/kms/KmsManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kms/KmsManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.kms; +package io.openvidu.server.kms; import java.util.ArrayList; import java.util.Collections; @@ -22,14 +22,15 @@ import java.util.Iterator; import java.util.List; import org.kurento.client.KurentoClient; -import org.openvidu.client.OpenViduException; -import org.openvidu.client.OpenViduException.Code; -import org.openvidu.server.core.api.KurentoClientProvider; -import org.openvidu.server.core.api.KurentoClientSessionInfo; -import org.openvidu.server.core.internal.DefaultKurentoClientSessionInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import io.openvidu.client.OpenViduException; +import io.openvidu.client.OpenViduException.Code; +import io.openvidu.server.core.api.KurentoClientProvider; +import io.openvidu.server.core.api.KurentoClientSessionInfo; +import io.openvidu.server.core.internal.DefaultKurentoClientSessionInfo; + public abstract class KmsManager implements KurentoClientProvider { public static class KmsLoad implements Comparable { diff --git a/openvidu-server/src/main/java/org/openvidu/server/kms/LoadManager.java b/openvidu-server/src/main/java/io/openvidu/server/kms/LoadManager.java similarity index 95% rename from openvidu-server/src/main/java/org/openvidu/server/kms/LoadManager.java rename to openvidu-server/src/main/java/io/openvidu/server/kms/LoadManager.java index e5bb9eeb..997f4b31 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/kms/LoadManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kms/LoadManager.java @@ -15,7 +15,7 @@ * */ -package org.openvidu.server.kms; +package io.openvidu.server.kms; public interface LoadManager { diff --git a/openvidu-server/src/main/java/org/openvidu/server/kms/MaxWebRtcLoadManager.java b/openvidu-server/src/main/java/io/openvidu/server/kms/MaxWebRtcLoadManager.java similarity index 97% rename from openvidu-server/src/main/java/org/openvidu/server/kms/MaxWebRtcLoadManager.java rename to openvidu-server/src/main/java/io/openvidu/server/kms/MaxWebRtcLoadManager.java index 76e82c58..8d9b0b02 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/kms/MaxWebRtcLoadManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kms/MaxWebRtcLoadManager.java @@ -15,7 +15,7 @@ * */ -package org.openvidu.server.kms; +package io.openvidu.server.kms; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openvidu-server/src/main/java/io/openvidu/server/rest/NgrokController.java b/openvidu-server/src/main/java/io/openvidu/server/rest/NgrokController.java new file mode 100644 index 00000000..eca40276 --- /dev/null +++ b/openvidu-server/src/main/java/io/openvidu/server/rest/NgrokController.java @@ -0,0 +1,41 @@ +package io.openvidu.server.rest; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; + +import org.apache.http.HttpResponse; +import org.apache.http.client.ClientProtocolException; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.HttpClientBuilder; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +public class NgrokController { + + private final String NGROK_URL = "http://localhost:4040/api/tunnels"; + + HttpClient client = HttpClientBuilder.create().build(); + + public String getNgrokPublicUrl() throws ClientProtocolException, IOException { + HttpClient client = HttpClientBuilder.create().build(); + + HttpGet request = new HttpGet(NGROK_URL); + HttpResponse response = client.execute(request); + BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent())); + + StringBuffer result = new StringBuffer(); + String line = ""; + while ((line = rd.readLine()) != null) { + result.append(line); + } + JsonObject json = (JsonObject) new JsonParser().parse(result.toString()); + String publicUrl = json.getAsJsonArray("tunnels").get(0).getAsJsonObject().get("public_url").getAsString(); + publicUrl = publicUrl.replaceFirst("http://", "https://"); + + return publicUrl; + } + +} diff --git a/openvidu-server/src/main/java/org/openvidu/server/rest/RoomController.java b/openvidu-server/src/main/java/io/openvidu/server/rest/RoomController.java similarity index 95% rename from openvidu-server/src/main/java/org/openvidu/server/rest/RoomController.java rename to openvidu-server/src/main/java/io/openvidu/server/rest/RoomController.java index 9031771d..74e7a3e0 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/rest/RoomController.java +++ b/openvidu-server/src/main/java/io/openvidu/server/rest/RoomController.java @@ -14,16 +14,13 @@ * limitations under the License. * */ -package org.openvidu.server.rest; +package io.openvidu.server.rest; import static org.kurento.commons.PropertiesManager.getProperty; import java.util.Map; import java.util.Set; import org.json.simple.JSONObject; -import org.openvidu.client.OpenViduException; -import org.openvidu.server.core.NotificationRoomManager; -import org.openvidu.server.security.ParticipantRole; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -32,6 +29,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import io.openvidu.client.OpenViduException; +import io.openvidu.server.core.NotificationRoomManager; +import io.openvidu.server.security.ParticipantRole; + /** * * @author Raquel Díaz González diff --git a/openvidu-server/src/main/java/org/openvidu/server/rpc/JsonRpcNotificationService.java b/openvidu-server/src/main/java/io/openvidu/server/rpc/JsonRpcNotificationService.java similarity index 96% rename from openvidu-server/src/main/java/org/openvidu/server/rpc/JsonRpcNotificationService.java rename to openvidu-server/src/main/java/io/openvidu/server/rpc/JsonRpcNotificationService.java index eb64be25..78a2847c 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/rpc/JsonRpcNotificationService.java +++ b/openvidu-server/src/main/java/io/openvidu/server/rpc/JsonRpcNotificationService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.rpc; +package io.openvidu.server.rpc; import java.io.IOException; import java.util.concurrent.ConcurrentHashMap; @@ -23,14 +23,15 @@ import java.util.concurrent.ConcurrentMap; import org.kurento.jsonrpc.Session; import org.kurento.jsonrpc.Transaction; import org.kurento.jsonrpc.message.Request; -import org.openvidu.client.OpenViduException; -import org.openvidu.server.core.api.UserNotificationService; -import org.openvidu.server.core.api.pojo.ParticipantRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.gson.JsonObject; +import io.openvidu.client.OpenViduException; +import io.openvidu.server.core.api.UserNotificationService; +import io.openvidu.server.core.api.pojo.ParticipantRequest; + /** * JSON-RPC implementation of {@link UserNotificationService} for WebSockets. * diff --git a/openvidu-server/src/main/java/org/openvidu/server/rpc/JsonRpcUserControl.java b/openvidu-server/src/main/java/io/openvidu/server/rpc/JsonRpcUserControl.java similarity index 96% rename from openvidu-server/src/main/java/org/openvidu/server/rpc/JsonRpcUserControl.java rename to openvidu-server/src/main/java/io/openvidu/server/rpc/JsonRpcUserControl.java index 9c2140d8..b2daed5d 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/rpc/JsonRpcUserControl.java +++ b/openvidu-server/src/main/java/io/openvidu/server/rpc/JsonRpcUserControl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.rpc; +package io.openvidu.server.rpc; import java.io.IOException; import java.util.concurrent.ExecutionException; @@ -22,18 +22,19 @@ import java.util.concurrent.ExecutionException; import org.kurento.jsonrpc.Session; import org.kurento.jsonrpc.Transaction; import org.kurento.jsonrpc.message.Request; -import org.openvidu.client.OpenViduException; -import org.openvidu.client.OpenViduException.Code; -import org.openvidu.client.internal.ProtocolElements; -import org.openvidu.server.core.NotificationRoomManager; -import org.openvidu.server.core.api.pojo.ParticipantRequest; -import org.openvidu.server.core.api.pojo.UserParticipant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import com.google.gson.JsonObject; +import io.openvidu.client.OpenViduException; +import io.openvidu.client.OpenViduException.Code; +import io.openvidu.client.internal.ProtocolElements; +import io.openvidu.server.core.NotificationRoomManager; +import io.openvidu.server.core.api.pojo.ParticipantRequest; +import io.openvidu.server.core.api.pojo.UserParticipant; + /** * Controls the user interactions by delegating her JSON-RPC requests to the room API. * diff --git a/openvidu-server/src/main/java/org/openvidu/server/rpc/ParticipantSession.java b/openvidu-server/src/main/java/io/openvidu/server/rpc/ParticipantSession.java similarity index 98% rename from openvidu-server/src/main/java/org/openvidu/server/rpc/ParticipantSession.java rename to openvidu-server/src/main/java/io/openvidu/server/rpc/ParticipantSession.java index f5e03032..a4393745 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/rpc/ParticipantSession.java +++ b/openvidu-server/src/main/java/io/openvidu/server/rpc/ParticipantSession.java @@ -15,7 +15,7 @@ * */ -package org.openvidu.server.rpc; +package io.openvidu.server.rpc; /** * Participant information that should be stored in the WebSocket session. diff --git a/openvidu-server/src/main/java/org/openvidu/server/rpc/SessionWrapper.java b/openvidu-server/src/main/java/io/openvidu/server/rpc/SessionWrapper.java similarity index 98% rename from openvidu-server/src/main/java/org/openvidu/server/rpc/SessionWrapper.java rename to openvidu-server/src/main/java/io/openvidu/server/rpc/SessionWrapper.java index 81f078df..ddeb9a41 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/rpc/SessionWrapper.java +++ b/openvidu-server/src/main/java/io/openvidu/server/rpc/SessionWrapper.java @@ -15,7 +15,7 @@ * */ -package org.openvidu.server.rpc; +package io.openvidu.server.rpc; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; diff --git a/openvidu-server/src/main/java/org/openvidu/server/security/CertificateController.java b/openvidu-server/src/main/java/io/openvidu/server/security/CertificateController.java similarity index 92% rename from openvidu-server/src/main/java/org/openvidu/server/security/CertificateController.java rename to openvidu-server/src/main/java/io/openvidu/server/security/CertificateController.java index 31c70fef..f5ada746 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/security/CertificateController.java +++ b/openvidu-server/src/main/java/io/openvidu/server/security/CertificateController.java @@ -1,4 +1,4 @@ -package org.openvidu.server.security; +package io.openvidu.server.security; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/openvidu-server/src/main/java/org/openvidu/server/security/ParticipantRole.java b/openvidu-server/src/main/java/io/openvidu/server/security/ParticipantRole.java similarity index 64% rename from openvidu-server/src/main/java/org/openvidu/server/security/ParticipantRole.java rename to openvidu-server/src/main/java/io/openvidu/server/security/ParticipantRole.java index af462760..40e3ef0a 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/security/ParticipantRole.java +++ b/openvidu-server/src/main/java/io/openvidu/server/security/ParticipantRole.java @@ -1,4 +1,4 @@ -package org.openvidu.server.security; +package io.openvidu.server.security; public enum ParticipantRole { SUBSCRIBER, diff --git a/openvidu-server/src/main/java/org/openvidu/server/security/SecurityConfig.java b/openvidu-server/src/main/java/io/openvidu/server/security/SecurityConfig.java similarity index 97% rename from openvidu-server/src/main/java/org/openvidu/server/security/SecurityConfig.java rename to openvidu-server/src/main/java/io/openvidu/server/security/SecurityConfig.java index b04c3005..cc1ca259 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/security/SecurityConfig.java +++ b/openvidu-server/src/main/java/io/openvidu/server/security/SecurityConfig.java @@ -1,4 +1,4 @@ -package org.openvidu.server.security; +package io.openvidu.server.security; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/openvidu-server/src/main/java/org/openvidu/server/security/Token.java b/openvidu-server/src/main/java/io/openvidu/server/security/Token.java similarity index 95% rename from openvidu-server/src/main/java/org/openvidu/server/security/Token.java rename to openvidu-server/src/main/java/io/openvidu/server/security/Token.java index d3d34618..b45d5586 100644 --- a/openvidu-server/src/main/java/org/openvidu/server/security/Token.java +++ b/openvidu-server/src/main/java/io/openvidu/server/security/Token.java @@ -1,4 +1,4 @@ -package org.openvidu.server.security; +package io.openvidu.server.security; public class Token { diff --git a/openvidu-server/src/main/resources/application-ngrok.properties b/openvidu-server/src/main/resources/application-ngrok.properties new file mode 100644 index 00000000..8aa31d0b --- /dev/null +++ b/openvidu-server/src/main/resources/application-ngrok.properties @@ -0,0 +1,9 @@ +spring.profiles.active=ngrok + +server.port: 5000 +server.address: 0.0.0.0 + +kms.uris=[\"ws://localhost:8888/kurento\"] + +openvidu.secret: MY_SECRET +openvidu.security: true \ No newline at end of file diff --git a/openvidu-server/src/test/java/org/openvidu/server/test/AutodiscoveryKmsUrlTest.java b/openvidu-server/src/test/java/io/openvidu/server/test/AutodiscoveryKmsUrlTest.java similarity index 93% rename from openvidu-server/src/test/java/org/openvidu/server/test/AutodiscoveryKmsUrlTest.java rename to openvidu-server/src/test/java/io/openvidu/server/test/AutodiscoveryKmsUrlTest.java index 396b21df..f8d59f68 100644 --- a/openvidu-server/src/test/java/org/openvidu/server/test/AutodiscoveryKmsUrlTest.java +++ b/openvidu-server/src/test/java/io/openvidu/server/test/AutodiscoveryKmsUrlTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.server.test; +package io.openvidu.server.test; import static org.junit.Assert.fail; @@ -30,17 +30,18 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.kurento.client.internal.KmsProvider; import org.kurento.client.internal.NotEnoughResourcesException; -import org.openvidu.server.OpenViduServer; -import org.openvidu.server.core.NotificationRoomManager; -import org.openvidu.server.core.RoomManager; -import org.openvidu.server.core.api.KurentoClientSessionInfo; -import org.openvidu.server.core.internal.DefaultKurentoClientSessionInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ConfigurableApplicationContext; import com.google.common.base.StandardSystemProperty; +import io.openvidu.server.OpenViduServer; +import io.openvidu.server.core.NotificationRoomManager; +import io.openvidu.server.core.RoomManager; +import io.openvidu.server.core.api.KurentoClientSessionInfo; +import io.openvidu.server.core.internal.DefaultKurentoClientSessionInfo; + /** * Integration server test, checks the autodiscovery of KMS URLs. * diff --git a/openvidu-server/src/test/java/org/openvidu/server/test/RoomProtocolTest.java b/openvidu-server/src/test/java/io/openvidu/server/test/RoomProtocolTest.java similarity index 90% rename from openvidu-server/src/test/java/org/openvidu/server/test/RoomProtocolTest.java rename to openvidu-server/src/test/java/io/openvidu/server/test/RoomProtocolTest.java index 2a8d971b..9769cd29 100644 --- a/openvidu-server/src/test/java/org/openvidu/server/test/RoomProtocolTest.java +++ b/openvidu-server/src/test/java/io/openvidu/server/test/RoomProtocolTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.server.test; +package io.openvidu.server.test; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; @@ -47,23 +47,24 @@ import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; -import org.openvidu.client.OpenViduClient; -import org.openvidu.client.ServerJsonRpcHandler; -import org.openvidu.client.internal.Notification; -import org.openvidu.client.internal.ParticipantJoinedInfo; -import org.openvidu.client.internal.ProtocolElements; -import org.openvidu.client.internal.Notification.Method; -import org.openvidu.server.RoomJsonRpcHandler; -import org.openvidu.server.core.api.pojo.ParticipantRequest; -import org.openvidu.server.core.api.pojo.UserParticipant; -import org.openvidu.server.core.internal.DefaultNotificationRoomHandler; -import org.openvidu.server.rpc.JsonRpcNotificationService; -import org.openvidu.server.rpc.JsonRpcUserControl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.gson.JsonObject; +import io.openvidu.client.OpenViduClient; +import io.openvidu.client.ServerJsonRpcHandler; +import io.openvidu.client.internal.Notification; +import io.openvidu.client.internal.ParticipantJoinedInfo; +import io.openvidu.client.internal.ProtocolElements; +import io.openvidu.client.internal.Notification.Method; +import io.openvidu.server.RoomJsonRpcHandler; +import io.openvidu.server.core.api.pojo.ParticipantRequest; +import io.openvidu.server.core.api.pojo.UserParticipant; +import io.openvidu.server.core.internal.DefaultNotificationRoomHandler; +import io.openvidu.server.rpc.JsonRpcNotificationService; +import io.openvidu.server.rpc.JsonRpcUserControl; + /** * Integration tests for the room server protocol. * diff --git a/openvidu-server/src/test/java/org/openvidu/server/test/core/NotificationRoomManagerWithDefaultHandlerTest.java b/openvidu-server/src/test/java/io/openvidu/server/test/core/NotificationRoomManagerWithDefaultHandlerTest.java similarity index 98% rename from openvidu-server/src/test/java/org/openvidu/server/test/core/NotificationRoomManagerWithDefaultHandlerTest.java rename to openvidu-server/src/test/java/io/openvidu/server/test/core/NotificationRoomManagerWithDefaultHandlerTest.java index db5ffa23..c5aa9714 100644 --- a/openvidu-server/src/test/java/org/openvidu/server/test/core/NotificationRoomManagerWithDefaultHandlerTest.java +++ b/openvidu-server/src/test/java/io/openvidu/server/test/core/NotificationRoomManagerWithDefaultHandlerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.test.core; +package io.openvidu.server.test.core; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; @@ -64,15 +64,6 @@ import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.openvidu.client.OpenViduException; -import org.openvidu.client.internal.ProtocolElements; -import org.openvidu.server.core.NotificationRoomManager; -import org.openvidu.server.core.api.KurentoClientProvider; -import org.openvidu.server.core.api.KurentoClientSessionInfo; -import org.openvidu.server.core.api.UserNotificationService; -import org.openvidu.server.core.api.pojo.ParticipantRequest; -import org.openvidu.server.core.api.pojo.UserParticipant; -import org.openvidu.server.core.internal.DefaultNotificationRoomHandler; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -80,6 +71,16 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import io.openvidu.client.OpenViduException; +import io.openvidu.client.internal.ProtocolElements; +import io.openvidu.server.core.NotificationRoomManager; +import io.openvidu.server.core.api.KurentoClientProvider; +import io.openvidu.server.core.api.KurentoClientSessionInfo; +import io.openvidu.server.core.api.UserNotificationService; +import io.openvidu.server.core.api.pojo.ParticipantRequest; +import io.openvidu.server.core.api.pojo.UserParticipant; +import io.openvidu.server.core.internal.DefaultNotificationRoomHandler; + /** * Tests for {@link NotificationRoomManager} when using {@link DefaultNotificationRoomHandler} * (mocked {@link UserNotificationService} and {@link KurentoClient} resources). diff --git a/openvidu-server/src/test/java/org/openvidu/server/test/core/RoomManagerTest.java b/openvidu-server/src/test/java/io/openvidu/server/test/core/RoomManagerTest.java similarity index 99% rename from openvidu-server/src/test/java/org/openvidu/server/test/core/RoomManagerTest.java rename to openvidu-server/src/test/java/io/openvidu/server/test/core/RoomManagerTest.java index f3e4de8a..757b1383 100644 --- a/openvidu-server/src/test/java/org/openvidu/server/test/core/RoomManagerTest.java +++ b/openvidu-server/src/test/java/io/openvidu/server/test/core/RoomManagerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openvidu.server.test.core; +package io.openvidu.server.test.core; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.hasItem; @@ -79,17 +79,18 @@ import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.openvidu.client.OpenViduException; -import org.openvidu.client.OpenViduException.Code; -import org.openvidu.server.core.RoomManager; -import org.openvidu.server.core.api.KurentoClientProvider; -import org.openvidu.server.core.api.KurentoClientSessionInfo; -import org.openvidu.server.core.api.MutedMediaType; -import org.openvidu.server.core.api.RoomHandler; -import org.openvidu.server.core.api.pojo.UserParticipant; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import io.openvidu.client.OpenViduException; +import io.openvidu.client.OpenViduException.Code; +import io.openvidu.server.core.RoomManager; +import io.openvidu.server.core.api.KurentoClientProvider; +import io.openvidu.server.core.api.KurentoClientSessionInfo; +import io.openvidu.server.core.api.MutedMediaType; +import io.openvidu.server.core.api.RoomHandler; +import io.openvidu.server.core.api.pojo.UserParticipant; + /** * Tests for {@link RoomManager} when using mocked {@link KurentoClient} resources. * diff --git a/openvidu-test/pom.xml b/openvidu-test/pom.xml index 4fefbaca..6ce80b30 100644 --- a/openvidu-test/pom.xml +++ b/openvidu-test/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.openvidu + io.openvidu openvidu 0.0.1-SNAPSHOT @@ -41,10 +41,10 @@ - openvidu.org - -openvidu.org Community - OpenVidu.org - https://github.com/OpenVidu/openvidu + openvidu.io + -openvidu.io Community + OpenVidu + http://openvidu.io @@ -55,7 +55,7 @@ compile - org.openvidu + io.openvidu openvidu-client diff --git a/openvidu-test/src/main/java/org/openvidu/test/OpenViduClientBrowserTest.java b/openvidu-test/src/main/java/io/openvidu/test/OpenViduClientBrowserTest.java similarity index 99% rename from openvidu-test/src/main/java/org/openvidu/test/OpenViduClientBrowserTest.java rename to openvidu-test/src/main/java/io/openvidu/test/OpenViduClientBrowserTest.java index 6734959b..6cd9b0be 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/OpenViduClientBrowserTest.java +++ b/openvidu-test/src/main/java/io/openvidu/test/OpenViduClientBrowserTest.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test; +package io.openvidu.test; +import static io.openvidu.test.config.RoomTestConfiguration.ROOM_APP_CLASSNAME_DEFAULT; +import static io.openvidu.test.config.RoomTestConfiguration.ROOM_APP_CLASSNAME_PROP; import static org.junit.Assert.fail; import static org.kurento.commons.PropertiesManager.getProperty; import static org.kurento.test.config.TestConfiguration.SELENIUM_SCOPE_PROPERTY; import static org.kurento.test.config.TestConfiguration.TEST_URL_TIMEOUT_DEFAULT; import static org.kurento.test.config.TestConfiguration.TEST_URL_TIMEOUT_PROPERTY; -import static org.openvidu.test.config.RoomTestConfiguration.ROOM_APP_CLASSNAME_DEFAULT; -import static org.openvidu.test.config.RoomTestConfiguration.ROOM_APP_CLASSNAME_PROP; import java.security.SecureRandom; import java.util.ArrayList; diff --git a/openvidu-test/src/main/java/org/openvidu/test/RoomClientFakeTest.java b/openvidu-test/src/main/java/io/openvidu/test/RoomClientFakeTest.java similarity index 99% rename from openvidu-test/src/main/java/org/openvidu/test/RoomClientFakeTest.java rename to openvidu-test/src/main/java/io/openvidu/test/RoomClientFakeTest.java index 83a15fc6..9b3591ad 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/RoomClientFakeTest.java +++ b/openvidu-test/src/main/java/io/openvidu/test/RoomClientFakeTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test; +package io.openvidu.test; import static org.kurento.commons.PropertiesManager.getProperty; import static org.kurento.test.config.TestConfiguration.TEST_HOST_PROPERTY; @@ -47,7 +47,8 @@ import org.kurento.test.services.KmsService; import org.kurento.test.services.Service; import org.kurento.test.services.WebServerService; import org.kurento.test.utils.Shell; -import org.openvidu.test.fake.util.FakeSession; + +import io.openvidu.test.fake.util.FakeSession; /** * Base for Kurento Room tests with browsers and fake clients. diff --git a/openvidu-test/src/main/java/org/openvidu/test/RoomFunctionalBrowserTest.java b/openvidu-test/src/main/java/io/openvidu/test/RoomFunctionalBrowserTest.java similarity index 97% rename from openvidu-test/src/main/java/org/openvidu/test/RoomFunctionalBrowserTest.java rename to openvidu-test/src/main/java/io/openvidu/test/RoomFunctionalBrowserTest.java index 1163f415..673368f9 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/RoomFunctionalBrowserTest.java +++ b/openvidu-test/src/main/java/io/openvidu/test/RoomFunctionalBrowserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test; +package io.openvidu.test; import org.junit.experimental.categories.Category; import org.kurento.commons.testing.SystemFunctionalTests; diff --git a/openvidu-test/src/main/java/org/openvidu/test/RoomFunctionalFakeTest.java b/openvidu-test/src/main/java/io/openvidu/test/RoomFunctionalFakeTest.java similarity index 97% rename from openvidu-test/src/main/java/org/openvidu/test/RoomFunctionalFakeTest.java rename to openvidu-test/src/main/java/io/openvidu/test/RoomFunctionalFakeTest.java index 323c9525..5a222ac2 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/RoomFunctionalFakeTest.java +++ b/openvidu-test/src/main/java/io/openvidu/test/RoomFunctionalFakeTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test; +package io.openvidu.test; import org.junit.experimental.categories.Category; import org.kurento.commons.testing.SystemFunctionalTests; diff --git a/openvidu-test/src/main/java/org/openvidu/test/browser/AddRemoveUsers.java b/openvidu-test/src/main/java/io/openvidu/test/browser/AddRemoveUsers.java similarity index 96% rename from openvidu-test/src/main/java/org/openvidu/test/browser/AddRemoveUsers.java rename to openvidu-test/src/main/java/io/openvidu/test/browser/AddRemoveUsers.java index 361dce8f..54e43afd 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/browser/AddRemoveUsers.java +++ b/openvidu-test/src/main/java/io/openvidu/test/browser/AddRemoveUsers.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.browser; +package io.openvidu.test.browser; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.Test; import org.kurento.test.browser.WebPage; -import org.openvidu.test.RoomFunctionalBrowserTest; + +import io.openvidu.test.RoomFunctionalBrowserTest; /** * Room demo integration test (basic version). diff --git a/openvidu-test/src/main/java/org/openvidu/test/browser/AddRemoveUsersNoSinkVerify.java b/openvidu-test/src/main/java/io/openvidu/test/browser/AddRemoveUsersNoSinkVerify.java similarity index 95% rename from openvidu-test/src/main/java/org/openvidu/test/browser/AddRemoveUsersNoSinkVerify.java rename to openvidu-test/src/main/java/io/openvidu/test/browser/AddRemoveUsersNoSinkVerify.java index 5910bd74..c2510f9d 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/browser/AddRemoveUsersNoSinkVerify.java +++ b/openvidu-test/src/main/java/io/openvidu/test/browser/AddRemoveUsersNoSinkVerify.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.openvidu.test.browser; +package io.openvidu.test.browser; import org.junit.Test; import org.kurento.test.browser.WebPage; -import org.openvidu.test.RoomFunctionalBrowserTest; + +import io.openvidu.test.RoomFunctionalBrowserTest; /** * Room integration test (basic version). diff --git a/openvidu-test/src/main/java/org/openvidu/test/browser/NUsersEqualLifetime.java b/openvidu-test/src/main/java/io/openvidu/test/browser/NUsersEqualLifetime.java similarity index 97% rename from openvidu-test/src/main/java/org/openvidu/test/browser/NUsersEqualLifetime.java rename to openvidu-test/src/main/java/io/openvidu/test/browser/NUsersEqualLifetime.java index eb51e446..c97ec52d 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/browser/NUsersEqualLifetime.java +++ b/openvidu-test/src/main/java/io/openvidu/test/browser/NUsersEqualLifetime.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.browser; +package io.openvidu.test.browser; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.Test; import org.kurento.test.browser.WebPage; -import org.openvidu.test.RoomFunctionalBrowserTest; + +import io.openvidu.test.RoomFunctionalBrowserTest; /** * Room demo integration test (basic version). diff --git a/openvidu-test/src/main/java/org/openvidu/test/browser/OneUserQuickReentry.java b/openvidu-test/src/main/java/io/openvidu/test/browser/OneUserQuickReentry.java similarity index 96% rename from openvidu-test/src/main/java/org/openvidu/test/browser/OneUserQuickReentry.java rename to openvidu-test/src/main/java/io/openvidu/test/browser/OneUserQuickReentry.java index 6713918d..d19ae6a4 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/browser/OneUserQuickReentry.java +++ b/openvidu-test/src/main/java/io/openvidu/test/browser/OneUserQuickReentry.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.browser; +package io.openvidu.test.browser; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.Test; import org.kurento.test.browser.WebPage; -import org.openvidu.test.RoomFunctionalBrowserTest; + +import io.openvidu.test.RoomFunctionalBrowserTest; /** * Room demo integration test (basic version). diff --git a/openvidu-test/src/main/java/org/openvidu/test/browser/SeqAddRemoveUser.java b/openvidu-test/src/main/java/io/openvidu/test/browser/SeqAddRemoveUser.java similarity index 96% rename from openvidu-test/src/main/java/org/openvidu/test/browser/SeqAddRemoveUser.java rename to openvidu-test/src/main/java/io/openvidu/test/browser/SeqAddRemoveUser.java index 6e0f86b7..33c41d74 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/browser/SeqAddRemoveUser.java +++ b/openvidu-test/src/main/java/io/openvidu/test/browser/SeqAddRemoveUser.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.openvidu.test.browser; +package io.openvidu.test.browser; import org.junit.Test; import org.kurento.test.browser.WebPage; -import org.openvidu.test.RoomFunctionalBrowserTest; + +import io.openvidu.test.RoomFunctionalBrowserTest; /** * Room demo integration test (basic version). diff --git a/openvidu-test/src/main/java/org/openvidu/test/browser/SeqNUsersEqualLifetime.java b/openvidu-test/src/main/java/io/openvidu/test/browser/SeqNUsersEqualLifetime.java similarity index 95% rename from openvidu-test/src/main/java/org/openvidu/test/browser/SeqNUsersEqualLifetime.java rename to openvidu-test/src/main/java/io/openvidu/test/browser/SeqNUsersEqualLifetime.java index 112d7719..938b9938 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/browser/SeqNUsersEqualLifetime.java +++ b/openvidu-test/src/main/java/io/openvidu/test/browser/SeqNUsersEqualLifetime.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.openvidu.test.browser; +package io.openvidu.test.browser; import org.junit.Test; import org.kurento.test.browser.WebPage; -import org.openvidu.test.RoomFunctionalBrowserTest; + +import io.openvidu.test.RoomFunctionalBrowserTest; /** * Room demo integration test (basic version). diff --git a/openvidu-test/src/main/java/org/openvidu/test/browser/TwoUsersEqualLifetime.java b/openvidu-test/src/main/java/io/openvidu/test/browser/TwoUsersEqualLifetime.java similarity index 95% rename from openvidu-test/src/main/java/org/openvidu/test/browser/TwoUsersEqualLifetime.java rename to openvidu-test/src/main/java/io/openvidu/test/browser/TwoUsersEqualLifetime.java index cf714081..94176c61 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/browser/TwoUsersEqualLifetime.java +++ b/openvidu-test/src/main/java/io/openvidu/test/browser/TwoUsersEqualLifetime.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.openvidu.test.browser; +package io.openvidu.test.browser; import org.junit.Test; import org.kurento.test.browser.WebPage; -import org.openvidu.test.RoomFunctionalBrowserTest; + +import io.openvidu.test.RoomFunctionalBrowserTest; /** * Room demo integration test (basic version). diff --git a/openvidu-test/src/main/java/org/openvidu/test/browser/UnpublishMedia.java b/openvidu-test/src/main/java/io/openvidu/test/browser/UnpublishMedia.java similarity index 98% rename from openvidu-test/src/main/java/org/openvidu/test/browser/UnpublishMedia.java rename to openvidu-test/src/main/java/io/openvidu/test/browser/UnpublishMedia.java index 26cebb65..31423217 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/browser/UnpublishMedia.java +++ b/openvidu-test/src/main/java/io/openvidu/test/browser/UnpublishMedia.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.browser; +package io.openvidu.test.browser; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.Test; import org.kurento.test.browser.WebPage; -import org.openvidu.test.RoomFunctionalBrowserTest; + +import io.openvidu.test.RoomFunctionalBrowserTest; /** * Room browser test. Designed for the demo app. diff --git a/openvidu-test/src/main/java/org/openvidu/test/browser/UnsubscribeFromMedia.java b/openvidu-test/src/main/java/io/openvidu/test/browser/UnsubscribeFromMedia.java similarity index 98% rename from openvidu-test/src/main/java/org/openvidu/test/browser/UnsubscribeFromMedia.java rename to openvidu-test/src/main/java/io/openvidu/test/browser/UnsubscribeFromMedia.java index e16484d7..b4ca29a8 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/browser/UnsubscribeFromMedia.java +++ b/openvidu-test/src/main/java/io/openvidu/test/browser/UnsubscribeFromMedia.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openvidu.test.browser; +package io.openvidu.test.browser; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.Test; import org.kurento.test.browser.WebPage; -import org.openvidu.test.RoomFunctionalBrowserTest; + +import io.openvidu.test.RoomFunctionalBrowserTest; /** * Room browser test. Designed for the demo app. diff --git a/openvidu-test/src/main/java/org/openvidu/test/browser/WebAppAvailability.java b/openvidu-test/src/main/java/io/openvidu/test/browser/WebAppAvailability.java similarity index 95% rename from openvidu-test/src/main/java/org/openvidu/test/browser/WebAppAvailability.java rename to openvidu-test/src/main/java/io/openvidu/test/browser/WebAppAvailability.java index 57d930ca..d836887c 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/browser/WebAppAvailability.java +++ b/openvidu-test/src/main/java/io/openvidu/test/browser/WebAppAvailability.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.openvidu.test.browser; +package io.openvidu.test.browser; import org.junit.Test; import org.kurento.test.browser.WebPage; -import org.openvidu.test.RoomFunctionalBrowserTest; + +import io.openvidu.test.RoomFunctionalBrowserTest; /** * Web app availability basic test. diff --git a/openvidu-test/src/main/java/org/openvidu/test/config/RoomTestConfiguration.java b/openvidu-test/src/main/java/io/openvidu/test/config/RoomTestConfiguration.java similarity index 98% rename from openvidu-test/src/main/java/org/openvidu/test/config/RoomTestConfiguration.java rename to openvidu-test/src/main/java/io/openvidu/test/config/RoomTestConfiguration.java index 9b0b501c..adce8a20 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/config/RoomTestConfiguration.java +++ b/openvidu-test/src/main/java/io/openvidu/test/config/RoomTestConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test.config; +package io.openvidu.test.config; import static org.kurento.test.config.TestConfiguration.KMS_WS_URI_DEFAULT; import static org.kurento.test.config.TestConfiguration.KMS_WS_URI_PROP; diff --git a/openvidu-test/src/main/java/org/openvidu/test/fake/ExtraKmsFakeUsers.java b/openvidu-test/src/main/java/io/openvidu/test/fake/ExtraKmsFakeUsers.java similarity index 93% rename from openvidu-test/src/main/java/org/openvidu/test/fake/ExtraKmsFakeUsers.java rename to openvidu-test/src/main/java/io/openvidu/test/fake/ExtraKmsFakeUsers.java index 2c5f3fca..63629fa1 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/fake/ExtraKmsFakeUsers.java +++ b/openvidu-test/src/main/java/io/openvidu/test/fake/ExtraKmsFakeUsers.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test.fake; +package io.openvidu.test.fake; -import static org.openvidu.test.config.RoomTestConfiguration.EXTRA_KMS_WS_URI_DEFAULT; -import static org.openvidu.test.config.RoomTestConfiguration.EXTRA_KMS_WS_URI_PROP; +import static io.openvidu.test.config.RoomTestConfiguration.EXTRA_KMS_WS_URI_DEFAULT; +import static io.openvidu.test.config.RoomTestConfiguration.EXTRA_KMS_WS_URI_PROP; import java.util.Arrays; import java.util.concurrent.CountDownLatch; @@ -26,8 +26,9 @@ import org.kurento.client.KurentoClient; import org.kurento.client.KurentoConnectionListener; import org.kurento.commons.PropertiesManager; import org.kurento.test.browser.WebPage; -import org.openvidu.test.RoomFunctionalFakeTest; -import org.openvidu.test.config.RoomTestConfiguration; + +import io.openvidu.test.RoomFunctionalFakeTest; +import io.openvidu.test.config.RoomTestConfiguration; /** * Tests multiple fake WebRTC users concurrently joining the same room. Some of them are built on a diff --git a/openvidu-test/src/main/java/org/openvidu/test/fake/MixedUsers.java b/openvidu-test/src/main/java/io/openvidu/test/fake/MixedUsers.java similarity index 98% rename from openvidu-test/src/main/java/org/openvidu/test/fake/MixedUsers.java rename to openvidu-test/src/main/java/io/openvidu/test/fake/MixedUsers.java index f3e6ed28..f5536d4b 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/fake/MixedUsers.java +++ b/openvidu-test/src/main/java/io/openvidu/test/fake/MixedUsers.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test.fake; +package io.openvidu.test.fake; import java.util.Arrays; import java.util.HashMap; @@ -22,7 +22,8 @@ import java.util.concurrent.CountDownLatch; import org.junit.Test; import org.kurento.test.browser.WebPage; -import org.openvidu.test.RoomFunctionalFakeTest; + +import io.openvidu.test.RoomFunctionalFakeTest; /** * Tests multiple fake WebRTC and Selenium (Chrome) users sequentially joining the same room. diff --git a/openvidu-test/src/main/java/org/openvidu/test/fake/ParallelNFakeUsers.java b/openvidu-test/src/main/java/io/openvidu/test/fake/ParallelNFakeUsers.java similarity index 96% rename from openvidu-test/src/main/java/org/openvidu/test/fake/ParallelNFakeUsers.java rename to openvidu-test/src/main/java/io/openvidu/test/fake/ParallelNFakeUsers.java index 76dcdf35..b8385887 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/fake/ParallelNFakeUsers.java +++ b/openvidu-test/src/main/java/io/openvidu/test/fake/ParallelNFakeUsers.java @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test.fake; +package io.openvidu.test.fake; import java.util.Arrays; import java.util.concurrent.CountDownLatch; import org.junit.Test; import org.kurento.test.browser.WebPage; -import org.openvidu.test.RoomFunctionalFakeTest; + +import io.openvidu.test.RoomFunctionalFakeTest; /** * Tests several fake WebRTC users' concurrently joining the same room. diff --git a/openvidu-test/src/main/java/org/openvidu/test/fake/util/AudioVideoFile.java b/openvidu-test/src/main/java/io/openvidu/test/fake/util/AudioVideoFile.java similarity index 97% rename from openvidu-test/src/main/java/org/openvidu/test/fake/util/AudioVideoFile.java rename to openvidu-test/src/main/java/io/openvidu/test/fake/util/AudioVideoFile.java index 74d1c0bb..0d80fa55 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/fake/util/AudioVideoFile.java +++ b/openvidu-test/src/main/java/io/openvidu/test/fake/util/AudioVideoFile.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test.fake.util; +package io.openvidu.test.fake.util; public class AudioVideoFile { private String audio; diff --git a/openvidu-test/src/main/java/org/openvidu/test/fake/util/FakeParticipant.java b/openvidu-test/src/main/java/io/openvidu/test/fake/util/FakeParticipant.java similarity index 97% rename from openvidu-test/src/main/java/org/openvidu/test/fake/util/FakeParticipant.java rename to openvidu-test/src/main/java/io/openvidu/test/fake/util/FakeParticipant.java index c3593f33..73e8dc76 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/fake/util/FakeParticipant.java +++ b/openvidu-test/src/main/java/io/openvidu/test/fake/util/FakeParticipant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test.fake.util; +package io.openvidu.test.fake.util; import java.io.Closeable; import java.io.IOException; @@ -37,12 +37,12 @@ import org.kurento.client.MediaStateChangedEvent; import org.kurento.client.OnIceCandidateEvent; import org.kurento.client.PlayerEndpoint; import org.kurento.client.WebRtcEndpoint; -import org.openvidu.client.OpenViduClient; -import org.openvidu.client.internal.IceCandidateInfo; -import org.openvidu.client.internal.Notification; -import org.openvidu.client.internal.ParticipantLeftInfo; -import org.openvidu.client.internal.ParticipantPublishedInfo; -import org.openvidu.client.internal.ParticipantUnpublishedInfo; +import io.openvidu.client.OpenViduClient; +import io.openvidu.client.internal.IceCandidateInfo; +import io.openvidu.client.internal.Notification; +import io.openvidu.client.internal.ParticipantLeftInfo; +import io.openvidu.client.internal.ParticipantPublishedInfo; +import io.openvidu.client.internal.ParticipantUnpublishedInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -194,7 +194,7 @@ public class FakeParticipant implements Closeable { } private IceCandidate toKurentoIceCandidate( - org.openvidu.client.internal.IceCandidate iceCandidate) { + io.openvidu.client.internal.IceCandidate iceCandidate) { return new IceCandidate(iceCandidate.getCandidate(), iceCandidate.getSdpMid(), iceCandidate.getSdpMLineIndex()); } diff --git a/openvidu-test/src/main/java/org/openvidu/test/fake/util/FakeSession.java b/openvidu-test/src/main/java/io/openvidu/test/fake/util/FakeSession.java similarity index 98% rename from openvidu-test/src/main/java/org/openvidu/test/fake/util/FakeSession.java rename to openvidu-test/src/main/java/io/openvidu/test/fake/util/FakeSession.java index c1386d67..ba5a4e38 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/fake/util/FakeSession.java +++ b/openvidu-test/src/main/java/io/openvidu/test/fake/util/FakeSession.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test.fake.util; +package io.openvidu.test.fake.util; import java.io.Closeable; import java.io.IOException; diff --git a/openvidu-test/src/main/java/org/openvidu/test/fake/util/TestPipeline.java b/openvidu-test/src/main/java/io/openvidu/test/fake/util/TestPipeline.java similarity index 98% rename from openvidu-test/src/main/java/org/openvidu/test/fake/util/TestPipeline.java rename to openvidu-test/src/main/java/io/openvidu/test/fake/util/TestPipeline.java index b2dd785e..f1f58cb6 100644 --- a/openvidu-test/src/main/java/org/openvidu/test/fake/util/TestPipeline.java +++ b/openvidu-test/src/main/java/io/openvidu/test/fake/util/TestPipeline.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.test.fake.util; +package io.openvidu.test.fake.util; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/openvidu-testapp/pom.xml b/openvidu-testapp/pom.xml index b65fddcc..9c4399a2 100644 --- a/openvidu-testapp/pom.xml +++ b/openvidu-testapp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.openvidu + io.openvidu openvidu 0.0.1-SNAPSHOT ../ @@ -40,16 +40,16 @@ - openvidu.org - -openvidu.org Community - OpenVidu.org - https://github.com/OpenVidu/openvidu + openvidu.io + -openvidu.io Community + OpenVidu + http://openvidu.io - org.openvidu.testapp.OpenViduTestApp + io.openvidu.testapp.OpenViduTestApp @@ -192,7 +192,7 @@ - org.openvidu + io.openvidu openvidu-server @@ -202,7 +202,7 @@ - org.openvidu + io.openvidu openvidu-browser @@ -210,7 +210,7 @@ spring-boot-starter-log4j2 - org.openvidu + io.openvidu openvidu-test test diff --git a/openvidu-testapp/src/main/java/org/openvidu/testapp/OpenViduTestApp.java b/openvidu-testapp/src/main/java/io/openvidu/testapp/OpenViduTestApp.java similarity index 94% rename from openvidu-testapp/src/main/java/org/openvidu/testapp/OpenViduTestApp.java rename to openvidu-testapp/src/main/java/io/openvidu/testapp/OpenViduTestApp.java index 51153a06..3b4aa039 100644 --- a/openvidu-testapp/src/main/java/org/openvidu/testapp/OpenViduTestApp.java +++ b/openvidu-testapp/src/main/java/io/openvidu/testapp/OpenViduTestApp.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.testapp; +package io.openvidu.testapp; import org.kurento.commons.ConfigFileManager; -import org.openvidu.server.OpenViduServer; +import io.openvidu.server.OpenViduServer; import org.springframework.boot.SpringApplication; import org.springframework.context.annotation.Import; diff --git a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/AddRemoveUsersBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/AddRemoveUsersBasicTest.java similarity index 93% rename from openvidu-testapp/src/test/java/org/openvidu/testapp/test/AddRemoveUsersBasicTest.java rename to openvidu-testapp/src/test/java/io/openvidu/testapp/test/AddRemoveUsersBasicTest.java index 93b0cdd0..62e66089 100644 --- a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/AddRemoveUsersBasicTest.java +++ b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/AddRemoveUsersBasicTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openvidu.testapp.test; +package io.openvidu.testapp.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.AddRemoveUsers; +import io.openvidu.test.browser.AddRemoveUsers; /** * @see AddRemoveUsers diff --git a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/AddRemoveUsersNoSinkVerifyBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/AddRemoveUsersNoSinkVerifyBasicTest.java similarity index 93% rename from openvidu-testapp/src/test/java/org/openvidu/testapp/test/AddRemoveUsersNoSinkVerifyBasicTest.java rename to openvidu-testapp/src/test/java/io/openvidu/testapp/test/AddRemoveUsersNoSinkVerifyBasicTest.java index 1410a1dd..9e8e724f 100644 --- a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/AddRemoveUsersNoSinkVerifyBasicTest.java +++ b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/AddRemoveUsersNoSinkVerifyBasicTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openvidu.testapp.test; +package io.openvidu.testapp.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.AddRemoveUsersNoSinkVerify; +import io.openvidu.test.browser.AddRemoveUsersNoSinkVerify; /** * @see AddRemoveUsersNoSinkVerify diff --git a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/NUsersEqualLifetimeBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/NUsersEqualLifetimeBasicTest.java similarity index 93% rename from openvidu-testapp/src/test/java/org/openvidu/testapp/test/NUsersEqualLifetimeBasicTest.java rename to openvidu-testapp/src/test/java/io/openvidu/testapp/test/NUsersEqualLifetimeBasicTest.java index 2c3b43b7..e412afed 100644 --- a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/NUsersEqualLifetimeBasicTest.java +++ b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/NUsersEqualLifetimeBasicTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openvidu.testapp.test; +package io.openvidu.testapp.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.NUsersEqualLifetime; +import io.openvidu.test.browser.NUsersEqualLifetime; /** * @see NUsersEqualLifetime diff --git a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/OneUserQuickReentryBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/OneUserQuickReentryBasicTest.java similarity index 93% rename from openvidu-testapp/src/test/java/org/openvidu/testapp/test/OneUserQuickReentryBasicTest.java rename to openvidu-testapp/src/test/java/io/openvidu/testapp/test/OneUserQuickReentryBasicTest.java index fa49f771..1f9500c9 100644 --- a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/OneUserQuickReentryBasicTest.java +++ b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/OneUserQuickReentryBasicTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openvidu.testapp.test; +package io.openvidu.testapp.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.OneUserQuickReentry; +import io.openvidu.test.browser.OneUserQuickReentry; /** * @see OneUserQuickReentry diff --git a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/SeqAddRemoveUserBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/SeqAddRemoveUserBasicTest.java similarity index 93% rename from openvidu-testapp/src/test/java/org/openvidu/testapp/test/SeqAddRemoveUserBasicTest.java rename to openvidu-testapp/src/test/java/io/openvidu/testapp/test/SeqAddRemoveUserBasicTest.java index 8a20830e..651db1be 100644 --- a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/SeqAddRemoveUserBasicTest.java +++ b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/SeqAddRemoveUserBasicTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openvidu.testapp.test; +package io.openvidu.testapp.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.SeqAddRemoveUser; +import io.openvidu.test.browser.SeqAddRemoveUser; /** * @see SeqAddRemoveUser diff --git a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/SeqNUsersEqualLifetimeBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/SeqNUsersEqualLifetimeBasicTest.java similarity index 93% rename from openvidu-testapp/src/test/java/org/openvidu/testapp/test/SeqNUsersEqualLifetimeBasicTest.java rename to openvidu-testapp/src/test/java/io/openvidu/testapp/test/SeqNUsersEqualLifetimeBasicTest.java index 90e2f015..82ae24d7 100644 --- a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/SeqNUsersEqualLifetimeBasicTest.java +++ b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/SeqNUsersEqualLifetimeBasicTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openvidu.testapp.test; +package io.openvidu.testapp.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.SeqNUsersEqualLifetime; +import io.openvidu.test.browser.SeqNUsersEqualLifetime; /** * @see SeqNUsersEqualLifetime diff --git a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/TwoUsersEqualLifetimeBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/TwoUsersEqualLifetimeBasicTest.java similarity index 93% rename from openvidu-testapp/src/test/java/org/openvidu/testapp/test/TwoUsersEqualLifetimeBasicTest.java rename to openvidu-testapp/src/test/java/io/openvidu/testapp/test/TwoUsersEqualLifetimeBasicTest.java index 685acda4..65e9de20 100644 --- a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/TwoUsersEqualLifetimeBasicTest.java +++ b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/TwoUsersEqualLifetimeBasicTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openvidu.testapp.test; +package io.openvidu.testapp.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.TwoUsersEqualLifetime; +import io.openvidu.test.browser.TwoUsersEqualLifetime; /** * @see TwoUsersEqualLifetime diff --git a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/WebAppAvailabilityBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/WebAppAvailabilityBasicTest.java similarity index 93% rename from openvidu-testapp/src/test/java/org/openvidu/testapp/test/WebAppAvailabilityBasicTest.java rename to openvidu-testapp/src/test/java/io/openvidu/testapp/test/WebAppAvailabilityBasicTest.java index a2f44dae..2b58d66c 100644 --- a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/WebAppAvailabilityBasicTest.java +++ b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/WebAppAvailabilityBasicTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openvidu.testapp.test; +package io.openvidu.testapp.test; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.browser.WebAppAvailability; +import io.openvidu.test.browser.WebAppAvailability; /** * @author Radu Tom Vlad (rvlad@naevatec.com) diff --git a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/fake/ExtraKmsFakeUsersBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/fake/ExtraKmsFakeUsersBasicTest.java similarity index 93% rename from openvidu-testapp/src/test/java/org/openvidu/testapp/test/fake/ExtraKmsFakeUsersBasicTest.java rename to openvidu-testapp/src/test/java/io/openvidu/testapp/test/fake/ExtraKmsFakeUsersBasicTest.java index 6cdbf600..0c588252 100644 --- a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/fake/ExtraKmsFakeUsersBasicTest.java +++ b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/fake/ExtraKmsFakeUsersBasicTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.testapp.test.fake; +package io.openvidu.testapp.test.fake; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.fake.ExtraKmsFakeUsers; +import io.openvidu.test.fake.ExtraKmsFakeUsers; /** * @see ExtraKmsFakeUsers diff --git a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/fake/ParallelNFakeUsersBasicTest.java b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/fake/ParallelNFakeUsersBasicTest.java similarity index 93% rename from openvidu-testapp/src/test/java/org/openvidu/testapp/test/fake/ParallelNFakeUsersBasicTest.java rename to openvidu-testapp/src/test/java/io/openvidu/testapp/test/fake/ParallelNFakeUsersBasicTest.java index fed7ef9e..ebfe95d8 100644 --- a/openvidu-testapp/src/test/java/org/openvidu/testapp/test/fake/ParallelNFakeUsersBasicTest.java +++ b/openvidu-testapp/src/test/java/io/openvidu/testapp/test/fake/ParallelNFakeUsersBasicTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openvidu.testapp.test.fake; +package io.openvidu.testapp.test.fake; import java.lang.invoke.MethodHandles; import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.kurento.test.browser.WebPageType; -import org.openvidu.test.fake.ParallelNFakeUsers; +import io.openvidu.test.fake.ParallelNFakeUsers; /** * @see ParallelNFakeUsers diff --git a/pom.xml b/pom.xml index 1f3d3337..59c3dedf 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 6.6.1-SNAPSHOT - org.openvidu + io.openvidu openvidu 0.0.1-SNAPSHOT pom @@ -17,7 +17,7 @@ OpenVidu modules: sdk, client, server, demos, test - https://github.com/OpenVidu/openvidu + http://openvidu.io @@ -29,7 +29,7 @@ OpenVidu - https://github.com/OpenVidu/openvidu + http://openvidu.io @@ -41,10 +41,10 @@ - openvidu.org - -openvidu.org Community - OpenVidu.org - https://github.com/OpenVidu/openvidu + openvidu.io + -openvidu.io Community + openvidu.io + http://openvidu.io @@ -75,7 +75,7 @@ openvidu-demo openvidu-testapp openvidu-sample-app - openvidu-backend-client + openvidu-java-client @@ -99,37 +99,37 @@ - org.openvidu + io.openvidu openvidu-sdk ${version.openvidu} - org.openvidu + io.openvidu openvidu-server ${version.openvidu} - org.openvidu + io.openvidu openvidu-client ${version.openvidu} - org.openvidu + io.openvidu openvidu-browser ${version.openvidu} - org.openvidu + io.openvidu openvidu-test ${version.openvidu} - org.openvidu + io.openvidu openvidu-demo ${version.openvidu} - org.openvidu + io.openvidu openvidu-basicapp ${version.openvidu}