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

diff --git a/trunk/infrastructure/framework-src/modules/yuicompressor.js b/trunk/infrastructure/framework-src/modules/yuicompressor.js
deleted file mode 100644
index 572cc0d..0000000
--- a/trunk/infrastructure/framework-src/modules/yuicompressor.js
+++ /dev/null
@@ -1,85 +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.lang.System.err")
-jimport("yuicompressor.org.mozilla.javascript.ErrorReporter");
-jimport("com.yahoo.platform.yui.compressor.JavaScriptCompressor")
-jimport("com.yahoo.platform.yui.compressor.CssCompressor")
-jimport("java.io.StringReader");
-jimport("java.io.StringWriter");
-
-/**
- * Compresses the given JavaScript code into an equivalent, shorter string of code using
- * YUICompressor.  In addition to removing white-space and comments, YUICompressor
- * does a full semantic parse of the code and renames non-global variables to have
- * very short names.  Scopes that are visible to "eval" and "with" are excluded from
- * variable renaming, making the operation very safe.
- * <p>
- * For example,
- * yuicompressor.compressJS("function foo() { var longVariableName = 3; return longVariableName }");
- * produces
- * "function foo(){var A=3;return A;}"
- */
-
-function compressJS(code) {
-  function getComplaint(message, sourceName, line, lineSource, lineOffset) {
-    if (line < 0) return message;
-    else return (line+":"+lineOffset+":"+message);
-  }
-  function complaintHandler(func) {
-    return function(message, sourceName, line, lineSource, lineOffset) {
-      return func(getComplaint(message, sourceName, line, lineSource, lineOffset));
-    }
-  }
-  var myErrorReporter = new JavaAdapter(ErrorReporter, {
-    warning: complaintHandler(function (msg) {
-      if (msg.indexOf("Try to use a single 'var' statement per scope.") >= 0)
-	return;
-      err.println("yuicompressor.compressJS warning: "+msg);
-    }),
-    error: complaintHandler(function (msg) {
-      throw new Error("yuicompressor.compressJS error: "+msg);
-    }),
-    runtimeError: complaintHandler(function (msg) {
-      throw new Error("yuicompressor.compressJS error: "+msg);
-    })
-  });
-
-  var munge = true;
-  var verbose = false;
-  var optimize = true;
-  var wrapPos = 100; // characters, no wrap == -1
-  var compressor = new JavaScriptCompressor(new StringReader(code), myErrorReporter);
-  var writer = new StringWriter();
-  compressor.compress(writer, 100, munge, verbose, true, !optimize);
-  return String(writer.toString());
-}
-
-/**
- * Compresses the given CSS code into an equivalent, shorter string of code using
- * YUICompressor.  Besides removing unnecessary white-space and comments, the operation
- * performs an assortment of semantics-preserving optimizations.  The operation attempts
- * to preserve common "hacks" that take advantage of browser differences in parsing.
- */
-
-function compressCSS(code) {
-  var compressor = new CssCompressor(new StringReader(code));
-  var wrapPos = 100; // characters, no wrap == -1
-  var writer = new StringWriter();
-  compressor.compress(writer, wrapPos);
-  return String(writer.toString());
-}