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

diff --git a/trunk/infrastructure/net.appjet.common/rhino/rhinospect.scala b/trunk/infrastructure/net.appjet.common/rhino/rhinospect.scala
deleted file mode 100644
index 65f278c..0000000
--- a/trunk/infrastructure/net.appjet.common/rhino/rhinospect.scala
+++ /dev/null
@@ -1,58 +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.rhino;
-
-import java.lang.reflect.Modifier;
-
-object rhinospect {
-
-  def visitFields(obj: Object, func: (String,Any)=>Unit) {
-    var cls: Class[_] = obj.getClass;
-
-    if (cls.isArray) {
-      import java.lang.reflect.Array;
-      for(i <- 0 until Array.getLength(obj)) {
-	func(String.valueOf(i), Array.get(obj, i));
-      }
-    }
-    else {
-      while (cls ne null) {
-	for (f <- cls.getDeclaredFields) {
-	  if (! Modifier.isStatic(f.getModifiers)) {
-	    f.setAccessible(true);
-	    val nm = f.getName;
-	    val vl = f.get(obj);
-	    func(nm, vl);
-	  }
-	}
-	cls = cls.getSuperclass;
-      }
-    }
-  }
-
-  def dumpFields(obj: Object, depth: Int, prefix: String): String = {
-    val s = new java.io.StringWriter();
-    val out = new java.io.PrintWriter(s);
-    visitFields(obj, (name: String, value: Any) => {
-      out.printf("%30s: %s\n", name+prefix, String.valueOf(value));
-      if (depth > 0 && value.isInstanceOf[Object]) {
-	out.print(dumpFields(value.asInstanceOf[Object], depth-1, prefix+" --"));
-      }
-    });
-    s.toString();
-  }
-}