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, 107 insertions, 0 deletions

diff --git a/infrastructure/framework-src/modules/global/appjet.js b/infrastructure/framework-src/modules/global/appjet.js
new file mode 100644
index 0000000..135ac44
--- /dev/null
+++ b/infrastructure/framework-src/modules/global/appjet.js
@@ -0,0 +1,107 @@
+/**
+ * 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");
+
+//----------------------------------------------------------------
+// global static "appjet" object
+//----------------------------------------------------------------
+
+/**
+ * @fileOverview The global appjet object contains access to the AppJet runtime,
+ * app meta-data, and other information.
+ */
+var appjet = {
+
+/**
+ * This is the interface to the execution context.  You probably won't need
+ * to use this, but if you do, be careful!
+ * @type object
+ */
+get context() {
+  return net.appjet.oui.ExecutionContextUtils.currentContext();
+},
+
+get executionId() {
+  return this.context.executionId();
+},
+
+// /**
+//  * Holds the current request's requestId. (These IDs may be reused!)
+//  * @type String
+//  */
+// get requestId() {
+//   return this.context.requestId();
+// },
+
+/**
+ * Volatile cache that persists between requests.  (JavaScript object).
+ */
+get cache() {
+  return Packages.net.appjet.ajstdlib.ajstdlib.attributes()
+    .getOrElseUpdate("cache", scalaF0({}));
+},
+
+get cacheRoot() {
+  return function(name) {
+    return Packages.net.appjet.ajstdlib.ajstdlib.attributes()
+      .getOrElseUpdate("cache-"+(name?name:""), scalaF0({}));
+  };
+},
+
+/**
+ * A global lock for this app (ReentrantLock object).
+ */
+get globalLock() {
+  return net.appjet.ajstdlib.ajstdlib.globalLock(); 
+},
+
+/**
+ * Per-request cache, cleared between requests.
+ */
+get requestCache() {
+  return this.context.attributes().getOrElseUpdate("requestCache", scalaF0({}))
+},
+
+/**
+ * Per-scope cache, persisted in this "server" instance.
+ */
+get scopeCache() {
+  return this.context.runner().attributes().getOrElseUpdate("scopeCache", scalaF0({}));
+},
+
+/**
+ * config params for app.
+ */
+get config() {
+  return Packages.net.appjet.oui.config.configObject(this.context.runner().globalScope());
+},
+
+/**
+ * tells appjet not to re-use this "scope"/"server"
+ */
+get retireScope() {
+  return function() { this.context.runner().reuseOk_$eq(false); }
+},
+  
+/**
+ * How many milliseconds the server has been running for.
+ */
+get uptime() {
+  return Date.now() - Packages.net.appjet.oui.main.startTime().getTime();
+}
+  
+}; // end: var appjet = {...
\ No newline at end of file