From bf2f522ae6e8630ca12a87dfd978b97ac7c2a71a Mon Sep 17 00:00:00 2001 From: pb Date: Fri, 16 Dec 2011 22:36:18 +0000 Subject: [PATCH] Nachtrag Version 1.1.6 IAW und Modifikation von local in bundle, siehe README. git-svn-id: https://svn.libreccm.org/ccm/trunk@1368 8810af33-2d31-482b-a856-94f89814c4df --- ...bles.sql => create_publish_lock_table.sql} | 22 +- ccm-cms/src/com/arsdigita/cms/CMSConfig.java | 2 +- .../src/com/arsdigita/bebop/BebopConfig.java | 76 +-- .../bundles/demo/cfg/integration.properties | 13 +- ccm-sci-bundle/bundles/local/README | 29 + ccm-sci-bundle/bundles/local/iaw-dev/AUTHORS | 0 .../bundles/local/iaw-dev/ChangeLog | 9 - ccm-sci-bundle/bundles/local/iaw-dev/NEWS | 0 ccm-sci-bundle/bundles/local/iaw-dev/README | 0 .../bundles/local/iaw-dev/bundle.in | 4 - .../local/iaw-dev/cfg/integration.properties | 144 ----- .../bundles/local/iaw-dev/cfg/project.xml | 166 ------ .../bundles/local/iaw-dev/cfg/web-iaw.xml | 540 ----------------- .../bundle/categories/iaw-nav-domain-1.00.xml | 55 -- .../categories/iaw-nav-hierarchy-1.00.xml | 247 -------- .../res/bundle/navigation/iaw-templates.txt | 11 - .../local/iaw-dev/res/placeholder.info | 3 - .../ccm-navigation/navigation/iaw-archive.jsp | 83 --- .../ccm-navigation/navigation/iaw-events.jsp | 83 --- .../local/iaw-dev/templates/placeholder.info | 12 - .../bundles/local/iaw-dev/themes/README | 13 - .../bundles/local/iaw-dev/themes/master/dummy | 1 - ccm-sci-bundle/bundles/local/zes-dev/AUTHORS | 0 .../bundles/local/zes-dev/ChangeLog | 9 - ccm-sci-bundle/bundles/local/zes-dev/NEWS | 0 ccm-sci-bundle/bundles/local/zes-dev/README | 0 .../bundles/local/zes-dev/bundle.in | 4 - .../local/zes-dev/cfg/applications.cfg | 58 -- .../local/zes-dev/cfg/integration.properties | 147 ----- .../bundles/local/zes-dev/cfg/project.xml | 107 ---- .../bundles/local/zes-dev/cfg/web.xml | 558 ------------------ ccm-sci-bundle/bundles/local/zes-std/AUTHORS | 0 .../bundles/local/zes-std/ChangeLog | 9 - ccm-sci-bundle/bundles/local/zes-std/NEWS | 0 ccm-sci-bundle/bundles/local/zes-std/README | 0 .../bundles/local/zes-std/bundle.in | 4 - .../local/zes-std/cfg/integration.properties | 145 ----- .../bundles/local/zes-std/cfg/project.xml | 126 ---- .../bundles/local/zes-std/cfg/web.xml | 558 ------------------ .../bundle/categories/zes-nav-domain-1.00.xml | 48 -- .../categories/zes-nav-hierarchy-1.00.xml | 229 ------- .../local/zes-std/res/placeholder.info | 3 - .../navigation/SciDepartment-index.jsp | 67 --- .../navigation/SciDepartmentActiveMembers.jsp | 56 -- .../SciDepartmentAssociatedMembers.jsp | 57 -- .../navigation/SciDepartmentDescription.jsp | 50 -- .../SciDepartmentFinishedProjects.jsp | 60 -- .../navigation/SciDepartmentFormerMembers.jsp | 56 -- .../navigation/SciDepartmentMembers.jsp | 55 -- .../SciDepartmentOngoingProjects.jsp | 60 -- .../navigation/SciDepartmentProjects.jsp | 54 -- .../SciDepartmentSubDepartments.jsp | 54 -- .../navigation/SciMember-index.jsp | 70 --- .../navigation/SciOrganization-index.jsp | 67 --- .../SciOrganizationActiveMembers.jsp | 58 -- .../SciOrganizationAssociatedMembers.jsp | 58 -- .../navigation/SciOrganizationDepartments.jsp | 54 -- .../navigation/SciOrganizationDescription.jsp | 50 -- .../SciOrganizationFinishedProjects.jsp | 61 -- .../SciOrganizationFormerMembers.jsp | 57 -- .../navigation/SciOrganizationMembers.jsp | 56 -- .../SciOrganizationOngoingProjects.jsp | 61 -- .../navigation/SciOrganizationProjects.jsp | 56 -- .../navigation/SciProjectList.jsp | 67 --- .../navigation/placeholder.info | 12 - .../local/zes-std/templates/placeholder.info | 12 - .../bundles/local/zes-std/themes/README | 13 - .../bundles/local/zes-std/themes/master/dummy | 1 - .../default/6.6.0-6.6.1/upd_cms_tables.sql | 26 + .../upgrade/oracle-se-6.6.0-6.6.1.sql | 10 +- .../upgrade/postgres-6.6.0-6.6.1.sql | 3 + 71 files changed, 123 insertions(+), 4756 deletions(-) rename ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/{cleanup_some_tables.sql => create_publish_lock_table.sql} (63%) create mode 100644 ccm-sci-bundle/bundles/local/README delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/AUTHORS delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/ChangeLog delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/NEWS delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/README delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/bundle.in delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/cfg/web-iaw.xml delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/res/bundle/categories/iaw-nav-domain-1.00.xml delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/res/bundle/categories/iaw-nav-hierarchy-1.00.xml delete mode 100755 ccm-sci-bundle/bundles/local/iaw-dev/res/bundle/navigation/iaw-templates.txt delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/res/placeholder.info delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/templates/ccm-navigation/navigation/iaw-archive.jsp delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/templates/ccm-navigation/navigation/iaw-events.jsp delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/templates/placeholder.info delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/themes/README delete mode 100644 ccm-sci-bundle/bundles/local/iaw-dev/themes/master/dummy delete mode 100644 ccm-sci-bundle/bundles/local/zes-dev/AUTHORS delete mode 100644 ccm-sci-bundle/bundles/local/zes-dev/ChangeLog delete mode 100644 ccm-sci-bundle/bundles/local/zes-dev/NEWS delete mode 100644 ccm-sci-bundle/bundles/local/zes-dev/README delete mode 100644 ccm-sci-bundle/bundles/local/zes-dev/bundle.in delete mode 100644 ccm-sci-bundle/bundles/local/zes-dev/cfg/applications.cfg delete mode 100644 ccm-sci-bundle/bundles/local/zes-dev/cfg/integration.properties delete mode 100644 ccm-sci-bundle/bundles/local/zes-dev/cfg/project.xml delete mode 100644 ccm-sci-bundle/bundles/local/zes-dev/cfg/web.xml delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/AUTHORS delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/ChangeLog delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/NEWS delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/README delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/bundle.in delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/cfg/integration.properties delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/cfg/project.xml delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/cfg/web.xml delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/res/bundle/categories/zes-nav-domain-1.00.xml delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/res/bundle/categories/zes-nav-hierarchy-1.00.xml delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/res/placeholder.info delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartment-index.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentActiveMembers.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentAssociatedMembers.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentDescription.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentFinishedProjects.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentFormerMembers.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentMembers.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentOngoingProjects.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentProjects.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentSubDepartments.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciMember-index.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganization-index.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationActiveMembers.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationAssociatedMembers.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationDepartments.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationDescription.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationFinishedProjects.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationFormerMembers.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationMembers.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationOngoingProjects.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciOrganizationProjects.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciProjectList.jsp delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/placeholder.info delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/templates/placeholder.info delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/themes/README delete mode 100644 ccm-sci-bundle/bundles/local/zes-std/themes/master/dummy create mode 100644 ccm-subsite/sql/ccm-subsite/upgrade/default/6.6.0-6.6.1/upd_cms_tables.sql diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/cleanup_some_tables.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/create_publish_lock_table.sql similarity index 63% rename from ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/cleanup_some_tables.sql rename to ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/create_publish_lock_table.sql index 4104edfe8..f55e32217 100644 --- a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/cleanup_some_tables.sql +++ b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/create_publish_lock_table.sql @@ -1,4 +1,5 @@ -- +-- Copyright (C) 2011 Jens Pelzetter All Rights Reserved. -- -- This library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public License @@ -14,18 +15,17 @@ -- License along with this library; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- --- $Id: cleanup_tables.sql pboy $ +-- $Id: create_publish_lock_table.sql pboy $ --- db staatsschiff-114, wsf-114 --- ALTER TABLE ONLY cms_persons --- DROP CONSTRAINT cms_persons_alias_id_fkey; --- db iaw-114 -ALTER TABLE ONLY cms_persons - DROP CONSTRAINT cms_persons_aliasid_fkey; -ALTER TABLE cms_persons - ADD CONSTRAINT cms_persons_alias_id_f_uaoxu FOREIGN KEY (alias_id) - REFERENCES cms_persons (person_id) MATCH SIMPLE - ON UPDATE NO ACTION ON DELETE NO ACTION; +CREATE TABLE cms_publish_lock ( + lock_id integer NOT NULL, + locked_oid character varying(2048), + lock_timestamp timestamp with time zone, + action character varying(256) +); + +ALTER TABLE ONLY cms_publish_lock + ADD CONSTRAINT cms_publis_loc_lock_id_p_8n7d0 PRIMARY KEY (lock_id); diff --git a/ccm-cms/src/com/arsdigita/cms/CMSConfig.java b/ccm-cms/src/com/arsdigita/cms/CMSConfig.java index c0aa466ba..e84cc9a78 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSConfig.java +++ b/ccm-cms/src/com/arsdigita/cms/CMSConfig.java @@ -192,7 +192,7 @@ public final class CMSConfig extends AbstractConfig { new DHTMLEditorConfigParameter( "com.arsdigita.cms.dhtml_editor_config", Parameter.REQUIRED, - new DHTMLEditor.Config("XinhaConfig", + new DHTMLEditor.Config("Xinha.Config", "/assets/xinha/CCMcmsXinhaConfig.js")); // previous parameter definition: // > DHTMLEditor.Config.STANDARD); < diff --git a/ccm-core/src/com/arsdigita/bebop/BebopConfig.java b/ccm-core/src/com/arsdigita/bebop/BebopConfig.java index 00349b146..776fbc77d 100755 --- a/ccm-core/src/com/arsdigita/bebop/BebopConfig.java +++ b/ccm-core/src/com/arsdigita/bebop/BebopConfig.java @@ -40,42 +40,50 @@ public final class BebopConfig extends AbstractConfig { private static final Logger s_log = Logger.getLogger(BebopConfig.class); - private final Parameter m_presenter; - private final Parameter m_page; - /** Pointer to JTidy validation listener config file */ - private final Parameter m_tidy; - private final Parameter m_fancyErrors; - private final Parameter m_dcpOnButtons; - private final Parameter m_dcpOnLinks; - private final Parameter m_enableTreeSelect; + /** + * + */ + private final Parameter m_presenter = new SingletonParameter + ("waf.bebop.presentation_manager", Parameter.REQUIRED, + new PageTransformer()); + /** + * + */ + private final Parameter m_page = new ClassParameter + ("waf.bebop.base_page", Parameter.REQUIRED, SimplePage.class); + /** Pointer to JTidy validation listener config file */ + private final Parameter m_tidy = new StringParameter + ("waf.bebop.tidy_config_file", Parameter.REQUIRED, + "com/arsdigita/bebop/parameters/tidy.properties"); + private final Parameter m_fancyErrors = new BooleanParameter + ("waf.bebop.fancy_xsl_errors", + Parameter.REQUIRED, + Boolean.FALSE); + /** Double Click Protection, enabled by default for all buttons in a form.*/ + private final Parameter m_dcpOnButtons = new BooleanParameter + ("waf.bebop.dcp_on_buttons", Parameter.REQUIRED, Boolean.TRUE); + /** Double Click Protection, disabled by default for all links. */ + private final Parameter m_dcpOnLinks = new BooleanParameter + ("waf.bebop.dcp_on_links", Parameter.REQUIRED, Boolean.FALSE); + /** + * + */ + private final Parameter m_enableTreeSelect = new BooleanParameter + ("waf.bebop.enable_tree_select_attribute", + Parameter.REQUIRED, + Boolean.FALSE); /** List of supported DHTML editors, first one is default (Xinha) */ private final EnumerationParameter m_dhtmlEditor; /** Path to DHTML editor source file, relativ to document root */ private final Parameter m_dhtmlEditorSrcFile; - private final Parameter m_showClassName; + /** */ + private final Parameter m_showClassName = new BooleanParameter + ("waf.bebop.show_class_name", Parameter.OPTIONAL, Boolean.FALSE); + /** + * + */ public BebopConfig() { - m_presenter = new SingletonParameter - ("waf.bebop.presentation_manager", Parameter.REQUIRED, - new PageTransformer()); - - m_page = new ClassParameter - ("waf.bebop.base_page", Parameter.REQUIRED, SimplePage.class); - - /* Pointer to JTidy validation listener config file */ - m_tidy = new StringParameter - ("waf.bebop.tidy_config_file", Parameter.REQUIRED, - "com/arsdigita/bebop/parameters/tidy.properties"); - - m_fancyErrors = new BooleanParameter - ("waf.bebop.fancy_xsl_errors", - Parameter.REQUIRED, - Boolean.FALSE); - - m_enableTreeSelect = new BooleanParameter - ("waf.bebop.enable_tree_select_attribute", - Parameter.REQUIRED, - Boolean.FALSE); /** List of supported DHTML editors, first one is default (Xinha) */ m_dhtmlEditor = new EnumerationParameter("waf.bebop.dhtml_editor", @@ -89,14 +97,6 @@ public final class BebopConfig extends AbstractConfig { m_dhtmlEditorSrcFile = new StringParameter ("waf.bebop.dhtml_editor_src", Parameter.REQUIRED, "/assets/xinha/XinhaLoader.js"); - - m_dcpOnButtons = new BooleanParameter - ("waf.bebop.dcp_on_buttons", Parameter.REQUIRED, Boolean.TRUE); - m_dcpOnLinks = new BooleanParameter - ("waf.bebop.dcp_on_links", Parameter.REQUIRED, Boolean.FALSE); - - m_showClassName = new BooleanParameter - ("waf.bebop.show_class_name", Parameter.OPTIONAL, Boolean.FALSE); register(m_presenter); register(m_page); diff --git a/ccm-sci-bundle/bundles/demo/cfg/integration.properties b/ccm-sci-bundle/bundles/demo/cfg/integration.properties index 574defac3..389ba1ead 100644 --- a/ccm-sci-bundle/bundles/demo/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/demo/cfg/integration.properties @@ -5,7 +5,8 @@ waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage ; dhtml editor to use (system wide) ; Xinha is default ; default: Xinha editor & src=/assets/xinha/XinhaLoader.js -#waf.bebop.dhtml_editor=FCKeditor +; To use FCKeditor configure: +; waf.bebop.dhtml_editor=FCKeditor waf.categorization.show_internal_name=true @@ -45,18 +46,16 @@ com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver ; Configure dhtml editor for use in cms content-center -; Xinha is default and should work out of the box -; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/XinhaConfig.js -; as a temporary measure a different configuration file which includes a link selection box for CCM items -; and CCM images should be specified: -com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/CCMcmsXinhaConfig.js +; Xinha is default and does work out of the box +; A CCM specific configuration file is used to prevent a mess with the standard +; configuration, default is: +; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/CCMcmsXinhaConfig.js ; to use FCKeditor: ; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js ; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/XinhaConfig.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 diff --git a/ccm-sci-bundle/bundles/local/README b/ccm-sci-bundle/bundles/local/README new file mode 100644 index 000000000..1910183a3 --- /dev/null +++ b/ccm-sci-bundle/bundles/local/README @@ -0,0 +1,29 @@ +This directory should host custom site specific bundles which are not +to be stored in the central software repository. + +For each site specific bundle a subdirectory should be created which +in turn hosts the bundles subdirectories cfg, res, templates and themes. + +Example: + +~/local/mysite +~/local/mysite/cfg +~/local/mysite/res +~/local/mysite/templates +~/local/mysite/themes + +This site specific bundle is activated in local.ccm.properties by: + +> ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/local/mysite + +By default subversion is configured to ignore all unversioned lower case +names in this directory so the directory mysite will not be stored in +repository. + +Instead it is recommended to store the bundle either in a seperate +respository or in its own branch in the repository, eg. + +> svn import -m 'Save mysite.' mysite https://myrepo.dom/svn/bundles/mysite + +If other versioning systems are used their configuration should be created +accordingly. diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/AUTHORS b/ccm-sci-bundle/bundles/local/iaw-dev/AUTHORS deleted file mode 100644 index e69de29bb..000000000 diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/ChangeLog b/ccm-sci-bundle/bundles/local/iaw-dev/ChangeLog deleted file mode 100644 index 786623bdb..000000000 --- a/ccm-sci-bundle/bundles/local/iaw-dev/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -* Thu Sep 22 2005 Alan Pevec -- Build all APLAWS+ bundles from the common set of templates. - -* Mon Feb 21 2005 Alan Pevec -- Requires applications. - -* Mon Jan 26 2004 Daniel Berrange -- Initial build. - diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/NEWS b/ccm-sci-bundle/bundles/local/iaw-dev/NEWS deleted file mode 100644 index e69de29bb..000000000 diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/README b/ccm-sci-bundle/bundles/local/iaw-dev/README deleted file mode 100644 index e69de29bb..000000000 diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/bundle.in b/ccm-sci-bundle/bundles/local/iaw-dev/bundle.in deleted file mode 100644 index 093aac421..000000000 --- a/ccm-sci-bundle/bundles/local/iaw-dev/bundle.in +++ /dev/null @@ -1,4 +0,0 @@ -BUNDLE_NAME=aplaws-plus-zes-devel -BUNDLE_PRETTY_NAME="APLAWS+ ZeS Devel Bundle" -VERSION=1.1.2devel -RELEASE=1 diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties deleted file mode 100644 index ea6e2453b..000000000 --- a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties +++ /dev/null @@ -1,144 +0,0 @@ -# Scientific CMS IAW-devel bundle integration.properties -# -waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage -# -; dhtml editor to use (system wide) -; Xinha is default -; default: Xinha editor & src=/assets/xinha/XinhaLoader.js -#waf.bebop.dhtml_editor=FCKeditor - -waf.categorization.show_internal_name=true - -waf.dispatcher.default_expiry=3600 -; -waf.kernel.data_permission_check_enabled=false -waf.kernel.primary_user_identifier=email -; if you activate screen_name, forum loader does not work. -; waf.kernel.primary_user_identifier=screen_name -waf.kernel.supported_languages=de,en - -; security.properties: -waf.auto_registration_on=false - -; Searches for localized style sheet (among others) -waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver -waf.templating.stylesheet_paths=/WEB-INF/resources/scientificCMS-stylesheet-paths.txt - -core.ui.pagemap.root_page_url=navigation/ -core.ui.pagemap.workspace_url=navigation/ -core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp - -; workflow configuration -waf.workflow.simple.alerts_enabled=true -waf.workflow.simple.alerts_sender=root@localhost.localdomain - -; Configures the xml processing -waf.xml.xsl_transformer=xalan -waf.xml.activate_full_date_formatter=true - -# ccm-cms parameters - -com.arsdigita.cms.category_authoring_add_form=com.arsdigita.bundle.ui.ItemCategoryPicker - -com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp -com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp -com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver - -; Configure dhtml editor for use in cms content-center -; Xinha is default and should work out of the box -; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/XinhaConfig.js -; as a temporary measure a different configuration file which includes a link selection box for CCM items -; and CCM images should be specified: -com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/CCMcmsXinhaConfig.js - -; to use FCKeditor: -; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js -; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/XinhaConfig.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 - - -# ccm-cms-types-event parameters -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.event.start_year=2000 -com.arsdigita.cms.contenttypes.event.end_year_delta=5 - - -# ccm-cms-types-newsitem parameters -com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true -com.arsdigita.cms.contenttypes.newsitem.start_year=2000 -com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5 - - -# Forum application -#com.arsdigita.forum.show_new_tabs=true -#com.arsdigita.forum.use_wysiwyg_editor=true -#com.arsdigita.forum.allow_quick_finish=true -#com.arsdigita.forum.disable_page_caching=true - - -# ccm-navigation application -com.arsdigita.navigation.category_menu_show_grand_children=false -com.arsdigita.navigation.default_cat_root_path=/navigation/ -com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/sci-default.jsp -com.arsdigita.navigation.templates_file=bundle/navigation/iaw-templates.txt - - -# ccm-ldn-search application -com.arsdigita.london.search.show_sponsored_links=true - - -# ccm-ldn-subsite application -com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker - - -# ccm-ldn-themedirector application -themedirector.default_theme_context= -# themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf -themedirector.default_theme_path=themes/static/aplaws-generic -themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl - - -# ccm-sci-bundle (Loader only) -com.arsdigita.bundle.loader.category_files=bundle/categories/iaw-nav-domain-1.00.xml,bundle/catgegories/iaw-nav-hierarchy-1.00.xml -com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/generic/,STD-NAV:/portal/ - -# ============================================================================================= -# runtime specific configurations - -waf.admin.email=webmaster@iaw.uni-bremen.de -waf.admin.name.given=IAW -waf.admin.name.family=Administrator -waf.admin.password=nge2015 -waf.admin.password.question=12345 -waf.admin.password.answer=6 - -waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/iaw-test?user\=iaw&password\=iaw24&stringtype\=unspecified -waf.runtime.jdbc_pool_size=40 - -waf.web.server=localhost\:8080 - - -# ============================================================================================= -# devel specific configurations -waf.debug=true -waf.bebop.fancy_xsl_errors=true - diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml deleted file mode 100644 index cf3fbebbe..000000000 --- a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/web-iaw.xml b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/web-iaw.xml deleted file mode 100644 index cf6d0d318..000000000 --- a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/web-iaw.xml +++ /dev/null @@ -1,540 +0,0 @@ - - - - CCM IAW (DEVEL) - Content and Collaboration Management for Scientific Institutions - - - - log4j-conf-file - WEB-INF/conf/log4j.properties - - - - - - - - shortcuts - com.arsdigita.london.shortcuts.ShortcutFilter - - - - subsite - com.arsdigita.london.subsite.SubsiteFilter - - - - - - subsite - /* - - - - shortcuts - /* - - - - - com.arsdigita.web.CCMApplicationContextListener - - - - - - reg - com.arsdigita.web.ContextRegistrationServlet - - uri - / - - 1 - - - - legacy-dispatcher - com.arsdigita.sitenode.SiteNodeDispatcher - 3 - - - - ccm-dispatcher - com.arsdigita.web.DispatcherServlet - - fallback-servlet - legacy-dispatcher - - 2 - - - - legacy-adapter - com.arsdigita.web.LegacyAdapterServlet - - - - cache-manager - com.arsdigita.caching.CacheServlet - - - - db-test - com.arsdigita.web.monitoring.DBTestServlet - - - - versioning-log - com.arsdigita.versioning.VersioningServlet - - - - oid-redirect - com.arsdigita.web.OIDRedirectServlet - - - - resource-resolver - com.arsdigita.web.ResourceServlet - - - - - - content-section - com.arsdigita.cms.ContentSectionServlet - - - - content-type-xsl - com.arsdigita.cms.dispatcher.ContentTypeXSLServlet - - - - content-item-xsl - com.arsdigita.cms.dispatcher.ContentItemXSLServlet - - - - template-xsl - com.arsdigita.cms.dispatcher.TemplateXSLServlet - - - - TextOnlyServlet - Text Only Servlet - - com.arsdigita.web.InternalPrefixerServlet - - - prefix - /text - - - - - PrintFriendlyServlet - Printer Friendly Output Servlet - - com.arsdigita.web.InternalPrefixerServlet - - - prefix - /print - - - - - - - - - forum-main - com.arsdigita.forum.ForumServlet - - - - - portalworkspace-files - com.arsdigita.web.ApplicationFileServlet - - template-path - /templates/ccm-portalworkspace - - - - - navigation-files - com.arsdigita.web.ApplicationFileServlet - - template-path - /templates/ccm-navigation - - - file-resolver - com.arsdigita.navigation.NavigationFileResolver - - - - - portlet-type-xsl - com.arsdigita.dispatcher.PortletTypeXSLServlet - - - - - rss-files - com.arsdigita.web.ApplicationFileServlet - - template-path - /templates/ccm-ldn-rss - - - file-resolver - com.arsdigita.london.rss.RSSFileResolver - - - - - - - worker - com.arsdigita.london.search.SearchWorkerServlet - 4 - - - - search-files - com.arsdigita.web.ApplicationFileServlet - - template-path - /templates/ccm-ldn-search - - - - - AxisServlet - Apache-Axis Servlet - - org.apache.axis.transport.http.AxisServlet - - - - - - - shortcuts-files - com.arsdigita.web.ApplicationFileServlet - - template-path - /templates/ccm-ldn-shortcuts - - - - - - subsite-files - com.arsdigita.web.ApplicationFileServlet - - template-path - /templates/ccm-ldn-subsite - - - - - - - terms-files - com.arsdigita.web.ApplicationFileServlet - - template-path - /templates/ccm-ldn-terms - - - - - - - theme-files - com.arsdigita.web.ApplicationFileServlet - - template-path - /templates/ccm-themedirector - - - - - ThemeDownload - com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet - - - - ThemePreviewServlet - Servlet to allow admins to preview look/feel - - com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet - - - prefix - /theme - - - - - - - - - - forum-main - /forum-main/main/* - - - - - portlet-type-xsl - /__ccm__/servlet/portlet-type/* - - - - portalworkspace-files - /ccm-portalworkspace/files/* - - - - navigation-files - /ccm-navigation/files/* - - - - - rss-files - /ccm-ldn-rss/files/* - - - - - search-files - /ccm-ldn-search/files/* - - - - AxisServlet - /services/* - - - - - - shortcuts-files - /ccm-ldn-shortcuts/files/* - - - - - subsite-files - /ccm-ldn-subsite/files/* - - - - - - terms-files - /ccm-ldn-terms/files/* - - - - - - theme-files - /theme-files/* - - - - ThemeDownload - /theme-files/download/* - - - - ThemePreviewServlet - /theme/* - - - - - - - - reg - /__ccm__/null/reg/* - - - - ccm-dispatcher - /ccm/* - - - - legacy-adapter - /__ccm__/servlet/legacy-adapter/* - - - - cache-manager - /expireCache/* - - - - db-test - /dbtest - - - - versioning-log - /versioning/* - - - - oid-redirect - /redirect/* - - - - resource-resolver - /resource/* - - - - - - content-section - /__ccm__/servlet/content-section/* - - - - content-item-xsl - /__ccm__/servlet/content-item/* - - - - content-type-xsl - /__ccm__/servlet/content-type/* - - - - template-xsl - /__ccm__/servlet/template/* - - - - TextOnlyServlet - /text/* - - - - PrintFriendlyServlet - /print/* - - - - - - com.arsdigita.dispatcher.AccessDeniedException - /error/access-denied.jsp - - - - com.arsdigita.dispatcher.ObjectNotFoundException - /error/object-not-found.jsp - - - - com.arsdigita.kernel.permissions.PermissionException - /error/permission-denied.jsp - - - - com.arsdigita.persistence.DbNotAvailableException - /error/db-not-available.jsp - - - - com.arsdigita.db.DbNotAvailableException - /error/db-not-available.jsp - - - - java.lang.Exception - /error/general.jsp - - - - java.lang.Error - /error/general.jsp - - - - - - /WEB-INF/bebop-show.tld - /WEB-INF/bebop-show.tld - - - - /WEB-INF/bebop-define.tld - /WEB-INF/bebop-define.tld - - - diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/res/bundle/categories/iaw-nav-domain-1.00.xml b/ccm-sci-bundle/bundles/local/iaw-dev/res/bundle/categories/iaw-nav-domain-1.00.xml deleted file mode 100644 index 3123c67d8..000000000 --- a/ccm-sci-bundle/bundles/local/iaw-dev/res/bundle/categories/iaw-nav-domain-1.00.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/res/bundle/categories/iaw-nav-hierarchy-1.00.xml b/ccm-sci-bundle/bundles/local/iaw-dev/res/bundle/categories/iaw-nav-hierarchy-1.00.xml deleted file mode 100644 index 441260d0b..000000000 --- a/ccm-sci-bundle/bundles/local/iaw-dev/res/bundle/categories/iaw-nav-hierarchy-1.00.xml +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/res/bundle/navigation/iaw-templates.txt b/ccm-sci-bundle/bundles/local/iaw-dev/res/bundle/navigation/iaw-templates.txt deleted file mode 100755 index 8a09ac6c9..000000000 --- a/ccm-sci-bundle/bundles/local/iaw-dev/res/bundle/navigation/iaw-templates.txt +++ /dev/null @@ -1,11 +0,0 @@ -ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/sci-default.jsp -ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/sci-recent.jsp -ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/sci-atoz.jsp -ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/sci-events.jsp -ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/sci-portal.jsp -ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/sci-portal-welcome.jsp -ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/sci-welcome.jsp -ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/SpecializingList.jsp -ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/SciPublicationList.jsp -IAW Events Page,IAW Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/iaw-events.jsp -IAW Archive Page,IAW Archive Page ordering ??? in ??? order,/templates/ccm-navigation/navigation/iaw-archive.jsp diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/res/placeholder.info b/ccm-sci-bundle/bundles/local/iaw-dev/res/placeholder.info deleted file mode 100644 index 5ae76207c..000000000 --- a/ccm-sci-bundle/bundles/local/iaw-dev/res/placeholder.info +++ /dev/null @@ -1,3 +0,0 @@ -Subdirectory may optionally contain one or more local site specific -import xml files for Terms domain categories. - diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/templates/ccm-navigation/navigation/iaw-archive.jsp b/ccm-sci-bundle/bundles/local/iaw-dev/templates/ccm-navigation/navigation/iaw-archive.jsp deleted file mode 100644 index a6c4f9273..000000000 --- a/ccm-sci-bundle/bundles/local/iaw-dev/templates/ccm-navigation/navigation/iaw-archive.jsp +++ /dev/null @@ -1,83 +0,0 @@ -<%-- - Document : iaw-archive - Created on : 20.03.2011, 22:57:33 - Author : pb ---%> - - - - - - - - - - - long age = Navigation.getConfig().getIndexPageCacheLifetime(); - if (age == 0) { - DispatcherHelper.cacheDisable(response); - } else { - DispatcherHelper.cacheForWorld(response, (int)age); - } - - - - - - - - - - - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event"); - - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setSQLFilter("(endDate <= :today) or (endDate is null and startDate <= :today)"); - - // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings - // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren. - // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen. - // Komplizierter geht's wohl nicht mehr. - java.util.GregorianCalendar now = new java.util.GregorianCalendar(); - java.util.Date today = (new java.util.GregorianCalendar(now.get(java.util.GregorianCalendar.YEAR), - now.get(java.util.GregorianCalendar.MONTH), - now.get(java.util.GregorianCalendar.DATE))).getTime(); - // Im Event-CT ist das Datum als SQL-Type Date eingetragen, die Uhrzeit aber als SQL-Typ timestamptz. Leider wird von ccm im letzten - // das Datum nicht gesetzt, so daß der Timestamp immer eine Uhrzeit am 1.1.1970 angibt. Das ist ziemlich bescheuert und macht hier - // diesen kompliezierten Vergleich notwendig. Sonst könnte man einfach mit dem aktuellen Timestamp vergleichen. - java.util.Date time = (new java.util.GregorianCalendar(70,0,1, // this is 01.01.1970 - start of UNIX timestamp - now.get(java.util.GregorianCalendar.HOUR_OF_DAY), - now.get(java.util.GregorianCalendar.MINUTE), - now.get(java.util.GregorianCalendar.SECOND))).getTime(); - - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setParameter("today", today); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setParameter("time", time); - - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setDescendCategories(true); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("startDate"); - - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(30); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("objectType"); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("title"); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("lead"); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("eventDate"); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("launchDate"); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("startDate"); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("endDate"); - - - - - - diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/templates/ccm-navigation/navigation/iaw-events.jsp b/ccm-sci-bundle/bundles/local/iaw-dev/templates/ccm-navigation/navigation/iaw-events.jsp deleted file mode 100644 index 0395cb7b6..000000000 --- a/ccm-sci-bundle/bundles/local/iaw-dev/templates/ccm-navigation/navigation/iaw-events.jsp +++ /dev/null @@ -1,83 +0,0 @@ -<%-- - Document : iaw-events - Created on : 20.03.2011, 22:59:41 - Author : pb ---%> - - - - - - - - - - - long age = Navigation.getConfig().getIndexPageCacheLifetime(); - if (age == 0) { - DispatcherHelper.cacheDisable(response); - } else { - DispatcherHelper.cacheForWorld(response, (int)age); - } - - - - - - - - - - - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event"); - - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setSQLFilter("(endDate >= :today and (endTime > :time or endTime is null)) or (endDate is null and startDate >= :today)"); - - // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings - // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren. - // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen. - // Komplizierter geht's wohl nicht mehr. - java.util.GregorianCalendar now = new java.util.GregorianCalendar(); - java.util.Date today = (new java.util.GregorianCalendar(now.get(java.util.GregorianCalendar.YEAR), - now.get(java.util.GregorianCalendar.MONTH), - now.get(java.util.GregorianCalendar.DATE))).getTime(); - // Im Event-CT ist das Datum als SQL-Type Date eingetragen, die Uhrzeit aber als SQL-Typ timestamptz. Leider wird von ccm im letzten - // das Datum nicht gesetzt, so daß der Timestamp immer eine Uhrzeit am 1.1.1970 angibt. Das ist ziemlich bescheuert und macht hier - // diesen kompliezierten Vergleich notwendig. Sonst könnte man einfach mit dem aktuellen Timestamp vergleichen. - java.util.Date time = (new java.util.GregorianCalendar(70,0,1, // this is 01.01.1970 - start of UNIX timestamp - now.get(java.util.GregorianCalendar.HOUR_OF_DAY), - now.get(java.util.GregorianCalendar.MINUTE), - now.get(java.util.GregorianCalendar.SECOND))).getTime(); - - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setParameter("today", today); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setParameter("time", time); - - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setDescendCategories(true); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("startDate"); - - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(30); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("objectType"); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("title"); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("lead"); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("eventDate"); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("launchDate"); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("startDate"); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("endDate"); - - - - - - diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/templates/placeholder.info b/ccm-sci-bundle/bundles/local/iaw-dev/templates/placeholder.info deleted file mode 100644 index c78cf06e6..000000000 --- a/ccm-sci-bundle/bundles/local/iaw-dev/templates/placeholder.info +++ /dev/null @@ -1,12 +0,0 @@ -Subdirectory