monorepo: Java: Move and review all files...

* Simplify all dir names, remove "kurento-" prefix from everywhere. * Remove unmaintained and deprecated packages: - jurento-java/kurento-assembly - jurento-java/kurento-basicroom - jurento-java/kurento-repository - kurento-java/kurento-integration-tests/kurento-repository-test - kurento-tutorial-java/kurento-hello-world-repository * Move kurento-java/kurento-integration-tests out of kurento-java. Now it exists independently, at test/integration/ This fixes a circular dependency issue between components: - Extra/Example plugins (chroma, crowddetector, platedetector, etc) depend on kurento-client. - kurento-java builds kurento-client and kurento-integration-tests. - kurento-integration-tests depends on extra plugins (chrome, etc). - Thus it was impossible to make a from-scratch, clean slate build of all this. * Update ALL files to ensure consistent names and correct information everywhere: - Git repo: https://github.com/Kurento/kurento.git - Website: https://kurento.openvidu.io/ - Email: kurento@openvidu.io - Version: 7.0.0
Kurento · Jan 17, 2023 · 1853128 · 1853128
1 parent 50588df
commit 1853128
Show file tree

Hide file tree

Showing 1,238 changed files with 469 additions and 16,376 deletions.
diff --git a/clients/java/README.md b/clients/java/README.md
@@ -55,7 +55,7 @@ Usage:
 
 Issues:
 
