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

diff --git a/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaPackage.java b/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaPackage.java
deleted file mode 100644
index 71f09f7..0000000
--- a/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaPackage.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (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.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Rhino code, released
- * May 6, 1999.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1997-1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Norris Boyd
- *   Frank Mitchell
- *   Mike Shaver
- *
- * Alternatively, the contents of this file may be used under the terms of
- * the GNU General Public License Version 2 or later (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of those above. If
- * you wish to allow use of your version of this file only under the terms of
- * the GPL and not to allow others to use your version of this file under the
- * MPL, indicate your decision by deleting the provisions above and replacing
- * them with the notice and other provisions required by the GPL. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package org.mozilla.javascript;
-
-/**
- * This class reflects Java packages into the JavaScript environment.  We
- * lazily reflect classes and subpackages, and use a caching/sharing
- * system to ensure that members reflected into one JavaPackage appear
- * in all other references to the same package (as with Packages.java.lang
- * and java.lang).
- *
- * @author Mike Shaver
- * @see NativeJavaArray
- * @see NativeJavaObject
- * @see NativeJavaClass
- */
-
-public class NativeJavaPackage extends ScriptableObject
-{
-    static final long serialVersionUID = 7445054382212031523L;
-
-    NativeJavaPackage(boolean internalUsage,
-                      String packageName, ClassLoader classLoader)
-    {
-        this.packageName = packageName;
-        this.classLoader = classLoader;
-    }
-
-    /**
-     * @deprecated NativeJavaPackage is an internal class, do not use
-     * it directly.
-     */
-    public NativeJavaPackage(String packageName, ClassLoader classLoader) {
-        this(false, packageName, classLoader);
-    }
-
-    /**
-     * @deprecated NativeJavaPackage is an internal class, do not use
-     * it directly.
-     */
-    public NativeJavaPackage(String packageName) {
-        this(false, packageName,
-             Context.getCurrentContext().getApplicationClassLoader());
-    }
-
-    public String getClassName() {
-        return "JavaPackage";
-    }
-
-    public boolean has(String id, Scriptable start) {
-        return true;
-    }
-
-    public boolean has(int index, Scriptable start) {
-        return false;
-    }
-
-    public void put(String id, Scriptable start, Object value) {
-        // Can't add properties to Java packages.  Sorry.
-    }
-
-    public void put(int index, Scriptable start, Object value) {
-        throw Context.reportRuntimeError0("msg.pkg.int");
-    }
-
-    public Object get(String id, Scriptable start) {
-        return getPkgProperty(id, start, true);
-    }
-
-    public Object get(int index, Scriptable start) {
-        return NOT_FOUND;
-    }
-
-    // set up a name which is known to be a package so we don't
-    // need to look for a class by that name
-    void forcePackage(String name, Scriptable scope)
-    {
-        NativeJavaPackage pkg;
-        int end = name.indexOf('.');
-        if (end == -1) {
-            end = name.length();
-        }
-
-        String id = name.substring(0, end);
-        Object cached = super.get(id, this);
-        if (cached != null && cached instanceof NativeJavaPackage) {
-            pkg = (NativeJavaPackage) cached;
-        } else {
-            String newPackage = packageName.length() == 0
-                                ? id
-                                : packageName + "." + id;
-            pkg = new NativeJavaPackage(true, newPackage, classLoader);
-            ScriptRuntime.setObjectProtoAndParent(pkg, scope);
-            super.put(id, this, pkg);
-        }
-        if (end < name.length()) {
-            pkg.forcePackage(name.substring(end+1), scope);
-        }
-    }
-
-    synchronized Object getPkgProperty(String name, Scriptable start,
-                                       boolean createPkg)
-    {
-        Object cached = super.get(name, start);
-        if (cached != NOT_FOUND)
-            return cached;
-
-        String className = (packageName.length() == 0)
-                               ? name : packageName + '.' + name;
-        Context cx = Context.getContext();
-        ClassShutter shutter = cx.getClassShutter();
-        Scriptable newValue = null;
-        if (shutter == null || shutter.visibleToScripts(className)) {
-            Class cl = null;
-            if (classLoader != null) {
-                cl = Kit.classOrNull(classLoader, className);
-            } else {
-                cl = Kit.classOrNull(className);
-            }
-            if (cl != null) {
-                newValue = new NativeJavaClass(getTopLevelScope(this), cl);
-                newValue.setPrototype(getPrototype());
-            }
-        }
-        if (newValue == null && createPkg) {
-            NativeJavaPackage pkg;
-            pkg = new NativeJavaPackage(true, className, classLoader);
-            ScriptRuntime.setObjectProtoAndParent(pkg, getParentScope());
-            newValue = pkg;
-        }
-        if (newValue != null) {
-            // Make it available for fast lookup and sharing of
-            // lazily-reflected constructors and static members.
-            super.put(name, start, newValue);
-        }
-        return newValue;
-    }
-
-    public Object getDefaultValue(Class ignored) {
-        return toString();
-    }
-
-    public String toString() {
-        return "[JavaPackage " + packageName + "]";
-    }
-
-    public boolean equals(Object obj) {
-        if(obj instanceof NativeJavaPackage) {
-            NativeJavaPackage njp = (NativeJavaPackage)obj;
-            return packageName.equals(njp.packageName) && classLoader == njp.classLoader;
-        }
-        return false;
-    }
-    
-    public int hashCode() {
-        return packageName.hashCode() ^ (classLoader == null ? 0 : classLoader.hashCode());
-    }
-
-    private String packageName;
-    private ClassLoader classLoader;
-}
\ No newline at end of file