An ECDC angepasst, default, APLAWS-basiertes theme bereinigt, web.xml bereinigt.

git-svn-id: https://svn.libreccm.org/ccm/trunk@135 8810af33-2d31-482b-a856-94f89814c4df

ccm-zes-aplaws/bundles/devel/cfg/applications.cfg

@@ -38,6 +38,8 @@ ccm-cms-types-newsitem
 # -- ccm-cms-types-pressrelease
 # -- ccm-cms-types-service
 ccm-cms-types-siteproxy
+#  --  xmlfeed wird moeglicherweise ebenfalls nicht gebraucht
+ccm-cms-types-xmlfeed
 
 
 # Applications
@@ -70,8 +72,6 @@ ccm-ldn-subsite
 ccm-ldn-terms
 ccm-ldn-theme
 ccm-ldn-util
-#  --  xmlfeed wird moeglicherweise ebenfalls nicht gebraucht
-ccm-ldn-xmlfeed
 
 # zes extensions
 ccm-zes-aplaws

ccm-zes-aplaws/bundles/devel/cfg/integration.properties

@@ -1,56 +1,95 @@
-; in core: Sucht PatternStyleSheet, u.a. um passende localization zu finden
+waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
-waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
+; dhtml editor to use (system wide)
-waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
+waf.bebop.dhtml_editor=FCKeditor
+
+waf.categorization.show_internal_name=true
+waf.categorization.supported_languages=de,en
+
+waf.dispatcher.default_expiry=3600
 ;
 waf.kernel.data_permission_check_enabled=false
 waf.kernel.primary_user_identifier=email
-waf.dispatcher.default_expiry=3600
+; if you activate screen_name, forum loader doesn't work.
+; waf.kernel.primary_user_identifier=screen_name
 
-waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
+; security.properties: 
+waf.auto_registration_on=false
 waf.pagemap.root=navigation/
 waf.pagemap.workspace=navigation/
 waf.pagemap.login_redirect=content/content-center-redirect.jsp
 
+; Searches for localized style sheet (among others) 
+waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
+waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
+
+
+com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+
 com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
 com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
 com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
 
+; Configure dhtml editor for use in cms content-center
+com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
+com.arsdigita.cms.dhtml_editor_hidden_buttons=
+; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
+com.arsdigita.cms.dhtml_editor_plugins=
+
 com.arsdigita.cms.disable_item_pfs=true
+
+com.arsdigita.cms.hide_admin_tabs=true
+com.arsdigita.cms.hide_folder_index_checkbox=true
+com.arsdigita.cms.hide_launch_date=true
+com.arsdigita.cms.hide_templates_tab=true
+com.arsdigita.cms.hide_timezone=true
+com.arsdigita.cms.hide_udct_ui=true
+
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
-com.arsdigita.cms.hide_templates_tab=true
-com.arsdigita.cms.hide_admin_tabs=true
-com.arsdigita.cms.hide_timezone=true
-com.arsdigita.cms.hide_launch_date=true
 
-com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js
-com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
 
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+com.arsdigita.cms.contenttypes.event.hide_cost=true
+com.arsdigita.cms.contenttypes.event.hide_date_description=false
+com.arsdigita.cms.contenttypes.event.hide_event_type=true
+com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
+com.arsdigita.cms.contenttypes.event.hide_main_contributor=true
+com.arsdigita.cms.contenttypes.event.use_html_date_description=false
+
+
 com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
+
 com.arsdigita.cms.contenttypes.mparticle.template=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+
 com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
-com.arsdigita.cms.hide_udct_ui=true
+
-com.arsdigita.cms.hide_folder_index_checkbox=true
 
 ;  atoz currently not in use
 ;  com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
+; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
-com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
-com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
-com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
+; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
+com.arsdigita.london.navigation.category_menu_show_grand_children=false
+; com.arsdigita.london.navigation.category_menu_show_nephews=false
+com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp
 
-; com.arsdigita.london.theme.default_theme_path=__ccm__/themes/shp
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws
-com.arsdigita.london.theme.default_theme_context=
-com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf
 com.arsdigita.london.search.show_sponsored_links=true
 
