diff --git a/ccm-cms/src/com/arsdigita/cms/ContentBundle.java b/ccm-cms/src/com/arsdigita/cms/ContentBundle.java
index 4d7d574ec..45bcae7bb 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentBundle.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentBundle.java
@@ -392,10 +392,11 @@ public class ContentBundle extends ContentItem {
instances.addFilter(
ff.or().addFilter(ff.equals(LANGUAGE, language)).
addFilter(ff.equals(LANGUAGE, "--")));*/
- instances.addFilter(String.format("(%s = '%s' or %s = '--')",
+ instances.addFilter(String.format("(%s = '%s' or %s = '%s')",
LANGUAGE,
language,
- LANGUAGE));
+ LANGUAGE,
+ GlobalizationHelper.LANG_INDEPENDENT));
}
return !instances.isEmpty();
diff --git a/ccm-cms/src/com/arsdigita/cms/LanguageAwareObjectCopier.java b/ccm-cms/src/com/arsdigita/cms/LanguageAwareObjectCopier.java
index 6f9cb0be3..a89fcf2c9 100644
--- a/ccm-cms/src/com/arsdigita/cms/LanguageAwareObjectCopier.java
+++ b/ccm-cms/src/com/arsdigita/cms/LanguageAwareObjectCopier.java
@@ -1,10 +1,14 @@
package com.arsdigita.cms;
import com.arsdigita.domain.DomainObject;
+import com.arsdigita.globalization.GlobalizationHelper;
+import com.arsdigita.kernel.ACSObject;
import com.arsdigita.persistence.DataAssociation;
import com.arsdigita.persistence.DataAssociationCursor;
+import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.metadata.Property;
+import java.math.BigDecimal;
import org.apache.log4j.Logger;
/**
@@ -20,9 +24,9 @@ public class LanguageAwareObjectCopier extends ObjectCopier {
public LanguageAwareObjectCopier(String language) {
super();
- this.language = language;
+ this.language = language;
}
-
+
@Override
protected void copyCollection(final DomainObject source,
final DomainObject target,
@@ -36,7 +40,7 @@ public class LanguageAwareObjectCopier extends ObjectCopier {
final String name = prop.getName();
final DataAssociation sass = (DataAssociation) get(source, name);
- final DataAssociationCursor scursor = sass.cursor();
+ final DataAssociationCursor scursor = sass.cursor();
final Property reverse = prop.getAssociatedProperty();
while (scursor.next()) {
@@ -45,12 +49,12 @@ public class LanguageAwareObjectCopier extends ObjectCopier {
m_traversed.add(selem, reverse);
DomainObject telem = copy(source, target, selem, prop);
- if ((telem instanceof ContentPage)
- && ((ContentPage) telem).getContentBundle() != null) {
+ if ((telem instanceof ContentPage)
+ && ((ContentPage) telem).getContentBundle() != null) {
telem = ((ContentPage) telem).getContentBundle().getInstance(
language);
- }
-
+ }
+
DataObject tgtLink = null;
// removing this assert since copy will return null in the
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericOrganizationalUnitSubordinateCollection.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericOrganizationalUnitSubordinateCollection.java
index b1e1fbb54..e59a8f056 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericOrganizationalUnitSubordinateCollection.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericOrganizationalUnitSubordinateCollection.java
@@ -11,7 +11,7 @@ import com.arsdigita.persistence.OID;
import java.math.BigDecimal;
/**
- *
+ *
* @author Jens Pelzetter
* @version $Id$
*/
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrgaUnitTab.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrgaUnitTab.java
index 050752222..d5ed5f2bb 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrgaUnitTab.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrgaUnitTab.java
@@ -5,14 +5,28 @@ import com.arsdigita.cms.contenttypes.GenericOrganizationalUnit;
import com.arsdigita.xml.Element;
/**
+ * Interface for a tab rendered by {@link GenericOrgaUnitExtraXmlGenerator}.
*
* @author Jens Pelzetter
* @version $Id$
*/
public interface GenericOrgaUnitTab {
+ /**
+ *
+ * @param orgaunit
+ * @return Returns true if the provided orgaunit has data to show in this
+ * tab, false otherwise.
+ */
boolean hasData(GenericOrganizationalUnit orgaunit);
+ /**
+ * The implementation of this method creates the XML output for the tab.
+ *
+ * @param orgaunit The orgaunit which is the source of the data to use
+ * @param parent parent element for the XML
+ * @param state The current page state
+ */
void generateXml(GenericOrganizationalUnit orgaunit,
Element parent,
PageState state);
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java
index 1ffc8e0f5..896d16b51 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java
@@ -19,6 +19,7 @@ import org.apache.log4j.Logger;
public class Paginator {
private static final String PAGE_NUMBER = "pageNumber";
+ private static final String PAGE_SIZE = "pageSize";
private final int pageSize;
private int pageNumber;
private final int objectCount;
@@ -44,7 +45,13 @@ public class Paginator {
logger.debug(String.format("pageNumber = %d", pageNumber));
}
this.objectCount = objectCount;
- this.pageSize = pageSize;
+
+ if (request.getParameter(PAGE_SIZE) == null) {
+ this.pageSize = pageSize;
+ } else {
+ final String pageSizeStr = request.getParameter(PAGE_SIZE);
+ this.pageSize = Integer.parseInt(pageSizeStr);
+ }
normalizePageNumber();
}
@@ -72,7 +79,7 @@ public class Paginator {
paginatorElem.addAttribute("pageCount", Integer.toString(getPageCount()));
paginatorElem.addAttribute("pageSize", Integer.toString(pageSize));
paginatorElem.addAttribute("objectBegin", Integer.toString(getBegin()));
- paginatorElem.addAttribute("objectEnd", Integer.toString(getEnd()));
+ paginatorElem.addAttribute("objectEnd", Integer.toString(getEnd() - 1));
paginatorElem.addAttribute("objectCount", Integer.toString(objectCount));
}
@@ -90,9 +97,9 @@ public class Paginator {
getBegin(),
getEnd()));
/*if (getBegin() == getEnd()) {
- query.setRange(getBegin(), getEnd() + 1);
+ query.setRange(getBegin(), getEnd() + 1);
} else {*/
- query.setRange(getBegin(), getEnd() + 1);
+ query.setRange(getBegin(), getEnd() + 1);
//}
}
@@ -123,7 +130,7 @@ public class Paginator {
if (pageNumber == 1) {
return 1;
} else {
- return (pageNumber - 1) * pageSize;
+ return ((pageNumber - 1) * pageSize) + 1;
}
}
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/cfg/integration.properties b/ccm-sci-bundle/bundles/local/jensp-dev/cfg/integration.properties
new file mode 100644
index 000000000..d850438ae
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/jensp-dev/cfg/integration.properties
@@ -0,0 +1,142 @@
+# Scientific CMS 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.categorization.supported_languages=de,en
+
+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
+waf.kernel.language_independent_items=true
+
+; 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=XinhaConfig,/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=XinhaConfig,/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=XinhaConfig,/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_link_to_map=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/sci-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-jp-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
+
+# =============================================================================================
+# runtime specific configurations
+
+waf.admin.email=webmaster@pwi.uni-bremen.de
+waf.admin.name.given=ScientificCMS
+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/ccm?user\=ccm&password\=ccm47web&stringtype\=unspecified
+waf.runtime.jdbc_pool_size=30
+
+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/jensp-dev/cfg/project.xml b/ccm-sci-bundle/bundles/local/jensp-dev/cfg/project.xml
new file mode 100644
index 000000000..cbbaab11c
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/jensp-dev/cfg/project.xml
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/dummy b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/dummy
new file mode 100644
index 000000000..f9c053b8b
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/dummy
@@ -0,0 +1 @@
+Dummy file for developing & testing purpose
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/placeholder.info b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/placeholder.info
new file mode 100644
index 000000000..5ae76207c
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/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/jensp-dev/res/bundle/categories/sci-nav-domain-1.00.xml b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/sci-nav-domain-1.00.xml
new file mode 100644
index 000000000..31486e212
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/sci-nav-domain-1.00.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/sci-nav-hierarchy-1.00.xml b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/sci-nav-hierarchy-1.00.xml
new file mode 100644
index 000000000..cfce50400
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/sci-nav-hierarchy-1.00.xml
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-domain.xml b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-domain.xml
new file mode 100644
index 000000000..87ee0c8c2
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-domain.xml
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-hierarchy.xml b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-hierarchy.xml
new file mode 100644
index 000000000..ed6c7c16b
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-hierarchy.xml
@@ -0,0 +1,1034 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
new file mode 100644
index 000000000..b983bd2d7
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
new file mode 100644
index 000000000..34b25d21e
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/navigation/sci-templates.txt b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/navigation/sci-templates.txt
new file mode 100755
index 000000000..65c187b5d
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/navigation/sci-templates.txt
@@ -0,0 +1,10 @@
+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
+Institute Project List,institute project list,/templates/ccm-navigation/navigation/institute-projectlist.jsp
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/placeholder.info b/ccm-sci-bundle/bundles/local/jensp-dev/res/placeholder.info
new file mode 100644
index 000000000..5ae76207c
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/jensp-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/jensp-dev/templates/placeholder.info b/ccm-sci-bundle/bundles/local/jensp-dev/templates/placeholder.info
new file mode 100644
index 000000000..c78cf06e6
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/jensp-dev/templates/placeholder.info
@@ -0,0 +1,12 @@
+Subdirectory