diff --git a/ccm-core/etc/lib/postgresql-8.4-704.jdbc3.jar b/ccm-core/etc/lib/postgresql-8.4-704.jdbc3.jar
new file mode 100644
index 000000000..1abf03c0a
Binary files /dev/null and b/ccm-core/etc/lib/postgresql-8.4-704.jdbc3.jar differ
diff --git a/ccm-core/lib/postgresql-8.4-704.jdbc3.jar b/ccm-core/lib/postgresql-8.4-704.jdbc3.jar
new file mode 100644
index 000000000..1abf03c0a
Binary files /dev/null and b/ccm-core/lib/postgresql-8.4-704.jdbc3.jar differ
diff --git a/ccm-core/web/packages/bebop/xsl/BoxPanel.xsl b/ccm-core/web/packages/bebop/xsl/BoxPanel.xsl
deleted file mode 100755
index 4057e853e..000000000
--- a/ccm-core/web/packages/bebop/xsl/BoxPanel.xsl
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-
- <xsl:output method="html" indent="yes"/>
-
- <xsl:template match="bebop:boxPanel[@axis='1']"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <table>
-     <xsl:if test="string-length(@width)>0">
-       <xsl:attribute name="width">
-         <xsl:value-of select="@width"/>
-       </xsl:attribute>
-     </xsl:if>
-     <xsl:if test="string-length(@border)>0">
-       <xsl:attribute name="border">
-         <xsl:value-of select="@border"/>
-       </xsl:attribute>
-     </xsl:if>
-     <tr>
-       <xsl:for-each select="bebop:cell">
-         <td>
-           <xsl:for-each select="*/@class|*/@style">
-             <xsl:attribute name="{name()}">
-               <xsl:value-of select="." />
-             </xsl:attribute>
-           </xsl:for-each>
-           <xsl:apply-templates/>
-         </td>
-       </xsl:for-each>
-     </tr>
-   </table>  
- </xsl:template>
-
- <xsl:template match="bebop:boxPanel[@axis='2']"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <table>
-     <xsl:if test="string-length(@width)>0">
-       <xsl:attribute name="width">
-         <xsl:value-of select="@width"/>
-       </xsl:attribute>
-     </xsl:if>
-     <xsl:if test="string-length(@border)>0">
-       <xsl:attribute name="border">
-         <xsl:value-of select="@border"/>
-       </xsl:attribute>
-     </xsl:if>
-     <xsl:for-each select="bebop:cell">
-       <tr>
-         <td>
-           <xsl:for-each select="*/@class|*/@style">
-             <xsl:attribute name="{name()}">
-               <xsl:value-of select="." />
-             </xsl:attribute>
-           </xsl:for-each>
-           <xsl:apply-templates/>
-         </td>
-       </tr>
-     </xsl:for-each>
-   </table>  
- </xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/CheckBoxGroup.xsl b/ccm-core/web/packages/bebop/xsl/CheckBoxGroup.xsl
deleted file mode 100755
index 1c1625271..000000000
--- a/ccm-core/web/packages/bebop/xsl/CheckBoxGroup.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
->
-  <xsl:output method="html" indent="yes"/>
-
-  <xsl:template match="bebop:checkboxGroup">
-    <xsl:apply-templates select="bebop:checkbox"/>
-  </xsl:template>
-
-  <xsl:template match="bebop:checkbox">
-    <input id="{@name}:{@value}" type="checkbox">
-      <xsl:copy-of select="@*"/>
-
-      <xsl:if test="../@readonly">
-        <xsl:attribute name="readonly">readonly</xsl:attribute>
-      </xsl:if>
-
-      <xsl:if test="../@disabled">
-        <xsl:attribute name="disabled">disabled</xsl:attribute>
-      </xsl:if>
-      <xsl:if test="../@title">
-        <xsl:attribute name="title"><xsl:value-of select="../@title"/></xsl:attribute>
-      </xsl:if>
-      <xsl:if test="../@onclick">
-        <xsl:attribute name="onclick"><xsl:value-of select="../@onclick"/></xsl:attribute>
-      </xsl:if>
-    </input>
-
-    <label for="{@name}:{@value}">
-      <xsl:apply-templates select="bebop:label"/>
-    </label>
-
-    <br/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/ColumnPanel.xsl b/ccm-core/web/packages/bebop/xsl/ColumnPanel.xsl
deleted file mode 100755
index 3a056b6d4..000000000
--- a/ccm-core/web/packages/bebop/xsl/ColumnPanel.xsl
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <xsl:output method="html" indent="yes"/>
-
-
- <xsl:template match="bebop:padFrame|bebop:border"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <table>
-     <xsl:for-each select="@*">
-         <xsl:attribute name="{name()}">
-             <xsl:value-of select="."/>
-         </xsl:attribute>
-        </xsl:for-each>
-     <tr><td><xsl:apply-templates /></td></tr>
-   </table>
- </xsl:template>
-
- <xsl:template match="bebop:pad"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <table>
-     <xsl:for-each select="@*">
-         <xsl:attribute name="{name()}">
-             <xsl:value-of select="."/>
-         </xsl:attribute>
-        </xsl:for-each>
-     <xsl:apply-templates />
-   </table>
- </xsl:template>
-
- <xsl:template match="bebop:panelRow"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <tr>
-     <xsl:for-each select="bebop:cell">
-       <td>
-         <xsl:for-each select="@align|@valign|@colspan|@width">
-           <xsl:attribute name="{local-name()}">
-             <xsl:value-of select="."/>
-           </xsl:attribute>
-         </xsl:for-each>
-         <xsl:apply-templates /></td>
-     </xsl:for-each>
-   </tr>
- </xsl:template>
-
- <!-- all bebop:cells should pass through attributes -->
- <xsl:template match="bebop:cell"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <xsl:for-each select="@*">
-     <xsl:attribute name="{name()}">
-       <xsl:value-of select="."/>
-     </xsl:attribute>
-   </xsl:for-each>
-   <xsl:apply-templates />
- </xsl:template>
- 
- <xsl:template match="bebop:columnPanel"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <xsl:apply-templates />
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/DHTMLEditor.xsl b/ccm-core/web/packages/bebop/xsl/DHTMLEditor.xsl
deleted file mode 100755
index 49909d1cf..000000000
--- a/ccm-core/web/packages/bebop/xsl/DHTMLEditor.xsl
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  
-  <xsl:output method="html" indent="yes"/>
-  
-  <xsl:template match="bebop:dhtmleditor"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-
-    <xsl:variable name="firstMatch"><xsl:value-of select="//bebop:dhtmleditor/@name"/></xsl:variable>
-    <xsl:if test="@name=$firstMatch">    
-
-      <script type="text/javascript">
-        _editor_url = "/assets/htmlarea/";
-        _editor_lang = "en";
-	var numEd = 0;
-      </script>
-
-      <script type="text/javascript" src="/assets/htmlarea/htmlarea.js"/>
-
-      <script type="text/javascript">
-        <xsl:for-each select="bebop:plugin">
-          HTMLArea.loadPlugin("<xsl:value-of select="@name"/>");
-        </xsl:for-each>
-
-	// Using Styled.js didn't seem to work anymore with htmlarea 3.0rc3,
-	// so instead we configure the editor here
-
-	var css_plugin_args = {
-            combos : [
-                { label: "Style",
-                  options: { "None" : "",
-                             "Main" : "main",
-                             "Dark" : "dark",
-                             "Medium" : "medium",
-                             "Light" : "light"
-                           }
-                }
-            ]
-        };
-
-	<xsl:for-each select="//bebop:dhtmleditor">
-	  var config_<xsl:value-of select="@name"/> = null;
-	  var editor_<xsl:value-of select="@name"/> = null;
-	</xsl:for-each>
-
-        function initDocument() {
-          <xsl:for-each select="//bebop:dhtmleditor">
-	    config_<xsl:value-of select="@name"/> = new HTMLArea.Config();
-            editor_<xsl:value-of select="@name"/> = new HTMLArea("ta_<xsl:value-of select="@name"/>", config_<xsl:value-of select="@name"/>);
-
-	    config_<xsl:value-of select="@name"/>.registerButton("insertlink", "Insert link", _editor_url + "images/ed_link.gif", false, function(editor) {
-              <!-- Modified to add the open in new window button NJ-20062403-->
-              <!--  editor._popupDialog("insert_link.html", function(param) {
-                if (!param) {   // user must have pressed Cancel
-                        return false;
-                }
-                var furl = param["f_url"];
-                var sel = editor._getSelection();
-                var range = editor._createRange(sel);
-                editor._doc.execCommand("createlink", false, furl);
-                }, null); -->
-                var sel = editor._getSelection();
-                var range = editor._createRange(sel);
-                var compare = 0;
-                if (HTMLArea.is_ie) {
-                  compare = range.compareEndPoints("StartToEnd", range);
-                }
-                else {
-                  compare = range.compareBoundaryPoints(range.START_TO_END, range);
-                }
-                if (compare == 0) {
-                  alert("You need to select some text before creating a link");
-                  return;
-                }
-                editor._popupDialog("insert_link.html", function(param) {
-                if (!param) {   // user must have pressed Cancel
-                  return false;
-                }
-                var sel = editor._getSelection();
-                var range = editor._createRange(sel);
-                if (range.insertNode) { // Standards compliant version
-                  var link = document.createElement("a");
-                  var linkText = range.extractContents();
-                  link.href=param["f_url"];
-                  if (param["f_external"])
-                    link.target="_blank";
-                  link.appendChild(linkText);
-                  range.insertNode(link);
-                }
-                else if (range.pasteHTML) { // Alternative non standards version
-                  var target = "";
-                  if (param["f_external"]) {
-                    target='target="_blank"';
-                  }
-                  range.pasteHTML('&lt;a href="' + param["f_url"] + '"' + target + '&gt;' + range.text + '&lt;/a&gt;');
-                }
-                }, null);
-	    });
-            config_<xsl:value-of select="@name"/>.sizeIncludesToolbar = false;
-            config_<xsl:value-of select="@name"/>.statusBar = false;
-            config_<xsl:value-of select="@name"/>.toolbar = [
-                [ "formatblock", "space",
-                  "bold", "italic", "underline", "strikethrough", "separator",
-                  "subscript", "superscript", "separator",
-                  "copy", "cut", "paste", "space", "undo", "redo", "space", "removeformat", "killword"  ],
-                [ "justifyleft", "justifycenter", "justifyright", "justifyfull", "separator",
-                  "lefttoright", "righttoleft", "separator",
-                  "orderedlist", "unorderedlist", "outdent", "indent", "separator",
-                  "textindicator", "separator",
-                  "inserthorizontalrule", "insertlink", "insertimage", "inserttable", "htmlmode", "separator",
-                  "popupeditor", "separator" ]
-            ];
-       <xsl:if test="bebop:config/@hidden-buttons">
-           config_<xsl:value-of select="@name"/>.hideSomeButtons("<xsl:value-of select="bebop:config/@hidden-buttons"/>");
-       </xsl:if>
-	    editor_<xsl:value-of select="@name"/>.config.pageStyle = "@import url(/assets/htmlarea/htmlarea.css);";
-
-            <xsl:for-each select="bebop:plugin">
-	      <xsl:choose>
-		<xsl:when test="@name = 'CSS'">
-		  editor_<xsl:value-of select="../@name"/>.registerPlugin(<xsl:value-of select="@name"/>, css_plugin_args);
-		</xsl:when>
-		<xsl:otherwise>
-		  editor_<xsl:value-of select="../@name"/>.registerPlugin(<xsl:value-of select="@name"/>);
-		</xsl:otherwise>
-	      </xsl:choose>
-	    </xsl:for-each>
-	    
-            setTimeout(function() {
-	      editor_<xsl:value-of select="@name"/>.generate();
-	    }, 500*numEd);
-	    numEd++;
-          </xsl:for-each>
-        }
-
-	HTMLArea.init();
-	HTMLArea.onload = initDocument;
-
-	function wordClean_<xsl:value-of select="@name"/>() {
-	  editor_<xsl:value-of select="@name"/>._wordClean();
-	}
-      </script>
-      <style type="text/css">
-        textarea { background-color: #fff; border: 1px solid 00f; }
-      </style>
-
-    </xsl:if> 
-
-    <div style="width:560px; border:1px outset #666;">
-      <textarea id="ta_{@name}" name="{@name}" rows="{@rows}" cols="{@cols}" wrap="{@wrap}" style="width:100%">
-      <xsl:value-of disable-output-escaping="no" select="text()"/>
-    </textarea>
-    </div>
-    
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/DataTable.xsl b/ccm-core/web/packages/bebop/xsl/DataTable.xsl
deleted file mode 100755
index 619c86548..000000000
--- a/ccm-core/web/packages/bebop/xsl/DataTable.xsl
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-   exclude-result-prefixes="bebop"
-                   version="1.0">
-
-<xsl:import href="TabbedPane.xsl"/>
-<xsl:import href="DimensionalNavbar.xsl"/>
-
-<xsl:param name="internal-theme"/>
-
-
-<xsl:template match="bebop:table[@class='dataTable']">
-<table cellpadding="1" cellspacing="2" border="0">
-<xsl:for-each select="thead|bebop:thead"> 
-<xsl:call-template name="dataTableHead">
-  <xsl:with-param name="orderColumn" select="../@order"/>
-  <xsl:with-param name="direction" select="../@direction"/> 
-</xsl:call-template>
-</xsl:for-each>
-<xsl:for-each select="bebop:tbody">
-<xsl:call-template name="dataTableBody"/>
-</xsl:for-each>
-</table>
-</xsl:template>
-
-<xsl:template name="dataTableHead">
-  <xsl:param name="orderColumn">0</xsl:param>
-  <xsl:param name="direction">asc</xsl:param>
-  <tr class="table_header" bgcolor="#ffffff">
-    <xsl:for-each select="cell|bebop:cell">
-      <th class="table_header" nowrap="nowrap">
-        <xsl:text>&#160;</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:choose>
-          <xsl:when test="(position()-1)=$orderColumn">
-            <xsl:text>&#160;</xsl:text>   
-              <img border="0">
-                <xsl:attribute name="src">
-                  <xsl:choose>
-                    <xsl:when test="$direction='asc'">
-                      <xsl:value-of select="//@assets"/>{$internal-theme}/images/gray-triangle-up.gif
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:value-of select="//@assets"/>{$internal-theme}/images/gray-triangle-down.gif
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:attribute>
-              </img>
-             </xsl:when> 
-             <xsl:otherwise>
-               <xsl:text>&#160;</xsl:text> 
-               <xsl:text>&#160;</xsl:text> 
-             </xsl:otherwise>
-           </xsl:choose>
-            <xsl:text>&#160;</xsl:text>
-           </th>
-    </xsl:for-each>
-  </tr>
-</xsl:template>
-
-<xsl:template match="thead/cell/bebop:link|bebop:thead/bebop:cell/bebop:link">
-<a class="table_header" href="{@href}">
-<xsl:apply-templates/>
-</a>
-</xsl:template>
-
-<xsl:template name="dataTableBody">
-<tbody>
-<xsl:for-each select="bebop:trow">
-<tr>
- <xsl:attribute name="class">
-   <xsl:choose>
-     <xsl:when test="position() mod 2">table_odd</xsl:when>
-     <xsl:otherwise>table_even</xsl:otherwise>
-   </xsl:choose>
- </xsl:attribute>
- <xsl:attribute name="bgcolor">
-   <xsl:choose>
-     <xsl:when test="position() mod 2">#eaded0</xsl:when>
-     <xsl:otherwise>#ffffff</xsl:otherwise>
-   </xsl:choose>
- </xsl:attribute>
-      
- <xsl:for-each select="bebop:cell">
-         <td class="table_cell" nowrap="nowrap">
-           <xsl:for-each select="@align|@valign|@colspan|@width">
-             <xsl:attribute name="{local-name()}">
-              <xsl:value-of select="."/>
-             </xsl:attribute>
-           </xsl:for-each>
-           <xsl:text>&#160;</xsl:text>
-           <xsl:apply-templates/>
-           <xsl:text>&#160;</xsl:text>
-         </td>
- </xsl:for-each>
-</tr>
-</xsl:for-each>
-</tbody>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/DateTime.xsl b/ccm-core/web/packages/bebop/xsl/DateTime.xsl
deleted file mode 100755
index f661da5a8..000000000
--- a/ccm-core/web/packages/bebop/xsl/DateTime.xsl
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:output method="html" indent="yes"/>
-
-  <xsl:template match="bebop:datetime"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <xsl:for-each select="*">
-      <xsl:if test="position()=4"><br/></xsl:if>
-      <xsl:if test="position()=5"> : </xsl:if>
-      <xsl:if test="position()=6 and last()=7"> : </xsl:if>
-
-      <xsl:apply-templates select="."/>  
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template match="bebop:date"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-      <xsl:copy>
-        <xsl:apply-templates/>
-      </xsl:copy>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/DimensionalNavbar.xsl b/ccm-core/web/packages/bebop/xsl/DimensionalNavbar.xsl
deleted file mode 100755
index 95b85fa43..000000000
--- a/ccm-core/web/packages/bebop/xsl/DimensionalNavbar.xsl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-	xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  exclude-result-prefixes="bebop">
-
-  <xsl:output method="html" indent="yes"/>
-
-  <xsl:template match="bebop:dimensionalNavbar">
-    <xsl:comment>bebop:dimensionalNavbar</xsl:comment>
-    <xsl:value-of select="@startTag"/>
-    <xsl:for-each select="*">
-      <xsl:apply-templates select="."/>
-      <xsl:if test="position()!=last()">
-        <xsl:choose>
-          <xsl:when test="string-length(../@delimiter)=0">
-            &#160;&gt;&#160;
-          </xsl:when>
-          <xsl:otherwise><xsl:value-of select="../@delimiter"/></xsl:otherwise>
-        </xsl:choose>
-      </xsl:if>
-    </xsl:for-each>
-    <xsl:value-of select="@endTag"/>
-    <xsl:comment>/bebop:dimensionalNavbar</xsl:comment>
-  </xsl:template>
-
-  <xsl:template match="bebop:dimensionalNavbar[@id='global-navbar']">
-    <xsl:comment>bebop:dimensionalNavbar @id='global-navbar'</xsl:comment>
-    <xsl:for-each select="*">
-      <xsl:apply-templates select="."/>
-      <xsl:if test="position()!=last()">&#160;-&#160;</xsl:if>
-    </xsl:for-each>
-    <xsl:comment>/bebop:dimensionalNavbar @id='global-navbar'</xsl:comment>
-  </xsl:template>
-
-  <!-- Top-right links, in the form of a bebop:dimensionalNavbar -->
-  <xsl:template match="bebop:dimensionalNavbar[@class='top-right']">
-    <xsl:value-of select="@startTag"/>
-    <xsl:for-each select="*">
-      <xsl:apply-templates select="."/>
-      <xsl:if test="not(position()=last())">
-        <xsl:value-of select="../@delimiter"/>
-      </xsl:if>
-    </xsl:for-each>
-    <xsl:value-of select="@endTag"/>
-  </xsl:template>
-
-
-  <!-- dimensional navbar
-  <xsl:template match="bebop:dimensionalNavbar">
-    <table border="0" cellpadding="2" cellspacing="0" width="100%">
-      <tr>
-        <td align="{@align}">
-          <font size="2" face="tahoma,verdana,arial,helvetica">
-            <xsl:value-of select="@startTag"/>
-            <xsl:for-each select="*">
-              <xsl:apply-templates select="."/>
-              <xsl:if test="not(position()=last())">
-                <xsl:value-of select="../@delimiter"/>
-              </xsl:if>
-            </xsl:for-each>
-            <xsl:value-of select="@endTag"/>
-          </font>
-        </td>
-      </tr>
-    </table>   
-  </xsl:template>
-  -->
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/FCKEditor.xsl b/ccm-core/web/packages/bebop/xsl/FCKEditor.xsl
deleted file mode 100755
index 2a175cb26..000000000
--- a/ccm-core/web/packages/bebop/xsl/FCKEditor.xsl
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  
-  <xsl:output method="html" indent="yes"/>
-  
-  <xsl:template match="bebop:fckeditor"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-
-    <xsl:variable name="firstMatch"><xsl:value-of select="//bebop:fckeditor/@name"/></xsl:variable>
-    <!-- Start of the FCKeditor component code -->
-    <xsl:if test="@name=$firstMatch">    
-       
-      <script type="text/javascript">
-        _editor_url = "/assets/fckeditor/";
-        _editor_lang = "en";
-        var numEd = 0;
-      </script>
-      
-      <script type="text/javascript" src="/assets/fckeditor/fckeditor.js"/>
-      
-      <script type="text/javascript">
-        <xsl:for-each select="//bebop:fckeditor">
-           var editor_<xsl:value-of select="@name"/> = null;
-       </xsl:for-each>
-
-        window.onload = function() {
-        <xsl:for-each select="//bebop:fckeditor">
-          editor_<xsl:value-of select="@name"/> = new FCKeditor("ta_<xsl:value-of select="@name"/>") ;
-          editor_<xsl:value-of select="@name"/>.Width = 
-          <xsl:choose>
-          		<xsl:when test="@metadata.width">
-          			'<xsl:value-of select="@metadata.width"/>'; 
-          		</xsl:when>
-          		<xsl:otherwise>
-          			'100%';
-          		</xsl:otherwise>
-          </xsl:choose>
-          editor_<xsl:value-of select="@name"/>.Height = 
-          <xsl:choose>
-          		<xsl:when test="@metadata.height">
-          			'<xsl:value-of select="@metadata.height"/>'; 
-          		</xsl:when>
-          		<xsl:otherwise>
-          			'400';
-          		</xsl:otherwise>
-          </xsl:choose>
-          
-          editor_<xsl:value-of select="@name"/>.BasePath = "/assets/fckeditor/" ;
-          editor_<xsl:value-of select="@name"/>.PluginsPath = editor_<xsl:value-of select="@name"/>.BasePath + "editor/plugins/" ;
-          <xsl:if test="bebop:config/@path">
-           editor_<xsl:value-of select="//bebop:fckeditor/@name"/>.Config['CustomConfigurationsPath'] = "<xsl:value-of select="//bebop:fckeditor/bebop:config/@path"/>";
-          </xsl:if>
-          editor_<xsl:value-of select="@name"/>.ToolbarSet = "Basic";
-          editor_<xsl:value-of select="@name"/>.ReplaceTextarea();
-        }
-        </xsl:for-each>       
-
-      </script>
-
-      <style type="text/css">
-        textarea { background-color: #fff; border: 1px solid 00f; }
-      </style>
-      
-    </xsl:if>
-    <!-- End of fckeditor setup -->
-      
-    <textarea id="ta_{@name}" name="{@name}" style="width:100%" rows="{@rows}" cols="{@cols}" wrap="{@wrap}">
-      <xsl:value-of disable-output-escaping="no" select="text()"/>
-    </textarea>
-    
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/Form.xsl b/ccm-core/web/packages/bebop/xsl/Form.xsl
deleted file mode 100755
index 79f35a796..000000000
--- a/ccm-core/web/packages/bebop/xsl/Form.xsl
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:output method="html" indent="yes"/>
-  
-  
-  <xsl:template match="bebop:form" name="bebopForm"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <xsl:value-of select="@message"/>
-    <form>
-      <xsl:for-each select="@*[not(self::method)]">
-        <xsl:attribute name="{name()}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-        <xsl:attribute name="method">
-          <xsl:choose> 
-            <xsl:when test="string-length(../@method)=0">post</xsl:when>
-            <xsl:otherwise><xsl:value-of select="../@method"/></xsl:otherwise>
-          </xsl:choose> 
-        </xsl:attribute>
-      </xsl:for-each>
-      <xsl:apply-templates />
-    </form>
-  </xsl:template>
-  
-  <!-- no-op (transparent) tags -->
-  <xsl:template match="bebop:statel|bebop:pane"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <xsl:apply-templates />
-  </xsl:template>
-  
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/FormWidget.xsl b/ccm-core/web/packages/bebop/xsl/FormWidget.xsl
deleted file mode 100755
index 2b4ae838a..000000000
--- a/ccm-core/web/packages/bebop/xsl/FormWidget.xsl
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet 
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-exclude-result-prefixes="xsl bebop"
-version="1.0">
-
- <xsl:output method="html" indent="yes"/>
-
- <xsl:template match="bebop:formWidget">
-    <input>
-        <xsl:for-each select="@*">
-            <xsl:attribute name="{name()}">
-                <xsl:value-of select="."/>
-            </xsl:attribute>
-        </xsl:for-each>
-    </input>
- </xsl:template>
-
- <xsl:template match="bebop:formWidget[@type='submit']">
-    <input>
-      <xsl:if test="boolean(@onclick) = false()">
-        <xsl:attribute name="onclick">
-           <xsl:text>dcp_hide(this);</xsl:text>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:for-each select="@*">
-        <xsl:attribute name="{name()}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:for-each>
-    </input>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/GridPanel.xsl b/ccm-core/web/packages/bebop/xsl/GridPanel.xsl
deleted file mode 100755
index 7c647c9b8..000000000
--- a/ccm-core/web/packages/bebop/xsl/GridPanel.xsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <xsl:output method="html" indent="yes"/>
-
- <xsl:template match="bebop:gridPanel"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <table width="100%">
-     <xsl:for-each select="@bottomborder">
-       <xsl:attribute name="border">
-         <xsl:value-of select="."/>
-       </xsl:attribute>
-     </xsl:for-each>
-     <xsl:apply-templates />
-   </table>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/Image.xsl b/ccm-core/web/packages/bebop/xsl/Image.xsl
deleted file mode 100755
index 11683b8d6..000000000
--- a/ccm-core/web/packages/bebop/xsl/Image.xsl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <xsl:output method="html" indent="yes"/>
-
- <xsl:template match="bebop:image" mode="javascript-mode"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <xsl:call-template name="bebop:image" />
- </xsl:template>
-
- <xsl:template name="bebop:image" match="bebop:image"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <img>
-        <xsl:for-each select="@*">
-            <xsl:attribute name="{name()}">
-                <xsl:value-of select="."/>
-            </xsl:attribute>
-        </xsl:for-each>
-    </img>
- </xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/Label.xsl b/ccm-core/web/packages/bebop/xsl/Label.xsl
deleted file mode 100755
index c5d82e3c9..000000000
--- a/ccm-core/web/packages/bebop/xsl/Label.xsl
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:output method="html" indent="yes"/>
-
-<!-- ************************************* -->
-
- <xsl:template match="bebop:label[@color!='' and @weight!='']"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <xsl:element name="{@weight}">
-     <xsl:element name="font">
-       <xsl:attribute name="color">
-         <xsl:value-of select="@color"/>
-       </xsl:attribute>
-       <xsl:call-template name="bebop-label-text">
-          <xsl:with-param name="text" select="text()"/>
-          <xsl:with-param name="escape" select="@escape"/>
-       </xsl:call-template>
-     </xsl:element>
-   </xsl:element>
- </xsl:template>
-
- <xsl:template match="bebop:label[@color!='' and @weight!='']"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-	       mode="javascript-mode">
-   <xsl:element name="{@weight}">
-     <xsl:element name="font">
-       <xsl:attribute name="color">
-         <xsl:value-of select="@color"/>
-       </xsl:attribute>
-       <xsl:call-template name="bebop-label-javascript-text">
-          <xsl:with-param name="text" select="text()"/>
-          <xsl:with-param name="escape" select="@escape"/>
-       </xsl:call-template>
-     </xsl:element>
-   </xsl:element>
- </xsl:template>
-
-<!-- ************************************* -->
-
- <xsl:template match="bebop:label[@weight!='']"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <xsl:element name="{@weight}">
-     <xsl:call-template name="bebop-label-text">
-        <xsl:with-param name="text" select="text()"/>
-        <xsl:with-param name="escape" select="@escape"/>
-     </xsl:call-template>
-   </xsl:element>
- </xsl:template>
-
- <xsl:template match="bebop:label[@weight!='']"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-	       mode="javascript-mode">
-   <xsl:element name="{@weight}">
-     <xsl:call-template name="bebop-label-javascript-text">
-        <xsl:with-param name="text" select="text()"/>
-        <xsl:with-param name="escape" select="@escape"/>
-     </xsl:call-template>
-   </xsl:element>
- </xsl:template>
-
-<!-- ************************************* -->
-
- <xsl:template match="bebop:label[@color!='']"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <xsl:element name="font">
-     <xsl:attribute name="color">
-       <xsl:value-of select="@color"/>
-     </xsl:attribute>
-     <xsl:call-template name="bebop-label-text">
-        <xsl:with-param name="text" select="text()"/>
-        <xsl:with-param name="escape" select="@escape"/>
-     </xsl:call-template>
-   </xsl:element>
- </xsl:template>
-
- <xsl:template match="bebop:label[@color!='']"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-	       mode="javascript-mode">
-   <xsl:element name="font">
-     <xsl:attribute name="color">
-       <xsl:value-of select="@color"/>
-     </xsl:attribute>
-     <xsl:call-template name="bebop-label-javascript-text">
-        <xsl:with-param name="text" select="text()"/>
-        <xsl:with-param name="escape" select="@escape"/>
-     </xsl:call-template>
-   </xsl:element>
- </xsl:template>
-
-<!-- ************************************* -->
-
- <xsl:template match="bebop:label"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-     <xsl:call-template name="bebop-label-text">
-        <xsl:with-param name="text" select="text()"/>
-        <xsl:with-param name="escape" select="@escape"/>
-     </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="bebop:label"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-	       mode="javascript-mode">
-     <xsl:call-template name="bebop-label-javascript-text">
-        <xsl:with-param name="text" select="text()"/>
-        <xsl:with-param name="escape" select="@escape"/>
-     </xsl:call-template>
- </xsl:template>
-
-<!-- ************************************* -->
-
- <xsl:template name="bebop-label-text">
-   <xsl:param name="text"/>
-   <xsl:param name="escape"/>
-   <xsl:variable name="realtext">
-     <xsl:choose>
-       <xsl:when test="normalize-space($text)=''">&#160;</xsl:when>
-       <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
-     </xsl:choose>
-   </xsl:variable>
-     
-   <xsl:choose>
-     <xsl:when test="$escape='yes'">
-       <xsl:value-of disable-output-escaping="yes" select="$realtext"/>
-     </xsl:when>
-     <xsl:otherwise>
-       <xsl:value-of disable-output-escaping="no" select="$realtext"/>
-     </xsl:otherwise>
-   </xsl:choose> 
- </xsl:template>
-
-<!-- ************************************* -->
-
-<xsl:template name="bebop-label-javascript-text">
-  <xsl:param name="text" />
-  <xsl:param name="escape" />
-  <xsl:variable name="lapos">&apos;</xsl:variable>
-  <xsl:variable name="output-text">
-    <xsl:call-template name="string-replace">
-      <xsl:with-param name="from" select="$lapos"/>
-      <xsl:with-param name="to" select="concat('\', $lapos)"/> 
-      <xsl:with-param name="string" select="$text"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:call-template name="bebop-label-text">
-     <xsl:with-param name="text" select="$output-text"/>
-     <xsl:with-param name="escape" select="$escape"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- replace all occurences of the character(s) `from'
-     by the string `to' in the string `string'.-->
-<xsl:template name="string-replace" >
-  <xsl:param name="string"/>
-  <xsl:param name="from"/>
-  <xsl:param name="to"/>
-  <xsl:choose>
-    <xsl:when test="contains($string,$from)">
-      <xsl:value-of select="substring-before($string,$from)"/>
-      <xsl:value-of select="$to"/>
-      <xsl:call-template name="string-replace">
-        <xsl:with-param name="string" select="substring-after($string,$from)"/>
-        <xsl:with-param name="from" select="$from"/>
-        <xsl:with-param name="to" select="$to"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$string"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/Link.xsl b/ccm-core/web/packages/bebop/xsl/Link.xsl
deleted file mode 100755
index e0d31bc75..000000000
--- a/ccm-core/web/packages/bebop/xsl/Link.xsl
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-
- <xsl:param name="internal-theme"/>
-
- <xsl:output method="html" indent="yes"/>
-
-
- <xsl:template match="bebop:link">
-   <xsl:choose>
-     <xsl:when test="@confirm">
-       <xsl:call-template name="bebop:link"/>
-     </xsl:when>
-
-     <!--  The item search page should not use the dcp_hide function -->
-     <xsl:when test="/bebop:page[@bebop:classname='com.arsdigita.cms.ui.ItemSearchPage']">
-       <xsl:call-template name="bebop:link"/>
-     </xsl:when>
-
-     <xsl:otherwise>
-       <a>
-         <xsl:if test="boolean(@onclick) = false()">
-           <xsl:attribute name="onclick">
-             <xsl:text>dcp_disable_link(this);</xsl:text>
-           </xsl:attribute>
-         </xsl:if>
-         <xsl:copy-of select="@*[name() != 'href_no_javascript']"/>
-         <xsl:apply-templates/>
-       </a>
-     </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>
-
- <xsl:template match="bebop:link[@class = 'actionLink']">
-   <xsl:choose>
-     <xsl:when test="@confirm">
-       <xsl:call-template name="bebop:actionLink"/>
-     </xsl:when>
-
-     <xsl:otherwise>
-       <a href="{@href_no_javascript}">
-         <img src="{$internal-theme}/images/action-generic.png" border="0" width="14" height="14">
-           <xsl:attribute name="alt">
-             <xsl:apply-templates/>
-           </xsl:attribute>
-         </img>
-       </a>
-       <xsl:text>&#160;</xsl:text>
-       <a>
-         <xsl:if test="boolean(@onclick) = false()">
-           <xsl:attribute name="onclick">
-             <xsl:text>dcp_disable_link(this);</xsl:text>
-           </xsl:attribute>
-         </xsl:if>
-         <xsl:copy-of select="@*[name() != 'href_no_javascript']"/>
-         <xsl:apply-templates/>
-       </a>
-     </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>
-
-  <xsl:template match="bebop:link[@class = 'title']">
-   <xsl:choose>
-     <xsl:when test="@confirm">
-       <xsl:call-template name="bebop:actionLink"/>
-     </xsl:when>
-
-     <xsl:otherwise>
-       <a href="{@href_no_javascript}">
-         <img src="{$internal-theme}/images/action-generic.png" border="0" width="14" height="14">
-           <xsl:attribute name="alt">
-             <xsl:apply-templates/>
-           </xsl:attribute>
-         </img>
-       </a>
-       <xsl:text>&#160;</xsl:text>
-       <a onclick="{@onclick}">
-         <xsl:copy-of select="@*[name() != 'href_no_javascript' and name() != 'onclick']"/>
-         <xsl:apply-templates/>
-       </a>
-     </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>
-
- <xsl:template name="bebop:link"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-
-       <!-- This is ugly, but I need the whole output on one line =p -->
-       <![CDATA[ document.write(']]><a><xsl:for-each select="@*[name() != 'href_no_javascript' and name()!= 'confirm']"><xsl:attribute name="{name()}"><xsl:value-of select="."/></xsl:attribute></xsl:for-each><xsl:apply-templates mode="javascript-mode"/><![CDATA[')]]>
-       <![CDATA[ document.write(']]></a><![CDATA[')]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-       <![CDATA[document.write("\<!--") ]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <a>
-        <xsl:for-each select="@*[name() != 'href']">
-	    <xsl:choose>
-	     <xsl:when test="name() = 'href_no_javascript'">
-	      <xsl:attribute name="href">
-	       <xsl:value-of select="."/>
-	      </xsl:attribute>
-	     </xsl:when>
-	     <xsl:when test="name() = 'onclick'">
-	     </xsl:when>
-	     <xsl:otherwise>
-              <xsl:attribute name="{name()}">
-	       <xsl:value-of select="."/>
-	      </xsl:attribute>
-	     </xsl:otherwise>
-	    </xsl:choose>
-        </xsl:for-each>
-        <xsl:apply-templates />
-       </a>
-
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-       <![CDATA[ document.write("--\>") ]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
- </xsl:template>
-
-<xsl:template name="bebop:actionLink">
-       <!-- Begin Image -->
-
-       <!-- Image JavaScript  -->
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-
-       <!-- This is ugly, but I need the whole output on one line =p -->
-       <![CDATA[ document.write(']]><a href="{@href}" onclick="{@onclick}"><img src="{$internal-theme}/images/action-generic.png" border="0" width="14" height="14"><xsl:attribute name="alt"><xsl:apply-templates mode="javascript-mode"/></xsl:attribute></img><![CDATA[')]]>
-       <![CDATA[ document.write(']]></a><![CDATA[')]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <!-- Image No JavaScript  -->
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-       <![CDATA[document.write("\<!--") ]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <a href="{@href_no_javascript}">
-         <img src="{$internal-theme}/images/action-generic.png" border="0" width="14" height="14">
-           <xsl:attribute name="alt">
-             <xsl:apply-templates/>
-           </xsl:attribute>
-         </img>
-       </a>
-
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-       <![CDATA[document.write("\<!--") ]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <!-- Begin Link -->
-
-       <xsl:text>&#160;</xsl:text>
-
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-
-       <!-- This is ugly, but I need the whole output on one line =p -->
-       <![CDATA[ document.write(']]><a><xsl:for-each select="@*[name() != 'href_no_javascript' and name()!= 'confirm']"><xsl:attribute name="{name()}"><xsl:value-of select="."/></xsl:attribute></xsl:for-each><xsl:apply-templates mode="javascript-mode"/><![CDATA[')]]>
-       <![CDATA[ document.write(']]></a><![CDATA[')]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-       <![CDATA[document.write("\<!--") ]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <a>
-        <xsl:for-each select="@*[name() != 'href']">
-	    <xsl:choose>
-	     <xsl:when test="name() = 'href_no_javascript'">
-	      <xsl:attribute name="href">
-	       <xsl:value-of select="."/>
-	      </xsl:attribute>
-	     </xsl:when>
-	     <xsl:when test="name() = 'onclick'">
-	     </xsl:when>
-	     <xsl:otherwise>
-              <xsl:attribute name="{name()}">
-	       <xsl:value-of select="."/>
-	      </xsl:attribute>
-	     </xsl:otherwise>
-	    </xsl:choose>
-        </xsl:for-each>
-        <xsl:apply-templates />
-       </a>
-
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-       <![CDATA[ document.write("--\>") ]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/List.xsl b/ccm-core/web/packages/bebop/xsl/List.xsl
deleted file mode 100755
index 4c7615090..000000000
--- a/ccm-core/web/packages/bebop/xsl/List.xsl
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <xsl:output method="html" indent="yes"/>
-
-
- <xsl:template match="bebop:list[@layout='vertical']"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <table>
-      <xsl:for-each select="@*">
-        <xsl:attribute name="{name()}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:for-each>
-
-      <xsl:for-each select="bebop:cell">
-        <tr><td><xsl:apply-templates/></td></tr>
-      </xsl:for-each>
-    </table>
- </xsl:template>
-
-
- <xsl:template match="bebop:list[@layout='horizontal']"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <table>
-      <xsl:for-each select="@*">
-        <xsl:attribute name="{name()}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:for-each>
-
-      <tr>
-        <xsl:for-each select="bebop:cell">
-          <td><xsl:apply-templates/></td>
-        </xsl:for-each>
-      </tr>
-    </table>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/ListPanel.xsl b/ccm-core/web/packages/bebop/xsl/ListPanel.xsl
deleted file mode 100755
index 8c86baa9a..000000000
--- a/ccm-core/web/packages/bebop/xsl/ListPanel.xsl
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <xsl:output method="html" indent="yes"/>
-
- <xsl:template match="bebop:listPanel"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <ul>
-      <xsl:for-each select="bebop:cell">
-        <li><xsl:apply-templates /></li>
-      </xsl:for-each>
-    </ul>
- </xsl:template>
-
- <xsl:template match="bebop:listPanel[@ordered='true']"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <ol>
-      <xsl:for-each select="bebop:cell">
-        <li><xsl:apply-templates /></li>
-      </xsl:for-each>
-    </ol>
-  </xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/MultipleSelect.xsl b/ccm-core/web/packages/bebop/xsl/MultipleSelect.xsl
deleted file mode 100755
index f03ae35ef..000000000
--- a/ccm-core/web/packages/bebop/xsl/MultipleSelect.xsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  
-  <xsl:output method="html" indent="yes"/>
-  
-  <xsl:template match="bebop:multiSelect"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <select name="{@name}" multiple="{@multiple}">
-      <xsl:for-each select="@disabled|@size|@title|@*[starts-with(name(), 'on')]">
-        <xsl:attribute name="{name()}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:for-each>
-      <xsl:apply-templates/>
-    </select>
-  </xsl:template>
-  
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/Page.xsl b/ccm-core/web/packages/bebop/xsl/Page.xsl
deleted file mode 100755
index f962d8811..000000000
--- a/ccm-core/web/packages/bebop/xsl/Page.xsl
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet 
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:deditor="http://www.arsdigita.com/deditor/1.0"
-  exclude-result-prefixes="bebop">
-  
-  <xsl:output method="html" indent="yes"
-    doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
-
-  <xsl:param name="root-context-prefix"/>
-  
-  <!-- The contract for this template is that
-       it can be called from any place in the DOM -->
-  <xsl:template name="bebop:pageTitle">
-    <xsl:value-of select="/bebop:page/bebop:title"/>
-  </xsl:template>
-  
-  <!-- The contract for this template is that
-       it must be called in context of bebop:page 
-       element -->
-  <xsl:template name="bebop:pageCSS">
-    <xsl:call-template name="bebop:pageCSSMain"/>
-  </xsl:template>
-  
-  <xsl:template name="bebop:pageCSSMain">
-    <link href="{$root-context-prefix}/css/acs-master.css" rel="stylesheet" type="text/css"/>
-    <xsl:for-each select="bebop:stylesheet">
-      <link href="{@href}" rel="stylesheet" type="{@type}"/>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template match="bebop:title">
-    <!-- Nada -->
-  </xsl:template>
-  
-  <xsl:template match="bebop:page" 
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <html>
-      <head>
-        <title><xsl:call-template name="bebop:pageTitle"/></title>       
-        <xsl:call-template name="bebop:pageCSS"/>
-      </head>
-      <body>
-        <xsl:call-template name="bebop:dcpJavascript"/>
-        <h2><xsl:call-template name="bebop:pageTitle"/></h2>
-        <xsl:apply-templates select="*[position()>1]"/>
-      </body>
-    </html>
-  </xsl:template>
-  
-  <!-- Display the page structure; used by debugging -->
-  <xsl:template match="bebop:structure">
-    <h1>Bebop Page Structure</h1>
-    <xsl:value-of disable-output-escaping="yes" select="text()"/>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/PageErrorDisplay.xsl b/ccm-core/web/packages/bebop/xsl/PageErrorDisplay.xsl
deleted file mode 100755
index 1cb83885e..000000000
--- a/ccm-core/web/packages/bebop/xsl/PageErrorDisplay.xsl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-
-  <xsl:output method="html" indent="yes"/>
-
-  <xsl:template match="bebop:list[@class='pageErrorDisplay']"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <xsl:if test="count(bebop:cell)">      
-      <table border="0" cellpadding="4" cellspacing="0">
-        <tr><td nowrap="1">
-          <font color="{@color}">Please correct the following errors:</font>
-        </td></tr>
-        <tr><td> 
-          <ul>
-            <xsl:for-each select="bebop:cell">
-              <li><font color="{../@color}"><xsl:apply-templates/></font></li>
-            </xsl:for-each>
-          </ul>
-        </td></tr>
-      </table>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/PageState.xsl b/ccm-core/web/packages/bebop/xsl/PageState.xsl
deleted file mode 100755
index e3a17746a..000000000
--- a/ccm-core/web/packages/bebop/xsl/PageState.xsl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <xsl:output method="html" indent="yes"/>
-
-
- <xsl:template match="bebop:pageState"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <input>
-        <xsl:attribute name="type">hidden</xsl:attribute>
-        <xsl:for-each select="@*">
-            <xsl:attribute name="{name()}">
-                <xsl:value-of select="."/>
-            </xsl:attribute>
-        </xsl:for-each>
-    </input>
- </xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/RadioGroup.xsl b/ccm-core/web/packages/bebop/xsl/RadioGroup.xsl
deleted file mode 100755
index b773b4a60..000000000
--- a/ccm-core/web/packages/bebop/xsl/RadioGroup.xsl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <xsl:output method="html" indent="yes"/>
-
-
-  <xsl:template match="bebop:radioGroup"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <xsl:apply-templates/>
-  </xsl:template>
-
-  <!-- matching class attr is deprecated and preserved for compatibility -->
-  <xsl:template match="bebop:radioGroup[@class='vertical' or @axis='2']"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-	<xsl:for-each select="bebop:radio">
-      <xsl:apply-templates select="."/><br />
-      <xsl:text disable-output-escaping="yes"> </xsl:text>
-	</xsl:for-each>
-  </xsl:template>
-
-  <xsl:template match="bebop:radio"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <input id="{@name}:{@value}">
-      <xsl:if test="../@readonly">
-        <xsl:attribute name="readonly">readonly</xsl:attribute>        
-      </xsl:if>
-      <xsl:if test="../@disabled">
-        <xsl:attribute name="disabled">disabled</xsl:attribute>        
-      </xsl:if>
-      <xsl:if test="../@title">
-        <xsl:attribute name="title"><xsl:value-of select="../@title"/></xsl:attribute>
-      </xsl:if>
-      <xsl:attribute name="type">radio</xsl:attribute>
-      <xsl:for-each select="@*[not(name()='label')]">
-        <xsl:attribute name="{name()}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:for-each>
-      <xsl:apply-templates />
-    </input>
-  </xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/SegmentedPanel.xsl b/ccm-core/web/packages/bebop/xsl/SegmentedPanel.xsl
deleted file mode 100755
index 56bae29fe..000000000
--- a/ccm-core/web/packages/bebop/xsl/SegmentedPanel.xsl
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-
-<xsl:template name="segment">
-  <xsl:param name="header"/>
-  <xsl:param name="headerNodes"/>
-  <xsl:param name="body"/>
-
-  <tr>
-    <td>
-      <table border="0" cellpadding="2" cellspacing="0" width="100%">
-        <tr>
-          <th class="split_pane_header"   cellpadding="0" cellspacing="0">
-            <xsl:choose>
-              <xsl:when test="$header">
-                <xsl:value-of select="$header"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:apply-templates select="$headerNodes"/>               
-	      </xsl:otherwise>
-            </xsl:choose>
-          </th>
-        </tr>
-      </table>
-    </td>
-  </tr> 
-  <tr>
-    <td bgcolor="#ffffff">
-      <table border="0" cellpadding="0" cellspacing="0">
-        <tr>
-          <td height="1"/>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td class="split_pane_right_body">
-      <xsl:apply-templates select="$body"/>
-    </td>
-  </tr>
-      
-</xsl:template>
-
-<xsl:template match="bebop:segmentedPanel">
-  <table width="100%" cellspacing="0" cellpadding="0" border="0" >
-    <xsl:for-each select="bebop:segment">
-      <xsl:call-template name="segment">
-        <xsl:with-param name="headerNodes" select="bebop:segmentHeader"/>
-        <xsl:with-param name="body" select="bebop:segmentBody"/>
-      </xsl:call-template>
-    </xsl:for-each>
-  </table>
-</xsl:template>
-
-<xsl:template match="bebop:segmentHeader|bebop:segmentBody">
-  <xsl:apply-templates/>
-</xsl:template>
-
-
-</xsl:stylesheet>
-
-
-
-
diff --git a/ccm-core/web/packages/bebop/xsl/Select.xsl b/ccm-core/web/packages/bebop/xsl/Select.xsl
deleted file mode 100755
index 1faef4d9e..000000000
--- a/ccm-core/web/packages/bebop/xsl/Select.xsl
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  
-  <xsl:output method="html" indent="yes"/>
-
-  <xsl:template match="bebop:select[@class='displayOneOptionAsLabel']"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <xsl:choose>
-      <xsl:when test="count(bebop:option)=1">
-        <xsl:choose>
-          <xsl:when test="bebop:option/@label">
-            <xsl:value-of select="bebop:option/@label"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="bebop:option/bebop:label"/>
-          </xsl:otherwise>
-        </xsl:choose>
-        <input type="hidden" name="{@name}" value="{bebop:option/@value}" />
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- copy-pasting the code here is wrong ! -->
-        <select name="{@name}">
-          <xsl:for-each select="@size|@*[starts-with(name(), 'on')]">
-            <xsl:attribute name="{name()}">
-              <xsl:value-of select="."/>
-            </xsl:attribute>
-          </xsl:for-each>
-          <xsl:apply-templates/>
-        </select>
-      </xsl:otherwise>
-    </xsl:choose>
-    
-  </xsl:template>
-  
-  <xsl:template match="bebop:select"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <select name="{@name}">
-      <xsl:for-each select="@disabled|@size|@title|@id|@*[starts-with(name(), 'on')]">
-        <xsl:attribute name="{name()}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:for-each>
-      <xsl:apply-templates/>
-    </select>
-  </xsl:template>
-  
-  <xsl:template match="bebop:option"
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <option>
-      <xsl:for-each select="@*[not(name()='label')]">
-        <xsl:attribute name="{name()}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:for-each>
-      <xsl:apply-templates select="bebop:label" />
-    </option>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/SplitPanel.xsl b/ccm-core/web/packages/bebop/xsl/SplitPanel.xsl
deleted file mode 100755
index d11a19d47..000000000
--- a/ccm-core/web/packages/bebop/xsl/SplitPanel.xsl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <xsl:output method="html" indent="yes"/>
-
- <xsl:template match="bebop:splitPanel"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <table width="{@width}" border="{@border}" cellpadding="{@cellpadding}" cellspacing="{@cellspacing}">
-     <tr width="100%">
-       <th width="100%" nowrap="1" valign="middle" align="left" colspan="2">
-         <xsl:apply-templates select="bebop:cell[position()=1]"/>
-       </th>
-     </tr>
-     <tr width="100%">
-       <td width="{@divider_left}" nowrap="1" valign="top">
-         <xsl:apply-templates select="bebop:cell[position()=2]"/>
-       </td>
-       <td width="{@divider_right}" valign="top">
-         <xsl:apply-templates select="bebop:cell[position()>2]"/>
-       </td>
-     </tr>
-   </table>  
- </xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/ccm-core/web/packages/bebop/xsl/TabbedPane.xsl b/ccm-core/web/packages/bebop/xsl/TabbedPane.xsl
deleted file mode 100755
index 383791f9d..000000000
--- a/ccm-core/web/packages/bebop/xsl/TabbedPane.xsl
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-	xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-	exclude-result-prefixes="bebop">
-
-
-<xsl:template match="bebop:tabStrip">
-  <table border="0" cellpadding="0" cellspacing="0" width="100%">
-    <tr>
-      <td align="left">
-        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-          <tr>
-            <td align="left">
-              <table border="0" cellpadding="0" cellspacing="0">
-                <tr>
-                  <td width="8"/>
-                  <xsl:for-each select="bebop:tab">
-                    
-                    <!-- selected tab -->
-                    <xsl:if test="count(@current)">
-                      <td class="tab_selected">
-                        <table border="0" cellpadding="2" cellspacing="0" width="100%">
-                          <tr class="tab_selected">
-                            <td width="6"/>
-                            <td class="tab_selected">
-                              <xsl:apply-templates/>
-                            </td>
-                            <td width="6"/>
-                          </tr>
-                        </table>
-                      </td>
-                    </xsl:if>
-
-                    <!-- unselected tabs -->
-                    <xsl:if test="count(@href)">
-                      <td>
-                        <table border="0" cellpadding="2" cellspacing="0" width="100%">
-                          <tr>
-                            <td width="6"/>
-                            <td>
-                              <a class="tab_unselected" href="{@href}">
-                                <xsl:apply-templates/>
-                              </a>
-                            </td>
-                            <td width="6"/>
-                          </tr>
-                        </table>
-                      </td>
-                    </xsl:if>
-                  </xsl:for-each>
-
-                </tr>
-              </table>
-            </td>
-
-            <!-- MP: The preview link sits on the right end of the tabstrip. 
-                 It is normally suppressed, but here we explicitly render it. -->
-            <td align="right">
-              <table border="0" cellpadding="2" cellspacing="0" width="100%">
-                <tr>
-                  <td width="6"/>
-                  <td align="right">
-                    <xsl:comment>Item Preview</xsl:comment>
-                    <xsl:for-each select="//bebop:link[@id='preview_link']">
-                      <a target="preview" class="tab_unselected" href="{@href}">
-                        <xsl:apply-templates/>
-                      </a>
-                    </xsl:for-each>          
-                  </td>
-                  <td width="6"/>
-                </tr>
-              </table>
-            </td>
-
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr bgcolor="#878175">
-      <td>
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td height="1"/>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr bgcolor="white">
-      <td>
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td height="10"/>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</xsl:template>
-
-<!-- currentPane: This holds the body of the pages. -->
-<xsl:template match="bebop:currentPane">
-  <table border="0" cellpadding="0" cellspacing="0" width="100%">
-    <tr>
-      <td>
-        <xsl:apply-templates/>
-      </td>
-    </tr>
-  </table>
-</xsl:template>
-
-<!-- MP: This is a hack to place the Preview Link [@id='preview_link'] -->
-<xsl:template match="*[@id='preview_link']">
-  <!-- do nothing. invisible tag. -->
-</xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/Table.xsl b/ccm-core/web/packages/bebop/xsl/Table.xsl
deleted file mode 100755
index e4102febf..000000000
--- a/ccm-core/web/packages/bebop/xsl/Table.xsl
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:output method="html" indent="yes"/>
-
- <!-- The make-attribute template used here is defined in BoxPanel.xsl
-      TODO: We need to move such utilities to one place, to make finding
-      them easier
-   -->
-
- <xsl:template match="bebop:table"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <table>
-     <xsl:for-each select="@*">
-       <xsl:attribute name="{name()}">
-         <xsl:value-of select="."/>
-       </xsl:attribute>
-     </xsl:for-each>
-     <xsl:apply-templates select="bebop:thead"/>
-     <xsl:apply-templates select="bebop:tbody"/>
-   </table>
- </xsl:template>
-
- <xsl:template match="bebop:thead"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <xsl:element name="thead">
-     <tr>
-       <xsl:for-each select="bebop:cell">
-         <th>
-             <xsl:for-each select="@class|@style|@align|@valign|@colspan|@width|@rowspan|@height">
-               <xsl:attribute name="{local-name()}">
-                <xsl:value-of select="."/>
-               </xsl:attribute>
-             </xsl:for-each>
-         <xsl:apply-templates/>
-         </th>
-       </xsl:for-each>
-     </tr>
-   </xsl:element>
- </xsl:template>
-
- <xsl:template match="bebop:tbody"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <tbody>
-     <xsl:for-each select="bebop:trow">
-       <tr>
-         <xsl:if test="../@striped and (position() mod 2) = 1">
-           <xsl:attribute name="class">rowOdd</xsl:attribute>
-         </xsl:if>
-         <xsl:for-each select="bebop:cell">
-           <td>
-             <xsl:for-each select="@class|@style|@align|@valign|@width|@height">
-               <xsl:attribute name="{local-name()}">
-                <xsl:value-of select="."/>
-               </xsl:attribute>
-             </xsl:for-each>
-             <xsl:apply-templates/>
-           </td>
-         </xsl:for-each>
-       </tr>
-     </xsl:for-each>
-   </tbody>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/TextArea.xsl b/ccm-core/web/packages/bebop/xsl/TextArea.xsl
deleted file mode 100755
index 468ccd622..000000000
--- a/ccm-core/web/packages/bebop/xsl/TextArea.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <xsl:output method="html" indent="yes"/>
-
-
- <xsl:template match="bebop:textarea"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <textarea>
-        <xsl:for-each select="@*[not(name()='value')]">
-            <xsl:attribute name="{name()}">
-                <xsl:value-of select="."/>
-            </xsl:attribute>
-        </xsl:for-each>
-	<xsl:if test="string-length(@value)=0">&#160;</xsl:if>
-        <xsl:value-of select="@value"/>
-   </textarea>
- </xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/Tree.xsl b/ccm-core/web/packages/bebop/xsl/Tree.xsl
deleted file mode 100755
index b4f279d35..000000000
--- a/ccm-core/web/packages/bebop/xsl/Tree.xsl
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  version="1.0">
-
- <xsl:output method="html" indent="yes"/>
-
- <xsl:template name="write-node">
-   <xsl:param name="node"/>
-   <xsl:param name="total-indent"/>
-   <xsl:param name="level-indent">&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;</xsl:param>
-   <xsl:for-each select="$node">
-     <tr>
-       <td>
-         <xsl:value-of disable-output-escaping="yes" select="$total-indent"/>
-         <xsl:choose>
-           <xsl:when test="@collapsed='t'">
-             <a href="{@href}">+</a>
-           </xsl:when>
-           <xsl:when test="@expanded='t'">
-             <a href="{@href}">-</a>
-           </xsl:when>
-           <xsl:otherwise>
-             <xsl:text>&#160;</xsl:text>
-           </xsl:otherwise>
-         </xsl:choose>
-         <xsl:text>&#160;</xsl:text>
-         <xsl:apply-templates select="*[position()=1]"/>
-       </td>
-     </tr>
-     <xsl:for-each select="bebop:t_node">
-       <xsl:call-template name="write-node">
-         <xsl:with-param name="node" select="."/>
-         <xsl:with-param name="total-indent">
-           <xsl:copy-of select="$total-indent"/>
-           <xsl:copy-of select="$level-indent"/>
-         </xsl:with-param>
-       </xsl:call-template>
-     </xsl:for-each>
-   </xsl:for-each>
- </xsl:template>
-  
- <xsl:template match="bebop:tree">
-   <table>
-     <xsl:for-each select="bebop:t_node">
-       <xsl:call-template name="write-node">
-         <xsl:with-param name="node" select="."/>
-       </xsl:call-template>
-     </xsl:for-each>
-   </table>
- </xsl:template>
-  
-
-</xsl:stylesheet>
-
-
-
-
diff --git a/ccm-core/web/packages/bebop/xsl/Widget.xsl b/ccm-core/web/packages/bebop/xsl/Widget.xsl
deleted file mode 100755
index 8abc53441..000000000
--- a/ccm-core/web/packages/bebop/xsl/Widget.xsl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet 
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-exclude-result-prefixes="xsl bebop"
-version="1.0">
-
- <xsl:output method="html" indent="yes"/>
-
-
- <xsl:template match="bebop:formErrors">    
- 	<font color="red">
-    <xsl:value-of disable-output-escaping="yes" select="@message"/>
-    </font>
-    <br />
- </xsl:template>
- 
- <xsl:template match="bebop:formWidget">
-    <xsl:element name="input">
-        <xsl:for-each select="@*">
-            <xsl:attribute name="{name()}">
-                <xsl:value-of select="."/>
-            </xsl:attribute>
-        </xsl:for-each>
-    </xsl:element>
- </xsl:template>
-
- <xsl:template match="bebop:formWidget[@type='submit']">
-    <input>
-      <xsl:if test="boolean(@onclick) = false()">
-        <xsl:attribute name="onclick">
-             <xsl:text>dcp_hide(this);</xsl:text>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:for-each select="@*">
-        <xsl:attribute name="{name()}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:for-each>
-    </input>
- </xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/XinhaEditor.xsl b/ccm-core/web/packages/bebop/xsl/XinhaEditor.xsl
deleted file mode 100755
index f3b53eb26..000000000
--- a/ccm-core/web/packages/bebop/xsl/XinhaEditor.xsl
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
-  exclude-result-prefixes="xsl bebop" 
-  version="1.0">
-  
-  
-  <!-- This is a backport from Mandalay v0.9 to support Xinha editor with the -->
-  <!-- generic theme. Xinha is the follow-up of the discontinued HTMLArea. -->
-  
-  <!-- DE Benutze Xinha -->
-  <!-- EN Use Xinha -->
-
-  <xsl:template match="bebop:xinha">
-    
-    <xsl:variable name="firstMatch">
-      <xsl:value-of select="//bebop:xinha/@name"/>
-    </xsl:variable>
-
-    <xsl:if test="@name=$firstMatch">    
- 
-      <script type="text/javascript">
-        _editor_url = "<xsl:value-of select="@editor_url"/>";
-        _editor_lang = "en";
-<!--        _editor_skin = "silva";-->
-        
-        <!-- DE Definiere, welche Textareas zu Xinha-Editoren werden sollen -->
-        <!-- EN Define all textares which should become xinha editors -->
-        xinha_editors = [
-        <xsl:for-each select="//bebop:xinha">
-          'ta_<xsl:value-of select="@name"/>'<xsl:if test="position() != last()">, </xsl:if>
-        </xsl:for-each>
-        ];
-        
-        <!-- DE Lade die angegebenen Plugins falls angegeben -->
-        <!-- EN Load the mentioned plugins if any-->
-        xinha_plugins = null;
-        <xsl:if test="bebop:plugin">
-          xinha_plugins = [
-          <xsl:for-each select="bebop:plugin">
-            '<xsl:value-of select="@name"/>'<xsl:if test="position() != last()">, </xsl:if>
-          </xsl:for-each>
-          ];
-        </xsl:if>
-      </script>      
-    
-      <!-- DE Lade die externe JavaScript-Datei für Xinha -->
-      <script type="text/javascript" src="{@editor_src}"/>
-      
-      <!-- DE Lade die angegebene Konfiguration -->
-      <script type="text/javascript">
-        <xsl:attribute name="src">
-          <xsl:choose>
-            <xsl:when test="bebop:config[@name='XinhaConfig']">
-              <xsl:value-of select="bebop:config[@name='XinhaConfig']/@path"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="bebop:config[@name='Xinha.Config']/@path"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </script>
-    
-    </xsl:if>
-    
-    <textarea id="ta_{@name}" name="{@name}" rows="{@rows}" cols="{@cols}" wrap="{@wrap}" style="width:100%">
-      <xsl:value-of disable-output-escaping="no" select="text()"/>
-    </textarea>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/bebop.xsl b/ccm-core/web/packages/bebop/xsl/bebop.xsl
deleted file mode 100755
index 4ca14559f..000000000
--- a/ccm-core/web/packages/bebop/xsl/bebop.xsl
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- 
-This is the main stylesheet for Bebop.  It imports all of the .xsl
-files with xsl.import.  This stylesheet is locale-independent. 
---> 
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-                xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-
-<!-- catch-all rules must have lowest precedence -->
-<xsl:import href="plain.xsl"/>
-
-<!-- templates for each component -->
-<xsl:import href="Page.xsl"/>
-<xsl:import href="BoxPanel.xsl"/>
-<xsl:import href="CheckBoxGroup.xsl"/>
-<xsl:import href="ColumnPanel.xsl"/>
-<xsl:import href="DataTable.xsl"/>
-<xsl:import href="DimensionalNavbar.xsl"/>
-<xsl:import href="Form.xsl"/>
-<xsl:import href="GridPanel.xsl"/>
-<xsl:import href="Image.xsl"/>
-<xsl:import href="Label.xsl"/>
-<xsl:import href="Link.xsl"/>
-<xsl:import href="List.xsl"/>
-<xsl:import href="PageErrorDisplay.xsl"/>
-<xsl:import href="ListPanel.xsl"/>
-<xsl:import href="MultipleSelect.xsl"/>
-<xsl:import href="PageState.xsl"/>
-<xsl:import href="RadioGroup.xsl"/>
-<xsl:import href="Select.xsl"/>
-<xsl:import href="SplitPanel.xsl"/>
-<xsl:import href="TabbedPane.xsl"/>
-<xsl:import href="Table.xsl"/>
-<xsl:import href="TextArea.xsl"/>
-<xsl:import href="DHTMLEditor.xsl"/>
-<xsl:import href="FCKEditor.xsl"/>
-<xsl:import href="XinhaEditor.xsl"/>
-<xsl:import href="Tree.xsl"/>
-<xsl:import href="Widget.xsl"/>
-<xsl:import href="SegmentedPanel.xsl"/>
-<xsl:import href="DateTime.xsl"/>
-<xsl:import href="dcp.xsl"/>
-
-<!-- solid line -->
-<xsl:template match="bebop:solidLine">
-  <hr />
-</xsl:template>
-
-
-</xsl:stylesheet>
-
-
-
-
diff --git a/ccm-core/web/packages/bebop/xsl/dcp.xsl b/ccm-core/web/packages/bebop/xsl/dcp.xsl
deleted file mode 100755
index ebbbacf7e..000000000
--- a/ccm-core/web/packages/bebop/xsl/dcp.xsl
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  exclude-result-prefixes="bebop">
-
-<xsl:output method="html" indent="yes"/>
-
-<xsl:param name="dcp-on-buttons"/>
-<xsl:param name="dcp-on-links"/>
-
-<xsl:template name="bebop:dcpJavascript">
-  <script language="javascript">
-  <xsl:choose>
-    <xsl:when test="$dcp-on-buttons">
-      function dcp_hide(e) {
-          if (e.form != null) {
-              elements = e.form.elements;
-              for (i=0; i &lt; elements.length; i++) {
-                 if (elements[i].tagName == "INPUT" &amp;&amp; elements[i].type == "submit" &amp;&amp; elements[i] != e) {
-                    elements[i].setAttribute("disabled", "disabled");
-                 }
-             }
-        }
-        try {
-            // IE version - setAttribute("value", .... doesn't work in IE, so results in default browser value (submit query) 
-            // also note, class attribute referred to as className in IE!??!
-            
-            proxybutton = document.createElement("&lt;input class='" + e.getAttribute("className") + "' id = '" + e.getAttribute("id") + "' type='submit' value='" +  e.getAttribute("value") + "' disabled /&gt;");
-        	
-        } catch (error) {
-            // proper version
-            proxybutton = document.createElement('input');
-            proxybutton.setAttribute("disabled", "disabled");
-            proxybutton.setAttribute("value", e.getAttribute("value"));
-            proxybutton.setAttribute("class", e.getAttribute("class"));
-            proxybutton.setAttribute("id", e.getAttribute("id"));
-            proxybutton.setAttribute("type", "submit");
-        }
-        e.parentNode.insertBefore(proxybutton, e);
-          e.style.display = 'none';
-        
-      }
-    </xsl:when>
-    <xsl:otherwise>
-      function dcp_hide(e) { }
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:choose>
-    <xsl:when test="$dcp-on-links">
-      
-         
-      function dcp_disable_link(e) { 
-      		proxylink = e.cloneNode(true);
-            proxylink.removeAttribute("href");
-            e.parentNode.insertBefore(proxylink, e);
-            e.style.display = 'none';
-       	
-      }                                                 
-    </xsl:when>
-    <xsl:otherwise>
-        function dcp_disable_link(e) { }
-    </xsl:otherwise>
-  </xsl:choose>
-  </script>
-</xsl:template>
-
-
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop/xsl/plain.xsl b/ccm-core/web/packages/bebop/xsl/plain.xsl
deleted file mode 100755
index 2b24b2b5d..000000000
--- a/ccm-core/web/packages/bebop/xsl/plain.xsl
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<!--  The templates associated with any bebop component are in a file
-      named after the component.  This file contains only sundry
-      leftovers: a catch-all and some unused tags.
-  -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <xsl:output method="html" indent="yes"/>
-
- <!-- catch-all -->
- <xsl:template match="*|@*|text()">
-   <xsl:copy>
-    <xsl:apply-templates/>
-   </xsl:copy>
- </xsl:template>
-
- <!-- XXX unused -->
- <xsl:template match="bebop:sortableTable"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <xsl:apply-templates />
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/tools-ng/devel/lib/postgresql-8.4-704.jdbc3.jar b/tools-ng/devel/lib/postgresql-8.4-704.jdbc3.jar
new file mode 100644
index 000000000..1abf03c0a
Binary files /dev/null and b/tools-ng/devel/lib/postgresql-8.4-704.jdbc3.jar differ
diff --git a/tools-ng/devel/lib/postgresql-8.4-704.jdbc4.jar b/tools-ng/devel/lib/postgresql-8.4-704.jdbc4.jar
new file mode 100644
index 000000000..8e4c44fd9
Binary files /dev/null and b/tools-ng/devel/lib/postgresql-8.4-704.jdbc4.jar differ
diff --git a/tools-ng/devel/lib/postgresql-9.0-801.jdbc4.jar b/tools-ng/devel/lib/postgresql-9.0-801.jdbc4.jar
deleted file mode 100644
index 63e54165e..000000000
Binary files a/tools-ng/devel/lib/postgresql-9.0-801.jdbc4.jar and /dev/null differ
diff --git a/tools-ng/devel/lib/postgresql-9.3-1101.jdbc3.jar b/tools-ng/devel/lib/postgresql-9.3-1101.jdbc3.jar
new file mode 100644
index 000000000..2e58deb46
Binary files /dev/null and b/tools-ng/devel/lib/postgresql-9.3-1101.jdbc3.jar differ
diff --git a/tools-ng/devel/lib/postgresql-jdbc-8.2.506.jar b/tools-ng/devel/lib/postgresql-jdbc-8.2.506.jar
deleted file mode 100644
index 85d5d0818..000000000
Binary files a/tools-ng/devel/lib/postgresql-jdbc-8.2.506.jar and /dev/null differ
diff --git a/tools-ng/ecdc/scriptlib/build-runtime.xml b/tools-ng/ecdc/scriptlib/build-runtime.xml
index 5f7638171..92f095515 100644
--- a/tools-ng/ecdc/scriptlib/build-runtime.xml
+++ b/tools-ng/ecdc/scriptlib/build-runtime.xml
@@ -29,10 +29,13 @@
 		<copy file="ccm-core/lib/xercesImpl.jar"
                       todir="${app.server.shared.dir}/endorsed" preservelastmodified="true"/>
         -->
+        <!--  JDBC driver relocated to CCM WEB-INF/lib in order not to touch
+              the Tomcat / application server installation in any way.
 		<copy file="tools-ng/devel/lib/ojdbc14.jar"
                       todir="${app.server.shared.dir}" preservelastmodified="true"/>
 		<copy file="tools-ng/devel/lib/postgresql-jdbc.jar"
                       todir="${app.server.shared.dir}" preservelastmodified="true"/>
+        -->
 	</target>
         
     <target name="install-liferay" depends="uninstall-liferay">