+com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes105neu?user\=zes&password\=zes47web
+com.arsdigita.london.theme.default_theme_context=
+com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf
+com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic
+com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl xml  
+
+
+; =============================================================================================
+; devel specific configurations
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes?user\=zes&password\=zes47web
 waf.runtime.jdbc_pool_size=80
+
 waf.web.server=localhost\:9000
 
 waf.admin.email=webmaster@zes.uni-bremen.de

ccm-zes-aplaws/bundles/devel/cfg/web.xml

@@ -4,7 +4,7 @@
 
 <web-app>
 
-  <display-name>CCM</display-name>
+  <display-name>CCM ZeS</display-name> 
   <description>Content and Collaboration Management</description>
 
   <!-- Require secure connection by redirect to host-port part
@@ -331,12 +331,13 @@
      MODULES SERVLET MAPPINGS SECTION
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <!-- module ccm-ldn-atoz  -  servlet mappings BEGIN  -->
+  <!-- module ccm-ldn-atoz  -  servlet mappings BEGIN  
+       NOT USED HERE
   <servlet-mapping>
     <servlet-name>atoz-files</servlet-name>
     <url-pattern>/ccm-ldn-atoz/files/*</url-pattern>
   </servlet-mapping>
-  <!-- module ccm-ldn-atoz  -  servlet mappings END  -->
+       module ccm-ldn-atoz  -  servlet mappings END  -->
 
   <!-- module ccm-forum  -  servlet mappings BEGIN  -->
   <servlet-mapping>

ccm-zes-aplaws/bundles/standard/cfg/applications.cfg

@@ -1,78 +0,0 @@
-# Main apps
-ccm-core
-ccm-cms
-
-# Content assets
-ccm-cms-assets-fileattachment
-ccm-cms-assets-notes
-ccm-cms-assets-relatedlink
-
-# Content types
-ccm-cms-types-address
-# -- ccm-cms-types-agenda
-ccm-cms-types-article
-ccm-cms-types-bookmark
-ccm-cms-types-contact
-# -- ccm-cms-types-esdservice
-ccm-cms-types-event
-#  --  faqitem koennte bei zes auch entfallen
-#      2008-06-07 auskommentiert, ist in Produktionssystem
-#      nicht enthalten und nicht anwählbar.
-# -- ccm-cms-types-faqitem
-ccm-cms-types-filestorageitem
-ccm-cms-types-formitem
-ccm-cms-types-formsectionitem
-#  --  glossaryitem koennte bei zes auch entfallen
-#      2008-06-07 auskommentiert, ist in Produktionssystem
-#      nicht enthalten und nicht anwählbar.
-# -- ccm-cms-types-glossaryitem
-# -- ccm-cms-types-htmlform
-# -- ccm-cms-types-inlinesite
-# -- ccm-cms-types-job
-# -- ccm-cms-types-legalnotice
-# -- ccm-cms-types-minutes
-# -- ccm-cms-types-motditem
-ccm-cms-types-mparticle
-ccm-cms-types-newsitem
-# -- ccm-cms-types-organization
-# -- ccm-cms-types-pressrelease
-# -- ccm-cms-types-service
-ccm-cms-types-siteproxy
-
-
-# Applications
-# ------------
-# -- ccm-auth-http
-# -- ccm-bookmarks
-# -- ccm-docmngr    ## temp., produces errors in build
-# -- ccm-formbuilder-pdf
-ccm-forum
-ccm-simplesurvey
-ccm-user-preferences
-# -- ccm-weblog
-# -- ccm-webpage
-
-# ldn extensions
-# --------------
-# -- ccm-ldn-aplaws
-# -- ccm-ldn-atoz
-# -- ccm-ldn-dublin
-# -- ccm-ldn-exporter
-# -- ccm-ldn-freeform
-ccm-ldn-image-step
-# -- ccm-ldn-importer
-ccm-ldn-navigation
-ccm-ldn-portal
-ccm-ldn-rss
-ccm-ldn-search
-ccm-ldn-shortcuts
-ccm-ldn-subsite
-ccm-ldn-terms
-ccm-ldn-theme
-ccm-ldn-util
-#  --  xmlfeed wird moeglicherweise ebenfalls nicht gebraucht
-ccm-ldn-xmlfeed
-
-# zes extensions
-ccm-zes-aplaws
-

ccm-zes-aplaws/bundles/standard/cfg/integration.properties

@@ -1,65 +0,0 @@
-; in core: Sucht PatternStyleSheet, u.a. um passende localization zu finden
-waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
-waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
-;
-waf.kernel.data_permission_check_enabled=false
-waf.kernel.primary_user_identifier=email
-waf.dispatcher.default_expiry=3600
-
-waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
-waf.pagemap.root=navigation/
-waf.pagemap.workspace=navigation/
-waf.pagemap.login_redirect=content/content-center-redirect.jsp
-
-com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
-com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
-com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
-
-com.arsdigita.cms.disable_item_pfs=true
-com.arsdigita.cms.use_section_categories=false
-com.arsdigita.cms.use_streamlined_creation=true
-com.arsdigita.cms.hide_templates_tab=true
-com.arsdigita.cms.hide_admin_tabs=true
-com.arsdigita.cms.hide_timezone=true
-com.arsdigita.cms.hide_launch_date=true
-
-com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js
-com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
-
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
-com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
-com.arsdigita.cms.contenttypes.mparticle.template=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
-com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
-com.arsdigita.cms.hide_udct_ui=true
-com.arsdigita.cms.hide_folder_index_checkbox=true
-
-;  atoz currently not in use
-;  com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-
-com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
-com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
-com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
-com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
-
-; com.arsdigita.london.theme.default_theme_path=__ccm__/themes/shp
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws
-com.arsdigita.london.theme.default_theme_context=
-com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf
-com.arsdigita.london.search.show_sponsored_links=true
-
-
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes105neu?user\=zes&password\=zes47web
-waf.runtime.jdbc_pool_size=80
-waf.web.server=localhost\:9000
-
-waf.admin.email=webmaster@zes.uni-bremen.de
-waf.admin.name.given=ZeS 
-waf.admin.name.family=Administrator
-waf.admin.password=nge2015
-waf.admin.password.question=12345 
-waf.admin.password.answer=6
-
-;  waf.debug=true
-;  waf.bebop.fancy_xsl_errors=true
-

ccm-zes-aplaws/bundles/standard/cfg/web.xml

@@ -1,552 +0,0 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
-
-  <display-name>CCM</display-name>
-  <description>Content and Collaboration Management</description>
-
-  <!-- Require secure connection by redirect to host-port part
-       of parameter waf.web.secure_server               
-       NOT USED with ZeS                                        
-  <filter>
-    <filter-name>secured</filter-name>
-    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
-  </filter>
-  -->
-  <!-- Initialize Profiler timers
-       NOT USED with ZeS standard / production                                  
-  <filter>
-    <filter-name>profiler</filter-name>
-    <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
-  </filter>
-  -->
-
-  <filter>
-    <filter-name>shortcuts</filter-name>
-    <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
-  </filter>
-
-  <filter>
-    <filter-name>subsite</filter-name>
-    <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
-  </filter>
-
-<!--    NOT USED HERE
-  <filter-mapping>
-    <filter-name>secured</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>/ccm/*</url-pattern>
-<!-- please check: with or w/o ccm?
-    <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>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     BASE SERVLET DECLARATIONS SECTION
-     basically requirred by ccm-core
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <servlet>
-    <servlet-name>reg</servlet-name>
-    <servlet-class>com.arsdigita.web.ContextRegistrationServlet</servlet-class>
-    <init-param>
-      <param-name>uri</param-name>
-      <param-value>/</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>legacy-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>ccm-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-    <init-param>
-      <param-name>fallback-servlet</param-name>
-      <param-value>legacy-dispatcher</param-value>
-    </init-param>
-    <load-on-startup>2</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>legacy-adapter</servlet-name>
-    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</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>versioning-log</servlet-name>
-    <servlet-class>com.arsdigita.versioning.VersioningServlet</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>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     ADDITIONAL SERVLET DECLARATIONS SECTION 
-     basically requirred by ccm-cms
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <servlet>
-    <servlet-name>content-section</servlet-name>
-    <servlet-class>com.arsdigita.cms.ContentSectionServlet</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>template-xsl</servlet-name>
-    <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
-  </servlet>
-
- <servlet>
-   <servlet-name>TextOnlyServlet</servlet-name>
-   <display-name>Text Only Servlet</display-name>
-   <servlet-class>
-    com.arsdigita.web.InternalPrefixerServlet
-   </servlet-class>
-   <init-param>
-     <param-name>prefix</param-name>
-     <param-value>/text</param-value>
-   </init-param>
- </servlet>
-
- <servlet>
-   <servlet-name>PrintFriendlyServlet</servlet-name>
-   <display-name>Printer Friendly Output Servlet</display-name>
-   <servlet-class>
-    com.arsdigita.web.InternalPrefixerServlet
-   </servlet-class>
-   <init-param>
-     <param-name>prefix</param-name>
-     <param-value>/print</param-value>
-   </init-param>
- </servlet>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     MODULES SERVLET DECLARATIONS SECTION
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN
-       NOT USED with ZeS   
-  <servlet>
-    <servlet-name>atoz-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-atoz</param-value>
-    </init-param>
-  </servlet>
-       module ccm-ldn-atoz  -  servlet definitions 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>portal-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-portal</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-ldn-navigation</param-value>
-    </init-param>
-    <init-param>
-      <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>portlet-type-xsl</servlet-name>
-    <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
-  </servlet>
- 
-  <!-- module ccm-ldn-rss  -  servlet declaration BEGIN   -->
-  <servlet>
-    <servlet-name>rss-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-rss</param-value>
-    </init-param>
-    <init-param>
-      <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.rss.RSSFileResolver</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-ldn-rss  -  servlet declaration END   -->
-
-  <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
-  <servlet>
-    <servlet-name>worker</servlet-name>
-    <servlet-class>com.arsdigita.london.search.SearchWorkerServlet</servlet-class>
-    <load-on-startup>4</load-on-startup>
-  </servlet>
-  
-  <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  -->
-
-  <!-- module ccm-ldn-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-ldn-shortcuts</param-value>
-    </init-param>
-  </servlet>
-
-  <!-- module ccm-ldn-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-ldn-subsite</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-ldn-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-themes  -  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-ldn-theme</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-     <servlet-name>ThemeDownload</servlet-name>
-     <servlet-class>com.arsdigita.london.theme.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.london.theme.dispatcher.InternalThemePrefixerServlet
-    </servlet-class>
-    <init-param>
-      <param-name>prefix</param-name>
-      <param-value>/theme</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-ldn-themes  -  servlet declarations END   -->
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     MODULES SERVLET MAPPINGS SECTION
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <!-- module ccm-ldn-atoz  -  servlet mappings BEGIN  -->
-  <servlet-mapping>
-    <servlet-name>atoz-files</servlet-name>
-    <url-pattern>/ccm-ldn-atoz/files/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-ldn-atoz  -  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>/__ccm__/servlet/portlet-type/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>portal-files</servlet-name>
-    <url-pattern>/ccm-ldn-portal/files/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- module ccm-ldn-rss  -  servlet mappings   -->
-  <servlet-mapping>
-    <servlet-name>rss-files</servlet-name>
-    <url-pattern>/ccm-ldn-rss/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  -->
-
-  <!-- module ccm-ldn-shortcuts  -  servlet mappings   -->
-  <servlet-mapping>
-    <servlet-name>shortcuts-files</servlet-name>
-    <url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- module ccm-ldn-subsite  -  servlet mappings BEGIN  -->
-  <servlet-mapping>
-    <servlet-name>subsite-files</servlet-name>
-    <url-pattern>/ccm-ldn-subsite/files/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-ldn-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-theme  -  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>ThemePreviewServlet</servlet-name>
-    <url-pattern>/theme/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-ldn-themes  -  servlet mappings END   -->
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     BASE SERVLET MAPPINGS SECTION
-     basically requirred by ccm-core
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <servlet-mapping>
-    <servlet-name>reg</servlet-name>
-    <url-pattern>/__ccm__/null/reg/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>ccm-dispatcher</servlet-name>
-    <url-pattern>/ccm/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/__ccm__/servlet/legacy-adapter/*</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>versioning-log</servlet-name>
-    <url-pattern>/versioning/*</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>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     ADDITIONAL SERVLET MAPPINGS SECTION
-     basically requirred by ccm-cms
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <servlet-mapping>
-    <servlet-name>content-section</servlet-name>
-    <url-pattern>/__ccm__/servlet/content-section/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>content-item-xsl</servlet-name>
-    <url-pattern>/__ccm__/servlet/content-item/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>content-type-xsl</servlet-name>
-    <url-pattern>/__ccm__/servlet/content-type/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>template-xsl</servlet-name>
-    <url-pattern>/__ccm__/servlet/template/*</url-pattern>
-  </servlet-mapping>
-
- <servlet-mapping>
-     <servlet-name>TextOnlyServlet</servlet-name>
-     <url-pattern>/text/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
-     <servlet-name>PrintFriendlyServlet</servlet-name>
-     <url-pattern>/print/*</url-pattern>
- </servlet-mapping>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     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.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.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>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>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     TAG LIBS
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <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>
-
-</web-app>

ccm-zes-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt

@@ -12,25 +12,25 @@ http://::host::/__ccm__/servlet/content-item/index.xsl?oid=::item_template_oid::
 
 # added by Quasimodo
 # Theme with single entry point (e.g Mandalay)
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/start.xsl
+http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/start.xsl
 
 # Theme, with optional locale & prefix
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
 
 # Theme, with optional locale
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::locale::.xsl
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/::application::-::url::.xsl
+http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::.xsl
 
 # APLAWS default, with locale and prefix
 # XXX change ROOT -> ccm-ldn-aplaws
-http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
-http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::.xsl
+http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl
 
 # APLAWS default, with locale
 # XXX change ROOT -> ccm-ldn-aplaws
-http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::locale::.xsl
+http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::locale::.xsl
-http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::.xsl
+http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::.xsl
 
 # Global default, from application's own web app
 http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::locale::.xsl

ccm-zes-aplaws/web/WEB-INF/web.xml-aplaws

@@ -4,9 +4,27 @@
 
 <web-app>
 
-  <display-name>CCM</display-name>
+  <display-name>CCM ZeS</display-name>
   <description>Content and Collaboration Management</description>
 
+
+  <!-- Require secure connection by redirect to host-port part
+       of parameter waf.web.secure_server               
+       NOT USED with ZeS                                        
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+  <!-- Initialize Profiler timers
+       NOT USED with ZeS standard / production                                  
+  <filter>
+    <filter-name>profiler</filter-name>
+    <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
+  </filter>
+  -->
+
+
   <filter>
     <filter-name>shortcuts</filter-name>
     <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
@@ -17,6 +35,20 @@
     <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
   </filter>
 
+
+<!--    NOT USED HERE
+  <filter-mapping>
+    <filter-name>secured</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>/ccm/*</url-pattern>
@@ -154,7 +186,8 @@
      MODULES SERVLET DECLARATIONS SECTION
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN   -->
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN      
+       NOT USED with ZeS
   <servlet>
     <servlet-name>atoz-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
@@ -163,7 +196,7 @@
       <param-value>/templates/ccm-ldn-atoz</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-atoz  -  servlet definitions END  -->
+       module ccm-ldn-atoz  -  servlet definitions END  -->
 
   <!-- module ccm-forum  -  servlet declarations BEGIN  -->  
   <servlet>
@@ -172,8 +205,6 @@
   </servlet>
   <!-- module ccm-forum  -  servlet declarations END    -->  
 
-<!-- XXX hack -->
-
   <servlet>
     <servlet-name>portal-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
@@ -306,6 +337,7 @@
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
   <!-- module ccm-ldn-atoz  -  servlet mappings BEGIN  - - >
+       NOT USED HERE
   <servlet-mapping>
     <servlet-name>atoz-files</servlet-name>
     <url-pattern>/ccm-ldn-atoz/files/*</url-pattern>

ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.xsl.NotUsedForNow

@@ -4,7 +4,12 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
 
+  <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application
   <xsl:import href="../../../../ccm-ldn-atoz/__ccm__/apps/atoz/xsl/index.xsl"/>
+  -->
+  <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed into the main CCM webapp
+  -->
+  <xsl:import href="../../../__ccm__/apps/atoz/xsl/index.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>

ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.xsl.NotUsedForNow

@@ -11,7 +11,13 @@
   exclude-result-prefixes="xsl bebop aplaws ui cms nav search atoz"
   version="1.0">
 
+  <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application
 <xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/>
+  -->
+
+  <!-- IMPORT DEFINITIONS ccm-ldn-atoz  installed into the main CCM webapp
+  -->
+  <xsl:import href="../../../__ccm__/apps/content-section/xsl/index.xsl"/>
 	
 <xsl:import href="lib/header.xsl"/>
 <xsl:import href="lib/lib.xsl"/>

ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl

@@ -35,12 +35,12 @@
 	      <xsl:if test="@addAction">
 	        <script LANGUAGE="JavaScript">
 	          <![CDATA[ <!-- begin script ]]>
-	          <![CDATA[ document.write('<a href="]]><xsl:value-of select="@addJSAction"/><![CDATA["><img src="/assets/action-add.png" border="0"/></a>')]]>
+	          <![CDATA[ document.write('<a href="]]><xsl:value-of select="@addJSAction"/><![CDATA["><img src="/assets/category-step/action-add.png" border="0"/></a>')]]>
 	          <![CDATA[ document.write("\<!--") ]]>
 	          <![CDATA[ // end script --> ]]>
 	        </script>
 	        <a href="{@addAction}">
-	          <img src="/assets/action-add.png" border="0"/>
+	          <img src="/assets/category-step/action-add.png" border="0"/>
 	        </a>
 	        <script LANGUAGE="JavaScript">
 	          <![CDATA[ <!-- begin script ]]>
@@ -78,7 +78,7 @@
 	              <li>
 	                <xsl:value-of select="substring(@path, string-length($name) + 5)"/>&#160;
 	                <xsl:if test="@deleteAction">
-	                  <a href="{@deleteAction}"><img src="/assets/action-delete.png" border="0"/></a>
+	                  <a href="{@deleteAction}"><img src="/assets/category-step/action-delete.png" border="0"/></a>
 	                  <xsl:text>&#160;</xsl:text>
 	                  <a href="{@deleteAction}">Remove</a>
 	                </xsl:if>
@@ -112,10 +112,10 @@
 
         if (elChildren.style.display != "block") {
            elChildren.style.display = "block";
-           elImg.src = "/assets/action-delete.png";
+           elImg.src = "/assets/category-step/action-delete.png";
         } else {
            elChildren.style.display = "none";
-           elImg.src = "/assets/action-add.png";
+           elImg.src = "/assets/category-step/action-add.png";
         }
         return true;
       }
@@ -205,14 +205,14 @@
 	      <xsl:choose>
 	        <xsl:when test="count(forum:category[@isEnabled = '1']) > 0 and $expand='none'">
 	          <a href="#" onClick="catToggle('{@nodeID}');">
-	             <img id="catTog{@nodeID}" src="/assets/action-add.png" width="14" height="14" border="0"/></a>
+	             <img id="catTog{@nodeID}" src="/assets/category-step/action-add.png" width="14" height="14" border="0"/></a>
 	        </xsl:when>
 	        <xsl:when test="count(forum:category[@isEnabled = '1']) > 0 and $expand!='none'">
-	          <a href="#" onClick="catToggle('{@nodeID}');"><img id="catTog{@nodeID}" src="/assets/action-delete.png" 
+	          <a href="#" onClick="catToggle('{@nodeID}');"><img id="catTog{@nodeID}" src="/assets/category-step/action-delete.png" 
 	                      width="14" height="14" border="0"/></a>
 	        </xsl:when>
 	        <xsl:otherwise>
-	          <img src="/assets/action-generic.png" width="14" height="14" border="0"/>
+	          <img src="/assets/category-step/action-generic.png" width="14" height="14" border="0"/>
 	        </xsl:otherwise>
 	      </xsl:choose>
 	      <a id="catLn{@nodeID}" href="#" style="padding-left: 6px; display: {$linkStyle}">

ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/portal/content-sections-portlet.xsl

@@ -18,7 +18,7 @@
   </div>
   <div>
     <a href="{@url}admin/index.jsp">
-      <img border="0" width="11" height="11" alt="admin" src="{$context-prefix}/assets/arrow-box.gif"/>
+      <img border="0" width="11" height="11" alt="admin" src="{$context-prefix}/assets/images/arrow-box.gif"/>
     </a>
     <a href="{@url}admin/index.jsp" class="action_link">admin</a>
   </div>