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

diff --git a/trunk/infrastructure/framework-src/modules/atomfeed.js b/trunk/infrastructure/framework-src/modules/atomfeed.js
deleted file mode 100644
index 4b86eeb..0000000
--- a/trunk/infrastructure/framework-src/modules/atomfeed.js
+++ /dev/null
@@ -1,72 +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.
- */
-
-import("stringutils.sprintf");
-
-// TODO: validate XHTML of entries?
-
-function _xmlDate(d) {
-  return sprintf("%04d-%02d-%02dT%02d:%02d:%02dZ", 
-    d.getUTCFullYear(), d.getUTCMonth()+1, d.getUTCDate(),
-    d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds());
-}
-
-// "entries" is an object with "forEach" member (an Array works).
-// Each entry should have these properties:
-//  * title
-//  * author
-//  * published (Date)
-//  * updated (Date)
-//  * href (URL for HTML version)
-//  * content (valid xhtml)
-//
-// NOTE: entries should be sorted descending by entry.updated (newest first)
-//
-
-function renderFeed(title, lastUpdated, entries, href) {
-  function ampesc(url) {
-    return url.replace(/&/g, '&');
-  }
-
-  var r = [];
-  r.push('<?xml version="1.0" encoding="utf-8"?>',
-	 '<feed xmlns="http://www.w3.org/2005/Atom">');
-
-  r.push('<title type="text">' + title + '</title>');
-  r.push('<updated>' + _xmlDate(lastUpdated) + '</updated>');
-  r.push('<link rel="self" href="' + request.url + '" />');
-  r.push('<link rel="alternate" type="text/html" href="' + href + '" />');
-  r.push('<id>' + ampesc(request.url) + '</id>');
-  
-  entries.forEach(function(entry) {
-    r.push('<entry>',
-	   '<title>' + entry.title + '</title>',
-	   '<author><name>' + entry.author + '</name></author>',
-	   '<published>' + _xmlDate(entry.published) + '</published>',
-	   '<updated>' + _xmlDate(entry.updated) + '</updated>',
-	   '<link rel="alternate" type="text/html" href="' + entry.href + '" />',
-	   '<id>'+ampesc(entry.href)+'</id>',
-	   '<content type="xhtml">',
-	   '<div xmlns="http://www.w3.org/1999/xhtml">'+entry.content+'</div>',
-	   '</content>',
-	   '</entry>');
-  });
-  
-  r.push('</feed>');
-  
-  return r.join('\n');
-}
-