Skip to content

Commit

Permalink
Replace oms.js to owt.js.
Browse files Browse the repository at this point in the history
  • Loading branch information
jianjunz committed Feb 27, 2019
1 parent 92f6322 commit 42cd018
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 32 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Open Media Streamer JavaScript SDK
# Open WebRTC Toolkit JavaScript SDK

Open Media Streamer JavaScript SDK builds on top of the W3C standard WebRTC APIs to accelerate development of real-time communications (RTC) for web applications, including peer-to-peer, broadcasting, and conference mode communications.
Open WebRTC Toolkit JavaScript SDK builds on top of the W3C standard WebRTC APIs to accelerate development of real-time communications (RTC) for web applications, including peer-to-peer, broadcasting, and conference mode communications.

## How to build release package
1. Run `npm install -g grunt-cli` to install grunt.
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdoc/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"dateFormat": "ddd MMM Do YYYY",
"outputSourceFiles": false,
"outputSourcePath": false,
"systemName": "Open Media Streamer",
"systemName": "Open WebRTC Toolkit",
"footer": "",
"copyright": "Copyright © 2018 Intel Corporation. All Rights Reserved. ",
"navType": "vertical",
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdoc/template/tmpl/layout.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</tr>
<tr>
<td colspan="3" style="font:115% Tahoma, Arial, sans-serif;padding-top:15px;padding-bottom:15px">
<font color="white" style="padding-left: 10px;">Open Media Streamer Client SDK for JavaScript</font>
<font color="white" style="padding-left: 10px;">Open WebRTC Toolkit Client SDK for JavaScript</font>
</td>
<td style="overflow:visible;rowspan:2">
<div class="navbar-nameclass navbar-collapse collapse" id="topNavigation">
Expand Down
14 changes: 7 additions & 7 deletions docs/mdfiles/index.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Open Media Streamer Client SDK for JavaScript
Open WebRTC Toolkit Client SDK for JavaScript
------------------

# 1 Introduction
The Open Media Streamer Client SDK for JavaScript provides tools to help you develop Web applications. The SDK is distributed in the `CS_WebRTC_Client_SDK_JavaScript.<ver>.zip` release package.
The Open WebRTC Toolkit Client SDK for JavaScript provides tools to help you develop Web applications. The SDK is distributed in the `CS_WebRTC_Client_SDK_JavaScript.<ver>.zip` release package.

Refer to the SDK release notes for the latest information on the SDK release package, including features, supported browsers, bug fixes, and known issues.

