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

diff --git a/trunk/infrastructure/framework-src/modules/sqlbase/persistent_vars.js b/trunk/infrastructure/framework-src/modules/sqlbase/persistent_vars.js
deleted file mode 100644
index 1c4cc95..0000000
--- a/trunk/infrastructure/framework-src/modules/sqlbase/persistent_vars.js
+++ /dev/null
@@ -1,57 +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("sqlbase.sqlobj");
-import("sqlbase.sqlcommon");
-
-jimport("java.lang.System.out.println");
-
-// TODO: add caching?
-
-// Curently supports:
-//   Strings
-
-function get(name) {
-  if (!sqlcommon.doesTableExist('persistent_vars')) {
-    return undefined;
-  }
-  var r = sqlobj.selectSingle('persistent_vars', {name: name});
-  if (!r) {
-    return undefined;
-  }
-  return r.stringVal;
-}
-
-function put(name, val) {
-  if (typeof(val) != 'string') {
-    throw Error("unsupported type for persistent_vars: "+typeof(val));
-  }
-
-  var r = sqlobj.selectSingle('persistent_vars', {name: name});
-  if (r) {
-    sqlobj.updateSingle('persistent_vars', {id: r.id}, {stringVal: val});
-  } else {
-    sqlobj.insert('persistent_vars', {name: name, stringVal: val});
-  }
-}
-
-function remove(name) {
-  var r = sqlobj.selectSingle('persistent_vars', {name: name});
-  if (r) {
-    sqlobj.deleteRows('persistent_vars', {id: r.id});
-  }
-}