merge shp bundle into source tree

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

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

@@ -3,35 +3,71 @@ ccm-core
 ccm-cms
 
 # Content assets
+ccm-cms-assets-fileattachment
+ccm-cms-assets-notes
 ccm-cms-assets-relatedlink
-ccm-ldn-dublin
 
 # 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-esdservice
+ccm-cms-types-event
+ccm-cms-types-faqitem
 ccm-cms-types-filestorageitem
 ccm-cms-types-formitem
 ccm-cms-types-formsectionitem
-ccm-cms-types-inlinesite
+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-pressrelease
+# -- ccm-cms-types-organization
-ccm-cms-types-xmlfeed
+# -- ccm-cms-types-pressrelease
+# -- ccm-cms-types-service
+# -- ccm-cms-types-siteproxy
+
 
 # Applications
-ccm-ldn-util
+# ------------
-ccm-ldn-atoz
+# -- ccm-auth-http
-ccm-ldn-rss
+# -- ccm-bookmarks
-ccm-ldn-portal
+# -- 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-aplaws
-
-# Extra apps
-ccm-forum
-ccm-ldn-importer
 ccm-ldn-theme
+ccm-ldn-util
+# ccm-ldn-xmlfeed
+
+# shp extensions
+ccm-shp-aplaws
+
+
+

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

@@ -1,15 +1,19 @@
+; 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.dispatcher.default_expiry=3600
+
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
-waf.pagemap.root=portal/
+waf.pagemap.root=navigation/
-waf.pagemap.workspace=portal/
+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
@@ -17,31 +21,37 @@ 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.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
 
-com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+;  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.theme.default_theme_path=__ccm__/themes/aplaws
+com.arsdigita.london.theme.default_theme_path=__ccm__/themes/shp
 com.arsdigita.london.theme.default_theme_context=
-com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-aplaws.web.mf
+com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf
 com.arsdigita.london.search.show_sponsored_links=true
 
-com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
-waf.admin.email=admin@example.com
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccmtrunk?user\=ccm&password\=ccm
-waf.admin.name.given=Administrator
+waf.web.server=localhost\:9002
-waf.admin.name.family=Account
+
-waf.admin.password=123456
+waf.admin.email=webmaster@schaedel-hirnpatienten.de
+waf.admin.name.given=SHP 
+waf.admin.name.family=Administrator
+waf.admin.password=nge2015
 waf.admin.password.question=12345 
 waf.admin.password.answer=6
 
-com.arsdigita.aplaws.lite_load=true
 waf.debug=true
 waf.bebop.fancy_xsl_errors=true
+

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

@@ -4,9 +4,23 @@
 
 <web-app>
 
-  <display-name>CCM</display-name>
+  <display-name>CCM SHP</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 SHP                                        
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+
+  <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 +31,18 @@
     <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>
@@ -125,7 +151,6 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
-
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -154,7 +179,8 @@
      MODULES SERVLET DECLARATIONS SECTION
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN   -->
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN
+       NOT USED HERE   
   <servlet>
     <servlet-name>atoz-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
@@ -163,7 +189,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>
@@ -305,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>
@@ -470,7 +497,6 @@
      <url-pattern>/print/*</url-pattern>
  </servlet-mapping>
 
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      ERROR PAGES
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

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

@@ -3,36 +3,71 @@ ccm-core
 ccm-cms
 
 # Content assets
-ccm-cms-assets-relatedlink
 ccm-cms-assets-fileattachment
-ccm-ldn-dublin
+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-esdservice
+ccm-cms-types-event
+ccm-cms-types-faqitem
 ccm-cms-types-filestorageitem
 ccm-cms-types-formitem
 ccm-cms-types-formsectionitem
-ccm-cms-types-inlinesite
+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-pressrelease
+# -- ccm-cms-types-organization
-ccm-cms-types-xmlfeed
+# -- ccm-cms-types-pressrelease
+# -- ccm-cms-types-service
+# -- ccm-cms-types-siteproxy
+
 
 # Applications
-ccm-ldn-util
+# ------------
-ccm-ldn-atoz
+# -- ccm-auth-http
-ccm-ldn-rss
+# -- ccm-bookmarks
-ccm-ldn-portal
+# -- 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-aplaws
-
-# Extra apps
-ccm-forum
-ccm-ldn-importer
 ccm-ldn-theme
+ccm-ldn-util
+# ccm-ldn-xmlfeed
+
+# shp extensions
+ccm-shp-aplaws
+
+
+

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

@@ -1,36 +1,95 @@
-waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
+; in core: Sucht PatternStyleSheet, u.a. um passende localization zu finden
+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
+; wenn man screen_name aktiviert, klappt loader des Forums nicht.
+; waf.kernel.primary_user_identifier=screen_name
+waf.auto_registration_on=false
 waf.dispatcher.default_expiry=3600
+
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
-waf.pagemap.root=portal/
+; dhtml editor
-waf.pagemap.workspace=portal/
+waf.bebop.dhtml_editor=FCKeditor
+
+waf.categorization.show_internal_name=true
+waf.categorization.supported_languages=de,en
+
+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.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js
+; 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.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.hide_udct_ui=true
-com.arsdigita.cms.hide_folder_index_checkbox=true
 
-com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+com.arsdigita.cms.contenttypes.event.hide_main_contributor=true
-com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+com.arsdigita.cms.contenttypes.event.use_html_date_description=false
+com.arsdigita.cms.contenttypes.event.hide_event_type=true
+com.arsdigita.cms.contenttypes.event.hide_cost=true
+com.arsdigita.cms.contenttypes.event.hide_date_description=false
+com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
+
+com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
+
+;  atoz currently not in use
+;  com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 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-aplaws.web.mf
+com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf
+com.arsdigita.london.theme.file_extensions=jpeg jpg gif xsl css js png bmp xml
+
 com.arsdigita.london.search.show_sponsored_links=true
 
-com.arsdigita.london.cms.dublin.audience_domain=LGAL
+com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+com.arsdigita.london.navigation.category_menu_show_grand_children_min=2
+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=4
+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/shp-default.jsp
+
+
+; =============================================================================================
+
+waf.mail.default_from=webmaster@schaedel-hirnpatienten.de
+
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/shp?user\=shp&password\=shp48web
+waf.runtime.jdbc_pool_size=80
+waf.web.server=localhost\:9000
+
+waf.admin.email=webmaster@schaedel-hirnpatienten.de
+waf.admin.name.given=SHP 
+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-shp-aplaws/bundles/standard/cfg/web.xml

@@ -7,6 +7,23 @@
   <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 SHP                                        
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+
+  <!-- Initialize Profiler timers
+       NOT USED with SHP 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 +34,18 @@
     <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>
@@ -125,7 +154,6 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
-
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -154,7 +182,8 @@
      MODULES SERVLET DECLARATIONS SECTION
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN   -->
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN   
+       NOT USED HERE  
   <servlet>
     <servlet-name>atoz-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
@@ -163,7 +192,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>
@@ -305,12 +334,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>