diff --git a/ccm-cms-types-historicdate/src/com/arsdigita/cms/contenttypes/HistoricDateInitializer.java b/ccm-cms-types-historicdate/src/com/arsdigita/cms/contenttypes/HistoricDateInitializer.java new file mode 100644 index 000000000..660033fe4 --- /dev/null +++ b/ccm-cms-types-historicdate/src/com/arsdigita/cms/contenttypes/HistoricDateInitializer.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2014 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 + * 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 + * + */ +package com.arsdigita.cms.contenttypes; + +/** + * + * @author Jens Pelzetter + * @version $Id$ + */ +public class HistoricDateInitializer extends ContentTypeInitializer { + + public HistoricDateInitializer() { + super("ccm-cms-types-historicdate.pdl.mf", HistoricDate.BASE_DATA_OBJECT_TYPE); + } + + @Override + public String getTraversalXML() { + return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/HistoricDate.xml"; + } + + + +} \ No newline at end of file diff --git a/ccm-core/src/ccm-core.config b/ccm-core/src/ccm-core.config index 4af189723..a4c501e2d 100755 --- a/ccm-core/src/ccm-core.config +++ b/ccm-core/src/ccm-core.config @@ -34,8 +34,8 @@ storage="ccm-core/templating.properties"/> - + * @author Jens Pelzetter */ -public class SystemInformation extends AbstractConfig { //implements Lockable { +public class SystemInformation { //extends AbstractConfig { //implements Lockable { - private Parameter sysInfoParam = new StringParameter( - "ccm.systeminformation", - Parameter.REQUIRED, - "version::2.x.y; appname::LibreCCM; apphomepage::http://www.libreccm.org;"); +// private Parameter sysInfoParam = new StringParameter( +// "ccm.systeminformation", +// Parameter.REQUIRED, +// "version::2.x.y; appname::LibreCCM; apphomepage::http://www.libreccm.org;"); - private Map systemInformation;// = new HashMap(); + private final Map sysInfo = new HashMap(); //private boolean locked = false; /** * The one and only instance of this class */ - private static SystemInformation INSTANCE;// = new SystemInformation(); + private final static SystemInformation INSTANCE = new SystemInformation(); public SystemInformation() { - - register(sysInfoParam); - loadInfo(); + + //register(sysInfoParam); + //loadInfo(); + + final Properties properties = new Properties(); + try { + properties.load(ResourceManager.getInstance().getResourceAsStream("/WEB-INF/systeminformation.properties")); + } catch (IOException ex) { + throw new UncheckedWrapperException(ex); + } + for (String key : properties.stringPropertyNames()) { + sysInfo.put(key, properties.getProperty(key)); + } + } /** * @return The instance of this class. */ public static SystemInformation getInstance() { - if (INSTANCE == null) { - INSTANCE = new SystemInformation(); - INSTANCE.load(); - } +// if (INSTANCE == null) { +// INSTANCE = new SystemInformation(); +// INSTANCE.load(); +// } return INSTANCE; } @@ -82,15 +95,15 @@ public class SystemInformation extends AbstractConfig { //implements Lockable { * * @throws IllegalArgumentException if key is null or empty */ - final public String get(String key) throws IllegalArgumentException { - if (systemInformation == null) { - loadMap(); - } + final public String get(final String key) throws IllegalArgumentException { +// if (sysInfo == null) { +// loadMap(); +// } if (key == null || key.isEmpty()) { throw new IllegalArgumentException("Parameter key must not be null or empty."); } - return systemInformation.get(key); + return sysInfo.get(key); } /** @@ -99,11 +112,11 @@ public class SystemInformation extends AbstractConfig { //implements Lockable { * @return iterator of map */ final public Iterator> iterator() { - if (systemInformation == null) { - loadMap(); - } +// if (sysInfo == null) { +// loadMap(); +// } - return (systemInformation.entrySet()).iterator(); + return sysInfo.entrySet().iterator(); } /** @@ -111,12 +124,12 @@ public class SystemInformation extends AbstractConfig { //implements Lockable { * @return */ final public boolean isEmpty() { - if (systemInformation == null) { - loadMap(); - } - - return systemInformation.isEmpty(); - +// if (sysInfo == null) { +// loadMap(); +// } + + return sysInfo.isEmpty(); + } /** @@ -134,20 +147,20 @@ public class SystemInformation extends AbstractConfig { //implements Lockable { // final public boolean isLocked() { // return locked; // } - private void loadMap() { - systemInformation = new HashMap(); - - final String[] tokens = ((String) get(sysInfoParam)).split(";"); - for (String token : tokens) { - processToken(token); - } - } - - private void processToken(final String token) { - final String[] parts = token.split("::"); - if (2 == parts.length) { - systemInformation.put(parts[0].trim(), parts[1].trim()); - } - } +// private void loadMap() { +// sysInfo = new HashMap(); +// +// final String[] tokens = ((String) get(sysInfoParam)).split(";"); +// for (String token : tokens) { +// processToken(token); +// } +// } +// +// private void processToken(final String token) { +// final String[] parts = token.split("::"); +// if (2 == parts.length) { +// sysInfo.put(parts[0].trim(), parts[1].trim()); +// } +// } } diff --git a/ccm-sci-bundle/web/WEB-INF/systeminformation.properties b/ccm-sci-bundle/web/WEB-INF/systeminformation.properties new file mode 100644 index 000000000..9c74a7a54 --- /dev/null +++ b/ccm-sci-bundle/web/WEB-INF/systeminformation.properties @@ -0,0 +1,5 @@ +version = 2.3.x +appname = ScientificCMS +apphomepage = http://www.scientificcms.org + +ccm.test = "Loaded from property file" diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl index 80397a314..b5c09e274 100755 --- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl +++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl @@ -391,13 +391,13 @@ - - + - diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/ris/GreyLiteratureConverter.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/ris/GreyLiteratureConverter.java index cc0e8e9f7..a7c48d440 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/ris/GreyLiteratureConverter.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/ris/GreyLiteratureConverter.java @@ -49,7 +49,7 @@ public class GreyLiteratureConverter extends AbstractRisConverter { greyLiterature = (GreyLiterature) publication; - getRisBuilder().setType(RisType.UNPD); + getRisBuilder().setType(RisType.UNPB); convertAuthors(publication); convertTitle(publication); convertYear(publication); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/imexporter/ris/RisType.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/imexporter/ris/RisType.java index 6b762af1f..4f9656213 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/imexporter/ris/RisType.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/imexporter/ris/RisType.java @@ -188,7 +188,7 @@ public enum RisType { /** * Unpublished work */ - UNPD, + UNPB, /** * Video recording */ diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/bibtex/converters/MiscConverter.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/bibtex/converters/MiscConverter.java index a6832b6a6..bd841854d 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/bibtex/converters/MiscConverter.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/bibtex/converters/MiscConverter.java @@ -55,6 +55,12 @@ public class MiscConverter implements BibTeXConverter + + + + + + + + + + + + com.arsdigita.auditing + + + com.arsdigita.kernel + + + com.arsdigita.atoz + + + com.arsdigita.web + + + com.arsdigita.categorization + + + com.arsdigita.cms + + + com.arsdigita.atoz.siteproxy + + + com.arsdigita.auth.http + + + com.arsdigita.versioning + + + com.arsdigita.workflow.simple + + + com.arsdigita.globalization + + + com.arsdigita.formbuilder + + + com.arsdigita.cms.contentassets + + + com.arsdigita.cms.contenttypes + + + com.arsdigita.cms.portlet + + + com.arsdigita.portal + + + com.arsdigita.cms.publicpersonalprofile + + + com.arsdigita.cms.publishToFile + + + com.arsdigita.formbuilder.actions + + + com.arsdigita.globalization.Charset + + + com.arsdigita.kernel.permissions + + + com.arsdigita.kernel.security + + + com.arsdigita.messaging + + + com.arsdigita.notification + + + com.arsdigita.persistence + + + com.arsdigita.cms.portletdataprovider + + + com.arsdigita.preferences + + + com.arsdigita.runtime + + + com.arsdigita.search.lucene + + + com.arsdigita.search.intermedia + + + com.arsdigita.ui.Login + + + com.arsdigita.ui.admin + + + com.arsdigita.ui.permissions + + + com.arsdigita.webdevsupport + + + com.arsdigita.workspace + + + + BasicAuditTrail + + + + + + ACSObject + + + + + + User + + + + + + Group + + + + + + Application + + + + + + EmailAdress + + + + + + Party + + + + + + PartyEmail + + + + + + PersonName + + + + + + ResourceType + + + + + + Resource + + + + + + Role + + + + + + ObjectContext + + + + + + UserAuthentication + + + + + + AtoZ + + + + + + AtoZProvider + + + + + + CategoryProvider + + + + + + CategoryAlias + + + + + + ItemAlias + + + + + + ItemProvider + + + + + + Application + + + + + + Host + + + + + + ApplicationType + + + + + + Category + + + + + + CategoryLocalization + + + + + + UseContext + + + + + + CategoryPurpose + + + + + + ContentType + + + + + + Asset + + + + + + AuthoringKit + + + + + + AuthoringStep + + + + + + CategoryTemplateMapping + + + + + + CMSTask + + + + + + CMSTaskType + + + + + + ContentCenter + + + + + + ContentBundle + + + + + + ContentItem + + + + + + ContentPage + + + + + + ContentSection + + + + + + ContentTypeLifecycleDefinition + + + + + + ContentTypeWorkflowTemplate + + + + + + FileAsset + + + + + + Folder + + + + + + ImageAsset + + + + + + ImageMimeType + + + + + + ItemTemplateMapping + + + + + + Lifecycle + + + + + + LifecycleDefinition + + + + + + LifecycleService + + + + + + Link + + + + + + MimeType + + + + + + MimeTypeExtension + + + + + + MimeTypeStatus + + + + + + Phase + + + + + + PhaseDefinition + + + + + + PublishLock + + + + + + PostConvertHTML + + + + + + PreConvertHTML + + + + + + PublishedLink + + + + + + RelationAttribute + + + + + + ResourceType + + + + + + Resource + + + + + + ResourceMapping + + + + + + ReusableImageAsset + + + + + + SectionTemplateMapping + + + + + + Service + + + + + + Standalone + + + + + + TaskEventURLGenerator + + + + + + TemplateContext + + + + + + Template + + + + + + TextAsset + + + + + + TextMimeType + + + + + + UpgradeProcess + + + + + + UserDefinedContentItem + + + + + + UserHomeFolderMap + + + + + + Category + + + + + + ACSObject + + + + + + User + + + + + + SiteProxyProvider + + + + + + HttpAuth + + + + + + Nounce + + + + + + UserLogin + + + + + + HTTPAuth + + + + + + VersionedACSObject + + + + + + BlobOperation + + + + + + ClobOperation + + + + + + DataObjectChange + + + + + + EventType + + + + + + GenericOperation + + + + + + JavaClass + + + + + + Operation + + + + + + Tag + + + + + + Txn + + + + + + UserTask + + + + + + WorkflowTemplate + + + + + + Task + + + + + + TaskComment + + + + + + Workflow + + + + + + Charset.Locale + + + + + + FormSection + + + + + + Component + + + + + + DataDrivenSelect + + + + + + Listener + + + + + + MetaObject + + + + + + ObjectType + + + + + + Option + + + + + + PersistentDataQuery + + + + + + ProcessListener + + + + + + Widget + + + + + + WidgetLabel + + + + + + DublinCoreES + + + + + + FileAttachment + + + + + + GenericOrgaUnitTextAsset + + + + + + ItemImageAttachment + + + + + + Notes + + + + + + RelatedLink + + + + + + ReleatedLink + + + + + + Link + + + + + + ReusableImageAsset + + + + + + Note + + + + + + ContentItem + + + + + + Link + + + + + + GenericOrganizationalUnit + + + + + + AddressType + + + + + + Agenda + + + + + + Article + + + + + + Bookmark + + + + + + Contact + + + + + + ContentGroup + + + + + + ContentGroupAssociation + + + + + + DecisionTree + + + + + + DecisionTreeSection + + + + + + DecisionTreeOption + + + + + + DecisionTreeSectionOptionTarget + + + + + + Event + + + + + + GenericAddress + + + + + + GenericAddressBundle + + + + + + GenericArticle + + + + + + GenericContact + + + + + + GenericContactBundle + + + + + + GenericContactEntry + + + + + + GenericOrganizationalUnitBundle + + + + + + GenericPerson + + + + + + GenericPersonBundle + + + + + + PublicPersonalProfile + + + + + + PublicPersonalProfileBundle + + + + + + PublicPersonalProfileNavItem + + + + + + DecisionTreeSectionOption + + + + + + DecisionTreeOptionTarget + + + + + + Address + + + + + + DecisionTreeptionTarget + + + + + + ContentItem + + + + + + ContentDirectoryPortlet + + + + + + ContentItemPortlet + + + + + + ContentSectionsPortlet + + + + + + TaskPortlet + + + + + + Portlet + + + + + + AgentPortlet + + + + + + Portal + + + + + + PortletType + + + + + + PublicPersonalProfile + + + + + + QueueEntry + + + + + + PublishedFile + + + + + + PublishedLink + + + + + + ConfirmEmailListener + + + + + + ConfirmRedirectListener + + + + + + RemoteServerPostListener + + + + + + SimpleEmailListener + + + + + + TemplateEmailListener + + + + + + XMLEmailListener + + + + + + Charset + + + + + + MessageCatalog + + + + + + Permission + + + + + + Privilege + + + + + + KeyStore + + + + + + Message + + + + + + MessagePart + + + + + + Thread + + + + + + ThreadedMessage + + + + + + Party + + + + + + Digest + + + + + + Notification + + + + + + QueueItem + + + + + + DynamicAssociation + + + + + + DynamicObjectType + + + + + + PortletDataProvider + + + + + + PreferenceParameter + + + + + + Preferences + + + + + + PerferenceParameter + + + + + + Initializer + + + + + + Document + + + + + + IndexId + + + + + + SearchContent + + + + + + Login + + + + + + Admin + + + + + + Permissions + + + + + + WebDevSupport + + + + + + BookmarkApplication + + + + + + Bookmark + + + + + + BookmarkPortlet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +