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, 81 deletions

diff --git a/trunk/infrastructure/framework-src/modules/sync.js b/trunk/infrastructure/framework-src/modules/sync.js
deleted file mode 100644
index a222ea0..0000000
--- a/trunk/infrastructure/framework-src/modules/sync.js
+++ /dev/null
@@ -1,81 +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.
- */
-
-jimport("java.util.concurrent.locks.ReentrantLock");
-jimport("net.appjet.oui.GlobalSynchronizer");
-
-/**
- * synchronously calls a no-argument function.
- * f may have return values.
- */
-function callsync(obj, f) {
-  if (!obj._LOCK) {
-    try {
-      appjet.globalLock.lock();
-      if (! obj._LOCK) {
-        obj._LOCK = new ReentrantLock();
-      }
-    } finally {
-      appjet.globalLock.unlock();
-    }
-  }
-  try {
-    obj._LOCK.lock();
-    return f();
-  } finally {
-    obj._LOCK.unlock();
-  }
-}
-
-/** 
- * synchronously calls a no-argument function iff
- * condition() is true. condition may be called 
- * twice and shouldn't have side-effects.
- */
-function callsyncIfTrue(obj, condition, f) {
-  if (condition()) {
-    callsync(obj, function() {
-      if (condition()) {
-        f();
-      }
-    });
-  }
-}
-
-/**
- * returns a function that synchronously calls
- * f with its own arguments
- */
-function wrapsync(obj, f, thisArg) {
-  return function() {
-    var args = Array.prototype.slice.call(arguments);
-    var wrapper = function() {
-      return f.apply(thisArg, args);
-    }
-    callsync(obj, wrapper);
-  }
-}
-
-function doWithStringLock(lockName, fn) {
-  GlobalSynchronizer.acquire(lockName);
-  try {
-    return fn();
-  }
-  finally {
-    GlobalSynchronizer.release(lockName);
-  }
-}
-