Fixing several problems with image attachments (#2484, #2485, #2486)

git-svn-id: https://svn.libreccm.org/ccm/trunk@3450 8810af33-2d31-482b-a856-94f89814c4df
2015-06-02 07:38:03 +00:00 · 2015-06-02 07:38:03 +00:00 · 8760ac5e73
parent 2ac2d9a7ff
commit 8760ac5e73
14 changed files with 464 additions and 421 deletions
--- a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ImageStepResources.properties
+++ b/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ImageStepResources.properties
@ -10,9 +10,9 @@ cms.contentassets.ui.image_step.caption=Caption
 cms.contentassets.ui.image_step.image_table.thumbnail=Thumbnail
 cms.contentassets.ui.image_step.remove_attached_image.confirm=Are you sure to remove this attached image?
 cms.contentassets.ui.image_step.image_table.properties=Image properties
-cms.contentassets.ui.image_step.table.edit_attached_image=\u270D
-cms.contentassets.ui.image_step.table.move_attached_image_up=\u2B06
-cms.contentassets.ui.image_step.table.move_attached_image_down=\u2B07
+cms.contentassets.ui.image_step.table.edit_attached_image=\u270d
+cms.contentassets.ui.image_step.table.move_attached_image_up=\u2b06
+cms.contentassets.ui.image_step.table.move_attached_image_down=\u2b07
 cms.contentassets.ui.image_step.table.remove_attached_image=\u2716
 cms.contentassets.ui.image_step.table.edit_attached_image.header=
 cms.contentassets.ui.image_step.table.move_attached_image_up.header=
--- a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ImageStepResources_de.properties
+++ b/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ImageStepResources_de.properties
@ -10,9 +10,9 @@ cms.contentassets.ui.image_step.caption=Bildunterschrift
 cms.contentassets.ui.image_step.image_table.thumbnail=Vorschau
 cms.contentassets.ui.image_step.remove_attached_image.confirm=Sind Sie sicher das Sie die Zuordnung dieses Bildes entfernen m\u00f6chten?
 cms.contentassets.ui.image_step.image_table.properties=Bildeigenschaften
-cms.contentassets.ui.image_step.table.edit_attached_image=\u270D
-cms.contentassets.ui.image_step.table.move_attached_image_up=\u2B06
-cms.contentassets.ui.image_step.table.move_attached_image_down=\u2B07
+cms.contentassets.ui.image_step.table.edit_attached_image=\u270d
+cms.contentassets.ui.image_step.table.move_attached_image_up=\u2b06
+cms.contentassets.ui.image_step.table.move_attached_image_down=\u2b07
 cms.contentassets.ui.image_step.table.remove_attached_image=\u2716
 cms.contentassets.ui.image_step.table.edit_attached_image.header=
 cms.contentassets.ui.image_step.table.move_attached_image_up.header=
--- a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ImageStepResources_en.properties
+++ b/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ImageStepResources_en.properties
@ -10,9 +10,9 @@ cms.contentassets.ui.image_step.caption=Caption
 cms.contentassets.ui.image_step.image_table.thumbnail=Thumbnail
 cms.contentassets.ui.image_step.remove_attached_image.confirm=cms.contentassets.ui.image_step.remove_attached_image.confirm
 cms.contentassets.ui.image_step.image_table.properties=Image properties
-cms.contentassets.ui.image_step.table.edit_attached_image=\u270D
-cms.contentassets.ui.image_step.table.move_attached_image_up=\u2B06
-cms.contentassets.ui.image_step.table.move_attached_image_down=\u2B07
+cms.contentassets.ui.image_step.table.edit_attached_image=\u270d
+cms.contentassets.ui.image_step.table.move_attached_image_up=\u2b06
+cms.contentassets.ui.image_step.table.move_attached_image_down=\u2b07
 cms.contentassets.ui.image_step.table.remove_attached_image=\u2716
 cms.contentassets.ui.image_step.table.edit_attached_image.header=
 cms.contentassets.ui.image_step.table.move_attached_image_up.header=
--- a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ui/ImageAttachmentEditForm.java
+++ b/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ui/ImageAttachmentEditForm.java
@ -9,8 +9,11 @@ import com.arsdigita.bebop.event.FormProcessListener;
 import com.arsdigita.bebop.event.FormSectionEvent;
 import com.arsdigita.bebop.event.FormSubmissionListener;
 import com.arsdigita.bebop.form.TextField;
+import com.arsdigita.bebop.parameters.StringInRangeValidationListener;
+import com.arsdigita.cms.CMS;
 import com.arsdigita.cms.contentassets.ItemImageAttachment;
 import com.arsdigita.cms.contentassets.util.ImageStepGlobalizationUtil;
+import com.arsdigita.cms.util.GlobalizationUtil;

 /**
 *
@ -18,6 +21,9 @@ import com.arsdigita.cms.contentassets.util.ImageStepGlobalizationUtil;
 */
 public class ImageAttachmentEditForm extends Form
    implements FormInitListener, FormProcessListener, FormSubmissionListener {
+    
+    private static final String CAPTION = "caption";
+    private static final String CONTEXT = "context";

    final ImageStep imageStep;
    final SaveCancelSection saveCancelSection;
@ -31,9 +37,20 @@ public class ImageAttachmentEditForm extends Form
            "cms.contentassets.ui.image_step.caption"));

        final TextField captionField = new TextField(CAPTION);
