10 files changed, 10 insertions, 67 deletions
diff --git a/node/utils/tar.json b/node/utils/tar.json
index 6a339e5c..82e5f7d9 100644
--- a/node/utils/tar.json
+++ b/node/utils/tar.json
@@ -41,7 +41,6 @@
   , "pad_impexp.js"
   , "AttributePoolFactory.js"
   , "Changeset.js"
-  , "easysync2_client.js"
   , "domline_client.js"
   , "linestylefilter_client.js"
   , "cssmanager_client.js"
@@ -56,7 +55,6 @@
   , "Changeset.js"
   , "skiplist.js"
   , "virtual_lines.js"
-  , "easysync2.js"
   , "cssmanager.js"
   , "colorutils.js"
   , "undomodule.js"
diff --git a/static/js/ace2_inner.js b/static/js/ace2_inner.js
index 31d4dac9..d2113574 100644
--- a/static/js/ace2_inner.js
+++ b/static/js/ace2_inner.js
@@ -42,8 +42,8 @@ var colorutils = require('/colorutils').colorutils;
 var makeContentCollector = require('/contentcollector').makeContentCollector;
 var makeCSSManager = require('/cssmanager').makeCSSManager;
 var domline = require('/domline').domline;
-var AttribPool = require('/easysync2').AttribPool;
-var Changeset = require('/easysync2').Changeset;
+var AttribPool = require('/AttributePoolFactory').createAttributePool;
+var Changeset = require('/Changeset');
 var linestylefilter = require('/linestylefilter').linestylefilter;
 var newSkipList = require('/skiplist').newSkipList;
 var undoModule = require('/undomodule').undoModule;
diff --git a/static/js/broadcast.js b/static/js/broadcast.js
index 020f47e7..e27e690c 100644
--- a/static/js/broadcast.js
+++ b/static/js/broadcast.js
@@ -22,8 +22,8 @@
 
 var makeCSSManager = require('/cssmanager_client').makeCSSManager;
 var domline = require('/domline_client').domline;
-var Changeset = require('/easysync2_client').Changeset;
-var AttribPool = require('/easysync2_client').AttribPool;
+var AttribPool = require('/AttributePoolFactory').createAttributePool;
+var Changeset = require('/Changeset');
 var linestylefilter = require('/linestylefilter_client').linestylefilter;
 var colorutils = require('/colorutils').colorutils;
 
diff --git a/static/js/changesettracker.js b/static/js/changesettracker.js
index 7b0fb3e4..e34dc107 100644
--- a/static/js/changesettracker.js
+++ b/static/js/changesettracker.js
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-var Changeset = require('/easysync2').Changeset;
-var AttribPool = require('/easysync2').AttribPool;
+var AttribPool = require('/AttributePoolFactory').createAttributePool;
+var Changeset = require('/Changeset');
 
 function makeChangesetTracker(scheduler, apool, aceCallbacksProvider)
 {
diff --git a/static/js/contentcollector.js b/static/js/contentcollector.js
index 0964a8ed..96dc4b7d 100644
--- a/static/js/contentcollector.js
+++ b/static/js/contentcollector.js
@@ -25,7 +25,7 @@
 
 var _MAX_LIST_LEVEL = 8;
 
-var Changeset = require('/easysync2').Changeset;
+var Changeset = require('/Changeset');
 var plugins = require('/plugins').plugins;
 
 function sanitizeUnicode(s)
diff --git a/static/js/easysync2.js b/static/js/easysync2.js
deleted file mode 100644
index 632cc9ae..00000000
--- a/static/js/easysync2.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * This code is mostly from the old Etherpad. Please help us to comment this code. 
- * This helps other people to understand this code better and helps them to improve it.
- * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
- */
-
-// THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.easysync2
-// %APPJET%: jimport("com.etherpad.Easysync2Support");
-/**
- * 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.
- */
-
-//var _opt = (this.Easysync2Support || null);
-
-exports.Changeset = require('/Changeset');
-exports.AttribPool = require('/AttributePoolFactory').createAttributePool;
diff --git a/static/js/easysync2_client.js b/static/js/easysync2_client.js
deleted file mode 100644
index 00a864a2..00000000
--- a/static/js/easysync2_client.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * This code is mostly from the old Etherpad. Please help us to comment this code. 
- * This helps other people to understand this code better and helps them to improve it.
- * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
- */
-
-// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/easysync2.js
-// THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.easysync2
-/**
- * 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.
- */
-//var _opt = (this.Easysync2Support || null);
-
-exports.Changeset = require('/Changeset');
-exports.AttribPool = require('/AttributePoolFactory').createAttributePool;
diff --git a/static/js/linestylefilter.js b/static/js/linestylefilter.js
index d0b5bc6e..4b455724 100644
--- a/static/js/linestylefilter.js
+++ b/static/js/linestylefilter.js
@@ -28,7 +28,7 @@
 // requires: plugins
 // requires: undefined
 
-var Changeset = require('/easysync2').Changeset
+var Changeset = require('/Changeset');
 var plugins = require('/plugins').plugins;
 var map = require('/ace2_common').map;
 
diff --git a/static/js/linestylefilter_client.js b/static/js/linestylefilter_client.js
index f057e21a..4c86d450 100644
--- a/static/js/linestylefilter_client.js
+++ b/static/js/linestylefilter_client.js
@@ -26,7 +26,7 @@
 // requires: plugins
 // requires: undefined
 
-var Changeset = require('/easysync2_client').Changeset
+var Changeset = require('/Changeset');
 var plugins = require('/plugins').plugins;
 var map = require('/ace2_common').map;
 
diff --git a/static/js/undomodule.js b/static/js/undomodule.js
index aff41a70..886cbdf0 100644
--- a/static/js/undomodule.js
+++ b/static/js/undomodule.js
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-var Changeset = require('/easysync2').Changeset;
+var Changeset = require('/Changeset');
 var extend = require('/ace2_common').extend;
 
 var undoModule = (function()