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

7 files changed, 0 insertions, 138 deletions

diff --git a/trunk/infrastructure/bin/classpath.sh b/infrastructure/bin/classpath.sh
index b1d297c..b1d297c 100755
--- a/trunk/infrastructure/bin/classpath.sh
+++ b/infrastructure/bin/classpath.sh
diff --git a/trunk/infrastructure/bin/comp.sh b/infrastructure/bin/comp.sh
index 5f65c2f..5f65c2f 100755
--- a/trunk/infrastructure/bin/comp.sh
+++ b/infrastructure/bin/comp.sh
diff --git a/trunk/infrastructure/bin/jscomp.sh b/infrastructure/bin/jscomp.sh
index 3f5bc51..3f5bc51 100755
--- a/trunk/infrastructure/bin/jscomp.sh
+++ b/infrastructure/bin/jscomp.sh
diff --git a/trunk/infrastructure/bin/makesars.sh b/infrastructure/bin/makesars.sh
index 541b04a..541b04a 100755
--- a/trunk/infrastructure/bin/makesars.sh
+++ b/infrastructure/bin/makesars.sh
diff --git a/trunk/infrastructure/bin/run.sh b/infrastructure/bin/run.sh
index cf918d4..cf918d4 100755
--- a/trunk/infrastructure/bin/run.sh
+++ b/infrastructure/bin/run.sh
diff --git a/trunk/infrastructure/bin/compilecache.sh b/trunk/infrastructure/bin/compilecache.sh
deleted file mode 100644
index a2b6220..0000000
--- a/trunk/infrastructure/bin/compilecache.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-#  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.
-
-CP_CMD="cp -R -u"
-if [ `uname` == "Darwin" ]; then
-    CP_CMD="/bin/cp -R -n"
-fi
-
-function cacheonfiles {
-    NAME=$1; FILES=$2; FUNC=$3; NOCOPY=1;
-    if [ -z "$4" ]; then
-	NOCOPY=0
-    fi
-    REBUILD=0
-    BPATH=buildcache/$NAME
-    FILETEST=$BPATH/t
-    if [ ! -f $FILETEST ]; then
-	REBUILD=1
-    else
-	for a in $FILES; do
-	    if [ $FILETEST -ot $a ]; then
-		echo $a has changed, rebuilding $NAME
-		REBUILD=1
-	    fi
-	done
-    fi
-    if [ $REBUILD -eq 1 ]; then
-	if [ -d $BPATH ]; then
-	    rm -rf $BPATH
-	fi
-	mkdir -p $BPATH
-	$FUNC $BPATH
-	pushd $BPATH >> /dev/null
-	touch t
-	popd >> /dev/null
-    else 
-	echo using cached $NAME...
-    fi
-    if [ $NOCOPY -ne 1 ]; then
-	for a in $BPATH/*; do
-	    if [ -d $a ]; then
-		$CP_CMD $a build/
-	    elif [ -f $a ]; then
-		cp $a build/
-	    else
-		echo unknown file type $a
-		exit 1
-	    fi
-	done
-    fi
-}	   
diff --git a/trunk/infrastructure/bin/makejar.sh b/trunk/infrastructure/bin/makejar.sh
deleted file mode 100755
index c774fa6..0000000
--- a/trunk/infrastructure/bin/makejar.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash -e
-
-#  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.
-
-if [ -z "$JAR" ]; then
-    JAR=jar
-else
-    echo "using JAR $JAR..."
-fi
-
-cp ${MYSQL_CONNECTOR_JAR} lib/
-
-source bin/compilecache.sh
-
-if [ "$1" == "clearcache" ]; then
-    echo "CLEARING BUILD CACHE"
-    rm -rf buildcache
-    shift;
-fi
-
-TMPSTORE=/tmp/ajbuild-tmpstore-`date +%s`
-
-JARFILES=`echo $SCALA_HOME/lib/scala-library.jar lib/*.jar lib/manifest`
-function genjar {
-    echo "unzipping JARs..."
-    pushd $1 >> /dev/null
-    $JAR xf $SCALA_HOME/lib/scala-library.jar
-    rm -rf META-INF
-    for a in ../../lib/*.jar; do
-	$JAR xf $a
-	rm -rf META-INF/{MANIFEST.MF,NOTICE{,.txt},LICENSE{,.txt},INDEX.LIST,SUN_MICR.{RSA,SF},maven}
-    done
-
-    echo "making cached JAR...."
-    $JAR -cfm appjet.jar ../../lib/manifest .
-    mv appjet.jar /tmp/appjet.jar
-    rm -rf *
-    mv /tmp/appjet.jar ./
-
-    popd >> /dev/null
-}
-cacheonfiles JAR "$JARFILES" genjar 1
-
-echo "compiling..."
-bin/comp.sh $@
-
-pushd build >> /dev/null
-
-echo "copying cached JAR..."
-cp ../buildcache/JAR/appjet.jar ./
-
-echo "making JAR..."
-mv appjet.jar /tmp/appjet.jar
-$JAR -uf /tmp/appjet.jar . #META-INF com javax org net uk v scala dojox
-mv /tmp/appjet.jar ./
-
-echo "cleaning up..."
-rm -rf $TMPSTORE
-
-popd >> /dev/null
-
-echo "done."