Updating licenses and reducing folder depth

LICENSE.txt

@@ -1,12 +1,11 @@
-Cordova Extension for Visual Studio Code
-
-Copyright (c) Microsoft Corporation
+Visual Studio Code Extension for Apache Cordova Applications
 
+Copyright (c) Microsoft Corporation.
 All rights reserved.
 
 MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 

ThirdPartyNotices.txt

@@ -1,3 +1,6 @@
+This project uses or incorporates third party material from the projects listed below. The original copyright notice and the license under which Microsoft received such third party material are set forth below. Microsoft reserves all other rights not expressly granted, whether by implication, estoppel or otherwise.
+
+
 websockets-ws
 
 (The MIT License)
@@ -9,3 +12,17 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+WebKit Debug Adapter for Visual Studio Code
+
+The MIT License
+
+Copyright (c) Microsoft Corporation.
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

gulpfile.js

@@ -40,7 +40,6 @@ var sources = [
     'typings',
     'debugger/adapter',
     'debugger/common',
-    'debugger/cordova',
     'debugger/test',
     'debugger/webkit',
 ].map(function(tsFolder) { return tsFolder + '/**/*.ts'; });
@@ -79,7 +78,6 @@ var lintSources = [
     'debugger/test',
     'debugger/test',
     'debugger/webkit',
-    'debugger/cordova',
 ].map(function(tsFolder) { return tsFolder + '/**/*.ts'; });
 lintSources = lintSources.concat([
     'debugger/adapter/sourceMaps/sourceMapTransformer.ts',
@@ -96,7 +94,7 @@ gulp.task('tslint', function(){
 });
 
 function test() {
-    return gulp.src('out/debugger/test/**/*.js', { read: false })
+    return gulp.src('out/debugger/test/**/*.test.js', { read: false })
         .pipe(mocha({ ui: 'tdd' }))
         .on('error', function(e) {
             log(e ? e.toString() : 'error in test task!');

package.json

@@ -46,7 +46,7 @@
                         "typescriptreact"
                     ]
                 },
-                "program": "./out/src/debugger/cordova/debugCordova.js",
+                "program": "./out/src/debugger/debugCordova.js",
                 "runtime": "node",
                 "initialConfigurations": [
                     {

src/debugger/cordovaDebugAdapter.ts

@@ -13,9 +13,9 @@ import {CordovaIosDeviceLauncher} from './cordovaIosDeviceLauncher';
 
 import {cordovaRunCommand, execCommand} from './extension';
 
-import {WebKitDebugAdapter} from '../../../debugger/webkit/WebKitDebugAdapter';
+import {WebKitDebugAdapter} from '../../debugger/webkit/WebKitDebugAdapter';
 
-import {CordovaProjectHelper} from '../../utils/cordovaProjectHelper';
+import {CordovaProjectHelper} from '../utils/cordovaProjectHelper';
 
 export class CordovaDebugAdapter extends WebKitDebugAdapter {
     private outputLogger: (message: string,  error?: boolean) => void;

src/debugger/cordovaDebugSession.ts

@@ -2,16 +2,16 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
-import {Response} from '../../../debugger/common/v8Protocol';
-import {DebugSession, ErrorDestination, OutputEvent} from '../../../debugger/common/debugSession';
+import {Response} from '../../debugger/common/v8Protocol';
+import {DebugSession, ErrorDestination, OutputEvent} from '../../debugger/common/debugSession';
 import {CordovaDebugAdapter} from './cordovaDebugAdapter';
 import {CordovaPathTransformer} from './cordovaPathTransformer';
-import {Logger} from '../../../debugger/webkit/utilities';
+import {Logger} from '../../debugger/webkit/utilities';
 
-import {AdapterProxy} from '../../../debugger/adapter/adapterProxy';
-import {LineNumberTransformer} from '../../../debugger/adapter/lineNumberTransformer';
+import {AdapterProxy} from '../../debugger/adapter/adapterProxy';
+import {LineNumberTransformer} from '../../debugger/adapter/lineNumberTransformer';
 
-import {SourceMapTransformer} from '../../../debugger/adapter/sourceMaps/sourceMapTransformer';
+import {SourceMapTransformer} from '../../debugger/adapter/sourceMaps/sourceMapTransformer';
 import * as Q from 'q';
 
 export class CordovaDebugSession extends DebugSession {

src/debugger/cordovaPathTransformer.ts

@@ -2,7 +2,7 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
-import * as utils from '../../../debugger/webkit/utilities';
+import * as utils from '../../debugger/webkit/utilities';
 import * as path from 'path';
 import * as fs from 'fs';
 

src/debugger/debugCordova.ts

@@ -3,6 +3,6 @@
  *--------------------------------------------------------*/
 
 import {CordovaDebugSession} from './cordovaDebugSession';
-import {DebugSession} from '../../../debugger/common/debugSession';
+import {DebugSession} from '../../debugger/common/debugSession';
 
 DebugSession.run(CordovaDebugSession);

test/debugger/cordovaIosDeviceLauncher.ts

@@ -1,7 +1,10 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for details.
+
 import * as mockery from 'mockery';
 
 // Used only for the type to allow mocking
-import {CordovaIosDeviceLauncher as _CordovaIosDeviceLauncher} from '../../../src/debugger/cordova/cordovaIosDeviceLauncher';
+import {CordovaIosDeviceLauncher as _CordovaIosDeviceLauncher} from '../../src/debugger/cordovaIosDeviceLauncher';
 
 let CordovaIosDeviceLauncher: typeof _CordovaIosDeviceLauncher;
 
@@ -12,7 +15,7 @@ describe('cordovaIosDeviceLauncher', function () {
     before(() => {
         mockery.enable({warnOnReplace: false, useCleanCache: true});
         mockery.registerAllowables([
-            '../../../src/debugger/cordova/cordovaIosDeviceLauncher',
+            '../../src/debugger/cordovaIosDeviceLauncher',
             'path',
             'q'
         ]);
@@ -21,7 +24,7 @@ describe('cordovaIosDeviceLauncher', function () {
 
         mockery.registerMock('fs', fsMock);
         mockery.registerMock('plist-with-patches', plistMock);
-        CordovaIosDeviceLauncher = require('../../../src/debugger/cordova/cordovaIosDeviceLauncher').CordovaIosDeviceLauncher;
+        CordovaIosDeviceLauncher = require('../../src/debugger/cordovaIosDeviceLauncher').CordovaIosDeviceLauncher;
     });
     after(() => {
         mockery.disable();

test/debugger/cordovaPathTransformer.ts

@@ -1,4 +1,7 @@
-import {CordovaPathTransformer} from '../../../src/debugger/cordova/cordovaPathTransformer';
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for details.
+
+import {CordovaPathTransformer} from '../../src/debugger/cordovaPathTransformer';
 
 import * as path from 'path';
 
@@ -11,8 +14,8 @@ describe('CordovaPathTransformer', () => {
        let logger = (message: string) => output += message + '\n';
        let pathTransformer = new CordovaPathTransformer(logger);
 
-       // __dirname is '/out/test/debugger/cordova' so we need to step up four levels to escape completely
-       let testapp = path.join(__dirname, '..', '..', '..', '..', 'test', 'testDebuggerProject');
+       // __dirname is '/out/test/debugger' so we need to step up three levels to escape completely
+       let testapp = path.join(__dirname, '..', '..', '..', 'test', 'testDebuggerProject');
        pathTransformer.attach({cwd: testapp, platform: 'android', port: 1234});
 
        pathTransformer.getClientPath('file:///android_asset/www/js/index.js').toLowerCase().should.equal(path.resolve(testapp, 'www', 'js', 'index.js').toLowerCase());