diff --git a/ccm-core/web/WEB-INF/web.xml-core-optional.in b/ccm-core/web/WEB-INF/web.optional-ccm-core.xml similarity index 100% rename from ccm-core/web/WEB-INF/web.xml-core-optional.in rename to ccm-core/web/WEB-INF/web.optional-ccm-core.xml diff --git a/ccm-sci-bundle/bundles/demo/cfg/integration.properties b/ccm-sci-bundle/bundles/demo/cfg/integration.properties index e172f1d46..c6bf6108d 100644 --- a/ccm-sci-bundle/bundles/demo/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/demo/cfg/integration.properties @@ -1,4 +1,4 @@ -# Scientific CMS devel bundle integration.properties +# Scientific CMS demo bundle integration.properties # waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage # @@ -8,7 +8,6 @@ waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage #waf.bebop.dhtml_editor=FCKeditor waf.categorization.show_internal_name=true -waf.categorization.supported_languages=de,en waf.dispatcher.default_expiry=3600 ; @@ -74,7 +73,10 @@ 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 @@ -97,7 +99,7 @@ com.arsdigita.forum.disable_page_caching=true 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=WEB-INF/navigation/sci-templates.txt +com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt # ccm-ldn-search application @@ -110,13 +112,13 @@ com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui. # ccm-ldn-themedirector application themedirector.default_theme_context= -themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf +# 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.category_files=WEB-INF/sci/sci-nav-domain-1.00.xml,WEB-INF/sci/sci-nav-hierarchy-1.00.xml +#com.arsdigita.bundle.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml # ============================================================================================= # runtime specific configurations @@ -136,6 +138,6 @@ waf.web.server=localhost\:8080 # ============================================================================================= # devel specific configurations -waf.debug=true -waf.bebop.fancy_xsl_errors=true +#waf.debug=true +#waf.bebop.fancy_xsl_errors=true diff --git a/ccm-sci-bundle/bundles/demo/cfg/project.xml b/ccm-sci-bundle/bundles/demo/cfg/project.xml index e38889f80..75df5a621 100644 --- a/ccm-sci-bundle/bundles/demo/cfg/project.xml +++ b/ccm-sci-bundle/bundles/demo/cfg/project.xml @@ -9,7 +9,7 @@ prettyName="Scientific CMS" version="1-1-6" release="devel" - webxml="web.xml-sci" + webxml="web-sci.xml" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> diff --git a/ccm-sci-bundle/bundles/demo/cfg/web.xml-sci b/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml similarity index 100% rename from ccm-sci-bundle/bundles/demo/cfg/web.xml-sci rename to ccm-sci-bundle/bundles/demo/cfg/web-sci.xml diff --git a/ccm-sci-bundle/bundles/demo/res/bundle/categories/dummy b/ccm-sci-bundle/bundles/demo/res/bundle/categories/dummy deleted file mode 100644 index f9c053b8b..000000000 --- a/ccm-sci-bundle/bundles/demo/res/bundle/categories/dummy +++ /dev/null @@ -1 +0,0 @@ -Dummy file for developing & testing purpose \ No newline at end of file diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties index f9900fd56..7ad143bb0 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties @@ -8,7 +8,6 @@ waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage #waf.bebop.dhtml_editor=FCKeditor waf.categorization.show_internal_name=true -waf.categorization.supported_languages=de,en waf.dispatcher.default_expiry=3600 ; @@ -74,7 +73,10 @@ 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 @@ -110,13 +112,13 @@ com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui. # ccm-ldn-themedirector application themedirector.default_theme_context= -themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf +# 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.category_files=bundle/categories/sci-nav-domain-1.00.xml,WEB-INF/sci/sci-nav-hierarchy-1.00.xml +#com.arsdigita.bundle.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml # ============================================================================================= # runtime specific configurations diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml index e38889f80..75df5a621 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/project.xml +++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml @@ -9,7 +9,7 @@ prettyName="Scientific CMS" version="1-1-6" release="devel" - webxml="web.xml-sci" + webxml="web-sci.xml" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> diff --git a/ccm-sci-bundle/bundles/devel/cfg/web.xml-sci b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml similarity index 100% rename from ccm-sci-bundle/bundles/devel/cfg/web.xml-sci rename to ccm-sci-bundle/bundles/devel/cfg/web-sci.xml diff --git a/ccm-sci-bundle/bundles/devel/res/bundle/categories/dummy b/ccm-sci-bundle/bundles/devel/res/bundle/categories/dummy deleted file mode 100644 index f9c053b8b..000000000 --- a/ccm-sci-bundle/bundles/devel/res/bundle/categories/dummy +++ /dev/null @@ -1 +0,0 @@ -Dummy file for developing & testing purpose \ No newline at end of file diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties index 682f3f7ec..2a33b4dcf 100644 --- a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties @@ -1,4 +1,4 @@ -# Scientific CMS devel bundle integration.properties +# Scientific CMS IAW-devel bundle integration.properties # waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage # @@ -8,7 +8,6 @@ waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage #waf.bebop.dhtml_editor=FCKeditor waf.categorization.show_internal_name=true -waf.categorization.supported_languages=de,en waf.dispatcher.default_expiry=3600 ; @@ -74,7 +73,10 @@ 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 @@ -87,16 +89,17 @@ 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 +#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.default_template=/templates/ccm-navigation/navigation/sci-default.jsp +com.arsdigita.navigation.templates_file=bundle/navigation/iaw-templates.txt # ccm-ldn-search application @@ -107,25 +110,28 @@ com.arsdigita.london.search.show_sponsored_links=true com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -# ccm-themedirector application +# ccm-ldn-themedirector application themedirector.default_theme_context= -#themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf +# 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.category_files=bundle/categories/iaw-nav-domain-1.00.xml,bundle/catgegories/iaw-nav-hierarchy-1.00.xml + # ============================================================================================= # runtime specific configurations -waf.admin.email=webmaster@scientificCMS.org -waf.admin.name.given=SCI +waf.admin.email=webmaster@iaw.uni-bremen.de +waf.admin.name.given=IAW waf.admin.name.family=Administrator -waf.admin.password=sci2000 +waf.admin.password=nge2015 waf.admin.password.question=12345 waf.admin.password.answer=6 -waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-sci?user\=sci&password\=sci47web&stringtype\=unspecified -waf.runtime.jdbc_pool_size=30 +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 diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml index ae8fb9458..db65005d1 100644 --- a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml +++ b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml @@ -1,15 +1,16 @@ - + + @@ -65,24 +66,23 @@ - - + + - - + + - +--> @@ -98,14 +98,15 @@ + + - --> @@ -114,11 +115,12 @@ ---> +--> diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/web.xml-sci b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/web-iaw.xml similarity index 99% rename from ccm-sci-bundle/bundles/local/iaw-dev/cfg/web.xml-sci rename to ccm-sci-bundle/bundles/local/iaw-dev/cfg/web-iaw.xml index 5babaffe0..cf6d0d318 100644 --- a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/web.xml-sci +++ b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/web-iaw.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - Scientific CMS + CCM IAW (DEVEL) Content and Collaboration Management for Scientific Institutions + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 000000000..441260d0b --- /dev/null +++ b/ccm-sci-bundle/bundles/local/iaw-dev/res/bundle/categories/iaw-nav-hierarchy-1.00.xml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100755 index 000000000..8a09ac6c9 --- /dev/null +++ b/ccm-sci-bundle/bundles/local/iaw-dev/res/bundle/navigation/iaw-templates.txt @@ -0,0 +1,11 @@ +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 new file mode 100644 index 000000000..5ae76207c --- /dev/null +++ b/ccm-sci-bundle/bundles/local/iaw-dev/res/placeholder.info @@ -0,0 +1,3 @@ +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 new file mode 100644 index 000000000..a6c4f9273 --- /dev/null +++ b/ccm-sci-bundle/bundles/local/iaw-dev/templates/ccm-navigation/navigation/iaw-archive.jsp @@ -0,0 +1,83 @@ +<%-- + 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 new file mode 100644 index 000000000..0395cb7b6 --- /dev/null +++ b/ccm-sci-bundle/bundles/local/iaw-dev/templates/ccm-navigation/navigation/iaw-events.jsp @@ -0,0 +1,83 @@ +<%-- + 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 new file mode 100644 index 000000000..c78cf06e6 --- /dev/null +++ b/ccm-sci-bundle/bundles/local/iaw-dev/templates/placeholder.info @@ -0,0 +1,12 @@ +Subdirectory