Please include `adapter.js` before `oms.js` in HTML files. `adapter.js` is an open source project hosted on [Github](https://github.com/webrtc/adapter). The revision we depend on is `4.0.2`.
Please include `adapter.js` before `owt.js` in HTML files. `adapter.js` is an open source project hosted on [Github](https://github.com/webrtc/adapter). The revision we depend on is `4.0.2`.

If you want to use conference SDK, please also include `socket.io.js` before `oms.js`.
If you want to use conference SDK, please also include `socket.io.js` before `owt.js`.

# 2 Browser requirement

The Open Media Streamer Client SDK for JavaScript has been tested on the following browsers and operating systems:
The Open WebRTC Toolkit Client SDK for JavaScript has been tested on the following browsers and operating systems:

Conference Mode:

Expand Down Expand Up @@ -63,15 +63,15 @@ Developers can help end users to make these changes by Firefox extension.
> **Note:** End users need to visit your site with https if they want to use screen sharing.
# 4 NAT and firewall traversal
Open Media Streamer Client SDK for JavaScript fully supports NAT and firewall traversal with STUN / TURN / ICE. The Coturn TURN server from https://github.com/coturn/coturn can be one choice.
Open WebRTC Toolkit Client SDK for JavaScript fully supports NAT and firewall traversal with STUN / TURN / ICE. The Coturn TURN server from https://github.com/coturn/coturn can be one choice.

# 5 Peer-to-peer (P2P) mode
To enable P2P chat, copy and paste the following code into the head section of your HTML document:
~~~~~~{.js}
<script type="text/JavaScript" src="socket.io.js"></script>
<script type="text/JavaScript" src="sc.websocket.js"></script>
<script type="text/JavaScript" src="adapter.js"></script>
<script type="text/JavaScript" src="oms.js"></script>
<script type="text/JavaScript" src="owt.js"></script>
~~~~~~
If you're using customized signling channel, please replace `socket.io.js` and `sc.websocket.js` with your own signaling channel implementation.

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "oms-javascript",
"title": "Open Media Streamer JavaScript SDK",
"description": "Open Media Streamer JavaScript SDK",
"title": "Open WebRTC Toolkit JavaScript SDK",
"description": "Open WebRTC Toolkit JavaScript SDK",
"version": "4.1.0",
"homepage": "https://webrtc.intel.com",
"author": "Intel WebRTC team",
Expand Down
22 changes: 11 additions & 11 deletions scripts/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
module.exports = function(grunt) {

const sdkEntry = 'src/sdk/export.js';
const sdkOutput = 'dist/sdk/oms.js';
const sdkOutput = 'dist/sdk/owt.js';

var srcFiles = [
'src/sdk/base/**',
Expand Down Expand Up @@ -47,7 +47,7 @@ window.L = L;\n\
dest: sdkOutput,
options: {
browserifyOptions: {
standalone: 'Oms',
standalone: 'Owt',
debug: false
},
transform: [
Expand All @@ -57,10 +57,10 @@ window.L = L;\n\
},
dev: {
src: [sdkEntry],
dest: 'dist/sdk-debug/oms.js',
dest: 'dist/sdk-debug/owt.js',
options: {
browserifyOptions: {
standalone: 'Oms',
standalone: 'Owt',
debug: true
},
transform: [
Expand Down Expand Up @@ -126,7 +126,7 @@ window.L = L;\n\
src: restFiles,
dest: 'dist/samples/conference/public/scripts/rest.js',
options:{
footer:'module.exports = OMS_REST;',
footer:'module.exports = OWT_REST;',
process: true
},
nonull: true
Expand Down Expand Up @@ -163,7 +163,7 @@ window.L = L;\n\
uglify: {
dist: {
files: {
'dist/sdk/oms.js': ['dist/sdk/oms.js']
'dist/sdk/owt.js': ['dist/sdk/owt.js']
},
options: {
banner: '<%= meta.banner %>',
Expand All @@ -180,9 +180,9 @@ window.L = L;\n\
{expand: true,cwd:'src/samples/conference/',src:['initcert.js'],dest:'dist/samples/conference/',flatten:false,mode:true},
{expand: true,cwd:'src/samples/conference/cert/',src:['.woogeen.keystore'],dest:'dist/samples/conference/cert/',flatten:false,mode:true},
{expand: true,cwd:'src/extension/',src:['**'],dest:'dist/',flatten:false},
{expand: true,cwd:'dist/sdk/',src:['oms.js'],dest:'dist/samples/conference/public/scripts/',flatten:false},
{expand: true,cwd:'dist/sdk/',src:['owt.js'],dest:'dist/samples/conference/public/scripts/',flatten:false},
{expand: true,cwd:'dist/samples/conference/public/scripts',src:['rest.js'],dest:'dist/samples/conference/',flatten:false},
{expand: true,cwd:'dist/sdk/',src:['oms.js'],dest:'dist/samples/p2p/js/',flatten:false}
{expand: true,cwd:'dist/sdk/',src:['owt.js'],dest:'dist/samples/p2p/js/',flatten:false}
]
}
},
Expand All @@ -195,7 +195,7 @@ window.L = L;\n\
replacements: [
{
pattern: /<!-- SDK Starts -->[\w\W]+<!-- SDK Stops -->/gm,
replacement: '<script src="js/oms.js" type="text/javascript"></script>'
replacement: '<script src="js/owt.js" type="text/javascript"></script>'
},
{
pattern: /var serverAddress.*/g,
Expand All @@ -211,8 +211,8 @@ window.L = L;\n\
options: {
replacements: [
{
pattern: '<script src="../../../../dist/sdk-debug/oms.js" type="text/javascript"></script>',
replacement: '<script src="scripts/oms.js" type="text/javascript"></script>'
pattern: '<script src="../../../../dist/sdk-debug/owt.js" type="text/javascript"></script>',
replacement: '<script src="scripts/owt.js" type="text/javascript"></script>'
},
]
}
Expand Down
4 changes: 2 additions & 2 deletions src/samples/conference/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "oms-sample-conference",
"title": "Open Media Streamer Conference Sample",
"description": "Open Media Streamer JavaScript Conference Sample",
"title": "Open WebRTC Toolkit Conference Sample",
"description": "Open WebRTC Toolkit JavaScript Conference Sample",
"version": "4.1.0",
"homepage": "http://webrtc.intel.com",
"author": "Intel WebRTC team",
Expand Down
2 changes: 1 addition & 1 deletion src/samples/conference/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js" type="text/javascript"></script>
<script src="https://webrtchacks.github.io/adapter/adapter-7.0.0.js" type="text/javascript"></script>
<script src="../../../../dist/sdk-debug/oms.js" type="text/javascript"></script>
<script src="../../../../dist/sdk-debug/owt.js" type="text/javascript"></script>
<script src="scripts/index.js" type="text/javascript"></script>
<script src="scripts/rest-sample.js" type="text/javascript"></script>
<script language="JavaScript">
Expand Down
2 changes: 1 addition & 1 deletion src/samples/p2p/js/sc.websocket.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/**
* @class SignalingChannel
* @classDesc Signaling module for Open Media Streamer P2P chat
* @classDesc Signaling module for Open WebRTC Toolkit P2P chat
*/
function SignalingChannel() {

Expand Down
2 changes: 1 addition & 1 deletion src/samples/p2p/peercall.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<script src="https://webrtchacks.github.io/adapter/adapter-7.0.0.js" type="text/javascript"></script>
<script src="js/sc.websocket.js" type="text/javascript"></script>
<!-- SDK Starts -->
<script src="../../../dist/sdk-debug/oms.js" type="text/javascript"></script>
<script src="../../../dist/sdk-debug/owt.js" type="text/javascript"></script>
<!-- SDK Stops -->
<h1>Intel<sup>&reg;</sup> Collaboration Suite for WebRTC</h1>
<h2>P2P Sample</h2>
Expand Down
2 changes: 1 addition & 1 deletion test/p2ptest/karma_config/chrome.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = function (config) {
'./test/p2ptest/dependencies/adapter.js',
'./test/p2ptest/dependencies/q.js',
'./dist/samples/p2p/js/sc.websocket.js',
'./dist/sdk/oms.js',
'./dist/sdk/owt.js',
'./test/p2ptest/js/errorHandler.js',
'./test/p2ptest/js/test_functions.js',
'./test/p2ptest/js/video_detector.js',
Expand Down
2 changes: 1 addition & 1 deletion test/p2ptest/karma_config/firefox.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = function (config) {
'./test/p2ptest/dependencies/adapter.js',
'./test/p2ptest/dependencies/q.js',
'./dist/samples/p2p/js/sc.websocket.js',
'./dist/sdk/oms.js',
'./dist/sdk/owt.js',
'./test/p2ptest/js/errorHandler.js',
'./test/p2ptest/js/test_functions.js',
'./test/p2ptest/js/video_detector.js',
Expand Down
2 changes: 1 addition & 1 deletion test/p2ptest/karma_config/safari.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = function (config) {
'./test/p2ptest/dependencies/adapter.js',
'./test/p2ptest/dependencies/q.js',
'./dist/samples/p2p/js/sc.websocket.js',
'./dist/sdk/oms.js',
'./dist/sdk/owt.js',
'./test/p2ptest/js/errorHandler.js',
'./test/p2ptest/js/test_functions.js',
'./test/p2ptest/js/video_detector.js',
Expand Down

0 comments on commit 42cd018

Please sign in to comment.