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

diff --git a/trunk/infrastructure/net.appjet.common.cli/cli.scala b/trunk/infrastructure/net.appjet.common.cli/cli.scala
deleted file mode 100644
index ef9223f..0000000
--- a/trunk/infrastructure/net.appjet.common.cli/cli.scala
+++ /dev/null
@@ -1,56 +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.
- */
-
-package net.appjet.common.cli;
-
-import org.apache.commons.lang.WordUtils;
-
-class CliOption(val name: String, val description: String, val argName: Option[String]);
-
-class ParseException(message: String) extends RuntimeException(message);
-
-class CliParser(predef: Array[CliOption]) {
-  val displayWidth = 80;
-  val options = Map((for (opt <- predef) yield ((opt.name, opt))): _*);
-
-  def parseOptions(args0: Array[String]): (Map[String, String], Array[String]) = {
-    val (opts, args) = args0.partition(_.startsWith("-"));
-    (Map((for (arg <- opts) yield {
-      val parts = arg.split("=", 2);
-      val name = "-+".r.replaceFirstIn(parts(0), "");
-      if (parts.length == 1 && options.get(name).map(_.argName.isDefined).exists(x => x))
-	throw new ParseException("Missing argument for flag: "+name);
-      (name, parts.orElse(Map(1 -> "true"))(1));
-    }): _*),
-     args.toArray);
-  }
-
-  def dprint(prefix: String, value: String) = {
-//    println(prefix+": "+value+"\n");
-    value;
-  }
-
-  def usage = {
-    val sb = new StringBuilder();
-    var maxLength = predef.map(opt => 2 + opt.name.length + opt.argName.map(_.length + 1).getOrElse(0) ).reduceRight(Math.max)+2;
-    for ((n, opt) <- options) {
-      sb.append("  --"+n+opt.argName.map("=<"+_+">").getOrElse("")+"\n");
-      sb.append("     "+WordUtils.wrap(opt.description, displayWidth-5).split("\n").mkString("\n     "));
-      sb.append("\n\n");
-    }
-    sb.toString();
-  }
-}