+        captionField.setLabel(ImageStepGlobalizationUtil.globalize(
+            "cms.contentassets.ui.image_step.caption"));
+        captionField.setSize(CMS.getConfig().getImageBrowserCaptionSize());
+        captionField.addValidationListener(
+            new StringInRangeValidationListener(1, 100));
+        
+        final TextField contextField = new TextField(CONTEXT);
+        contextField.setSize(40);
+        contextField.setLabel(GlobalizationUtil
+                .globalize("cms.contentasset.image.ui.use_context"));

        add(label);
        add(captionField);
+        add(contextField);

        saveCancelSection = new SaveCancelSection();
        add(saveCancelSection);
@ -43,20 +60,24 @@ public class ImageAttachmentEditForm extends Form

    }

-    private static final String CAPTION = "caption";
+    

    @Override
    public void init(final FormSectionEvent event) throws FormProcessException {
-        final ItemImageAttachment attachment = imageStep.getAttachment(event.getPageState());
+        final ItemImageAttachment attachment = imageStep.getAttachment(event
+            .getPageState());

        event.getFormData().put(CAPTION, attachment.getCaption());
    }

    @Override
-    public void process(final FormSectionEvent event) throws FormProcessException {
-        final ItemImageAttachment attachment = imageStep.getAttachment(event.getPageState());
+    public void process(final FormSectionEvent event) throws
+        FormProcessException {
+        final ItemImageAttachment attachment = imageStep.getAttachment(event
+            .getPageState());

        attachment.setCaption(event.getFormData().getString(CAPTION));
+        attachment.setUseContext(event.getFormData().getString(CONTEXT));

        attachment.save();

@ -64,7 +85,8 @@ public class ImageAttachmentEditForm extends Form
    }

    @Override
-    public void submitted(final FormSectionEvent event) throws FormProcessException {
+    public void submitted(final FormSectionEvent event) throws
+        FormProcessException {
        if (saveCancelSection.getCancelButton().isSelected(event.getPageState())) {
            imageStep.setAttachment(event.getPageState(), null);

--- a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ui/ImageComponentAttachListener.java
+++ b/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ui/ImageComponentAttachListener.java
@ -19,6 +19,7 @@

 package com.arsdigita.cms.contentassets.ui;

+import com.arsdigita.bebop.FormProcessException;
 import com.arsdigita.bebop.MapComponentSelectionModel;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.event.FormSectionEvent;
@ -27,6 +28,7 @@ import com.arsdigita.cms.ReusableImageAsset;
 import com.arsdigita.cms.contentassets.ItemImageAttachment;
 import com.arsdigita.cms.ui.ImageComponent;
 import com.arsdigita.cms.ui.ImageComponentAbstractListener;
+
 import org.apache.log4j.Logger;

 /**
@ -71,6 +73,7 @@ public class ImageComponentAttachListener extends ImageComponentAbstractListener
                    new RuntimeException());
            return;
        }
+        
        ItemImageAttachment attachment = m_imageStep.getAttachment(ps);
        if (null == attachment) {
            attachment = new ItemImageAttachment(item, image);
--- a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ui/ImageStepEdit.java
+++ b/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ui/ImageStepEdit.java
@ -82,7 +82,6 @@ public class ImageStepEdit extends SimpleContainer
        Map selectors = m_imageComponent.getComponentsMap();
        m_attachListener = new ImageComponentAttachListener(m_imageComponent, 
                                                            m_imageStep);
-
        /* Include CMS ImageLibrary to display existing images too select from */
        ImageLibraryComponent library = new ImageLibraryComponent();
        library.getForm().addInitListener(m_attachListener);
--- a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties
+++ b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties
@ -1112,3 +1112,4 @@ cms.ui.type.content_editing_failed=Failed to edit the content type: {0}
 cms.contenttyes.link.ui.caption=Caption:
 cms.contenttyes.link.ui.option_group.caption=caption
 cms.contenttypes.ui.title_is_required=A title is required
+images.no_image_selected=No image selected
--- a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
+++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
@ -1106,3 +1106,4 @@ cms.ui.type.content_editing_failed=Bearbeitung des Dokumenttyps: {0} ist fehlges
 cms.contenttyes.link.ui.caption=Zwischentitel:
 cms.contenttyes.link.ui.option_group.caption=Zwischentitel
 cms.contenttypes.ui.title_is_required=Ein Titel wird ben\u00f6tigt
+images.no_image_selected=Es wurde kein Bild ausgew\u00e4hlt
--- a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties
+++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties
@ -150,3 +150,4 @@ cms.ui.type.content_editing_failed=
 cms.contenttyes.link.ui.caption=Caption:
 cms.contenttyes.link.ui.option_group.caption=caption
 cms.contenttypes.ui.title_is_required=A title is required
+images.no_image_selected=No image selected
--- a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties
+++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties
@ -622,3 +622,4 @@ cms.ui.type.content_editing_failed=Impossible de modifier le type de contenu: {0
 cms.contenttyes.link.ui.caption=Caption:
 cms.contenttyes.link.ui.option_group.caption=caption
 cms.contenttypes.ui.title_is_required=A title is required
+images.no_image_selected=No image selected
--- a/ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAbstractListener.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAbstractListener.java
@ -13,15 +13,18 @@ import com.arsdigita.bebop.event.FormProcessListener;
 import com.arsdigita.bebop.event.FormSectionEvent;
 import com.arsdigita.bebop.event.FormSubmissionListener;
 import com.arsdigita.cms.ReusableImageAsset;
+import com.arsdigita.cms.util.GlobalizationUtil;
+
 import java.util.Iterator;
 import java.util.Map;
+
 import org.apache.log4j.Logger;

 /**
 * An abstract listener for {@link ImageComponent}.
 *
- * This listener provides the base implementation which is shared between all listeners of this
- * kind.
+ * This listener provides the base implementation which is shared between all
+ * listeners of this kind.
 *
 * This listerner is used by {@link ImageSelectPage}.
 *
@ -35,7 +38,8 @@ public abstract class ImageComponentAbstractListener implements FormInitListener
        ImageComponentSelectListener.class);
    MapComponentSelectionModel m_imageComponent;

-    public ImageComponentAbstractListener(MapComponentSelectionModel imageComponent) {
+    public ImageComponentAbstractListener(
+        MapComponentSelectionModel imageComponent) {
        super();
        m_imageComponent = imageComponent;
    }
@ -50,7 +54,8 @@ public abstract class ImageComponentAbstractListener implements FormInitListener
    }

    /**
-     * Call {@link #cancelled(com.arsdigita.bebop.PageState)} if the cancel button was pressed.
+     * Call {@link #cancelled(com.arsdigita.bebop.PageState)} if the cancel
+     * button was pressed.
     *
     * @param event the {@link FormSectionEvent}
     *
@ -87,7 +92,11 @@ public abstract class ImageComponentAbstractListener implements FormInitListener

 //		try {
        ReusableImageAsset image = component.getImage(event);
-
+        if (image == null) {
+            throw new FormProcessException("No image selected",
+                GlobalizationUtil.globalize("images.no_image_selected"));
+        }
+        
        processImage(event, ps, component, image);
 //		} catch (FormProcessException ex) {
 //		}
@ -110,7 +119,8 @@ public abstract class ImageComponentAbstractListener implements FormInitListener
     * @param image     the {@link ReusableImageAsset}
     */
    protected abstract void processImage(FormSectionEvent event, PageState ps,
-                                         ImageComponent component, ReusableImageAsset image);
+                                         ImageComponent component,
+                                         ReusableImageAsset image);

    protected ImageComponent getImageComponent(PageState ps) {
        if (!m_imageComponent.isSelected(ps)) {
--- a/ccm-cms/src/com/arsdigita/cms/ui/ImageLibraryComponent.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/ImageLibraryComponent.java
@ -18,12 +18,14 @@ import com.arsdigita.bebop.event.FormSectionEvent;
 import com.arsdigita.bebop.form.TextField;
 import com.arsdigita.bebop.parameters.BigDecimalParameter;
 import com.arsdigita.bebop.parameters.NotNullValidationListener;
+import com.arsdigita.bebop.parameters.StringInRangeValidationListener;
 import com.arsdigita.cms.CMS;
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.ReusableImageAsset;
 import com.arsdigita.cms.util.GlobalizationUtil;
 import com.arsdigita.domain.DataObjectNotFoundException;
+
 import java.math.BigDecimal;

 /**
@ -87,12 +89,11 @@ public class ImageLibraryComponent extends SimpleContainer
                    m_imageModel.setSelectedObject(state, image);
                } catch (DataObjectNotFoundException ex) {
                    ImagesPane.S_LOG.error("Selected non-existant image: "
-                                           + imageID, ex);
+                                               + imageID, ex);
                }
            }

        });
-        

        // Form for additional fields and submit
        m_form = new Form("imageLibraryComponent", new ColumnPanel(2));
@ -110,6 +111,8 @@ public class ImageLibraryComponent extends SimpleContainer
            m_form.add(new Label(GlobalizationUtil
                .globalize("cms.contentasset.image.ui.caption")));
            m_caption.addValidationListener(new NotNullValidationListener());
+            m_caption.addValidationListener(new StringInRangeValidationListener(
+                1, CMS.getConfig().getImageBrowserCaptionSize()));
            m_caption.setSize(CMS.getConfig().getImageBrowserCaptionSize());
            m_form.add(m_caption);
            m_description.addValidationListener(new NotNullValidationListener());
@ -128,10 +131,11 @@ public class ImageLibraryComponent extends SimpleContainer
            m_form.add(new Label(GlobalizationUtil
                .globalize("cms.contentasset.image.ui.use_context")));
            m_useContext.setSize(40);
+            m_useContext.addValidationListener(
+                new StringInRangeValidationListener(0, 40));
            m_form.add(m_useContext);
        }

-        
 //        if (m_mode == ImageComponent.SELECT_IMAGE) {
 //            m_form.setOnSubmit("selectImage();");
 //        }
@ -143,7 +147,7 @@ public class ImageLibraryComponent extends SimpleContainer
                || m_mode == ImageComponent.ATTACH_IMAGE) {
            m_form.add(m_saveCancel);
        }
-        
+
        add(m_chooser);
    }

--- a/ccm-core/src/com/arsdigita/xml/CCMTransformerFactory.java
+++ b/ccm-core/src/com/arsdigita/xml/CCMTransformerFactory.java
@ -51,6 +51,7 @@ public class CCMTransformerFactory extends TransformerFactory {
        final XMLConfig config = XMLConfig.getConfig();
        //Get the classname
        final String classname = config.getXSLTransformerFactoryClassname();
+        LOGGER.warn(String.format("XSL Transformer Factory classname is %s", classname));

        if (classname == null || classname.isEmpty()) {
            //To make this class errorprone we check for null and empty string. Normally this
--- a/ccm-sci-bundle/bundles/devel/cfg/sci-web.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/sci-web.xml
@ -46,484 +46,484 @@
    <url-pattern>/*</url-pattern>
  </filter-mapping>

-  <filter-mapping>
-    <filter-name>profiler</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-->
+      <filter-mapping>
+        <filter-name>profiler</filter-name>
+        <url-pattern>/*</url-pattern>
+      </filter-mapping>
+    -->


-  <filter-mapping>
-    <filter-name>subsite</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <filter-mapping>
+        <filter-name>subsite</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>

-  <filter-mapping>
-    <filter-name>shortcuts</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <filter-mapping>
+        <filter-name>shortcuts</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>

-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     Context Listener 
-     required and used to initialize the runtime environment before any other 
-     task is performed or any servlet initialized. 
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <listener>
-    <listener-class>com.arsdigita.web.CCMApplicationContextListener</listener-class>
-  </listener>
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    Context Listener 
+    required and used to initialize the runtime environment before any other 
+    task is performed or any servlet initialized. 
+    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <listener>
+        <listener-class>com.arsdigita.web.CCMApplicationContextListener</listener-class>
+    </listener>
    

-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     BASE SERVLET DECLARATIONS SECTION
-     basically requirred by ccm-core
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    BASE SERVLET DECLARATIONS SECTION
+    basically requirred by ccm-core
+    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

-  <servlet>
-    <servlet-name>ccm-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.web.CCMDispatcherServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
+    <servlet>
+        <servlet-name>ccm-dispatcher</servlet-name>
+        <servlet-class>com.arsdigita.web.CCMDispatcherServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
  
-  <servlet>
-    <servlet-name>cache-manager</servlet-name>
-    <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>cache-manager</servlet-name>
+        <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
+    </servlet>

-  <servlet>
-    <servlet-name>db-test</servlet-name>
-    <servlet-class>com.arsdigita.web.monitoring.DBTestServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>db-test</servlet-name>
+        <servlet-class>com.arsdigita.web.monitoring.DBTestServlet</servlet-class>
+    </servlet>

-  <servlet>
-    <servlet-name>versioning-log</servlet-name>
-    <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>versioning-log</servlet-name>
+        <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class>
+    </servlet>

-  <servlet>
-    <servlet-name>login</servlet-name>
-    <servlet-class>com.arsdigita.ui.login.LoginServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>login</servlet-name>
+        <servlet-class>com.arsdigita.ui.login.LoginServlet</servlet-class>
+    </servlet>

-  <servlet>
-    <servlet-name>webadmin</servlet-name>
-    <servlet-class>com.arsdigita.ui.admin.AdminServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>webadmin</servlet-name>
+        <servlet-class>com.arsdigita.ui.admin.AdminServlet</servlet-class>
+    </servlet>

-  <servlet>
-    <servlet-name>webadmin-permissions</servlet-name>
-    <servlet-class>com.arsdigita.ui.permissions.PermissionsServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>webadmin-permissions</servlet-name>
+        <servlet-class>com.arsdigita.ui.permissions.PermissionsServlet</servlet-class>
+    </servlet>

-  <servlet>
-    <servlet-name>webdevsupport</servlet-name>
-    <servlet-class>com.arsdigita.webdevsupport.WebDevSupportServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>webdevsupport</servlet-name>
+        <servlet-class>com.arsdigita.webdevsupport.WebDevSupportServlet</servlet-class>
+    </servlet>

-  <servlet>
-    <servlet-name>oid-redirect</servlet-name>
-    <servlet-class>com.arsdigita.web.OIDRedirectServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>oid-redirect</servlet-name>
+        <servlet-class>com.arsdigita.web.OIDRedirectServlet</servlet-class>
+    </servlet>

-  <servlet>
-    <servlet-name>resource-resolver</servlet-name>
-    <servlet-class>com.arsdigita.web.ResourceServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>resource-resolver</servlet-name>
+        <servlet-class>com.arsdigita.web.ResourceServlet</servlet-class>
+    </servlet>

-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     ADDITIONAL SERVLET DECLARATIONS SECTION 
-     basically requirred by ccm-cms
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    ADDITIONAL SERVLET DECLARATIONS SECTION 
+    basically requirred by ccm-cms
+    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

-  <servlet>
-    <servlet-name>content-center</servlet-name>
-    <servlet-class>com.arsdigita.cms.ContentCenterServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>content-center</servlet-name>
+        <servlet-class>com.arsdigita.cms.ContentCenterServlet</servlet-class>
+    </servlet>

-  <servlet>
-    <servlet-name>content-section</servlet-name>
-    <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>content-section</servlet-name>
+        <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
+    </servlet>

-  <servlet>
-    <servlet-name>cms-service</servlet-name>
-    <servlet-class>com.arsdigita.cms.ServiceServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>cms-service</servlet-name>
+        <servlet-class>com.arsdigita.cms.ServiceServlet</servlet-class>
+    </servlet>

-  <servlet>
-    <servlet-name>content-type-xsl</servlet-name>
-    <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>content-type-xsl</servlet-name>
+        <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
+    </servlet>

-  <servlet>
-    <servlet-name>content-item-xsl</servlet-name>
-    <servlet-class>com.arsdigita.cms.dispatcher.ContentItemXSLServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>content-item-xsl</servlet-name>
+        <servlet-class>com.arsdigita.cms.dispatcher.ContentItemXSLServlet</servlet-class>
+    </servlet>

-  <servlet>
-    <servlet-name>template-xsl</servlet-name>
-    <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>template-xsl</servlet-name>
+        <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
+    </servlet>

-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     MODULES SERVLET DECLARATIONS SECTION
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    MODULES SERVLET DECLARATIONS SECTION
+    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->


-  <!-- module ccm-forum  -  servlet declarations BEGIN  -->  
-  <servlet>
-    <servlet-name>forum-main</servlet-name>
-    <servlet-class>com.arsdigita.forum.ForumServlet</servlet-class>
-  </servlet>
-  <!-- module ccm-forum  -  servlet declarations END    -->  
+    <!-- module ccm-forum  -  servlet declarations BEGIN  -->  
+    <servlet>
+        <servlet-name>forum-main</servlet-name>
+        <servlet-class>com.arsdigita.forum.ForumServlet</servlet-class>
+    </servlet>
+    <!-- module ccm-forum  -  servlet declarations END    -->  

-  <servlet>
-    <servlet-name>portalworkspace-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-portalworkspace</param-value>
-    </init-param>
-  </servlet>
+    <servlet>
+        <servlet-name>portalworkspace-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-portalworkspace</param-value>
+        </init-param>
+    </servlet>

-  <servlet>
-    <servlet-name>navigation-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-navigation</param-value>
-    </init-param>
-    <init-param>
-      <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
-    </init-param>
-  </servlet>
+    <servlet>
+        <servlet-name>navigation-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-navigation</param-value>
+        </init-param>
+        <init-param>
+            <param-name>file-resolver</param-name>
+            <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
+        </init-param>
+    </servlet>

-  <servlet>
-    <servlet-name>portlet-type-xsl</servlet-name>
-    <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>portlet-type-xsl</servlet-name>
+        <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
+    </servlet>
 
-  <!-- module ccm-rssfeed  -  servlet declaration BEGIN   -->
-  <servlet>
-    <servlet-name>rssfeed-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-rssfeed</param-value>
-    </init-param>
-    <init-param>
-      <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.rssfeed.RSSFileResolver</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-rssfeed  -  servlet declaration END   -->
+    <!-- module ccm-rssfeed  -  servlet declaration BEGIN   -->
+    <servlet>
+        <servlet-name>rssfeed-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-rssfeed</param-value>
+        </init-param>
+        <init-param>
+            <param-name>file-resolver</param-name>
+            <param-value>com.arsdigita.rssfeed.RSSFileResolver</param-value>
+        </init-param>
+    </servlet>
+    <!-- module ccm-rssfeed  -  servlet declaration END   -->

-  <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
-  <servlet>
-    <servlet-name>search-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-search</param-value>
-    </init-param>
-  </servlet>
+    <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
+    <servlet>
+        <servlet-name>search-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-ldn-search</param-value>
+        </init-param>
+    </servlet>

-  <servlet>
-    <servlet-name>AxisServlet</servlet-name>
-    <display-name>Apache-Axis Servlet</display-name>
-    <servlet-class>
-     org.apache.axis.transport.http.AxisServlet
-    </servlet-class>
-  </servlet>
-  <!-- module ccm-ldn-search  -  servlet declarations END  -->
+    <servlet>
+        <servlet-name>AxisServlet</servlet-name>
+        <display-name>Apache-Axis Servlet</display-name>
+        <servlet-class>
+            org.apache.axis.transport.http.AxisServlet
+        </servlet-class>
+    </servlet>
+    <!-- module ccm-ldn-search  -  servlet declarations END  -->

-  <!-- module ccm-shortcuts  -  servlet definitions   -->
-  <servlet>
-    <servlet-name>shortcuts-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-shortcuts</param-value>
-    </init-param>
-  </servlet>
+    <!-- module ccm-shortcuts  -  servlet definitions   -->
+    <servlet>
+        <servlet-name>shortcuts-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-shortcuts</param-value>
+        </init-param>
+    </servlet>

-  <!-- module ccm-subsite  -  servlet declarations BEGIN  -->
-  <servlet>
-    <servlet-name>subsite-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-subsite</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-subsite  -  servlet declarations END  -->
+    <!-- module ccm-subsite  -  servlet declarations BEGIN  -->
+    <servlet>
+        <servlet-name>subsite-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-subsite</param-value>
+        </init-param>
+    </servlet>
+    <!-- module ccm-subsite  -  servlet declarations END  -->

-  <!-- module ccm-ldn-terms  -  servlet declarations BEGIN   -->
-  <servlet>
-    <servlet-name>terms-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-terms</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-ldn-terms  -  servlet declarations END   -->
+    <!-- module ccm-ldn-terms  -  servlet declarations BEGIN   -->
+    <servlet>
+        <servlet-name>terms-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-ldn-terms</param-value>
+        </init-param>
+    </servlet>
+    <!-- module ccm-ldn-terms  -  servlet declarations END   -->

-  <!-- module ccm-themedirector  -  servlet declarations BEGIN   -->
-  <servlet>
-    <servlet-name>theme-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-themedirector</param-value>
-    </init-param>
-  </servlet>
+    <!-- module ccm-themedirector  -  servlet declarations BEGIN   -->
+    <servlet>
+        <servlet-name>theme-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-themedirector</param-value>
+        </init-param>
+    </servlet>

-  <servlet>
-     <servlet-name>ThemeDownload</servlet-name>
-     <servlet-class>com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet</servlet-class>
-  </servlet>
+    <servlet>
+        <servlet-name>ThemeDownload</servlet-name>
+        <servlet-class>com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet</servlet-class>
+    </servlet>

-  <servlet>
-    <servlet-name>ThemePreviewServlet</servlet-name>
-     <display-name>Servlet to allow admins to preview look/feel</display-name>
-    <servlet-class>
-     com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
-    </servlet-class>
-    <init-param>
-      <param-name>prefix</param-name>
-      <param-value>/theme</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-themedirector  -  servlet declarations END   -->
+    <servlet>
+        <servlet-name>ThemePreviewServlet</servlet-name>
+        <display-name>Servlet to allow admins to preview look/feel</display-name>
+        <servlet-class>
+            com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
+        </servlet-class>
+        <init-param>
+            <param-name>prefix</param-name>
+            <param-value>/theme</param-value>
+        </init-param>
+    </servlet>
+    <!-- module ccm-themedirector  -  servlet declarations END   -->

-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     MODULES SERVLET MAPPINGS SECTION
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    MODULES SERVLET MAPPINGS SECTION
+    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->


-  <!-- module ccm-forum  -  servlet mappings BEGIN  -->
-  <servlet-mapping>
-    <servlet-name>forum-main</servlet-name>
-    <url-pattern>/forum-main/main/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-forum  -  servlet mappings END    -->
+    <!-- module ccm-forum  -  servlet mappings BEGIN  -->
+    <servlet-mapping>
+        <servlet-name>forum-main</servlet-name>
+        <url-pattern>/forum-main/main/*</url-pattern>
+    </servlet-mapping>
+    <!-- module ccm-forum  -  servlet mappings END    -->

-  <servlet-mapping>
-    <servlet-name>portlet-type-xsl</servlet-name>
-    <url-pattern>/themes/servlet/portlet-type/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>portlet-type-xsl</servlet-name>
+        <url-pattern>/themes/servlet/portlet-type/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>portalworkspace-files</servlet-name>
-    <url-pattern>/ccm-portalworkspace/files/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>portalworkspace-files</servlet-name>
+        <url-pattern>/ccm-portalworkspace/files/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-navigation/files/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>navigation-files</servlet-name>
+        <url-pattern>/ccm-navigation/files/*</url-pattern>
+    </servlet-mapping>

-  <!-- module ccm-rssfeed  -  servlet mappings  BEGIN   -->
-  <servlet-mapping>
-    <servlet-name>rssfeed-files</servlet-name>
-    <url-pattern>/ccm-rssfeed/files/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-rssfeed  -  servlet mappings  END   -->
+    <!-- module ccm-rssfeed  -  servlet mappings  BEGIN   -->
+    <servlet-mapping>
+        <servlet-name>rssfeed-files</servlet-name>
+        <url-pattern>/ccm-rssfeed/files/*</url-pattern>
+    </servlet-mapping>
+    <!-- module ccm-rssfeed  -  servlet mappings  END   -->

-  <!-- module ccm-ldn-search  -  servlet mappings BEGIN  -->
-  <servlet-mapping>
-    <servlet-name>search-files</servlet-name>
-    <url-pattern>/ccm-ldn-search/files/*</url-pattern>
-  </servlet-mapping>
+    <!-- module ccm-ldn-search  -  servlet mappings BEGIN  -->
+    <servlet-mapping>
+        <servlet-name>search-files</servlet-name>
+        <url-pattern>/ccm-ldn-search/files/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>AxisServlet</servlet-name>
-    <url-pattern>/services/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-ldn-search  -  servlet mappings END  -->
+    <servlet-mapping>
+        <servlet-name>AxisServlet</servlet-name>
+        <url-pattern>/services/*</url-pattern>
+    </servlet-mapping>
+    <!-- module ccm-ldn-search  -  servlet mappings END  -->

-  <!-- module ccm-shortcuts  -  servlet mappings   -->
-  <servlet-mapping>
-    <servlet-name>shortcuts-files</servlet-name>
-    <url-pattern>/ccm-shortcuts/files/*</url-pattern>
-  </servlet-mapping>
+    <!-- module ccm-shortcuts  -  servlet mappings   -->
+    <servlet-mapping>
+        <servlet-name>shortcuts-files</servlet-name>
+        <url-pattern>/ccm-shortcuts/files/*</url-pattern>
+    </servlet-mapping>

-  <!-- module ccm-subsite  -  servlet mappings BEGIN  -->
-  <servlet-mapping>
-    <servlet-name>subsite-files</servlet-name>
-    <url-pattern>/ccm-subsite/files/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-subsite  -  servlet mappings END  -->
+    <!-- module ccm-subsite  -  servlet mappings BEGIN  -->
+    <servlet-mapping>
+        <servlet-name>subsite-files</servlet-name>
+        <url-pattern>/ccm-subsite/files/*</url-pattern>
+    </servlet-mapping>
+    <!-- module ccm-subsite  -  servlet mappings END  -->

-  <!-- module ccm-ldn-terms  -  servlet mappings BEGIN  -->
-  <servlet-mapping>
-    <servlet-name>terms-files</servlet-name>
-    <url-pattern>/ccm-ldn-terms/files/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-ldn-terms  -  servlet mappings END  -->
+    <!-- module ccm-ldn-terms  -  servlet mappings BEGIN  -->
+    <servlet-mapping>
+        <servlet-name>terms-files</servlet-name>
+        <url-pattern>/ccm-ldn-terms/files/*</url-pattern>
+    </servlet-mapping>
+    <!-- module ccm-ldn-terms  -  servlet mappings END  -->

-  <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
-  <servlet-mapping>
-    <servlet-name>theme-files</servlet-name>
-    <url-pattern>/theme-files/*</url-pattern>
-  </servlet-mapping>
+    <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
+    <servlet-mapping>
+        <servlet-name>theme-files</servlet-name>
+        <url-pattern>/theme-files/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>ThemeDownload</servlet-name>
-    <url-pattern>/theme-files/download/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ThemeDownload</servlet-name>
+        <url-pattern>/theme-files/download/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>ThemePreviewServlet</servlet-name>
-    <url-pattern>/theme/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-themedirector  -  servlet mappings END   -->
+    <servlet-mapping>
+        <servlet-name>ThemePreviewServlet</servlet-name>
+        <url-pattern>/theme/*</url-pattern>
+    </servlet-mapping>
+    <!-- module ccm-themedirector  -  servlet mappings END   -->


-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     BASE SERVLET MAPPINGS SECTION
-     basically requirred by ccm-core
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    BASE SERVLET MAPPINGS SECTION
+    basically requirred by ccm-core
+    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

-  <servlet-mapping>
-    <servlet-name>ccm-dispatcher</servlet-name>
-    <url-pattern>/ccm/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ccm-dispatcher</servlet-name>
+        <url-pattern>/ccm/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>cache-manager</servlet-name>
-    <url-pattern>/expireCache/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>cache-manager</servlet-name>
+        <url-pattern>/expireCache/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>db-test</servlet-name>
-    <url-pattern>/dbtest</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>db-test</servlet-name>
+        <url-pattern>/dbtest</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>versioning-log</servlet-name>
-    <url-pattern>/versioning/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>versioning-log</servlet-name>
+        <url-pattern>/versioning/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>login</servlet-name>
-    <url-pattern>/login/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>login</servlet-name>
+        <url-pattern>/login/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>webadmin</servlet-name>
-    <url-pattern>/admin/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>webadmin</servlet-name>
+        <url-pattern>/admin/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>webadmin-permissions</servlet-name>
-    <url-pattern>/admin-permissions/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>webadmin-permissions</servlet-name>
+        <url-pattern>/admin-permissions/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>webdevsupport</servlet-name>
-    <url-pattern>/webdevsupport/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>webdevsupport</servlet-name>
+        <url-pattern>/webdevsupport/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>oid-redirect</servlet-name>
-    <url-pattern>/redirect/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>oid-redirect</servlet-name>
+        <url-pattern>/redirect/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>resource-resolver</servlet-name>
-    <url-pattern>/resource/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>resource-resolver</servlet-name>
+        <url-pattern>/resource/*</url-pattern>
+    </servlet-mapping>

-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     ADDITIONAL SERVLET MAPPINGS SECTION
-     basically requirred by ccm-cms
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    ADDITIONAL SERVLET MAPPINGS SECTION
+    basically requirred by ccm-cms
+    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

-  <servlet-mapping>
-    <servlet-name>content-center</servlet-name>
-    <url-pattern>/templates/servlet/content-center/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>content-center</servlet-name>
+        <url-pattern>/templates/servlet/content-center/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>content-section</servlet-name>
-    <url-pattern>/templates/servlet/content-section/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>content-section</servlet-name>
+        <url-pattern>/templates/servlet/content-section/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>cms-service</servlet-name>
-    <url-pattern>/templates/servlet/cms-service/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>cms-service</servlet-name>
+        <url-pattern>/templates/servlet/cms-service/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>content-item-xsl</servlet-name>
-    <url-pattern>/templates/servlet/content-item/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>content-item-xsl</servlet-name>
+        <url-pattern>/templates/servlet/content-item/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>content-type-xsl</servlet-name>
-    <url-pattern>/themes/servlet/content-type/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>content-type-xsl</servlet-name>
+        <url-pattern>/themes/servlet/content-type/*</url-pattern>
+    </servlet-mapping>

-  <servlet-mapping>
-    <servlet-name>template-xsl</servlet-name>
-    <url-pattern>/themes/servlet/template/*</url-pattern>
-  </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>template-xsl</servlet-name>
+        <url-pattern>/themes/servlet/template/*</url-pattern>
+    </servlet-mapping>

-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     ERROR PAGES
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    ERROR PAGES
+    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

-  <error-page>
-    <exception-type>com.arsdigita.dispatcher.AccessDeniedException</exception-type>
-    <location>/error/access-denied.jsp</location>
-  </error-page>
+    <error-page>
+        <exception-type>com.arsdigita.dispatcher.AccessDeniedException</exception-type>
+        <location>/error/access-denied.jsp</location>
+    </error-page>

-  <error-page>
-    <exception-type>com.arsdigita.dispatcher.ObjectNotFoundException</exception-type>
-    <location>/error/object-not-found.jsp</location>
-  </error-page>
+    <error-page>
+        <exception-type>com.arsdigita.dispatcher.ObjectNotFoundException</exception-type>
+        <location>/error/object-not-found.jsp</location>
+    </error-page>

-  <error-page>
-    <exception-type>com.arsdigita.kernel.permissions.PermissionException</exception-type>
-    <location>/error/permission-denied.jsp</location>
-  </error-page>
+    <error-page>
+        <exception-type>com.arsdigita.kernel.permissions.PermissionException</exception-type>
+        <location>/error/permission-denied.jsp</location>
+    </error-page>

-  <error-page>
-    <exception-type>com.arsdigita.persistence.DbNotAvailableException</exception-type>
-    <location>/error/db-not-available.jsp</location>
-  </error-page>
+    <error-page>
+        <exception-type>com.arsdigita.persistence.DbNotAvailableException</exception-type>
+        <location>/error/db-not-available.jsp</location>
+    </error-page>

-  <error-page>
-    <exception-type>com.arsdigita.db.DbNotAvailableException</exception-type>
-    <location>/error/db-not-available.jsp</location>
-  </error-page>
+    <error-page>
+        <exception-type>com.arsdigita.db.DbNotAvailableException</exception-type>
+        <location>/error/db-not-available.jsp</location>
+    </error-page>

-  <error-page>
-    <exception-type>java.lang.Exception</exception-type>
-    <location>/error/general.jsp</location>
-  </error-page>
+    <error-page>
+        <exception-type>java.lang.Exception</exception-type>
+        <location>/error/general.jsp</location>
+    </error-page>

-  <error-page>
-    <exception-type>java.lang.Error</exception-type>
-    <location>/error/general.jsp</location>
-  </error-page>
+    <error-page>
+        <exception-type>java.lang.Error</exception-type>
+        <location>/error/general.jsp</location>
+    </error-page>

-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     TAG LIBS
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    TAG LIBS
+    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

-  <jsp-config>
-    <taglib>
-      <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-      <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-    </taglib>
+    <jsp-config>
+        <taglib>
+            <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+            <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+        </taglib>

-    <taglib>
-      <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-      <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-    </taglib>
-  </jsp-config>
+        <taglib>
+            <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+            <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+        </taglib>
+    </jsp-config>

 </web-app>