From a894fcd4f9d349c9dde5ead8952bc9eb438701af Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Tue, 28 Feb 2012 21:19:10 +0100 Subject: [PATCH] Removed CommonCode entierly --- bin/checkPad.js | 2 +- bin/convert.js | 2 +- src/node/db/AuthorManager.js | 2 +- src/node/db/GroupManager.js | 2 +- src/node/db/Pad.js | 2 +- src/node/db/ReadOnlyManager.js | 2 +- src/node/db/SecurityManager.js | 2 +- src/node/db/SessionManager.js | 2 +- src/node/easysync_tests.js | 2 +- src/node/handler/APIHandler.js | 2 +- src/node/handler/PadMessageHandler.js | 2 +- src/node/handler/TimesliderMessageHandler.js | 2 +- src/node/utils/ExportDokuWiki.js | 2 +- src/node/utils/ExportHtml.js | 2 +- src/node/utils/ImportHtml.js | 2 +- src/node/utils/common_code.js | 24 -------------------- 16 files changed, 15 insertions(+), 39 deletions(-) delete mode 100644 src/node/utils/common_code.js diff --git a/bin/checkPad.js b/bin/checkPad.js index 0cac0af1..a72f0060 100644 --- a/bin/checkPad.js +++ b/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; diff --git a/bin/convert.js b/bin/convert.js index f4ddd29a..24fd393a 100644 --- a/bin/convert.js +++ b/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"); diff --git a/src/node/db/AuthorManager.js b/src/node/db/AuthorManager.js index 7a9c93c0..f644de12 100644 --- a/src/node/db/AuthorManager.js +++ b/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"); diff --git a/src/node/db/GroupManager.js b/src/node/db/GroupManager.js index 19b6857f..bd19507f 100644 --- a/src/node/db/GroupManager.js +++ b/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; diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js index c854c6af..b69780a4 100644 --- a/src/node/db/Pad.js +++ b/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"); diff --git a/src/node/db/ReadOnlyManager.js b/src/node/db/ReadOnlyManager.js index 5df68a16..34340630 100644 --- a/src/node/db/ReadOnlyManager.js +++ b/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"); diff --git a/src/node/db/SecurityManager.js b/src/node/db/SecurityManager.js index 0912308f..a092453a 100644 --- a/src/node/db/SecurityManager.js +++ b/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"); diff --git a/src/node/db/SessionManager.js b/src/node/db/SessionManager.js index b1c55632..ec4948a6 100644 --- a/src/node/db/SessionManager.js +++ b/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; diff --git a/src/node/easysync_tests.js b/src/node/easysync_tests.js index ee41f7c6..7a148289 100644 --- a/src/node/easysync_tests.js +++ b/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"); diff --git a/src/node/handler/APIHandler.js b/src/node/handler/APIHandler.js index f747201c..d4d7d6ce 100644 --- a/src/node/handler/APIHandler.js +++ b/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"); diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index c7ae1047..bfe7261d 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/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"); diff --git a/src/node/handler/TimesliderMessageHandler.js b/src/node/handler/TimesliderMessageHandler.js index a1f570fb..0081e645 100644 --- a/src/node/handler/TimesliderMessageHandler.js +++ b/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"); diff --git a/src/node/utils/ExportDokuWiki.js b/src/node/utils/ExportDokuWiki.js index ee774138..bcb21108 100644 --- a/src/node/utils/ExportDokuWiki.js +++ b/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"); diff --git a/src/node/utils/ExportHtml.js b/src/node/utils/ExportHtml.js index 9b45cb61..91ebe59f 100644 --- a/src/node/utils/ExportHtml.js +++ b/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"); diff --git a/src/node/utils/ImportHtml.js b/src/node/utils/ImportHtml.js index c2bb9cc4..4b50b032 100644 --- a/src/node/utils/ImportHtml.js +++ b/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; diff --git a/src/node/utils/common_code.js b/src/node/utils/common_code.js deleted file mode 100644 index 645a74ba..00000000 --- a/src/node/utils/common_code.js +++ /dev/null @@ -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;