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

diff --git a/trunk/infrastructure/framework-src/modules/netutils.js b/trunk/infrastructure/framework-src/modules/netutils.js
deleted file mode 100644
index 6616b76..0000000
--- a/trunk/infrastructure/framework-src/modules/netutils.js
+++ /dev/null
@@ -1,88 +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.
- */
-
-/**
- * @fileOverview A collection of network-related utilities.
- */
-
-import("jsutils.eachProperty");
-
-jimport("java.net.InetAddress");
-
- 
-function urlPost(url0, params, options) {
-  var url = new java.net.URL(url0);
-  
-  var data;
-  if (typeof(params) == 'string') {
-    data = params;
-  } else if (typeof(params) == 'object') {
-    var components = [];
-    eachProperty(params, function(k, v) {
-      components.push(encodeURIComponent(k)+"="+encodeURIComponent(v));
-    });
-    data = components.join('&');
-  }
-  var dataBytes = (new java.lang.String(data)).getBytes("UTF-8");
-  var conn = url.openConnection();
-  conn.setInstanceFollowRedirects(true);
-  conn.setRequestMethod("POST");
-  conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
-  conn.setRequestProperty("Content-Length", dataBytes.length);
-  conn.setDoInput(true);
-  conn.setDoOutput(true);
-  conn.setConnectTimeout(30*1000);
-  conn.setReadTimeout(30*1000);
-  conn.getOutputStream().write(dataBytes);
-  var content = conn.getContent();
-  var responseCode = conn.getResponseCode();
-  var contentType = conn.getContentType();
-  var contentEncoding = conn.getContentEncoding();
-  
-  if ((content instanceof java.io.InputStream) && (new java.lang.String(contentType)).startsWith("text/")) {
-    if (! contentEncoding) {
-      var encoding = contentType.split(/;\s*/);
-      if (encoding.length > 1) {
-        encoding = encoding[1].split("=");
-        if (encoding[0] == "charset")
-          contentEncoding = encoding[1];
-      }
-    }
-    content = net.appjet.common.util.BetterFile.getStreamBytes(content);
-    if (contentEncoding) {
-      content = (new java.lang.String(content, contentEncoding));
-    }
-  }
-  
-  return {
-    content: content,
-    status: responseCode,
-    contentType: contentType,
-    contentEncoding: contentEncoding
-  };
-}
-
-function getHostnameFromIp(ip) {
-  var ret = null;
-  try {
-    var addr = InetAddress.getByName(ip);
-    ret = addr.getHostName();
-  } catch (ex) { }
-  return ret;
-}
-
-
-