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/cleanup_some_tables.sql
new file mode 100644
index 000000000..4104edfe8
--- /dev/null
+++ b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/cleanup_some_tables.sql
@@ -0,0 +1,31 @@
+--
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- 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 $
+
+
+
+-- 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;
+
diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/create_orgaunit_hierarchy_table.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/create_orgaunit_hierarchy_table.sql
index bac9d493b..82801cfbe 100644
--- a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/create_orgaunit_hierarchy_table.sql
+++ b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/create_orgaunit_hierarchy_table.sql
@@ -15,11 +15,8 @@
-- 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: upd_table_persons.sql pboy $
+-- $Id: create_orgaunit_hierarchy_map.sql pboy $
--- This update is only applicable for the internal development tree at
--- University of Bremen ! Don't use for the APLAWS main trunk on
--- fedorahosted!
CREATE TABLE cms_organizationalunits_hierarchy_map (
superior_orgaunit_id integer NOT NULL,
@@ -29,14 +26,17 @@ CREATE TABLE cms_organizationalunits_hierarchy_map (
subordinate_orgaunit_order integer
);
--- No sure how to get db owner here
--- ALTER TABLE public.cms_organizationalunits_hierarchy_map OWNER TO iaw;
ALTER TABLE ONLY cms_organizationalunits_hierarchy_map
- ADD CONSTRAINT cms_org_hie_map_sub_or_p_nykpq PRIMARY KEY (subordinate_orgaunit_id, superior_orgaunit_id);
+ ADD CONSTRAINT cms_org_hie_map_sub_or_p_nykpq
+ PRIMARY KEY (subordinate_orgaunit_id, superior_orgaunit_id);
ALTER TABLE ONLY cms_organizationalunits_hierarchy_map
- ADD CONSTRAINT cms_org_hie_map_sub_or_f_xq5is FOREIGN KEY (subordinate_orgaunit_id) REFERENCES cms_organizationalunits(organizationalunit_id);
+ ADD CONSTRAINT cms_org_hie_map_sub_or_f_xq5is
+ FOREIGN KEY (subordinate_orgaunit_id)
+ REFERENCES cms_organizationalunits(organizationalunit_id);
ALTER TABLE ONLY cms_organizationalunits_hierarchy_map
- ADD CONSTRAINT cms_org_hie_map_sup_or_f_qchkn FOREIGN KEY (superior_orgaunit_id) REFERENCES cms_organizationalunits(organizationalunit_id);
\ No newline at end of file
+ ADD CONSTRAINT cms_org_hie_map_sup_or_f_qchkn
+ FOREIGN KEY (superior_orgaunit_id)
+ REFERENCES cms_organizationalunits(organizationalunit_id);
\ No newline at end of file
diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/create_publish_lock_table.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/create_publish_lock_table.sql
deleted file mode 100644
index 248cc033c..000000000
--- a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/create_publish_lock_table.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-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);
-
--- ALTER TABLE public.cms_publish_lock OWNER TO ccm;
\ No newline at end of file
diff --git a/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.3-6.6.4.sql b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.3-6.6.4.sql
new file mode 100644
index 000000000..255f45a38
--- /dev/null
+++ b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.3-6.6.4.sql
@@ -0,0 +1,24 @@
+--
+-- Copyright (C) 2011 Peter Boy 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
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- 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: oracle-se-6.6.2-6.6.3.sql 2011-09-06 15:10:39Z pboy $
+
+
+PROMPT Red Hat Enterprise CMS 6.6.3 -> 6.6.4 Upgrade Script (Oracle)
+
+@@ ../default/upgrade/6.6.3-6.6.4/create_orgaunit_hierarchy_table.sql
+@@ ../default/upgrade/6.6.3-6.6.4/create_publish_lock_table.sql
diff --git a/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.3-6.6.4.sql b/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.3-6.6.4.sql
index 929312b75..2ab0edff9 100644
--- a/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.3-6.6.4.sql
+++ b/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.3-6.6.4.sql
@@ -25,7 +25,7 @@
begin;
-\i ../default/upgrade/6.6.2-6.6.3/create_orgaunit_hierarchy_table.sql
-\i ../default/upgrade/6.6.2-6.6.3/create_publish_lock_table.sql
+\i ../default/upgrade/6.6.3-6.6.4/create_orgaunit_hierarchy_table.sql
+\i ../default/upgrade/6.6.3-6.6.4/create_publish_lock_table.sql
commit;
\ No newline at end of file
diff --git a/ccm-cms/src/ccm-cms.upgrade b/ccm-cms/src/ccm-cms.upgrade
index 857dd129f..75606295a 100755
--- a/ccm-cms/src/ccm-cms.upgrade
+++ b/ccm-cms/src/ccm-cms.upgrade
@@ -48,7 +48,6 @@
-
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentSection.java b/ccm-cms/src/com/arsdigita/cms/ContentSection.java
index 90dc7d8d9..4909b12fa 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentSection.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentSection.java
@@ -56,6 +56,7 @@ import org.apache.log4j.Logger;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.StringTokenizer;
+import org.apache.log4j.Level;
/**
*
A content section represents a collection of content that is
@@ -1071,11 +1072,11 @@ public class ContentSection extends Application {
ContentSection section = (ContentSection) sections.getDomainObject();
if (sections.isFirst() ) {
sections.close();
- s_log.warn("Default section is "+section.getName() );
+ s_log.debug("Default section is "+section.getName() );
return section;
} else {
sections.close();
- s_log.warn("Section found: "+section.getName()+", but not first." );
+ s_log.debug("Section found: "+section.getName()+", but not first." );
return null;
}
}
diff --git a/ccm-cms/src/com/arsdigita/cms/Loader.java b/ccm-cms/src/com/arsdigita/cms/Loader.java
index 7f9b2ebc9..c878c35fc 100755
--- a/ccm-cms/src/com/arsdigita/cms/Loader.java
+++ b/ccm-cms/src/com/arsdigita/cms/Loader.java
@@ -198,7 +198,7 @@ public class Loader extends PackageLoader {
* (e.g. 6.6.1-6.6.2).
*/
public static ApplicationType loadWorkspaceApplicationType() {
- s_log.warn("Creating CMS Workspace...");
+ s_log.debug("Creating CMS Workspace...");
// Creating of Workspace package using new style c.ad.web.Application
// in legacy compatible mode. Needs refactoring of the Workspace package.
@@ -226,7 +226,7 @@ public class Loader extends PackageLoader {
ApplicationType workspaceType = appsetup.run();
workspaceType.save();
- s_log.warn("CMS Workspace type created.");
+ s_log.debug("CMS Workspace type created.");
return workspaceType;
}
@@ -239,7 +239,7 @@ public class Loader extends PackageLoader {
ApplicationType workspaceType) {
// create legacy compatible application instance,
// old-style package key used as url fragment where to install the instance
- s_log.warn("Creating CMS Workspace instance ...");
+ s_log.debug("Creating CMS Workspace instance ...");
Workspace app = (Workspace) Application.createApplication(
workspaceType, // type
Workspace.PACKAGE_KEY, // url fragment
@@ -247,7 +247,7 @@ public class Loader extends PackageLoader {
null); // parent
app.setDescription("The default CMS workspace instance.");
app.save();
- s_log.warn("CMS Workspace instance " + Workspace.PACKAGE_KEY + " created.");
+ s_log.debug("CMS Workspace instance " + Workspace.PACKAGE_KEY + " created.");
s_log.debug("Done loading CMS Workspace.");
}
@@ -363,7 +363,7 @@ public class Loader extends PackageLoader {
for (int i = 0 ; i < sectionNames.length ; i++) {
final String sectionName = sectionNames[i];
- s_log.warn("Creating content section on /" + sectionName);
+ s_log.debug("Creating content section on /" + sectionName);
// Step 1: Validate name for section
Util.validateURLParameter("name", sectionName);
diff --git a/ccm-sci-bundle/bundles/demo/cfg/integration.properties b/ccm-sci-bundle/bundles/demo/cfg/integration.properties
index 7517c6b29..574defac3 100644
--- a/ccm-sci-bundle/bundles/demo/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/demo/cfg/integration.properties
@@ -106,7 +106,7 @@ com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
com.arsdigita.london.search.show_sponsored_links=true
-# ccm-ldn-subsite application
+# ccm-subsite application
com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
index 71763630c..ede047eab 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
@@ -38,7 +38,7 @@ waf.xml.activate_full_date_formatter=true
# ccm-cms parameters
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+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
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 2ea747857..ea6e2453b 100644
--- a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties
@@ -38,7 +38,7 @@ waf.xml.activate_full_date_formatter=true
# ccm-cms parameters
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+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
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/AUTHORS b/ccm-sci-bundle/bundles/local/iaw-std/AUTHORS
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/ChangeLog b/ccm-sci-bundle/bundles/local/iaw-std/ChangeLog
deleted file mode 100644
index 786623bdb..000000000
--- a/ccm-sci-bundle/bundles/local/iaw-std/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-std/NEWS b/ccm-sci-bundle/bundles/local/iaw-std/NEWS
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/README b/ccm-sci-bundle/bundles/local/iaw-std/README
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/bundle.in b/ccm-sci-bundle/bundles/local/iaw-std/bundle.in
deleted file mode 100644
index 093aac421..000000000
--- a/ccm-sci-bundle/bundles/local/iaw-std/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-std/cfg/integration.properties b/ccm-sci-bundle/bundles/local/iaw-std/cfg/integration.properties
deleted file mode 100644
index bddc48371..000000000
--- a/ccm-sci-bundle/bundles/local/iaw-std/cfg/integration.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-# Scientific CMS IAW-std bundle integration.properties Version 1.1.6
-#
-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.aplaws.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-subsite application
-com.arsdigita.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/categories/iaw-nav-hierarchy-1.00.xml
-com.arsdigita.bundle.loader.domain_mappings=IAW-NAV:/navigation/,IAW-NAV:/content/,IAW-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-116?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-std/cfg/project.xml b/ccm-sci-bundle/bundles/local/iaw-std/cfg/project.xml
deleted file mode 100644
index bfb5fc9f7..000000000
--- a/ccm-sci-bundle/bundles/local/iaw-std/cfg/project.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/cfg/web-iaw.xml b/ccm-sci-bundle/bundles/local/iaw-std/cfg/web-iaw.xml
deleted file mode 100644
index 0486fd0aa..000000000
--- a/ccm-sci-bundle/bundles/local/iaw-std/cfg/web-iaw.xml
+++ /dev/null
@@ -1,540 +0,0 @@
-
-
-
- CCM IAW
- Content and Collaboration Management for Scientific Institutions
-
-
-
- log4j-conf-file
- WEB-INF/conf/log4j.properties
-
-
-
-
-
-
-
- shortcuts
- com.arsdigita.london.shortcuts.ShortcutFilter
-
-
-
- subsite
- com.arsdigita.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-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-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-std/res/bundle/categories/iaw-nav-domain-1.00.xml b/ccm-sci-bundle/bundles/local/iaw-std/res/bundle/categories/iaw-nav-domain-1.00.xml
deleted file mode 100644
index 3123c67d8..000000000
--- a/ccm-sci-bundle/bundles/local/iaw-std/res/bundle/categories/iaw-nav-domain-1.00.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/res/bundle/categories/iaw-nav-hierarchy-1.00.xml b/ccm-sci-bundle/bundles/local/iaw-std/res/bundle/categories/iaw-nav-hierarchy-1.00.xml
deleted file mode 100644
index 441260d0b..000000000
--- a/ccm-sci-bundle/bundles/local/iaw-std/res/bundle/categories/iaw-nav-hierarchy-1.00.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/res/bundle/navigation/iaw-templates.txt b/ccm-sci-bundle/bundles/local/iaw-std/res/bundle/navigation/iaw-templates.txt
deleted file mode 100755
index 8a09ac6c9..000000000
--- a/ccm-sci-bundle/bundles/local/iaw-std/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-std/res/placeholder.info b/ccm-sci-bundle/bundles/local/iaw-std/res/placeholder.info
deleted file mode 100644
index 5ae76207c..000000000
--- a/ccm-sci-bundle/bundles/local/iaw-std/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-std/templates/ccm-navigation/navigation/iaw-archive.jsp b/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-navigation/navigation/iaw-archive.jsp
deleted file mode 100644
index a6c4f9273..000000000
--- a/ccm-sci-bundle/bundles/local/iaw-std/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-std/templates/ccm-navigation/navigation/iaw-events.jsp b/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-navigation/navigation/iaw-events.jsp
deleted file mode 100644
index 0395cb7b6..000000000
--- a/ccm-sci-bundle/bundles/local/iaw-std/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-std/templates/placeholder.info b/ccm-sci-bundle/bundles/local/iaw-std/templates/placeholder.info
deleted file mode 100644
index c78cf06e6..000000000
--- a/ccm-sci-bundle/bundles/local/iaw-std/templates/placeholder.info
+++ /dev/null
@@ -1,12 +0,0 @@
-Subdirectory