-* [Bug Tracker](https://github.com/Kurento/bugtracker/issues)
+* [Bug Tracker](https://github.com/Kurento/kurento/issues)
 * [Support](https://doc-kurento.readthedocs.io/en/latest/user/support.html)
 
 News:

diff --git a/clients/java/bin/set-versions.sh b/clients/java/bin/set-versions.sh
@@ -15,7 +15,7 @@
 #/ and existing (available for download or installed locally).
 #/
 #/ We have frequently found that this is a limitation, because some times it is
-#/ needed to update from an unexisting version (like if some component is
+#/ needed to update from an nonexistent version (like if some component is
 #/ skipping a patch number, during separate development of different modules),
 #/ or when doing a Release (when the release version is not yet available).
 #/
@@ -48,7 +48,7 @@
 #/   released, and the Java packages should be made to depend on the new API
 #/   definition ones (which get published as part of the Media Server release).
 #/
-#/   <KmsVersion> is a full Maven version, such as "6.12.0-SNAPSHOT" or "6.12.0".
+#/   <KmsVersion> is a full Maven version, such as "7.0.0-SNAPSHOT" or "7.0.0".
 #/
 #/   Optional. Default: None.
 #/
@@ -166,9 +166,27 @@ function git_add() {
 # Apply version
 # =============
 
+# maven-plugin
+{
+    pushd maven-plugin/
+
+    # Project version: Set new value.
+    xmlstarlet edit -S --inplace \
+        --update "/_:project/_:version" \
+        --value "$VERSION_JAVA" \
+        pom.xml
+
+    # Dependency on kurento-module-creator.
+    xmlstarlet edit -S --inplace \
+        --update "/_:project/_:dependencies/_:dependency[_:artifactId='kurento-module-creator']/_:version" \
+        --value "$VERSION_JAVA" \
+        pom.xml
+    popd
+}
+
 # kurento-parent-pom
 {
-    pushd kurento-parent-pom/
+    pushd parent-pom/
 
     # NOTE: No need to update the parent version. Release docs already instruct
     # to update it manually whenever kurento-qa-pom is getting a new version.
@@ -209,13 +227,9 @@ function git_add() {
 
     # Children: Make them inherit from the new parent.
     CHILDREN=(
-        kurento-assembly
-        kurento-basicroom
-        kurento-client
-        kurento-commons
-        kurento-integration-tests
-        kurento-jsonrpc
-        kurento-repository
+        client
+        commons
+        jsonrpc
     )
     for CHILD in "${CHILDREN[@]}"; do
         find "$CHILD" -name pom.xml -print0 | xargs -0 -n1 \

diff --git a/clients/java/kurento-assembly/LICENSE → clients/java/client/LICENSE b/clients/java/kurento-assembly/LICENSE → clients/java/client/LICENSE
diff --git a/clients/java/kurento-assembly/NOTICE → clients/java/client/NOTICE b/clients/java/kurento-assembly/NOTICE → clients/java/client/NOTICE
diff --git a/clients/java/kurento-client/README.md → clients/java/client/README.md b/clients/java/kurento-client/README.md → clients/java/client/README.md
@@ -42,7 +42,6 @@ News and Website
 ----------------
 
 Check the [Kurento blog]
-Follow us on Twitter @[kurentoms].
 
 Issue tracker
 -------------
@@ -98,9 +97,8 @@ Before asking for support, please read first the [Kurento Netiquette Guidelines]
 
 [documentation]: https://kurento.openvidu.io/documentation
 [FIWARE]: http://www.fiware.org
-[GitHub Kurento bugtracker]: https://github.com/Kurento/bugtracker/issues
-[GitHub Kurento Group]: https://github.com/kurento
-[kurentoms]: http://twitter.com/kurentoms
+[GitHub Kurento bugtracker]: https://github.com/Kurento/kurento/issues
+[GitHub Kurento Group]: https://github.com/Kurento
 [Kurento]: https://kurento.openvidu.io/
 [Kurento Blog]: https://kurento.openvidu.io/blog
 [Kurento FIWARE Catalog Entry]: http://catalogue.fiware.org/enablers/stream-oriented-kurento

diff --git a/clients/java/kurento-client/pom.xml → clients/java/client/pom.xml b/clients/java/kurento-client/pom.xml → clients/java/client/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>org.kurento</groupId>
 		<artifactId>kurento-parent-pom</artifactId>
 		<version>7.0.0-SNAPSHOT</version>
-		<relativePath>../kurento-parent-pom</relativePath>
+		<relativePath>../parent-pom</relativePath>
 	</parent>
 	<artifactId>kurento-client</artifactId>
 	<packaging>jar</packaging>

diff --git a/...a/org/kurento/client/AbstractBuilder.java → ...a/org/kurento/client/AbstractBuilder.java b/...a/org/kurento/client/AbstractBuilder.java → ...a/org/kurento/client/AbstractBuilder.java
diff --git a/...java/org/kurento/client/Continuation.java → ...java/org/kurento/client/Continuation.java b/...java/org/kurento/client/Continuation.java → ...java/org/kurento/client/Continuation.java
diff --git a/...c/main/java/org/kurento/client/Event.java → ...c/main/java/org/kurento/client/Event.java b/...c/main/java/org/kurento/client/Event.java → ...c/main/java/org/kurento/client/Event.java
diff --git a/...ava/org/kurento/client/EventListener.java → ...ava/org/kurento/client/EventListener.java b/...ava/org/kurento/client/EventListener.java → ...ava/org/kurento/client/EventListener.java
diff --git a/...g/kurento/client/GenericMediaElement.java → ...g/kurento/client/GenericMediaElement.java b/...g/kurento/client/GenericMediaElement.java → ...g/kurento/client/GenericMediaElement.java
diff --git a/...org/kurento/client/GenericMediaEvent.java → ...org/kurento/client/GenericMediaEvent.java b/...org/kurento/client/GenericMediaEvent.java → ...org/kurento/client/GenericMediaEvent.java
diff --git a/...main/java/org/kurento/client/Handler.java → ...main/java/org/kurento/client/Handler.java b/...main/java/org/kurento/client/Handler.java → ...main/java/org/kurento/client/Handler.java
diff --git a/...ent/JsonRpcConnectionListenerKurento.java → ...ent/JsonRpcConnectionListenerKurento.java b/...ent/JsonRpcConnectionListenerKurento.java → ...ent/JsonRpcConnectionListenerKurento.java
diff --git a/...ava/org/kurento/client/KurentoClient.java → ...ava/org/kurento/client/KurentoClient.java b/...ava/org/kurento/client/KurentoClient.java → ...ava/org/kurento/client/KurentoClient.java
diff --git a/.../kurento/client/KurentoClientBuilder.java → .../kurento/client/KurentoClientBuilder.java b/.../kurento/client/KurentoClientBuilder.java → .../kurento/client/KurentoClientBuilder.java
diff --git a/...nto/client/KurentoConnectionListener.java → ...nto/client/KurentoConnectionListener.java b/...nto/client/KurentoConnectionListener.java → ...nto/client/KurentoConnectionListener.java
diff --git a/...ava/org/kurento/client/KurentoObject.java → ...ava/org/kurento/client/KurentoObject.java b/...ava/org/kurento/client/KurentoObject.java → ...ava/org/kurento/client/KurentoObject.java
diff --git a/.../kurento/client/ListenerSubscription.java → .../kurento/client/ListenerSubscription.java b/.../kurento/client/ListenerSubscription.java → .../kurento/client/ListenerSubscription.java
diff --git a/...n/java/org/kurento/client/Properties.java → ...n/java/org/kurento/client/Properties.java b/...n/java/org/kurento/client/Properties.java → ...n/java/org/kurento/client/Properties.java
diff --git a/...rg/kurento/client/ReconnectedHandler.java → ...rg/kurento/client/ReconnectedHandler.java b/...rg/kurento/client/ReconnectedHandler.java → ...rg/kurento/client/ReconnectedHandler.java
diff --git a/...main/java/org/kurento/client/TFuture.java → ...main/java/org/kurento/client/TFuture.java b/...main/java/org/kurento/client/TFuture.java → ...main/java/org/kurento/client/TFuture.java
diff --git a/.../java/org/kurento/client/Transaction.java → .../java/org/kurento/client/Transaction.java b/.../java/org/kurento/client/Transaction.java → .../java/org/kurento/client/Transaction.java
diff --git a/.../kurento/client/TransactionException.java → .../kurento/client/TransactionException.java b/.../kurento/client/TransactionException.java → .../kurento/client/TransactionException.java
diff --git a/...client/TransactionExecutionException.java → ...client/TransactionExecutionException.java b/...client/TransactionExecutionException.java → ...client/TransactionExecutionException.java
diff --git a/...ient/TransactionNotCommitedException.java → ...ient/TransactionNotCommitedException.java b/...ient/TransactionNotCommitedException.java → ...ient/TransactionNotCommitedException.java
diff --git a/...ient/TransactionNotExecutedException.java → ...ient/TransactionNotExecutedException.java b/...ient/TransactionNotExecutedException.java → ...ient/TransactionNotExecutedException.java
diff --git a/.../client/TransactionRollbackException.java → .../client/TransactionRollbackException.java b/.../client/TransactionRollbackException.java → .../client/TransactionRollbackException.java
diff --git a/.../kurento/client/internal/KmsProvider.java → .../kurento/client/internal/KmsProvider.java b/.../kurento/client/internal/KmsProvider.java → .../kurento/client/internal/KmsProvider.java
diff --git a/...kurento/client/internal/KmsUrlLoader.java → ...kurento/client/internal/KmsUrlLoader.java b/...kurento/client/internal/KmsUrlLoader.java → ...kurento/client/internal/KmsUrlLoader.java
diff --git a/...g/kurento/client/internal/ModuleName.java → ...g/kurento/client/internal/ModuleName.java b/...g/kurento/client/internal/ModuleName.java → ...g/kurento/client/internal/ModuleName.java
diff --git a/...internal/NotEnoughResourcesException.java → ...internal/NotEnoughResourcesException.java b/...internal/NotEnoughResourcesException.java → ...internal/NotEnoughResourcesException.java
diff --git a/...client/internal/ParamAnnotationUtils.java → ...client/internal/ParamAnnotationUtils.java b/...client/internal/ParamAnnotationUtils.java → ...client/internal/ParamAnnotationUtils.java
diff --git a/.../kurento/client/internal/RemoteClass.java → .../kurento/client/internal/RemoteClass.java b/.../kurento/client/internal/RemoteClass.java → .../kurento/client/internal/RemoteClass.java
diff --git a/.../kurento/client/internal/TFutureImpl.java → .../kurento/client/internal/TFutureImpl.java b/.../kurento/client/internal/TFutureImpl.java → .../kurento/client/internal/TFutureImpl.java
diff --git a/...ento/client/internal/TransactionImpl.java → ...ento/client/internal/TransactionImpl.java b/...ento/client/internal/TransactionImpl.java → ...ento/client/internal/TransactionImpl.java
diff --git a/.../internal/client/DefaultContinuation.java → .../internal/client/DefaultContinuation.java b/.../internal/client/DefaultContinuation.java → .../internal/client/DefaultContinuation.java
diff --git a/...rnal/client/DefaultInvocationHandler.java → ...rnal/client/DefaultInvocationHandler.java b/...rnal/client/DefaultInvocationHandler.java → ...rnal/client/DefaultInvocationHandler.java
diff --git a/...internal/client/ErrorLogContinuation.java → ...internal/client/ErrorLogContinuation.java b/...internal/client/ErrorLogContinuation.java → ...internal/client/ErrorLogContinuation.java
diff --git a/...rnal/client/ListenerSubscriptionImpl.java → ...rnal/client/ListenerSubscriptionImpl.java b/...rnal/client/ListenerSubscriptionImpl.java → ...rnal/client/ListenerSubscriptionImpl.java
diff --git a/.../client/internal/client/RemoteObject.java → .../client/internal/client/RemoteObject.java b/.../client/internal/client/RemoteObject.java → .../client/internal/client/RemoteObject.java
diff --git a/...nal/client/RemoteObjectEventListener.java → ...nal/client/RemoteObjectEventListener.java b/...nal/client/RemoteObjectEventListener.java → ...nal/client/RemoteObjectEventListener.java
diff --git a/.../internal/client/RemoteObjectFactory.java → .../internal/client/RemoteObjectFactory.java b/.../internal/client/RemoteObjectFactory.java → .../internal/client/RemoteObjectFactory.java
diff --git a/...client/RemoteObjectInvocationHandler.java → ...client/RemoteObjectInvocationHandler.java b/...client/RemoteObjectInvocationHandler.java → ...client/RemoteObjectInvocationHandler.java
diff --git a/...nto/client/internal/client/RomClient.java → ...nto/client/internal/client/RomClient.java b/...nto/client/internal/client/RomClient.java → ...nto/client/internal/client/RomClient.java
diff --git a/...ternal/client/RomClientObjectManager.java → ...ternal/client/RomClientObjectManager.java b/...ternal/client/RomClientObjectManager.java → ...ternal/client/RomClientObjectManager.java
diff --git a/...ient/internal/client/RomEventHandler.java → ...ient/internal/client/RomEventHandler.java b/...ient/internal/client/RomEventHandler.java → ...ient/internal/client/RomEventHandler.java
diff --git a/...to/client/internal/client/RomManager.java → ...to/client/internal/client/RomManager.java b/...to/client/internal/client/RomManager.java → ...to/client/internal/client/RomManager.java
diff --git a/...nal/client/operation/InvokeOperation.java → ...nal/client/operation/InvokeOperation.java b/...nal/client/operation/InvokeOperation.java → ...nal/client/operation/InvokeOperation.java
diff --git a/...eration/MediaObjectCreationOperation.java → ...eration/MediaObjectCreationOperation.java b/...eration/MediaObjectCreationOperation.java → ...eration/MediaObjectCreationOperation.java
diff --git a/.../internal/client/operation/Operation.java → .../internal/client/operation/Operation.java b/.../internal/client/operation/Operation.java → .../internal/client/operation/Operation.java
diff --git a/...al/client/operation/ReleaseOperation.java → ...al/client/operation/ReleaseOperation.java b/...al/client/operation/ReleaseOperation.java → ...al/client/operation/ReleaseOperation.java
diff --git a/...ient/operation/SubscriptionOperation.java → ...ient/operation/SubscriptionOperation.java b/...ient/operation/SubscriptionOperation.java → ...ient/operation/SubscriptionOperation.java
diff --git a/...nt/operation/UnsubscriptionOperation.java → ...nt/operation/UnsubscriptionOperation.java b/...nt/operation/UnsubscriptionOperation.java → ...nt/operation/UnsubscriptionOperation.java
diff --git a/...nt/internal/server/EventSubscription.java → ...nt/internal/server/EventSubscription.java b/...nt/internal/server/EventSubscription.java → ...nt/internal/server/EventSubscription.java
diff --git a/...ternal/server/KurentoServerException.java → ...ternal/server/KurentoServerException.java b/...ternal/server/KurentoServerException.java → ...ternal/server/KurentoServerException.java
diff --git a/...rver/KurentoServerTransportException.java → ...rver/KurentoServerTransportException.java b/...rver/KurentoServerTransportException.java → ...rver/KurentoServerTransportException.java
diff --git a/...kurento/client/internal/server/Param.java → ...kurento/client/internal/server/Param.java b/...kurento/client/internal/server/Param.java → ...kurento/client/internal/server/Param.java
diff --git a/...nt/internal/server/ProtocolException.java → ...nt/internal/server/ProtocolException.java b/...nt/internal/server/ProtocolException.java → ...nt/internal/server/ProtocolException.java
diff --git a/.../internal/server/RemoteObjectManager.java → .../internal/server/RemoteObjectManager.java b/.../internal/server/RemoteObjectManager.java → .../internal/server/RemoteObjectManager.java
diff --git a/...nto/client/internal/server/RomServer.java → ...nto/client/internal/server/RomServer.java b/...nto/client/internal/server/RomServer.java → ...nto/client/internal/server/RomServer.java
diff --git a/.../transport/jsonrpc/JsonResponseUtils.java → .../transport/jsonrpc/JsonResponseUtils.java b/.../transport/jsonrpc/JsonResponseUtils.java → .../transport/jsonrpc/JsonResponseUtils.java
diff --git a/...sport/jsonrpc/RomClientJsonRpcClient.java → ...sport/jsonrpc/RomClientJsonRpcClient.java b/...sport/jsonrpc/RomClientJsonRpcClient.java → ...sport/jsonrpc/RomClientJsonRpcClient.java
diff --git a/...ransport/jsonrpc/RomJsonRpcConstants.java → ...ransport/jsonrpc/RomJsonRpcConstants.java b/...ransport/jsonrpc/RomJsonRpcConstants.java → ...ransport/jsonrpc/RomJsonRpcConstants.java
diff --git a/...port/jsonrpc/RomServerJsonRpcHandler.java → ...port/jsonrpc/RomServerJsonRpcHandler.java b/...port/jsonrpc/RomServerJsonRpcHandler.java → ...port/jsonrpc/RomServerJsonRpcHandler.java
diff --git a/...t/serialization/ModuleClassesManager.java → ...t/serialization/ModuleClassesManager.java b/...t/serialization/ModuleClassesManager.java → ...t/serialization/ModuleClassesManager.java
diff --git a/...port/serialization/ObjectRefsManager.java → ...port/serialization/ObjectRefsManager.java b/...port/serialization/ObjectRefsManager.java → ...port/serialization/ObjectRefsManager.java
diff --git a/...nsport/serialization/ParamsFlattener.java → ...nsport/serialization/ParamsFlattener.java b/...nsport/serialization/ParamsFlattener.java → ...nsport/serialization/ParamsFlattener.java
diff --git a/...ts/java/kurento-client/src/main/kmd/.keep → clients/java/client/src/main/kmd/.keep b/...ts/java/kurento-client/src/main/kmd/.keep → clients/java/client/src/main/kmd/.keep
diff --git a/...rces/templates/complexType_class_java.ftl → ...rces/templates/complexType_class_java.ftl b/...rces/templates/complexType_class_java.ftl → ...rces/templates/complexType_class_java.ftl
diff --git a/.../src/main/resources/templates/config.json → .../src/main/resources/templates/config.json b/.../src/main/resources/templates/config.json → .../src/main/resources/templates/config.json
diff --git a/...n/resources/templates/event_impl_java.ftl → ...n/resources/templates/event_impl_java.ftl b/...n/resources/templates/event_impl_java.ftl → ...n/resources/templates/event_impl_java.ftl
diff --git a/...t/src/main/resources/templates/macros.ftm → ...t/src/main/resources/templates/macros.ftm b/...t/src/main/resources/templates/macros.ftm → ...t/src/main/resources/templates/macros.ftm
diff --git a/...templates/model_moduleInfo_class_java.ftl → ...templates/model_moduleInfo_class_java.ftl b/...templates/model_moduleInfo_class_java.ftl → ...templates/model_moduleInfo_class_java.ftl
diff --git a/.../templates/remoteClass_interface_java.ftl → .../templates/remoteClass_interface_java.ftl b/.../templates/remoteClass_interface_java.ftl → .../templates/remoteClass_interface_java.ftl
diff --git a/...client/internal/test/AbstractRomTest.java → ...client/internal/test/AbstractRomTest.java b/...client/internal/test/AbstractRomTest.java → ...client/internal/test/AbstractRomTest.java
diff --git a/...lient/internal/test/ConstructionTest.java → ...lient/internal/test/ConstructionTest.java b/...lient/internal/test/ConstructionTest.java → ...lient/internal/test/ConstructionTest.java
diff --git a/...nternal/test/KmsUrlServiceLoaderTest.java → ...nternal/test/KmsUrlServiceLoaderTest.java b/...nternal/test/KmsUrlServiceLoaderTest.java → ...nternal/test/KmsUrlServiceLoaderTest.java
diff --git a/...to/client/internal/test/LocalRomTest.java → ...to/client/internal/test/LocalRomTest.java b/...to/client/internal/test/LocalRomTest.java → ...to/client/internal/test/LocalRomTest.java
diff --git a/...t/internal/test/ReturnReferencesTest.java → ...t/internal/test/ReturnReferencesTest.java b/...t/internal/test/ReturnReferencesTest.java → ...t/internal/test/ReturnReferencesTest.java
diff --git a/...rnal/test/RomClientWeakRemoteObjects.java → ...rnal/test/RomClientWeakRemoteObjects.java b/...rnal/test/RomClientWeakRemoteObjects.java → ...rnal/test/RomClientWeakRemoteObjects.java
diff --git a/...t/internal/test/RomInterfaceImplTest.java → ...t/internal/test/RomInterfaceImplTest.java b/...t/internal/test/RomInterfaceImplTest.java → ...t/internal/test/RomInterfaceImplTest.java
diff --git a/...t/internal/test/RomJsonConverterTest.java → ...t/internal/test/RomJsonConverterTest.java b/...t/internal/test/RomJsonConverterTest.java → ...t/internal/test/RomJsonConverterTest.java
diff --git a/...t/internal/test/SyncConstMethodsTest.java → ...t/internal/test/SyncConstMethodsTest.java b/...t/internal/test/SyncConstMethodsTest.java → ...t/internal/test/SyncConstMethodsTest.java
diff --git a/...lient/internal/test/WebSocketRomTest.java → ...lient/internal/test/WebSocketRomTest.java b/...lient/internal/test/WebSocketRomTest.java → ...lient/internal/test/WebSocketRomTest.java
diff --git a/...o/client/internal/test/model/Sample2.java → ...o/client/internal/test/model/Sample2.java b/...o/client/internal/test/model/Sample2.java → ...o/client/internal/test/model/Sample2.java
diff --git a/...ient/internal/test/model/Sample2Impl.java → ...ient/internal/test/model/Sample2Impl.java b/...ient/internal/test/model/Sample2Impl.java → ...ient/internal/test/model/Sample2Impl.java
diff --git a/...nternal/test/model/SampleRemoteClass.java → ...nternal/test/model/SampleRemoteClass.java b/...nternal/test/model/SampleRemoteClass.java → ...nternal/test/model/SampleRemoteClass.java
diff --git a/...nal/test/model/SampleRemoteClassImpl.java → ...nal/test/model/SampleRemoteClassImpl.java b/...nal/test/model/SampleRemoteClassImpl.java → ...nal/test/model/SampleRemoteClassImpl.java
diff --git a/...ernal/test/model/client/ComplexParam.java → ...ernal/test/model/client/ComplexParam.java b/...ernal/test/model/client/ComplexParam.java → ...ernal/test/model/client/ComplexParam.java
diff --git a/...test/model/client/MediaServerFactory.java → ...test/model/client/MediaServerFactory.java b/...test/model/client/MediaServerFactory.java → ...test/model/client/MediaServerFactory.java
diff --git a/...ternal/test/model/client/SampleClass.java → ...ternal/test/model/client/SampleClass.java b/...ternal/test/model/client/SampleClass.java → ...ternal/test/model/client/SampleClass.java
diff --git a/...nternal/test/model/client/SampleEnum.java → ...nternal/test/model/client/SampleEnum.java b/...nternal/test/model/client/SampleEnum.java → ...nternal/test/model/client/SampleEnum.java
diff --git a/...l/test/model/client/events/BaseEvent.java → ...l/test/model/client/events/BaseEvent.java b/...l/test/model/client/events/BaseEvent.java → ...l/test/model/client/events/BaseEvent.java
diff --git a/...test/model/client/events/SampleEvent.java → ...test/model/client/events/SampleEvent.java b/...test/model/client/events/SampleEvent.java → ...test/model/client/events/SampleEvent.java
diff --git a/...al/test/model/server/SampleClassImpl.java → ...al/test/model/server/SampleClassImpl.java b/...al/test/model/server/SampleClassImpl.java → ...al/test/model/server/SampleClassImpl.java
diff --git a/...urento/module/ComplexParamModuleInfo.java → ...urento/module/ComplexParamModuleInfo.java b/...urento/module/ComplexParamModuleInfo.java → ...urento/module/ComplexParamModuleInfo.java
diff --git a/...src/test/resources/config-test.properties → ...src/test/resources/config-test.properties b/...src/test/resources/config-test.properties → ...src/test/resources/config-test.properties
diff --git a/...nto-client/src/test/resources/config.json → ...ava/client/src/test/resources/config.json b/...nto-client/src/test/resources/config.json → ...ava/client/src/test/resources/config.json
diff --git a/.../test/resources/invalid-config.properties → .../test/resources/invalid-config.properties b/.../test/resources/invalid-config.properties → .../test/resources/invalid-config.properties
diff --git a/...test/resources/provider-config.properties → ...test/resources/provider-config.properties b/...test/resources/provider-config.properties → ...test/resources/provider-config.properties
diff --git a/...client/src/test/resources/test_model.json → ...client/src/test/resources/test_model.json b/...client/src/test/resources/test_model.json → ...client/src/test/resources/test_model.json
diff --git a/clients/java/kurento-basicroom/LICENSE → clients/java/commons/LICENSE b/clients/java/kurento-basicroom/LICENSE → clients/java/commons/LICENSE
diff --git a/clients/java/kurento-basicroom/NOTICE → clients/java/commons/NOTICE b/clients/java/kurento-basicroom/NOTICE → clients/java/commons/NOTICE
diff --git a/clients/java/kurento-commons/README.md → clients/java/commons/README.md b/clients/java/kurento-commons/README.md → clients/java/commons/README.md
@@ -41,7 +41,6 @@ News and Website
 ----------------
 
 Check the [Kurento blog]
-Follow us on Twitter @[kurentoms].
 
 Issue tracker
 -------------
@@ -97,9 +96,8 @@ Before asking for support, please read first the [Kurento Netiquette Guidelines]
 
 [documentation]: https://kurento.openvidu.io/documentation
 [FIWARE]: http://www.fiware.org
-[GitHub Kurento bugtracker]: https://github.com/Kurento/bugtracker/issues
-[GitHub Kurento Group]: https://github.com/kurento
-[kurentoms]: http://twitter.com/kurentoms
+[GitHub Kurento bugtracker]: https://github.com/Kurento/kurento/issues
+[GitHub Kurento Group]: https://github.com/Kurento
 [Kurento]: https://kurento.openvidu.io/
 [Kurento Blog]: https://kurento.openvidu.io/blog
 [Kurento FIWARE Catalog Entry]: http://catalogue.fiware.org/enablers/stream-oriented-kurento

diff --git a/clients/java/kurento-commons/pom.xml → clients/java/commons/pom.xml b/clients/java/kurento-commons/pom.xml → clients/java/commons/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>org.kurento</groupId>
 		<artifactId>kurento-parent-pom</artifactId>
 		<version>7.0.0-SNAPSHOT</version>
-		<relativePath>../kurento-parent-pom</relativePath>
+		<relativePath>../parent-pom</relativePath>
 	</parent>
 	<artifactId>kurento-commons</artifactId>
 	<packaging>jar</packaging>

diff --git a/...ain/java/org/kurento/commons/Address.java → ...ain/java/org/kurento/commons/Address.java b/...ain/java/org/kurento/commons/Address.java → ...ain/java/org/kurento/commons/Address.java
diff --git a/...a/org/kurento/commons/BasicJsonUtils.java → ...a/org/kurento/commons/BasicJsonUtils.java b/...a/org/kurento/commons/BasicJsonUtils.java → ...a/org/kurento/commons/BasicJsonUtils.java
diff --git a/...n/java/org/kurento/commons/ClassPath.java → ...n/java/org/kurento/commons/ClassPath.java b/...n/java/org/kurento/commons/ClassPath.java → ...n/java/org/kurento/commons/ClassPath.java
diff --git a/...org/kurento/commons/ConfigFileFinder.java → ...org/kurento/commons/ConfigFileFinder.java b/...org/kurento/commons/ConfigFileFinder.java → ...org/kurento/commons/ConfigFileFinder.java
diff --git a/...rg/kurento/commons/ConfigFileManager.java → ...rg/kurento/commons/ConfigFileManager.java b/...rg/kurento/commons/ConfigFileManager.java → ...rg/kurento/commons/ConfigFileManager.java
diff --git a/...org/kurento/commons/ConfigFileObject.java → ...org/kurento/commons/ConfigFileObject.java b/...org/kurento/commons/ConfigFileObject.java → ...org/kurento/commons/ConfigFileObject.java
diff --git a/...nto/commons/ConfigFilePropertyHolder.java → ...nto/commons/ConfigFilePropertyHolder.java b/...nto/commons/ConfigFilePropertyHolder.java → ...nto/commons/ConfigFilePropertyHolder.java
diff --git a/...rg/kurento/commons/PropertiesManager.java → ...rg/kurento/commons/PropertiesManager.java b/...rg/kurento/commons/PropertiesManager.java → ...rg/kurento/commons/PropertiesManager.java
diff --git a/.../org/kurento/commons/SecretGenerator.java → .../org/kurento/commons/SecretGenerator.java b/.../org/kurento/commons/SecretGenerator.java → .../org/kurento/commons/SecretGenerator.java
diff --git a/...kurento/commons/ThreadFactoryCreator.java → ...kurento/commons/ThreadFactoryCreator.java b/...kurento/commons/ThreadFactoryCreator.java → ...kurento/commons/ThreadFactoryCreator.java
diff --git a/...kurento/commons/TimeoutReentrantLock.java → ...kurento/commons/TimeoutReentrantLock.java b/...kurento/commons/TimeoutReentrantLock.java → ...kurento/commons/TimeoutReentrantLock.java
diff --git a/...ento/commons/TimeoutRuntimeException.java → ...ento/commons/TimeoutRuntimeException.java b/...ento/commons/TimeoutRuntimeException.java → ...ento/commons/TimeoutRuntimeException.java
diff --git a/...org/kurento/commons/UrlServiceLoader.java → ...org/kurento/commons/UrlServiceLoader.java b/...org/kurento/commons/UrlServiceLoader.java → ...org/kurento/commons/UrlServiceLoader.java
diff --git a/...org/kurento/commons/exception/Assert.java → ...org/kurento/commons/exception/Assert.java b/...org/kurento/commons/exception/Assert.java → ...org/kurento/commons/exception/Assert.java
diff --git a/...o/commons/exception/KurentoException.java → ...o/commons/exception/KurentoException.java b/...o/commons/exception/KurentoException.java → ...o/commons/exception/KurentoException.java
diff --git a/...rg/kurento/commons/net/RemoteService.java → ...rg/kurento/commons/net/RemoteService.java b/...rg/kurento/commons/net/RemoteService.java → ...rg/kurento/commons/net/RemoteService.java
diff --git a/...nto/commons/testing/IntegrationTests.java → ...nto/commons/testing/IntegrationTests.java b/...nto/commons/testing/IntegrationTests.java → ...nto/commons/testing/IntegrationTests.java
diff --git a/...ommons/testing/JsonRpcConnectorTests.java → ...ommons/testing/JsonRpcConnectorTests.java b/...ommons/testing/JsonRpcConnectorTests.java → ...ommons/testing/JsonRpcConnectorTests.java
diff --git a/...o/commons/testing/KurentoClientTests.java → ...o/commons/testing/KurentoClientTests.java b/...o/commons/testing/KurentoClientTests.java → ...o/commons/testing/KurentoClientTests.java
diff --git a/...ns/testing/KurentoControlServerTests.java → ...ns/testing/KurentoControlServerTests.java b/...ns/testing/KurentoControlServerTests.java → ...ns/testing/KurentoControlServerTests.java
diff --git a/...nto/commons/testing/KurentoTreeTests.java → ...nto/commons/testing/KurentoTreeTests.java b/...nto/commons/testing/KurentoTreeTests.java → ...nto/commons/testing/KurentoTreeTests.java
diff --git a/...o/commons/testing/RepositoryApiTests.java → ...o/commons/testing/RepositoryApiTests.java b/...o/commons/testing/RepositoryApiTests.java → ...o/commons/testing/RepositoryApiTests.java
diff --git a/.../kurento/commons/testing/SanityTests.java → .../kurento/commons/testing/SanityTests.java b/.../kurento/commons/testing/SanityTests.java → .../kurento/commons/testing/SanityTests.java
diff --git a/...ons/testing/SystemCompatibilityTests.java → ...ons/testing/SystemCompatibilityTests.java b/...ons/testing/SystemCompatibilityTests.java → ...ons/testing/SystemCompatibilityTests.java
diff --git a/...ommons/testing/SystemFunctionalTests.java → ...ommons/testing/SystemFunctionalTests.java b/...ommons/testing/SystemFunctionalTests.java → ...ommons/testing/SystemFunctionalTests.java
diff --git a/...mmons/testing/SystemPerformanceTests.java → ...mmons/testing/SystemPerformanceTests.java b/...mmons/testing/SystemPerformanceTests.java → ...mmons/testing/SystemPerformanceTests.java
diff --git a/...o/commons/testing/SystemQualityTests.java → ...o/commons/testing/SystemQualityTests.java b/...o/commons/testing/SystemQualityTests.java → ...o/commons/testing/SystemQualityTests.java
diff --git a/...mmons/testing/SystemScalabilityTests.java → ...mmons/testing/SystemScalabilityTests.java b/...mmons/testing/SystemScalabilityTests.java → ...mmons/testing/SystemScalabilityTests.java
diff --git a/...commons/testing/SystemStabilityTests.java → ...commons/testing/SystemStabilityTests.java b/...commons/testing/SystemStabilityTests.java → ...commons/testing/SystemStabilityTests.java
diff --git a/.../kurento/commons/testing/SystemTests.java → .../kurento/commons/testing/SystemTests.java b/.../kurento/commons/testing/SystemTests.java → .../kurento/commons/testing/SystemTests.java
diff --git a/.../resources/kurento-error-codes.properties → .../resources/kurento-error-codes.properties b/.../resources/kurento-error-codes.properties → .../resources/kurento-error-codes.properties
diff --git a/.../kurento/commons/test/ConfigFileTest.java → .../kurento/commons/test/ConfigFileTest.java b/.../kurento/commons/test/ConfigFileTest.java → .../kurento/commons/test/ConfigFileTest.java
diff --git a/...commons/src/test/resources/test.conf.json → ...commons/src/test/resources/test.conf.json b/...commons/src/test/resources/test.conf.json → ...commons/src/test/resources/test.conf.json
diff --git a/clients/java/kurento-jsonrpc/README.md → clients/java/jsonrpc/README.md b/clients/java/kurento-jsonrpc/README.md → clients/java/jsonrpc/README.md
@@ -43,7 +43,6 @@ News and Website
 ----------------
 
 Check the [Kurento blog]
-Follow us on Twitter @[kurentoms].
 
 Issue tracker
 -------------
@@ -99,9 +98,8 @@ Before asking for support, please read first the [Kurento Netiquette Guidelines]
 
 [documentation]: https://kurento.openvidu.io/documentation
 [FIWARE]: http://www.fiware.org
-[GitHub Kurento bugtracker]: https://github.com/Kurento/bugtracker/issues
-[GitHub Kurento Group]: https://github.com/kurento
-[kurentoms]: http://twitter.com/kurentoms
+[GitHub Kurento bugtracker]: https://github.com/Kurento/kurento/issues
+[GitHub Kurento Group]: https://github.com/Kurento
 [Kurento]: https://kurento.openvidu.io/
 [Kurento Blog]: https://kurento.openvidu.io/blog
 [Kurento FIWARE Catalog Entry]: http://catalogue.fiware.org/enablers/stream-oriented-kurento

diff --git a/...nrpc/kurento-jsonrpc-client-jetty/pom.xml → ...java/jsonrpc/jsonrpc-client-jetty/pom.xml b/...nrpc/kurento-jsonrpc-client-jetty/pom.xml → ...java/jsonrpc/jsonrpc-client-jetty/pom.xml
diff --git a/...sonrpc/client/JsonRpcClientWebSocket.java → ...sonrpc/client/JsonRpcClientWebSocket.java b/...sonrpc/client/JsonRpcClientWebSocket.java → ...sonrpc/client/JsonRpcClientWebSocket.java
diff --git a/clients/java/kurento-client/LICENSE → clients/java/jsonrpc/jsonrpc-client/LICENSE b/clients/java/kurento-client/LICENSE → clients/java/jsonrpc/jsonrpc-client/LICENSE
diff --git a/clients/java/kurento-client/NOTICE → clients/java/jsonrpc/jsonrpc-client/NOTICE b/clients/java/kurento-client/NOTICE → clients/java/jsonrpc/jsonrpc-client/NOTICE
diff --git a/...-jsonrpc/kurento-jsonrpc-client/README.md → ...nts/java/jsonrpc/jsonrpc-client/README.md b/...-jsonrpc/kurento-jsonrpc-client/README.md → ...nts/java/jsonrpc/jsonrpc-client/README.md
@@ -43,7 +43,6 @@ News and Website
 ----------------
 
 Check the [Kurento blog]
-Follow us on Twitter @[kurentoms].
 
 Issue tracker
 -------------
@@ -99,9 +98,8 @@ Before asking for support, please read first the [Kurento Netiquette Guidelines]
 
 [documentation]: https://kurento.openvidu.io/documentation
 [FIWARE]: http://www.fiware.org
-[GitHub Kurento bugtracker]: https://github.com/Kurento/bugtracker/issues
-[GitHub Kurento Group]: https://github.com/kurento
-[kurentoms]: http://twitter.com/kurentoms
+[GitHub Kurento bugtracker]: https://github.com/Kurento/kurento/issues
+[GitHub Kurento Group]: https://github.com/Kurento
 [Kurento]: https://kurento.openvidu.io/
 [Kurento Blog]: https://kurento.openvidu.io/blog
 [Kurento FIWARE Catalog Entry]: http://catalogue.fiware.org/enablers/stream-oriented-kurento

diff --git a/...to-jsonrpc/kurento-jsonrpc-client/pom.xml → clients/java/jsonrpc/jsonrpc-client/pom.xml b/...to-jsonrpc/kurento-jsonrpc-client/pom.xml → clients/java/jsonrpc/jsonrpc-client/pom.xml
diff --git a/...urento/jsonrpc/DefaultJsonRpcHandler.java → ...urento/jsonrpc/DefaultJsonRpcHandler.java b/...urento/jsonrpc/DefaultJsonRpcHandler.java → ...urento/jsonrpc/DefaultJsonRpcHandler.java
diff --git a/.../jsonrpc/JsonRpcAndJavaMethodManager.java → .../jsonrpc/JsonRpcAndJavaMethodManager.java b/.../jsonrpc/JsonRpcAndJavaMethodManager.java → .../jsonrpc/JsonRpcAndJavaMethodManager.java
diff --git a/...jsonrpc/JsonRpcClientClosedException.java → ...jsonrpc/JsonRpcClientClosedException.java b/...jsonrpc/JsonRpcClientClosedException.java → ...jsonrpc/JsonRpcClientClosedException.java
diff --git a/...urento/jsonrpc/JsonRpcErrorException.java → ...urento/jsonrpc/JsonRpcErrorException.java b/...urento/jsonrpc/JsonRpcErrorException.java → ...urento/jsonrpc/JsonRpcErrorException.java
diff --git a/...org/kurento/jsonrpc/JsonRpcException.java → ...org/kurento/jsonrpc/JsonRpcException.java b/...org/kurento/jsonrpc/JsonRpcException.java → ...org/kurento/jsonrpc/JsonRpcException.java
diff --git a/...a/org/kurento/jsonrpc/JsonRpcHandler.java → ...a/org/kurento/jsonrpc/JsonRpcHandler.java b/...a/org/kurento/jsonrpc/JsonRpcHandler.java → ...a/org/kurento/jsonrpc/JsonRpcHandler.java
diff --git a/...va/org/kurento/jsonrpc/JsonRpcMethod.java → ...va/org/kurento/jsonrpc/JsonRpcMethod.java b/...va/org/kurento/jsonrpc/JsonRpcMethod.java → ...va/org/kurento/jsonrpc/JsonRpcMethod.java
diff --git a/...n/java/org/kurento/jsonrpc/JsonUtils.java → ...n/java/org/kurento/jsonrpc/JsonUtils.java b/...n/java/org/kurento/jsonrpc/JsonUtils.java → ...n/java/org/kurento/jsonrpc/JsonUtils.java
diff --git a/...c/main/java/org/kurento/jsonrpc/Prop.java → ...c/main/java/org/kurento/jsonrpc/Prop.java b/...c/main/java/org/kurento/jsonrpc/Prop.java → ...c/main/java/org/kurento/jsonrpc/Prop.java
diff --git a/...in/java/org/kurento/jsonrpc/PropImpl.java → ...in/java/org/kurento/jsonrpc/PropImpl.java b/...in/java/org/kurento/jsonrpc/PropImpl.java → ...in/java/org/kurento/jsonrpc/PropImpl.java
diff --git a/.../main/java/org/kurento/jsonrpc/Props.java → .../main/java/org/kurento/jsonrpc/Props.java b/.../main/java/org/kurento/jsonrpc/Props.java → .../main/java/org/kurento/jsonrpc/Props.java
diff --git a/...ain/java/org/kurento/jsonrpc/Session.java → ...ain/java/org/kurento/jsonrpc/Session.java b/...ain/java/org/kurento/jsonrpc/Session.java → ...ain/java/org/kurento/jsonrpc/Session.java
diff --git a/...java/org/kurento/jsonrpc/Transaction.java → ...java/org/kurento/jsonrpc/Transaction.java b/...java/org/kurento/jsonrpc/Transaction.java → ...java/org/kurento/jsonrpc/Transaction.java
diff --git a/...g/kurento/jsonrpc/TransportException.java → ...g/kurento/jsonrpc/TransportException.java b/...g/kurento/jsonrpc/TransportException.java → ...g/kurento/jsonrpc/TransportException.java
diff --git a/...to/jsonrpc/TypeDefaultJsonRpcHandler.java → ...to/jsonrpc/TypeDefaultJsonRpcHandler.java b/...to/jsonrpc/TypeDefaultJsonRpcHandler.java → ...to/jsonrpc/TypeDefaultJsonRpcHandler.java
diff --git a/...lient/AbstractJsonRpcClientWebSocket.java → ...lient/AbstractJsonRpcClientWebSocket.java b/...lient/AbstractJsonRpcClientWebSocket.java → ...lient/AbstractJsonRpcClientWebSocket.java
diff --git a/...bstractJsonRpcWebSocketClientHandler.java → ...bstractJsonRpcWebSocketClientHandler.java b/...bstractJsonRpcWebSocketClientHandler.java → ...bstractJsonRpcWebSocketClientHandler.java
diff --git a/.../kurento/jsonrpc/client/Continuation.java → .../kurento/jsonrpc/client/Continuation.java b/.../kurento/jsonrpc/client/Continuation.java → .../kurento/jsonrpc/client/Continuation.java
diff --git a/...a/org/kurento/jsonrpc/client/Handler.java → ...a/org/kurento/jsonrpc/client/Handler.java b/...a/org/kurento/jsonrpc/client/Handler.java → ...a/org/kurento/jsonrpc/client/Handler.java
diff --git a/...jsonrpc/client/JsonRcpServiceAdapter.java → ...jsonrpc/client/JsonRcpServiceAdapter.java b/...jsonrpc/client/JsonRcpServiceAdapter.java → ...jsonrpc/client/JsonRcpServiceAdapter.java
diff --git a/...kurento/jsonrpc/client/JsonRpcClient.java → ...kurento/jsonrpc/client/JsonRpcClient.java b/...kurento/jsonrpc/client/JsonRpcClient.java → ...kurento/jsonrpc/client/JsonRpcClient.java
diff --git a/...nto/jsonrpc/client/JsonRpcClientHttp.java → ...nto/jsonrpc/client/JsonRpcClientHttp.java b/...nto/jsonrpc/client/JsonRpcClientHttp.java → ...nto/jsonrpc/client/JsonRpcClientHttp.java
diff --git a/...to/jsonrpc/client/JsonRpcClientLocal.java → ...to/jsonrpc/client/JsonRpcClientLocal.java b/...to/jsonrpc/client/JsonRpcClientLocal.java → ...to/jsonrpc/client/JsonRpcClientLocal.java
diff --git a/...c/client/JsonRpcClientNettyWebSocket.java → ...c/client/JsonRpcClientNettyWebSocket.java b/...c/client/JsonRpcClientNettyWebSocket.java → ...c/client/JsonRpcClientNettyWebSocket.java
diff --git a/...pc/client/JsonRpcWSConnectionAdapter.java → ...pc/client/JsonRpcWSConnectionAdapter.java b/...pc/client/JsonRpcWSConnectionAdapter.java → ...pc/client/JsonRpcWSConnectionAdapter.java
diff --git a/...c/client/JsonRpcWSConnectionListener.java → ...c/client/JsonRpcWSConnectionListener.java b/...c/client/JsonRpcWSConnectionListener.java → ...c/client/JsonRpcWSConnectionListener.java
diff --git a/...to/jsonrpc/client/ReconnectedHandler.java → ...to/jsonrpc/client/ReconnectedHandler.java b/...to/jsonrpc/client/ReconnectedHandler.java → ...to/jsonrpc/client/ReconnectedHandler.java
diff --git a/...ent/RequestAlreadyRespondedException.java → ...ent/RequestAlreadyRespondedException.java b/...ent/RequestAlreadyRespondedException.java → ...ent/RequestAlreadyRespondedException.java
diff --git a/...rento/jsonrpc/client/WebSocketClient.java → ...rento/jsonrpc/client/WebSocketClient.java b/...rento/jsonrpc/client/WebSocketClient.java → ...rento/jsonrpc/client/WebSocketClient.java
diff --git a/.../jsonrpc/internal/HttpResponseSender.java → .../jsonrpc/internal/HttpResponseSender.java b/.../jsonrpc/internal/HttpResponseSender.java → .../jsonrpc/internal/HttpResponseSender.java
diff --git a/...to/jsonrpc/internal/JsonRpcConstants.java → ...to/jsonrpc/internal/JsonRpcConstants.java b/...to/jsonrpc/internal/JsonRpcConstants.java → ...to/jsonrpc/internal/JsonRpcConstants.java
diff --git a/...onrpc/internal/JsonRpcHandlerManager.java → ...onrpc/internal/JsonRpcHandlerManager.java b/...onrpc/internal/JsonRpcHandlerManager.java → ...onrpc/internal/JsonRpcHandlerManager.java
diff --git a/...sonrpc/internal/JsonRpcRequestSender.java → ...sonrpc/internal/JsonRpcRequestSender.java b/...sonrpc/internal/JsonRpcRequestSender.java → ...sonrpc/internal/JsonRpcRequestSender.java
diff --git a/.../internal/JsonRpcRequestSenderHelper.java → .../internal/JsonRpcRequestSenderHelper.java b/.../internal/JsonRpcRequestSenderHelper.java → .../internal/JsonRpcRequestSenderHelper.java
diff --git a/...rento/jsonrpc/internal/ProtocolUtils.java → ...rento/jsonrpc/internal/ProtocolUtils.java b/...rento/jsonrpc/internal/ProtocolUtils.java → ...rento/jsonrpc/internal/ProtocolUtils.java
diff --git a/...nrpc/internal/client/AbstractSession.java → ...nrpc/internal/client/AbstractSession.java b/...nrpc/internal/client/AbstractSession.java → ...nrpc/internal/client/AbstractSession.java
diff --git a/.../internal/client/AbstractTransaction.java → .../internal/client/AbstractTransaction.java b/.../internal/client/AbstractTransaction.java → .../internal/client/AbstractTransaction.java
diff --git a/...sonrpc/internal/client/ClientSession.java → ...sonrpc/internal/client/ClientSession.java b/...sonrpc/internal/client/ClientSession.java → ...sonrpc/internal/client/ClientSession.java
diff --git a/...nrpc/internal/client/TransactionImpl.java → ...nrpc/internal/client/TransactionImpl.java b/...nrpc/internal/client/TransactionImpl.java → ...nrpc/internal/client/TransactionImpl.java
diff --git a/.../jsonrpc/internal/ws/PendingRequests.java → .../jsonrpc/internal/ws/PendingRequests.java b/.../jsonrpc/internal/ws/PendingRequests.java → .../jsonrpc/internal/ws/PendingRequests.java
diff --git a/.../org/kurento/jsonrpc/message/Message.java → .../org/kurento/jsonrpc/message/Message.java b/.../org/kurento/jsonrpc/message/Message.java → .../org/kurento/jsonrpc/message/Message.java
diff --git a/...kurento/jsonrpc/message/MessageUtils.java → ...kurento/jsonrpc/message/MessageUtils.java b/...kurento/jsonrpc/message/MessageUtils.java → ...kurento/jsonrpc/message/MessageUtils.java
diff --git a/.../org/kurento/jsonrpc/message/Request.java → .../org/kurento/jsonrpc/message/Request.java b/.../org/kurento/jsonrpc/message/Request.java → .../org/kurento/jsonrpc/message/Request.java
diff --git a/...org/kurento/jsonrpc/message/Response.java → ...org/kurento/jsonrpc/message/Response.java b/...org/kurento/jsonrpc/message/Response.java → ...org/kurento/jsonrpc/message/Response.java
diff --git a/...urento/jsonrpc/message/ResponseError.java → ...urento/jsonrpc/message/ResponseError.java b/...urento/jsonrpc/message/ResponseError.java → ...urento/jsonrpc/message/ResponseError.java
diff --git a/...ento/jsonrpc/test/GenericMessageTest.java → ...ento/jsonrpc/test/GenericMessageTest.java b/...ento/jsonrpc/test/GenericMessageTest.java → ...ento/jsonrpc/test/GenericMessageTest.java
diff --git a/.../jsonrpc/test/JsonRpcClientLocalTest.java → .../jsonrpc/test/JsonRpcClientLocalTest.java b/.../jsonrpc/test/JsonRpcClientLocalTest.java → .../jsonrpc/test/JsonRpcClientLocalTest.java
diff --git a/...jsonrpc/test/JsonRpcHandlerTypesTest.java → ...jsonrpc/test/JsonRpcHandlerTypesTest.java b/...jsonrpc/test/JsonRpcHandlerTypesTest.java → ...jsonrpc/test/JsonRpcHandlerTypesTest.java
diff --git a/...to/jsonrpc/test/SessionIdMessageTest.java → ...to/jsonrpc/test/SessionIdMessageTest.java b/...to/jsonrpc/test/SessionIdMessageTest.java → ...to/jsonrpc/test/SessionIdMessageTest.java
diff --git a/clients/java/kurento-commons/LICENSE → .../java/jsonrpc/jsonrpc-demo-server/LICENSE b/clients/java/kurento-commons/LICENSE → .../java/jsonrpc/jsonrpc-demo-server/LICENSE
diff --git a/clients/java/kurento-commons/NOTICE → ...s/java/jsonrpc/jsonrpc-demo-server/NOTICE b/clients/java/kurento-commons/NOTICE → ...s/java/jsonrpc/jsonrpc-demo-server/NOTICE
diff --git a/...rpc/kurento-jsonrpc-demo-server/README.md → ...ava/jsonrpc/jsonrpc-demo-server/README.md b/...rpc/kurento-jsonrpc-demo-server/README.md → ...ava/jsonrpc/jsonrpc-demo-server/README.md
@@ -22,7 +22,7 @@ Installation details
 * Build
 ```sh
 git clone git@github.com:Kurento/kurento-java.git
-cd kurento-java/kurento-jsonrpc/kurento-jsonrpc-demo-server
+cd kurento/clients/java/jsonrpc/jsonrpc-demo-server
 git checkout $(git describe --abbrev=0 --tags)
 mvn clean install
 ```
@@ -55,7 +55,7 @@ vim kurento-jsonrpc-demo-server-x.y.z-SNAPSHOT/config/kjrserver.conf.json
 * Build
 ```sh
 git clone git@github.com:Kurento/kurento-java.git
-cd kurento-java/kurento-jsonrpc/kurento-jsonrpc-demo-server
+cd kurento/clients/java/jsonrpc/jsonrpc-demo-server
 git checkout $(git describe --abbrev=0 --tags)
 mvn clean install
 ```
@@ -119,7 +119,6 @@ News and Website
 ----------------
 
 Check the [Kurento blog]
-Follow us on Twitter @[kurentoms].
 
 Issue tracker
 -------------
@@ -175,9 +174,8 @@ Before asking for support, please read first the [Kurento Netiquette Guidelines]
 
 [documentation]: https://kurento.openvidu.io/documentation
 [FIWARE]: http://www.fiware.org
-[GitHub Kurento bugtracker]: https://github.com/Kurento/bugtracker/issues
-[GitHub Kurento Group]: https://github.com/kurento
-[kurentoms]: http://twitter.com/kurentoms
+[GitHub Kurento bugtracker]: https://github.com/Kurento/kurento/issues
+[GitHub Kurento Group]: https://github.com/Kurento
 [Kurento]: https://kurento.openvidu.io/
 [Kurento Blog]: https://kurento.openvidu.io/blog
 [Kurento FIWARE Catalog Entry]: http://catalogue.fiware.org/enablers/stream-oriented-kurento

diff --git a/...sonrpc-demo-server/package/bin/install.sh → ...sonrpc-demo-server/package/bin/install.sh b/...sonrpc-demo-server/package/bin/install.sh → ...sonrpc-demo-server/package/bin/install.sh
diff --git a/...-jsonrpc-demo-server/package/bin/start.sh → .../jsonrpc-demo-server/package/bin/start.sh b/...-jsonrpc-demo-server/package/bin/start.sh → .../jsonrpc-demo-server/package/bin/start.sh
diff --git a/...package/config/kjrserver-log4j.properties → ...package/config/kjrserver-log4j.properties b/...package/config/kjrserver-log4j.properties → ...package/config/kjrserver-log4j.properties
diff --git a/...server/package/config/kjrserver.conf.json → ...server/package/config/kjrserver.conf.json b/...server/package/config/kjrserver.conf.json → ...server/package/config/kjrserver.conf.json
diff --git a/...r/package/support-files/kjrserver.service → ...r/package/support-files/kjrserver.service b/...r/package/support-files/kjrserver.service → ...r/package/support-files/kjrserver.service
diff --git a/...server/package/support-files/kjrserver.sh → ...server/package/support-files/kjrserver.sh b/...server/package/support-files/kjrserver.sh → ...server/package/support-files/kjrserver.sh
diff --git a/...onrpc/kurento-jsonrpc-demo-server/pom.xml → .../java/jsonrpc/jsonrpc-demo-server/pom.xml b/...onrpc/kurento-jsonrpc-demo-server/pom.xml → .../java/jsonrpc/jsonrpc-demo-server/pom.xml
diff --git a/...-jsonrpc-demo-server/src/assembly/bin.xml → .../jsonrpc-demo-server/src/assembly/bin.xml b/...-jsonrpc-demo-server/src/assembly/bin.xml → .../jsonrpc-demo-server/src/assembly/bin.xml
diff --git a/...urento/jsonrpc/TestServerApplication.java → ...urento/jsonrpc/TestServerApplication.java b/...urento/jsonrpc/TestServerApplication.java → ...urento/jsonrpc/TestServerApplication.java
diff --git a/...o/jsonrpc/handler/EchoJsonRpcHandler.java → ...o/jsonrpc/handler/EchoJsonRpcHandler.java b/...o/jsonrpc/handler/EchoJsonRpcHandler.java → ...o/jsonrpc/handler/EchoJsonRpcHandler.java
diff --git a/...demo-server/src/main/resources/banner.txt → ...demo-server/src/main/resources/banner.txt b/...demo-server/src/main/resources/banner.txt → ...demo-server/src/main/resources/banner.txt
diff --git a/...er/src/main/resources/kjrserver.conf.json → ...er/src/main/resources/kjrserver.conf.json b/...er/src/main/resources/kjrserver.conf.json → ...er/src/main/resources/kjrserver.conf.json
diff --git a/...erver/src/main/resources/log4j.properties → ...erver/src/main/resources/log4j.properties b/...erver/src/main/resources/log4j.properties → ...erver/src/main/resources/log4j.properties
diff --git a/...ts/java/kurento-integration-tests/LICENSE → clients/java/jsonrpc/jsonrpc-server/LICENSE b/...ts/java/kurento-integration-tests/LICENSE → clients/java/jsonrpc/jsonrpc-server/LICENSE
diff --git a/...nts/java/kurento-integration-tests/NOTICE → clients/java/jsonrpc/jsonrpc-server/NOTICE b/...nts/java/kurento-integration-tests/NOTICE → clients/java/jsonrpc/jsonrpc-server/NOTICE
diff --git a/...-jsonrpc/kurento-jsonrpc-server/README.md → ...nts/java/jsonrpc/jsonrpc-server/README.md b/...-jsonrpc/kurento-jsonrpc-server/README.md → ...nts/java/jsonrpc/jsonrpc-server/README.md
@@ -44,7 +44,6 @@ News and Website
 ----------------
 
 Check the [Kurento blog]
-Follow us on Twitter @[kurentoms].
 
 Issue tracker
 -------------
@@ -100,9 +99,8 @@ Before asking for support, please read first the [Kurento Netiquette Guidelines]
 
 [documentation]: https://kurento.openvidu.io/documentation
 [FIWARE]: http://www.fiware.org
-[GitHub Kurento bugtracker]: https://github.com/Kurento/bugtracker/issues
-[GitHub Kurento Group]: https://github.com/kurento
-[kurentoms]: http://twitter.com/kurentoms
+[GitHub Kurento bugtracker]: https://github.com/Kurento/kurento/issues
+[GitHub Kurento Group]: https://github.com/Kurento
 [Kurento]: https://kurento.openvidu.io/
 [Kurento Blog]: https://kurento.openvidu.io/blog
 [Kurento FIWARE Catalog Entry]: http://catalogue.fiware.org/enablers/stream-oriented-kurento

diff --git a/...to-jsonrpc/kurento-jsonrpc-server/pom.xml → clients/java/jsonrpc/jsonrpc-server/pom.xml b/...to-jsonrpc/kurento-jsonrpc-server/pom.xml → clients/java/jsonrpc/jsonrpc-server/pom.xml
diff --git a/...ernal/http/JsonRpcHttpRequestHandler.java → ...ernal/http/JsonRpcHttpRequestHandler.java b/...ernal/http/JsonRpcHttpRequestHandler.java → ...ernal/http/JsonRpcHttpRequestHandler.java
diff --git a/...c/internal/server/BeanCreatingHelper.java → ...c/internal/server/BeanCreatingHelper.java b/...c/internal/server/BeanCreatingHelper.java → ...c/internal/server/BeanCreatingHelper.java
diff --git a/...internal/server/NativeSessionHandler.java → ...internal/server/NativeSessionHandler.java b/...internal/server/NativeSessionHandler.java → ...internal/server/NativeSessionHandler.java
diff --git a/...rnal/server/PerSessionJsonRpcHandler.java → ...rnal/server/PerSessionJsonRpcHandler.java b/...rnal/server/PerSessionJsonRpcHandler.java → ...rnal/server/PerSessionJsonRpcHandler.java
diff --git a/.../internal/server/PingWatchdogManager.java → .../internal/server/PingWatchdogManager.java b/.../internal/server/PingWatchdogManager.java → .../internal/server/PingWatchdogManager.java
diff --git a/...nrpc/internal/server/ProtocolManager.java → ...nrpc/internal/server/ProtocolManager.java b/...nrpc/internal/server/ProtocolManager.java → ...nrpc/internal/server/ProtocolManager.java
diff --git a/...sonrpc/internal/server/ServerSession.java → ...sonrpc/internal/server/ServerSession.java b/...sonrpc/internal/server/ServerSession.java → ...sonrpc/internal/server/ServerSession.java
diff --git a/...nrpc/internal/server/SessionsManager.java → ...nrpc/internal/server/SessionsManager.java b/...nrpc/internal/server/SessionsManager.java → ...nrpc/internal/server/SessionsManager.java
diff --git a/...ig/DefaultJsonRpcHandlerRegistration.java → ...ig/DefaultJsonRpcHandlerRegistration.java b/...ig/DefaultJsonRpcHandlerRegistration.java → ...ig/DefaultJsonRpcHandlerRegistration.java
diff --git a/...config/DefaultJsonRpcHandlerRegistry.java → ...config/DefaultJsonRpcHandlerRegistry.java b/...config/DefaultJsonRpcHandlerRegistry.java → ...config/DefaultJsonRpcHandlerRegistry.java
diff --git a/...l/server/config/JsonRpcConfiguration.java → ...l/server/config/JsonRpcConfiguration.java b/...l/server/config/JsonRpcConfiguration.java → ...l/server/config/JsonRpcConfiguration.java
diff --git a/...rnal/server/config/JsonRpcProperties.java → ...rnal/server/config/JsonRpcProperties.java b/...rnal/server/config/JsonRpcProperties.java → ...rnal/server/config/JsonRpcProperties.java
diff --git a/...sonrpc/internal/ws/CloseStatusHelper.java → ...sonrpc/internal/ws/CloseStatusHelper.java b/...sonrpc/internal/ws/CloseStatusHelper.java → ...sonrpc/internal/ws/CloseStatusHelper.java
diff --git a/.../internal/ws/JsonRpcWebSocketHandler.java → .../internal/ws/JsonRpcWebSocketHandler.java b/.../internal/ws/JsonRpcWebSocketHandler.java → .../internal/ws/JsonRpcWebSocketHandler.java
diff --git a/...c/internal/ws/WebSocketServerSession.java → ...c/internal/ws/WebSocketServerSession.java b/...c/internal/ws/WebSocketServerSession.java → ...c/internal/ws/WebSocketServerSession.java
diff --git a/...nto/jsonrpc/server/JsonRpcConfigurer.java → ...nto/jsonrpc/server/JsonRpcConfigurer.java b/...nto/jsonrpc/server/JsonRpcConfigurer.java → ...nto/jsonrpc/server/JsonRpcConfigurer.java
diff --git a/...pc/server/JsonRpcHandlerRegistration.java → ...pc/server/JsonRpcHandlerRegistration.java b/...pc/server/JsonRpcHandlerRegistration.java → ...pc/server/JsonRpcHandlerRegistration.java
diff --git a/...sonrpc/server/JsonRpcHandlerRegistry.java → ...sonrpc/server/JsonRpcHandlerRegistry.java b/...sonrpc/server/JsonRpcHandlerRegistry.java → ...sonrpc/server/JsonRpcHandlerRegistry.java
diff --git a/...jsonrpc/test/PingWatchdogManagerTest.java → ...jsonrpc/test/PingWatchdogManagerTest.java b/...jsonrpc/test/PingWatchdogManagerTest.java → ...jsonrpc/test/PingWatchdogManagerTest.java
diff --git a/clients/java/kurento-jsonrpc/pom.xml → clients/java/jsonrpc/pom.xml b/clients/java/kurento-jsonrpc/pom.xml → clients/java/jsonrpc/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>org.kurento</groupId>
 		<artifactId>kurento-parent-pom</artifactId>
 		<version>7.0.0-SNAPSHOT</version>
-		<relativePath>../kurento-parent-pom</relativePath>
+		<relativePath>../parent-pom</relativePath>
 	</parent>
 	<artifactId>kurento-jsonrpc</artifactId>
 	<packaging>pom</packaging>
@@ -27,16 +27,16 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<modules>
-				<module>kurento-jsonrpc-client</module>
-				<module>kurento-jsonrpc-server</module>
-				<module>kurento-jsonrpc-demo-server</module>
+				<module>jsonrpc-client</module>
+				<module>jsonrpc-server</module>
+				<module>jsonrpc-demo-server</module>
 			</modules>
 		</profile>
 		<profile>
 			<id>deploy</id>
 			<modules>
-				<module>kurento-jsonrpc-client</module>
-				<module>kurento-jsonrpc-server</module>
+				<module>jsonrpc-client</module>
+				<module>jsonrpc-server</module>
 			</modules>
 			<build>
 				<plugins>
@@ -63,7 +63,7 @@
 	</dependencies>
 
 	<modules>
-		<module>kurento-jsonrpc-client-jetty</module>
+		<module>jsonrpc-client-jetty</module>
 	</modules>
 
 </project>
diff --git a/clients/java/kurento-assembly/README.md b/clients/java/kurento-assembly/README.md
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ Usage: @@
     Issues:
-    * [Bug Tracker](https://github.com/Kurento/bugtracker/issues)
+    * [Bug Tracker](https://github.com/Kurento/kurento/issues)
     * [Support](https://doc-kurento.readthedocs.io/en/latest/user/support.html)
     News:
@@ Expand Down @@