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

diff --git a/infrastructure/framework-src/modules/fileutils.js b/infrastructure/framework-src/modules/fileutils.js
new file mode 100644
index 0000000..aaf12e2
--- /dev/null
+++ b/infrastructure/framework-src/modules/fileutils.js
@@ -0,0 +1,108 @@
+/**
+ * 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.
+ */
+
+/** @fileOverview misc file functions */
+
+jimport("java.io.File",
+	"java.io.DataInputStream", 
+	"java.io.FileInputStream",
+	"java.lang.reflect.Array",
+	"java.lang.Byte",
+	"java.io.FileReader",
+	"java.io.BufferedReader",
+	"net.appjet.oui.JarVirtualFile");
+
+function readFileBytes(path) {
+  var jfile = new JarVirtualFile(path);
+  if (!jfile.exists() || jfile.isDirectory()) {
+    throw 'Not a file: '+path;
+  }
+  return net.appjet.common.util.BetterFile.getStreamBytes(jfile.openStream());
+}
+
+function readFile(path) {
+  var bytes = readFileBytes(path);
+  if (bytes !== null) {
+    return String(new java.lang.String(bytes));
+  } else {
+    return null;
+  }
+}
+
+function fileLastModified(path) {
+  var jfile = new JarVirtualFile(path);
+  if (!jfile.exists()) {
+    throw "Not a file: "+path;
+  }
+  return jfile.lastModified();
+}
+
+//----------------------------------------------------------------
+// real files
+//----------------------------------------------------------------
+
+function readRealFileBytes(path) {
+  var jfile = new File(path);
+  if (!jfile.exists() || jfile.isDirectory()) {
+    throw 'Not a real file: '+path;
+  }
+  var jdata = new DataInputStream(new FileInputStream(jfile));
+  var size = jfile.length();
+  var bytes = Array.newInstance(Byte.TYPE, size);
+  jdata.read(bytes, 0, size);
+  jdata.close();
+  return bytes;
+}
+
+function readRealFile(path) {
+  var bytes = readRealFileBytes(path);
+  if (bytes !== null) {
+    return String(new java.lang.String(bytes));
+  } else {
+    return null;
+  }
+}
+
+function writeRealFile(path, data) {
+  var jf = new Packages.java.io.File(path);
+  var fw = new Packages.java.io.FileWriter(jf);
+  fw.write(data);
+  fw.flush();
+  fw.close();
+}
+
+
+function eachFileLine(file, fn) {
+  var iter = fileLineIterator(file);
+  while (iter.hasNext) {
+    fn(iter.next);
+  }
+}
+
+function fileLineIterator(file) {
+  var reader = new BufferedReader(new FileReader(file));
+  var nextLine = reader.readLine();
+  return {
+    get hasNext() { return nextLine !== null },
+    get next() { 
+      var curLine = nextLine;
+      if (this.hasNext) {
+        nextLine = reader.readLine();        
+      }
+      return curLine;
+    }
+  };
+}