Merge remote branch 'upstream/master'

Conflicts:
	etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
	etherpad/src/etherpad/control/pro/pro_main_control.js
	etherpad/src/etherpad/control/pro_help_control.js
	etherpad/src/etherpad/globals.js
	etherpad/src/etherpad/legacy_urls.js
	etherpad/src/etherpad/pne/pne_utils.js
	etherpad/src/etherpad/pro/pro_utils.js
	etherpad/src/main.js
	etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
	etherpad/src/plugins/testplugin/templates/page.ejs
	etherpad/src/static/css/pad2_ejs.css
	etherpad/src/static/css/pro-help.css
	etherpad/src/static/img/jun09/pad/protop.gif
	etherpad/src/static/js/store.js
	etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
	etherpad/src/themes/default/templates/main/home.ejs
	etherpad/src/themes/default/templates/pro-help/main.ejs
	etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
	infrastructure/com.etherpad/licensing.scala
	trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
	trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
	trunk/etherpad/src/static/css/home-opensource.css
	trunk/etherpad/src/static/js/ace.js
	trunk/etherpad/src/static/js/linestylefilter_client.js
	trunk/etherpad/src/templates/email/eepnet_license_info.ejs
	trunk/etherpad/src/templates/pad/pad_body2.ejs
	trunk/etherpad/src/templates/pad/pad_content.ejs
	trunk/etherpad/src/templates/pad/padfull_body.ejs
	trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs

1 files changed, 0 insertions, 58 deletions

diff --git a/trunk/infrastructure/framework-src/modules/execution.js b/trunk/infrastructure/framework-src/modules/execution.js
deleted file mode 100644
index 1cec418..0000000
--- a/trunk/infrastructure/framework-src/modules/execution.js
+++ /dev/null
@@ -1,58 +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.
- */
-
-import("jsutils.{scalaF0,scalaF1}");
-
-/**
- * Asynchronously call a function as soon as the current request completes.
- **/
-function async(f) {
-  Packages.net.appjet.ajstdlib.execution.runAsync(appjet.context, f);
-}
-
-function initTaskThreadPool(name, poolSize) {
-  Packages.net.appjet.ajstdlib.execution.createNamedTaskThreadPool(name, poolSize);
-}
-
-function scheduleTask(poolName, taskName, delayMillis, args) {
-  return Packages.net.appjet.ajstdlib.execution.scheduleTaskInPool(poolName, taskName, delayMillis, args);
-}
-
-function shutdownAndWaitOnTaskThreadPool(poolName, timeoutMillis) {
-  return Packages.net.appjet.ajstdlib.execution.shutdownAndWaitOnTaskThreadPool(poolName, timeoutMillis);
-}
-
-function fancyAssEval(initCode, mainCode) {
-  function init(runner) {
-    Packages.net.appjet.bodylock.BodyLock.evaluateString(
-      runner.globalScope(),
-      initCode,
-      "eval'd code imports",
-      1);
-  }
-  var runner = Packages.net.appjet.oui.ScopeReuseManager.getEmpty(scalaF1(init));
-  var ec = new Packages.net.appjet.oui.ExecutionContext(
-    new Packages.net.appjet.oui.RequestWrapper(request.underlying),
-    null, runner);
-  return Packages.net.appjet.oui.ExecutionContextUtils.withContext(ec,
-    scalaF0(function() {
-      return Packages.net.appjet.bodylock.BodyLock.evaluateString(
-        runner.globalScope(),
-        mainCode,
-        "eval'd code main",
-        1);        
-    }));
-}
\ No newline at end of file