diff --git a/openvidu-browser/.bowerrc b/openvidu-browser/.bowerrc deleted file mode 100644 index 9e00ce04..00000000 --- a/openvidu-browser/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory" : "static/bower_components" -} diff --git a/openvidu-browser/.gitignore b/openvidu-browser/.gitignore index b83d2226..16932162 100644 --- a/openvidu-browser/.gitignore +++ b/openvidu-browser/.gitignore @@ -1 +1,4 @@ -/target/ +/node_modules/ +/yarn.lock +/npm-debug.log +/lib/ diff --git a/openvidu-browser/src/main/resources/.npmignore b/openvidu-browser/.npmignore similarity index 100% rename from openvidu-browser/src/main/resources/.npmignore rename to openvidu-browser/.npmignore diff --git a/openvidu-browser/README.md b/openvidu-browser/README.md deleted file mode 100644 index 7082542e..00000000 --- a/openvidu-browser/README.md +++ /dev/null @@ -1,16 +0,0 @@ -[![License badge](https://img.shields.io/badge/license-Apache2-orange.svg)](http://www.apache.org/licenses/LICENSE-2.0) -[![Documentation badge](https://readthedocs.org/projects/fiware-orion/badge/?version=latest)](http://openvidu.io/docs/reference-docs/openvidu-browser/) -[![Support badge](https://img.shields.io/badge/support-sof-yellowgreen.svg)](https://groups.google.com/forum/#!forum/openvidu) - -[![][OpenViduLogo]](http://openvidu.io) - -openvidu-browser -=== - -- **Description**: OpenVidu client side. It is a library for the browser. It allows you to control your videos and sessions directly from your client's browsers. - -- **Docs**: [openvidu-browser API](http://openvidu.io/docs/reference-docs/openvidu-browser/) - -- **Release**: [OpenVidu Artifacts](http://openvidu.io/docs/reference-docs/openvidu-artifacts/) - -[OpenViduLogo]: https://secure.gravatar.com/avatar/5daba1d43042f2e4e85849733c8e5702?s=120 diff --git a/openvidu-browser/src/main/resources/package.json b/openvidu-browser/package.json similarity index 93% rename from openvidu-browser/src/main/resources/package.json rename to openvidu-browser/package.json index 7c46b07c..8bc01d3b 100644 --- a/openvidu-browser/src/main/resources/package.json +++ b/openvidu-browser/package.json @@ -2,6 +2,10 @@ "name": "openvidu-browser", "version": "1.1.0", "description": "OpenVidu Browser", + "repository": { + "type": "git", + "url": "git://github.com/OpenVidu/openvidu" + }, "main": "lib/OpenVidu/index.js", "types": "lib/OpenVidu/index.d.ts", "scripts": { diff --git a/openvidu-browser/pom.xml b/openvidu-browser/pom.xml deleted file mode 100644 index 356aaa0c..00000000 --- a/openvidu-browser/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - 4.0.0 - - - io.openvidu - openvidu-parent - 1.1.0 - - - openvidu-browser - jar - - OpenVidu Browser - 1.1.0 - - OpenVidu JS/TS library for the client-side - - https://github.com/OpenVidu/openvidu - - - - Apache 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - OpenVidu - https://github.com/OpenVidu/openvidu - - - - ${openvidu.scm.url} - scm:git:${openvidu.scm.connection} - scm:git:${openvidu.scm.connection} - develop - - - - - openvidu.io - -openvidu.io Community - OpenVidu - http://openvidu.io - - - - - - - org.codehaus.mojo - exec-maven-plugin - - ${start-class} - - - - - - - src/main/resources - false - - - - - - - org.kurento - kurento-utils-js - - - org.kurento - kurento-jsonrpc-js - - - - org.webjars.bower - adapter.js - - - - org.webjars.bower - EventEmitter.js - - - - - - default - - - default - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - org.apache.maven.plugins - maven-failsafe-plugin - - true - - - - - - - - diff --git a/openvidu-browser/src/main/resources/.gitignore b/openvidu-browser/src/main/resources/.gitignore deleted file mode 100644 index 16932162..00000000 --- a/openvidu-browser/src/main/resources/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/node_modules/ -/yarn.lock -/npm-debug.log -/lib/ diff --git a/openvidu-browser/src/main/resources/static/.vscode/tasks.json b/openvidu-browser/static/.vscode/tasks.json similarity index 100% rename from openvidu-browser/src/main/resources/static/.vscode/tasks.json rename to openvidu-browser/static/.vscode/tasks.json diff --git a/openvidu-browser/src/main/resources/static/img/spinner.gif b/openvidu-browser/static/img/spinner.gif similarity index 100% rename from openvidu-browser/src/main/resources/static/img/spinner.gif rename to openvidu-browser/static/img/spinner.gif diff --git a/openvidu-browser/src/main/resources/static/js/openvidu-browser-1.1.0.js b/openvidu-browser/static/js/openvidu-browser-1.1.0.js similarity index 100% rename from openvidu-browser/src/main/resources/static/js/openvidu-browser-1.1.0.js rename to openvidu-browser/static/js/openvidu-browser-1.1.0.js diff --git a/openvidu-browser/src/main/resources/static/js/openvidu-browser-1.1.0.min.js b/openvidu-browser/static/js/openvidu-browser-1.1.0.min.js similarity index 100% rename from openvidu-browser/src/main/resources/static/js/openvidu-browser-1.1.0.min.js rename to openvidu-browser/static/js/openvidu-browser-1.1.0.min.js diff --git a/openvidu-browser/src/main/resources/static/js/openvidu-browser-1.1.0.min.js.map b/openvidu-browser/static/js/openvidu-browser-1.1.0.min.js.map similarity index 100% rename from openvidu-browser/src/main/resources/static/js/openvidu-browser-1.1.0.min.js.map rename to openvidu-browser/static/js/openvidu-browser-1.1.0.min.js.map diff --git a/openvidu-browser/src/main/resources/ts/..jsOpenVidu.js b/openvidu-browser/ts/..jsOpenVidu.js similarity index 100% rename from openvidu-browser/src/main/resources/ts/..jsOpenVidu.js rename to openvidu-browser/ts/..jsOpenVidu.js diff --git a/openvidu-browser/src/main/resources/ts/..staticjsOpenVidu.js b/openvidu-browser/ts/..staticjsOpenVidu.js similarity index 100% rename from openvidu-browser/src/main/resources/ts/..staticjsOpenVidu.js rename to openvidu-browser/ts/..staticjsOpenVidu.js diff --git a/openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/Mapper.js b/openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/Mapper.js similarity index 100% rename from openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/Mapper.js rename to openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/Mapper.js diff --git a/openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/clients/index.js b/openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/clients/index.js similarity index 100% rename from openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/clients/index.js rename to openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/clients/index.js diff --git a/openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/clients/jsonrpcclient.js b/openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/clients/jsonrpcclient.js similarity index 100% rename from openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/clients/jsonrpcclient.js rename to openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/clients/jsonrpcclient.js diff --git a/openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/clients/transports/index.js b/openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/clients/transports/index.js similarity index 100% rename from openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/clients/transports/index.js rename to openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/clients/transports/index.js diff --git a/openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/clients/transports/webSocketWithReconnection.js b/openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/clients/transports/webSocketWithReconnection.js similarity index 100% rename from openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/clients/transports/webSocketWithReconnection.js rename to openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/clients/transports/webSocketWithReconnection.js diff --git a/openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/index.js b/openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/index.js similarity index 100% rename from openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/index.js rename to openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/index.js diff --git a/openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/packers/JsonRPC.js b/openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/packers/JsonRPC.js similarity index 100% rename from openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/packers/JsonRPC.js rename to openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/packers/JsonRPC.js diff --git a/openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/packers/XmlRPC.js b/openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/packers/XmlRPC.js similarity index 100% rename from openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/packers/XmlRPC.js rename to openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/packers/XmlRPC.js diff --git a/openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/packers/index.js b/openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/packers/index.js similarity index 100% rename from openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-jsonrpc/packers/index.js rename to openvidu-browser/ts/KurentoUtils/kurento-jsonrpc/packers/index.js diff --git a/openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-utils-js/WebRtcPeer.js b/openvidu-browser/ts/KurentoUtils/kurento-utils-js/WebRtcPeer.js similarity index 100% rename from openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-utils-js/WebRtcPeer.js rename to openvidu-browser/ts/KurentoUtils/kurento-utils-js/WebRtcPeer.js diff --git a/openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-utils-js/browser.js b/openvidu-browser/ts/KurentoUtils/kurento-utils-js/browser.js similarity index 100% rename from openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-utils-js/browser.js rename to openvidu-browser/ts/KurentoUtils/kurento-utils-js/browser.js diff --git a/openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-utils-js/index.js b/openvidu-browser/ts/KurentoUtils/kurento-utils-js/index.js similarity index 100% rename from openvidu-browser/src/main/resources/ts/KurentoUtils/kurento-utils-js/index.js rename to openvidu-browser/ts/KurentoUtils/kurento-utils-js/index.js diff --git a/openvidu-browser/src/main/resources/ts/OpenVidu/Main.ts b/openvidu-browser/ts/OpenVidu/Main.ts similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenVidu/Main.ts rename to openvidu-browser/ts/OpenVidu/Main.ts diff --git a/openvidu-browser/src/main/resources/ts/OpenVidu/OpenVidu.ts b/openvidu-browser/ts/OpenVidu/OpenVidu.ts similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenVidu/OpenVidu.ts rename to openvidu-browser/ts/OpenVidu/OpenVidu.ts diff --git a/openvidu-browser/src/main/resources/ts/OpenVidu/Publisher.ts b/openvidu-browser/ts/OpenVidu/Publisher.ts similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenVidu/Publisher.ts rename to openvidu-browser/ts/OpenVidu/Publisher.ts diff --git a/openvidu-browser/src/main/resources/ts/OpenVidu/Session.ts b/openvidu-browser/ts/OpenVidu/Session.ts similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenVidu/Session.ts rename to openvidu-browser/ts/OpenVidu/Session.ts diff --git a/openvidu-browser/src/main/resources/ts/OpenVidu/Subscriber.ts b/openvidu-browser/ts/OpenVidu/Subscriber.ts similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenVidu/Subscriber.ts rename to openvidu-browser/ts/OpenVidu/Subscriber.ts diff --git a/openvidu-browser/src/main/resources/ts/OpenVidu/definitions.d.ts b/openvidu-browser/ts/OpenVidu/definitions.d.ts similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenVidu/definitions.d.ts rename to openvidu-browser/ts/OpenVidu/definitions.d.ts diff --git a/openvidu-browser/src/main/resources/ts/OpenVidu/index.ts b/openvidu-browser/ts/OpenVidu/index.ts similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenVidu/index.ts rename to openvidu-browser/ts/OpenVidu/index.ts diff --git a/openvidu-browser/src/main/resources/ts/OpenVidu/tsconfig.json b/openvidu-browser/ts/OpenVidu/tsconfig.json similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenVidu/tsconfig.json rename to openvidu-browser/ts/OpenVidu/tsconfig.json diff --git a/openvidu-browser/src/main/resources/ts/OpenViduInternal/Connection.ts b/openvidu-browser/ts/OpenViduInternal/Connection.ts similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenViduInternal/Connection.ts rename to openvidu-browser/ts/OpenViduInternal/Connection.ts diff --git a/openvidu-browser/src/main/resources/ts/OpenViduInternal/Main.ts b/openvidu-browser/ts/OpenViduInternal/Main.ts similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenViduInternal/Main.ts rename to openvidu-browser/ts/OpenViduInternal/Main.ts diff --git a/openvidu-browser/src/main/resources/ts/OpenViduInternal/OpenViduInternal.ts b/openvidu-browser/ts/OpenViduInternal/OpenViduInternal.ts similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenViduInternal/OpenViduInternal.ts rename to openvidu-browser/ts/OpenViduInternal/OpenViduInternal.ts diff --git a/openvidu-browser/src/main/resources/ts/OpenViduInternal/SessionInternal.ts b/openvidu-browser/ts/OpenViduInternal/SessionInternal.ts similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenViduInternal/SessionInternal.ts rename to openvidu-browser/ts/OpenViduInternal/SessionInternal.ts diff --git a/openvidu-browser/src/main/resources/ts/OpenViduInternal/Stream.ts b/openvidu-browser/ts/OpenViduInternal/Stream.ts similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenViduInternal/Stream.ts rename to openvidu-browser/ts/OpenViduInternal/Stream.ts diff --git a/openvidu-browser/src/main/resources/ts/OpenViduInternal/definitions.d.ts b/openvidu-browser/ts/OpenViduInternal/definitions.d.ts similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenViduInternal/definitions.d.ts rename to openvidu-browser/ts/OpenViduInternal/definitions.d.ts diff --git a/openvidu-browser/src/main/resources/ts/OpenViduInternal/index.ts b/openvidu-browser/ts/OpenViduInternal/index.ts similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenViduInternal/index.ts rename to openvidu-browser/ts/OpenViduInternal/index.ts diff --git a/openvidu-browser/src/main/resources/ts/OpenViduInternal/tsconfig.json b/openvidu-browser/ts/OpenViduInternal/tsconfig.json similarity index 100% rename from openvidu-browser/src/main/resources/ts/OpenViduInternal/tsconfig.json rename to openvidu-browser/ts/OpenViduInternal/tsconfig.json diff --git a/openvidu-server/src/angular/frontend/package.json b/openvidu-server/src/angular/frontend/package.json index da4b596a..2bff0d71 100644 --- a/openvidu-server/src/angular/frontend/package.json +++ b/openvidu-server/src/angular/frontend/package.json @@ -27,7 +27,7 @@ "hammerjs": "^2.0.8", "rxjs": "^5.1.0", "zone.js": "^0.8.4", - "openvidu-browser": "1.0.5-beta.3" + "openvidu-browser": "1.1.0" }, "devDependencies": { "@angular/cli": "1.0.2", diff --git a/pom.xml b/pom.xml index 0f25c7c4..cc46e6e6 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,6 @@ openvidu-server openvidu-client - openvidu-browser openvidu-test openvidu-java-client @@ -197,11 +196,6 @@ openvidu-client ${version.openvidu} - - io.openvidu - openvidu-browser - ${version.openvidu} - io.openvidu openvidu-test diff --git a/update-plainjs-prod.sh b/update-plainjs-prod.sh index 41df241e..062dab4a 100755 --- a/update-plainjs-prod.sh +++ b/update-plainjs-prod.sh @@ -1,19 +1,19 @@ VERSION="$1" # openvidu-insecure-js -cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".min.js ../openvidu-tutorials/openvidu-insecure-js/web/openvidu-browser-"$1".min.js +cp openvidu-browser/static/js/openvidu-browser-"$1".min.js ../openvidu-tutorials/openvidu-insecure-js/web/openvidu-browser-"$1".min.js # openvidu-js-java -cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".min.js ../openvidu-tutorials/openvidu-js-java/src/main/resources/static/openvidu-browser-"$1".min.js +cp openvidu-browser/static/js/openvidu-browser-"$1".min.js ../openvidu-tutorials/openvidu-js-java/src/main/resources/static/openvidu-browser-"$1".min.js # openvidu-mvc-java -cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".min.js ../openvidu-tutorials/openvidu-mvc-java/src/main/resources/static/openvidu-browser-"$1".min.js +cp openvidu-browser/static/js/openvidu-browser-"$1".min.js ../openvidu-tutorials/openvidu-mvc-java/src/main/resources/static/openvidu-browser-"$1".min.js # openvidu-js-node -cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".min.js ../openvidu-tutorials/openvidu-js-node/public/openvidu-browser-"$1".min.js +cp openvidu-browser/static/js/openvidu-browser-"$1".min.js ../openvidu-tutorials/openvidu-js-node/public/openvidu-browser-"$1".min.js # openvidu-mvc-node -cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".min.js ../openvidu-tutorials/openvidu-mvc-node/public/openvidu-browser-"$1".min.js +cp openvidu-browser/static/js/openvidu-browser-"$1".min.js ../openvidu-tutorials/openvidu-mvc-node/public/openvidu-browser-"$1".min.js # openvidu-getaroom -cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".min.js ../openvidu-tutorials/openvidu-getaroom/web/openvidu-browser-"$1".min.js +cp openvidu-browser/static/js/openvidu-browser-"$1".min.js ../openvidu-tutorials/openvidu-getaroom/web/openvidu-browser-"$1".min.js diff --git a/update-plainjs.sh b/update-plainjs.sh index fb9cfc5c..e7d1ba0e 100755 --- a/update-plainjs.sh +++ b/update-plainjs.sh @@ -1,22 +1,22 @@ VERSION="$1" # openvidu-hello-world -cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-hello-world/web/openvidu-browser-"$1".js +cp openvidu-browser/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-hello-world/web/openvidu-browser-"$1".js # openvidu-insecure-js -cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-insecure-js/web/openvidu-browser-"$1".js +cp openvidu-browser/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-insecure-js/web/openvidu-browser-"$1".js # openvidu-js-java -cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-js-java/src/main/resources/static/openvidu-browser-"$1".js +cp openvidu-browser/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-js-java/src/main/resources/static/openvidu-browser-"$1".js # openvidu-mvc-java -cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-mvc-java/src/main/resources/static/openvidu-browser-"$1".js +cp openvidu-browser/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-mvc-java/src/main/resources/static/openvidu-browser-"$1".js # openvidu-js-node -cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-js-node/public/openvidu-browser-"$1".js +cp openvidu-browser/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-js-node/public/openvidu-browser-"$1".js # openvidu-mvc-node -cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-mvc-node/public/openvidu-browser-"$1".js +cp openvidu-browser/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-mvc-node/public/openvidu-browser-"$1".js # openvidu-getaroom -cp openvidu-browser/src/main/resources/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-getaroom/web/openvidu-browser-"$1".js +cp openvidu-browser/static/js/openvidu-browser-"$1".js ../openvidu-tutorials/openvidu-getaroom/web/openvidu-browser-"$1".js