Removed CommonCode entierly

bin/checkPad.js

@@ -15,7 +15,7 @@ var log4js = require("log4js");
 log4js.setGlobalLogLevel("INFO");
 var async = require("async");
 var db = require('../node/db/DB');
-var CommonCode = require('../node/utils/common_code');
+
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
 var padManager;
 

bin/convert.js

@@ -1,4 +1,4 @@
-var CommonCode = require('../node/utils/common_code');
+
 var startTime = new Date().getTime();
 var fs = require("fs");
 var ueberDB = require("ueberDB");

src/node/db/AuthorManager.js

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-var CommonCode = require('../utils/common_code');
+
 var ERR = require("async-stacktrace");
 var db = require("./DB").db;
 var async = require("async");

src/node/db/GroupManager.js

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
  
-var CommonCode = require('../utils/common_code');
+
 var ERR = require("async-stacktrace");
 var customError = require("../utils/customError");
 var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;

src/node/db/Pad.js

@@ -2,7 +2,7 @@
  * The pad object, defined with joose
  */
 
-var CommonCode = require('../utils/common_code');
+
 var ERR = require("async-stacktrace");
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
 var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory");

src/node/db/ReadOnlyManager.js

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-var CommonCode = require('../utils/common_code');
+
 var ERR = require("async-stacktrace");
 var db = require("./DB").db;
 var async = require("async");

src/node/db/SecurityManager.js

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-var CommonCode = require('../utils/common_code');
+
 var ERR = require("async-stacktrace");
 var db = require("./DB").db;
 var async = require("async");

src/node/db/SessionManager.js

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
  
-var CommonCode = require('../utils/common_code');
+
 var ERR = require("async-stacktrace");
 var customError = require("../utils/customError");
 var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;

src/node/easysync_tests.js

@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-var CommonCode = require('./utils/common_code');
+
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
 var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory");
 

src/node/handler/APIHandler.js

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-var CommonCode = require('../utils/common_code');
+
 var ERR = require("async-stacktrace");
 var fs = require("fs");
 var api = require("../db/API");

src/node/handler/PadMessageHandler.js

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-var CommonCode = require('../utils/common_code');
+
 var ERR = require("async-stacktrace");
 var async = require("async");
 var padManager = require("../db/PadManager");

src/node/handler/TimesliderMessageHandler.js

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-var CommonCode = require('../utils/common_code');
+
 var ERR = require("async-stacktrace");
 var async = require("async");
 var padManager = require("../db/PadManager");

src/node/utils/ExportDokuWiki.js

@@ -15,7 +15,7 @@
  */
 
 var async = require("async");
-var CommonCode = require('./common_code');
+
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
 var padManager = require("../db/PadManager");
 

src/node/utils/ExportHtml.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-var CommonCode = require('./common_code');
+
 var async = require("async");
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
 var padManager = require("../db/PadManager");

src/node/utils/ImportHtml.js

@@ -17,7 +17,7 @@
 var jsdom = require('jsdom-nocontextifiy').jsdom;
 var log4js = require('log4js');
 
-var CommonCode = require('../utils/common_code');
+
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
 var contentcollector = require("ep_etherpad-lite/static/js/contentcollector");
 var map = require("ep_etherpad-lite/static/js/ace2_common").map;

src/node/utils/common_code.js

@@ -1,24 +0,0 @@
-/**
- * Copyright 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS-IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var RequireKernel = require('require-kernel/');
-var path = require('path');
-
-var CLIENT_JS_SRC = path.normalize(__dirname + '/../../static/js/');
-var client_require = RequireKernel.requireForPaths(
-    'file://' + (CLIENT_JS_SRC.charAt(0) == '/' ? '' : '/') + encodeURI(CLIENT_JS_SRC));
-
-exports.require = client_require;