From 3d0cf2aee4b9e8ed4e203207a1ce6e946848ab47 Mon Sep 17 00:00:00 2001 From: pb Date: Sat, 20 Feb 2010 19:03:45 +0000 Subject: [PATCH] Abhaengigkeit von Legacy Init fuer alle Content Typen entfernt. git-svn-id: https://svn.libreccm.org/ccm/trunk@356 8810af33-2d31-482b-a856-94f89814c4df --- .../FileAttachmentInitializer.java | 56 ++--- .../contentassets/FileAttachmentLoader.java | 2 +- .../FileAttachmentMetadataProvider.java | 126 ++++++------ .../FileAttachmentResources_de.properties | 2 + .../FileAttachmentURLFinder.java | 6 +- .../ui/FileAttachmentUpload.java | 9 +- .../contentassets/ui/FileAttachmentsStep.java | 30 ++- .../src/com/arsdigita/london/notes/Note.java | 4 + .../london/notes/NotesInitializer.java | 4 +- .../london/notes/NotesResources_de.properties | 2 + .../contentassets/RelatedLinkInitializer.java | 14 +- .../cms/contentassets/RelatedLinkLoader.java | 2 +- .../RelatedLinkResources_de.properties | 4 + .../cms/contenttypes/AddressInitializer.java | 16 +- .../cms/contenttypes/AgendaInitializer.java | 19 +- .../cms/contenttypes/AgendaLoader.java | 10 +- .../cms/contenttypes/ArticleInitializer.java | 8 +- .../cms/contenttypes/ArticleLoader.java | 4 - .../cms/contenttypes/BookmarkInitializer.java | 9 +- .../cms/contenttypes/BookmarkLoader.java | 4 - .../arsdigita/cms/contenttypes/Contact.java | 18 +- .../cms/contenttypes/ContactAddress.java | 2 - .../cms/contenttypes/ContactInitializer.java | 39 ++-- .../cms/contenttypes/ContactType.java | 2 - .../contenttypes/ContactTypesCollection.java | 6 +- .../arsdigita/cms/contenttypes/package.html | 23 +++ .../ui/contact/ContactPropertyForm.java | 2 - .../util/ContactGlobalizationUtil.java | 32 ++- .../util/ContactResourceBundle.java | 3 - .../cms/contenttypes/ESDService.java | 2 - .../contenttypes/ESDServiceInitializer.java | 8 +- .../arsdigita/cms/contenttypes/package.html | 14 ++ .../cms/contenttypes/EventInitializer.java | 5 +- .../cms/contenttypes/FAQItemInitializer.java | 18 +- .../cms/contenttypes/FAQItemLoader.java | 4 - .../arsdigita/cms/contenttypes/package.html | 40 ++++ .../FileStorageItemInitializer.java | 17 +- .../contenttypes/FileStorageItemLoader.java | 4 - .../FileStorageItemResources_de.properties | 2 + .../cms/formbuilder/FormItemInitializer.java | 18 +- .../cms/formbuilder/FormItemLoader.java | 3 +- .../FormItemResources_de.properties | 4 + .../FormSectionItemInitializer.java | 17 +- .../formbuilder/FormSectionItemLoader.java | 3 +- .../FormSectionItemResources.properties | 2 +- .../FormSectionItemResources_de.properties | 4 + .../contenttypes/GlossaryItemInitializer.java | 16 +- .../cms/contenttypes/GlossaryItemLoader.java | 4 - .../GlossaryResources_de.properties | 2 + .../contenttypes/InlineSiteInitializer.java | 4 - .../cms/contenttypes/InlineSiteLoader.java | 4 - .../cms/contenttypes/JobInitializer.java | 3 +- .../arsdigita/cms/contenttypes/JobLoader.java | 3 +- .../contenttypes/JobResources_de.properties | 1 + .../contenttypes/LegalNoticeInitializer.java | 24 ++- .../cms/contenttypes/LegalNoticeLoader.java | 3 +- .../LegalNoticeResrouce_de.properties | 1 + .../cms/contenttypes/MinutesInitializer.java | 24 ++- .../cms/contenttypes/MinutesLoader.java | 3 +- .../MinutesResources_de.properties | 1 + .../cms/contenttypes/MOTDItemInitializer.java | 21 +- .../cms/contenttypes/MOTDItemLoader.java | 4 - .../cms/contenttypes/ArticleSection.java | 192 +++++++++--------- .../MultiPartArticleInitializer.java | 8 +- .../contenttypes/MultiPartArticleLoader.java | 1 - .../MultiPartArticleSectionURLFinder.java | 4 +- .../ui/mparticle/ArticleSectionPanel.java | 2 - .../mparticle/MultiPartArticleEditForm.java | 1 - .../ui/mparticle/SectionTable.java | 8 +- .../cms/contenttypes/NewsItemInitializer.java | 14 +- .../cms/contenttypes/NewsItemLoader.java | 3 +- .../contenttypes/OrganizationInitializer.java | 22 +- .../cms/contenttypes/OrganizationLoader.java | 5 - .../OrganizationResources_de.properties | 6 + .../contenttypes/PressReleaseInitializer.java | 16 +- .../cms/contenttypes/PressReleaseLoader.java | 3 +- .../PressReleaseResources_de.properties | 1 + .../PressReleaseResources_fr.properties | 1 + .../cms/contenttypes/ServiceInitializer.java | 26 ++- .../cms/contenttypes/ServiceLoader.java | 3 +- .../ServiceResources_de.properties | 1 + .../ServiceResources_fr.properties | 1 + .../contenttypes/SiteProxyInitializer.java | 17 +- .../SiteProxyResources_de.properties | 12 ++ .../SiteProxyResources_fr.properties | 12 ++ .../cms/dispatcher/SiteProxyPanel.java | 3 +- .../cms/contenttypes/xmlfeed/Initializer.java | 21 +- .../cms/contenttypes/xmlfeed/Loader.java | 5 +- .../cms/contenttypes/xmlfeed/XMLFeed.java | 2 - .../xmlfeed/listener/RetrieveListener.java | 9 +- .../xmlfeed/ui/XSLFileProperties.java | 2 - .../contenttypes/ContentAssetInitializer.java | 59 +++++- .../contenttypes/ContentTypeInitializer.java | 96 ++++++++- .../cms/dispatcher/ContentPanel.java | 3 +- .../dispatcher/ContentSectionDispatcher.java | 3 +- .../cms/lifecycle/PhaseCollection.java | 9 +- .../cms/lifecycle/PhaseDefinition.java | 5 +- .../lifecycle/PhaseDefinitionCollection.java | 9 +- .../lifecycle/PublishLifecycleListener.java | 4 - .../cms/lifecycle/PublishingException.java | 3 +- .../publishToFile/LocalRequestPassword.java | 36 ++-- .../cms/publishToFile/PublishToFile.java | 12 +- .../cms/publishToFile/PublishedFile.java | 2 - .../cms/publishToFile/PublishedLink.java | 1 - .../SetLocalRequestPassword.java | 2 +- .../cms/search/AssetMetadataProvider.java | 5 +- .../search/ContentItemMetadataProvider.java | 69 +++---- .../search/ContentPageMetadataProvider.java | 5 +- .../arsdigita/cms/docmgr/DocMgrConfig.java | 5 - .../docmgr/dispatcher/DocumentAssetPage.java | 2 - .../MultilingualDocumentResolver.java | 4 - .../docmgr/installer/DocLinkInitializer.java | 24 ++- .../docmgr/installer/DocumentInitializer.java | 15 +- .../ui/CategoryDocsNavigatorPortlet.java | 4 - .../cms/docmgr/ui/CategoryItemsBrowser.java | 2 - .../cms/docmgr/ui/DCNDispatcher.java | 4 - .../arsdigita/cms/docmgr/ui/DMDispatcher.java | 5 +- .../com/arsdigita/cms/docmgr/ui/DMUtils.java | 4 - .../cms/docmgr/ui/FilePropertiesPanel.java | 5 +- .../cms/docmgr/ui/FileUploadForm.java | 4 - .../cms/docmgr/ui/FolderCreateForm.java | 4 - .../LegacyCategoryDocsNavigatorPortlet.java | 4 - .../docmgr/ui/RecentUpdatedDocsPortlet.java | 3 +- .../cms/docmgr/ui/content/DocIndexPage.java | 4 - .../london/navigation/Initializer.java | 3 +- .../arsdigita/london/terms/TermsConfig.java | 18 +- .../arsdigita/simplesurvey/Initializer.java | 5 +- .../com/arsdigita/simplesurvey/Loader.java | 15 +- .../simplesurvey/ResponseCollection.java | 1 - .../arsdigita/simplesurvey/SimpleSurvey.java | 4 +- .../simplesurvey/SurveyCollection.java | 1 - .../ui/admin/AdminSurveyTableModel.java | 3 - environment/project.xml.iaw | 2 +- 133 files changed, 999 insertions(+), 611 deletions(-) create mode 100644 ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentResources_de.properties create mode 100644 ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesResources_de.properties create mode 100644 ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLinkResources_de.properties create mode 100644 ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/package.html create mode 100644 ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/package.html create mode 100644 ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/package.html create mode 100644 ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemResources_de.properties create mode 100644 ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemResources_de.properties create mode 100644 ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemResources_de.properties create mode 100644 ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryResources_de.properties create mode 100644 ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobResources_de.properties create mode 100644 ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResrouce_de.properties create mode 100644 ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesResources_de.properties create mode 100644 ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources_de.properties create mode 100644 ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseResources_de.properties create mode 100644 ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseResources_fr.properties create mode 100644 ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceResources_de.properties create mode 100644 ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceResources_fr.properties create mode 100644 ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyResources_de.properties create mode 100644 ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyResources_fr.properties diff --git a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentInitializer.java b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentInitializer.java index 79b7bcc7d..24b5851b2 100755 --- a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentInitializer.java +++ b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentInitializer.java @@ -16,34 +16,32 @@ package com.arsdigita.cms.contentassets; import com.arsdigita.cms.contenttypes.ContentAssetInitializer; import com.arsdigita.cms.contentassets.ui.FileAttachmentsStep; -import com.arsdigita.cms.ContentPage; +import com.arsdigita.cms.ContentPage; import com.arsdigita.domain.xml.TraversalHandler; import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.kernel.URLService; -import com.arsdigita.runtime.DomainInitEvent; +import com.arsdigita.runtime.DomainInitEvent; import com.arsdigita.runtime.LegacyInitEvent; -import com.arsdigita.search.MetadataProviderRegistry; +import com.arsdigita.search.MetadataProviderRegistry; import com.arsdigita.xml.XML; /** * Initializer * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: 1.1 $ $Date: 2004/12/15 15:37:51 $ + * @version $Revision: 1.1 $ $Date: 2004/12/15 15:37:51 $ + * @version $Id: FileAttachmentInitializer.java 1262 2006-07-17 08:15:45Z cgyg9330 $ **/ public class FileAttachmentInitializer extends ContentAssetInitializer { - public final static String versionId = - "$Id: FileAttachmentInitializer.java 1262 2006-07-17 08:15:45Z cgyg9330 $ by $Author: cgyg9330 $, $DateTime: 2004/03/30 18:21:14 $"; - public FileAttachmentInitializer() { super("ccm-cms-assets-fileattachment.pdl.mf"); } public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/" - + "cms/contentassets/FileAttachment.xml"; + return "/WEB-INF/traversal-adapters/com/arsdigita/" + + "cms/contentassets/FileAttachment.xml"; } public String getProperty() { @@ -74,29 +72,33 @@ public class FileAttachmentInitializer extends ContentAssetInitializer { return 2; // XXX config param please } - public void init(LegacyInitEvent evt) { + // public void init(LegacyInitEvent evt) { + public void init(DomainInitEvent evt) { super.init(evt); URLService.registerFinder( FileAttachment.BASE_DATA_OBJECT_TYPE, new FileAttachmentURLFinder()); - /* - * cms registers AssetMetadataProvider for type FileAsset and provides adapter for that - * context. We register a more specific metadataprovider for FileAttachment that provides useful information - * about the owner. Because we are using a new metadataprovider, we need to register - * adapter for that context. Note this is not the same as the adapters registered by the - * ContentAssetInitializer, because those are used specifically when traversing a content item - * that delegates assets to their specific adapters - * - * chris.gilbert@westsussex.gov.uk - */ - MetadataProviderRegistry.registerAdapter( - FileAttachment.BASE_DATA_OBJECT_TYPE, - new FileAttachmentMetadataProvider()); - XML.parseResource( - "/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachment-search.xml", - new TraversalHandler()); + /* + * cms registers AssetMetadataProvider for type FileAsset and provides + * adapter for that context. We register a more specific metadataprovider + * for FileAttachment that provides useful information about the owner. + * Because we are using a new metadataprovider, we need to register + * adapter for that context. Note this is not the same as the adapters + * registered by the ContentAssetInitializer, because those are used + * specifically when traversing a content item that delegates assets to + * their specific adapters + * + * chris.gilbert@westsussex.gov.uk + */ + MetadataProviderRegistry.registerAdapter( + FileAttachment.BASE_DATA_OBJECT_TYPE, + new FileAttachmentMetadataProvider()); + XML.parseResource( + "/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/" + + "FileAttachment-search.xml", + new TraversalHandler()); } - + } diff --git a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentLoader.java b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentLoader.java index 58e1c968f..1d8463ea4 100755 --- a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentLoader.java +++ b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentLoader.java @@ -22,11 +22,11 @@ import com.arsdigita.loader.PackageLoader; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #2 $ $Date: 2004/03/30 $ + * @version $Id: FileAttachmentLoader.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class FileAttachmentLoader extends PackageLoader { - public final static String versionId = "$Id: FileAttachmentLoader.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/03/30 18:21:14 $"; public void run(final ScriptContext ctx) { // nada } diff --git a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentMetadataProvider.java b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentMetadataProvider.java index e9c63de69..a4344647b 100755 --- a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentMetadataProvider.java +++ b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentMetadataProvider.java @@ -20,14 +20,9 @@ package com.arsdigita.cms.contentassets; import com.arsdigita.cms.Asset; import com.arsdigita.domain.DomainObject; -import com.arsdigita.search.ContentProvider; -import com.arsdigita.search.ContentType; -import com.arsdigita.util.StringUtils; import com.arsdigita.web.ParameterMap; import com.arsdigita.web.URL; import com.arsdigita.web.Web; -import com.arsdigita.kernel.URLService; -import com.arsdigita.kernel.NoValidURLException; import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentSection; @@ -41,81 +36,94 @@ import com.arsdigita.cms.search.AssetMetadataProvider; * * @author Daniel Berrange * @version $Revision: 1.2 $ $Date: 2005/09/07 15:18:36 $ + * @version $Id: FileAttachmentMetadataProvider.java,v 1.2 2005/09/07 15:18:36 cgyg9330 Exp $ */ public class FileAttachmentMetadataProvider extends AssetMetadataProvider { - private static final Logger s_log = - Logger.getLogger(FileAttachmentMetadataProvider.class); + private static final Logger s_log = + Logger.getLogger(FileAttachmentMetadataProvider.class); - public final static String versionId = - "$Id: FileAttachmentMetadataProvider.java,v 1.2 2005/09/07 15:18:36 cgyg9330 Exp $" - + " by $Author: cgyg9330 $, $DateTime: 2004/08/17 23:15:09 $"; + /** + * + * @param dobj + * @return + */ + public String getSummary(DomainObject dobj) { - public String getSummary(DomainObject dobj) { + // add config parameter to allow link to owner + FileAttachment file = (FileAttachment) dobj; + String description = file.getDescription(); + ContentPage owner = (ContentPage) file.getFileOwner(); + StringBuffer summary = new StringBuffer(); + if (description != null) { + summary.append(description + " - "); + } - // add config parameter to allow link to owner - FileAttachment file = (FileAttachment) dobj; - String description = file.getDescription(); - ContentPage owner = (ContentPage) file.getFileOwner(); - StringBuffer summary = new StringBuffer(); - if (description != null) { - summary.append(description + " - "); - } - if (owner != null) { - String title = owner.getTitle(); + if (owner != null) { + String title = owner.getTitle(); - if (owner.isLiveVersion()) { - ParameterMap map = new ParameterMap(); - map.setParameter( "oid", owner.getOID().toString() ); - - String url = new URL(Web.getConfig().getDefaultScheme(), - Web.getConfig().getServer().getName(), - Web.getConfig().getServer().getPort(), - "", - "", - "/redirect/", map ).getURL(); + if (owner.isLiveVersion()) { + ParameterMap map = new ParameterMap(); + map.setParameter( "oid", owner.getOID().toString() ); + String url = new URL(Web.getConfig().getDefaultScheme(), + Web.getConfig().getServer().getName(), + Web.getConfig().getServer().getPort(), + "", + "", + "/redirect/", map ).getURL(); + summary.append("A file attached to " + title + ""); - } else { - // draft - don't give a live link because stylesheets - // escape tags. If this is changed in the bebop stylesheets - // then just add parameter context=draft in map created above - // instead of this - summary.append("A file attached to " + title); + } else { + // draft - don't give a live link because stylesheets + // escape tags. If this is changed in the bebop stylesheets + // then just add parameter context=draft in map created above + // instead of this + summary.append("A file attached to " + title); + } + } - } - } + return summary.toString(); - return summary.toString(); - - } - - - - public boolean isIndexable (DomainObject dobj) { - FileAttachment file = (FileAttachment) dobj; - ContentPage owner = (ContentPage) file.getFileOwner(); - boolean index = false; - if (owner != null) { - s_log.debug("index this file attachment? " + !owner.indexAssetsWithPage()); - index = !owner.indexAssetsWithPage(); - } - return index; } + + + /** + * + * @param dobj + * @return + */ + public boolean isIndexable (DomainObject dobj) { + FileAttachment file = (FileAttachment) dobj; + ContentPage owner = (ContentPage) file.getFileOwner(); + boolean index = false; + if (owner != null) { + s_log.debug("index this file attachment? " + !owner.indexAssetsWithPage()); + index = !owner.indexAssetsWithPage(); + } + return index; + } + + + /** + * + * @param dobj + * @return + */ public String getContentSection(DomainObject dobj) { String sectionName = ""; FileAttachment file = (FileAttachment) dobj; ContentItem owner = file.getFileOwner(); + if (owner != null) { - - ContentSection section = owner.getContentSection(); + ContentSection section = owner.getContentSection(); if (section != null) { - sectionName = section.getName(); + sectionName = section.getName(); } } - return sectionName; - } + return sectionName; + } } diff --git a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentResources_de.properties b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentResources_de.properties new file mode 100644 index 000000000..585e70e3b --- /dev/null +++ b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentResources_de.properties @@ -0,0 +1,2 @@ +com.arsdigita.cms.contentassets.file_attachment_label=Dateien anf\u00FCgen +com.arsdigita.cms.contentassets.file_attachment_description=Dateien anf\u00FCgen diff --git a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentURLFinder.java b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentURLFinder.java index e369869f8..b676abe07 100755 --- a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentURLFinder.java +++ b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentURLFinder.java @@ -30,12 +30,12 @@ import com.arsdigita.persistence.OID; import com.arsdigita.persistence.SessionManager; /** - * @author cgyg9330 - * @author mbooth@redhat.com - * * A URLFinder for FileAttachments. In the draft context (ie, in CMS * backend search) it will return the draft url for the containing item. * Otherwise it will delegate to an AssetURLFinder. + * + * @author mbooth@redhat.com + * @author cgyg9330 */ public class FileAttachmentURLFinder implements URLFinder { diff --git a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/ui/FileAttachmentUpload.java b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/ui/FileAttachmentUpload.java index 2096fd225..9333e02be 100755 --- a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/ui/FileAttachmentUpload.java +++ b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/ui/FileAttachmentUpload.java @@ -42,12 +42,11 @@ import org.apache.log4j.Logger; * * @author Scott Seago (sseago@redhat.com) * @version $Revision: #2 $ $DateTime: 2004/03/30 18:21:14 $ + * @version $Id: FileAttachmentUpload.java 287 2005-02-22 00:29:02Z sskracic $ */ public class FileAttachmentUpload extends Form implements FormInitListener, FormProcessListener { - public static final String versionId = "$Id: FileAttachmentUpload.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/03/30 18:21:14 $"; - private static final Logger s_log = Logger.getLogger(FileAttachmentUpload.class); private FileUploadSection m_fileUploadSection; @@ -90,6 +89,7 @@ public class FileAttachmentUpload extends Form public ItemSelectionModel getItemSelectionModel() { return m_itemModel; } + /** * @return the save/cancel section for this form */ @@ -101,7 +101,6 @@ public class FileAttachmentUpload extends Form * @param state The page state * @return the currently selected item */ - public ContentItem getContentItem(PageState state) { return (ContentItem)m_itemModel.getSelectedObject(state); } @@ -113,12 +112,12 @@ public class FileAttachmentUpload extends Form * @param state The page state * @param asset The image asset */ - // this may not be needed at all -- it was in the medqic code for some reason. we should remove if possible + // this may not be needed at all -- it was in the medqic code for some reason. + // we should remove if possible public void setFileAttachment(PageState state) { ContentItem item = getContentItem(state); // Force the item to reload, since the assets query is cached ? // ? - } // Add the widgets diff --git a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/ui/FileAttachmentsStep.java b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/ui/FileAttachmentsStep.java index 91ca12242..581ddabf7 100755 --- a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/ui/FileAttachmentsStep.java +++ b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/ui/FileAttachmentsStep.java @@ -14,30 +14,17 @@ */ package com.arsdigita.cms.contentassets.ui; -import com.arsdigita.bebop.ColumnPanel; import com.arsdigita.bebop.Form; -import com.arsdigita.bebop.FormData; -import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormSection; import com.arsdigita.bebop.Label; import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.SaveCancelSection; -import com.arsdigita.bebop.SimpleComponent; import com.arsdigita.bebop.event.ActionEvent; import com.arsdigita.bebop.event.ActionListener; -import com.arsdigita.bebop.event.FormInitListener; -import com.arsdigita.bebop.event.FormProcessListener; -import com.arsdigita.bebop.event.FormSectionEvent; -import com.arsdigita.bebop.event.FormSubmissionListener; -import com.arsdigita.bebop.event.FormValidationListener; import com.arsdigita.bebop.event.PrintEvent; import com.arsdigita.bebop.event.PrintListener; import com.arsdigita.bebop.form.Submit; -import com.arsdigita.bebop.form.TextArea; import com.arsdigita.bebop.parameters.BigDecimalParameter; -import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ContentItem; -import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contentassets.FileAttachment; import com.arsdigita.cms.ui.CMSContainer; @@ -45,7 +32,6 @@ import com.arsdigita.cms.ui.SecurityPropertyEditor; import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess; import com.arsdigita.cms.ui.workflow.WorkflowLockedContainer; -import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.persistence.DataCollection; import com.arsdigita.util.Classes; @@ -54,10 +40,10 @@ import com.arsdigita.util.Classes; * * @author Scott Seago (sseago@redhat.com) * @version $Revision: #2 $ $DateTime: 2004/03/30 18:21:14 $ + * @version $Id: FileAttachmentsStep.java 1116 2006-04-20 13:55:17Z apevec $ */ public class FileAttachmentsStep extends SecurityPropertyEditor { - public static final String versionId = "$Id: FileAttachmentsStep.java 1116 2006-04-20 13:55:17Z apevec $"; private final ItemSelectionModel m_item; private final AuthoringKitWizard m_parent; @@ -66,11 +52,18 @@ public class FileAttachmentsStep extends SecurityPropertyEditor { private FileAttachmentUpload m_uploadForm; private BigDecimalParameter m_fileParam = new BigDecimalParameter("fa"); - private FileAttachmentSelectionModel m_fileModel = new FileAttachmentSelectionModel(m_fileParam); + private FileAttachmentSelectionModel m_fileModel = + new FileAttachmentSelectionModel(m_fileParam); private Submit m_cancel; private Form m_dcForm; - public FileAttachmentsStep(ItemSelectionModel itemModel,AuthoringKitWizard parent) { + /** + * + * @param itemModel + * @param parent + */ + public FileAttachmentsStep(ItemSelectionModel itemModel, + AuthoringKitWizard parent) { m_parent = parent; m_item = itemModel; @@ -87,7 +80,8 @@ public class FileAttachmentsStep extends SecurityPropertyEditor { DataCollection files = FileAttachment.getAttachments(item); Label mainTarget = (Label) event.getTarget(); if (files.isEmpty()) { - mainTarget.setLabel("This item does not have any associated files."); + mainTarget.setLabel( + "This item does not have any associated files."); } else { mainTarget.setLabel(""); } diff --git a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/Note.java b/ccm-cms-assets-notes/src/com/arsdigita/london/notes/Note.java index dba23e18a..021872687 100755 --- a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/Note.java +++ b/ccm-cms-assets-notes/src/com/arsdigita/london/notes/Note.java @@ -34,6 +34,10 @@ import com.arsdigita.util.Assert; import org.apache.log4j.Logger; +/** + * + * + */ public class Note extends ACSObject { public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.london.notes.Note"; diff --git a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesInitializer.java b/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesInitializer.java index a1ca18a4b..abf147efc 100755 --- a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesInitializer.java +++ b/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesInitializer.java @@ -27,6 +27,7 @@ import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.london.notes.ui.NotesStep; import com.arsdigita.london.notes.ui.NotesSummary; import com.arsdigita.runtime.LegacyInitEvent; +import com.arsdigita.runtime.DomainInitEvent; public class NotesInitializer extends ContentAssetInitializer { public NotesInitializer() { @@ -67,7 +68,8 @@ public class NotesInitializer extends ContentAssetInitializer { return 3; } - public void init( LegacyInitEvent ev ) { + // public void init( LegacyInitEvent ev ) { + public void init( DomainInitEvent ev ) { super.init( ev ); ContentType.registerXSLFile( null, "/__ccm__/assets/notes/index.xsl" ); diff --git a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesResources_de.properties b/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesResources_de.properties new file mode 100644 index 000000000..398fccc1f --- /dev/null +++ b/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesResources_de.properties @@ -0,0 +1,2 @@ +com.arsdigita.london.notes.authoring_step_label=Erg\u00E4nzende Notizen +com.arsdigita.london.notes.authoring_step_description=Erg\u00E4nzende Hinweise zu einem Dokument anf\u00FCgen. diff --git a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLinkInitializer.java b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLinkInitializer.java index fba074c58..fd0b53d8e 100755 --- a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLinkInitializer.java +++ b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLinkInitializer.java @@ -24,21 +24,31 @@ import com.arsdigita.globalization.GlobalizedMessage; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #4 $ $Date: 2004/03/30 $ + * @version $Id: RelatedLinkInitializer.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class RelatedLinkInitializer extends ContentAssetInitializer { - public final static String versionId = "$Id: RelatedLinkInitializer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/03/30 18:21:14 $"; - + /** + * + */ public RelatedLinkInitializer() { super("ccm-cms-assets-relatedlink.pdl.mf"); } + /** + * + * @return + */ public String getTraversalXML() { return "/WEB-INF/traversal-adapters/com/arsdigita/" + "cms/contentassets/RelatedLink.xml"; } + /** + * + * @return + */ public String getProperty() { return "links"; } diff --git a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLinkLoader.java b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLinkLoader.java index e4fda9ef2..734860ecd 100755 --- a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLinkLoader.java +++ b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLinkLoader.java @@ -22,11 +22,11 @@ import com.arsdigita.loader.PackageLoader; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #2 $ $Date: 2004/03/30 $ + * @version $Id: RelatedLinkLoader.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class RelatedLinkLoader extends PackageLoader { - public final static String versionId = "$Id: RelatedLinkLoader.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/03/30 18:21:14 $"; public void run(final ScriptContext ctx) { // nada } diff --git a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLinkResources_de.properties b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLinkResources_de.properties new file mode 100644 index 000000000..4cf7f26eb --- /dev/null +++ b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLinkResources_de.properties @@ -0,0 +1,4 @@ +com.arsdigita.cms.contentassets.related_link_label=Weiterf\u00FChrende Links +com.arsdigita.cms.contentassets.related_link_description=Weiterf\u00FChrende Links +com.arsdigita.cms.contentassets.related_link_resourceSize=Gr\u00F6\u00DFe +com.arsdigita.cms.contentassets.related_link_resourceType=Typ diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressInitializer.java b/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressInitializer.java index 9bb9f2143..ead7bbaa4 100755 --- a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressInitializer.java +++ b/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressInitializer.java @@ -26,7 +26,7 @@ import com.arsdigita.runtime.DomainInitEvent; import org.apache.log4j.Logger; /** - * The CMS initializer. + * Initializes the Address content type. * * @author Justin Ross <jross@redhat.com> * @version $Id: AddressInitializer.java 1597 2007-07-10 16:27:26Z p_boy $ @@ -35,11 +35,18 @@ public class AddressInitializer extends ContentTypeInitializer { private static final Logger s_log = Logger.getLogger(AddressInitializer.class); + /** + * Constructor + */ public AddressInitializer() { super("ccm-cms-types-address.pdl.mf", Address.BASE_DATA_OBJECT_TYPE); } + /** + * Initializer + * @param evt + */ public void init(DomainInitEvent evt) { super.init(evt); @@ -59,7 +66,12 @@ public class AddressInitializer extends ContentTypeInitializer { ); } + /** + * Provides location of the stylesheets assoziated with this content type. + * @return + */ public String[] getStylesheets() { - return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/Address.xsl" }; + return new String[] { + "/static/content-types/com/arsdigita/cms/contenttypes/Address.xsl" }; } } diff --git a/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java b/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java index 3b900afb6..fd023a906 100755 --- a/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java +++ b/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java @@ -21,30 +21,35 @@ package com.arsdigita.cms.contenttypes; import org.apache.log4j.Logger; /** - * Initializer + * Initializes the Agenda content type. + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #8 $ $Date: 2004/08/17 $ + * @version $Id: AgendaInitializer.java 1596 2007-07-10 16:25:57Z p_boy $ **/ public class AgendaInitializer extends ContentTypeInitializer { - public final static String versionId = - "$Id: AgendaInitializer.java 1596 2007-07-10 16:25:57Z p_boy $ by " + - "$Author: p_boy $, $DateTime: 2004/08/17 23:15:09 $"; - private static final Logger s_log = Logger.getLogger(AgendaInitializer.class); + /** + * Constructor + */ public AgendaInitializer() { super("ccm-cms-types-agenda.pdl.mf", Agenda.BASE_DATA_OBJECT_TYPE); } public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Agenda.xml"; + return + "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Agenda.xml"; } public String[] getStylesheets() { - return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/Agenda.xsl" }; + return new String[] { + "/static/content-types/com/arsdigita/cms/contenttypes/Agenda.xsl" }; } } diff --git a/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/AgendaLoader.java b/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/AgendaLoader.java index 84dbcfcf5..9fd601289 100755 --- a/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/AgendaLoader.java +++ b/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/AgendaLoader.java @@ -21,18 +21,14 @@ package com.arsdigita.cms.contenttypes; import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; /** - * Loader + * Loader. Just sets content type specific properties for use of the parent class. * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #7 $ $Date: 2004/08/17 $ - **/ - + * @version $Id: AgendaLoader.java 1596 2007-07-10 16:25:57Z p_boy $ + */ public class AgendaLoader extends AbstractContentTypeLoader { - public final static String versionId = - "$Id: AgendaLoader.java 1596 2007-07-10 16:25:57Z p_boy $ by " + - "$Author: p_boy $, $DateTime: 2004/08/17 23:15:09 $"; - private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Agenda.xml" }; diff --git a/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java b/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java index 24cd20d1b..5d9b87406 100755 --- a/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java +++ b/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java @@ -21,7 +21,10 @@ package com.arsdigita.cms.contenttypes; import org.apache.log4j.Logger; /** - * The CMS initializer. + * Initializes the Article content type. + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). * * @author Justin Ross <jross@redhat.com> * @version $Id: ArticleInitializer.java 757 2005-09-02 14:12:21Z sskracic $ @@ -36,6 +39,7 @@ public class ArticleInitializer extends ContentTypeInitializer { public String[] getStylesheets() { - return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/Article.xsl" }; + return new String[] + { "/static/content-types/com/arsdigita/cms/contenttypes/Article.xsl" }; } } diff --git a/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleLoader.java b/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleLoader.java index a42b48026..93b503938 100755 --- a/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleLoader.java +++ b/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleLoader.java @@ -27,10 +27,6 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; * @version $Id: ArticleLoader.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ArticleLoader extends AbstractContentTypeLoader { - public final static String versionId = - "$Id: ArticleLoader.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Article.xml" diff --git a/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java b/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java index 854a2a14f..a811b57c8 100755 --- a/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java +++ b/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java @@ -21,16 +21,15 @@ package com.arsdigita.cms.contenttypes; import org.apache.log4j.Logger; /** - * The CMS initializer. + * Initializes the Bookmark content type. + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). * * @author Justin Ross <jross@redhat.com> * @version $Id: BookmarkInitializer.java 757 2005-09-02 14:12:21Z sskracic $ */ public class BookmarkInitializer extends ContentTypeInitializer { - public final static String versionId = - "$Id: BookmarkInitializer.java 757 2005-09-02 14:12:21Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(BookmarkInitializer.class); diff --git a/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/BookmarkLoader.java b/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/BookmarkLoader.java index f9484c02e..8771305f2 100755 --- a/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/BookmarkLoader.java +++ b/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/BookmarkLoader.java @@ -27,10 +27,6 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; * @version $Id: BookmarkLoader.java 287 2005-02-22 00:29:02Z sskracic $ */ public class BookmarkLoader extends AbstractContentTypeLoader { - public final static String versionId = - "$Id: BookmarkLoader.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Bookmark.xml" diff --git a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/Contact.java b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/Contact.java index 0d568fe17..03c41bc3e 100755 --- a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/Contact.java +++ b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/Contact.java @@ -34,15 +34,14 @@ import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.SessionManager; import com.arsdigita.util.Assert; + + /** - * * DomainObject class to represent Contact ContentType * objects. * * @author Shashin Shinde sshinde@redhat.com - * * @version $Id: Contact.java 287 2005-02-22 00:29:02Z sskracic $ - * */ public class Contact extends ContentPage { @@ -71,7 +70,8 @@ public class Contact extends ContentPage { private static final Logger s_log = Logger.getLogger(Contact.class); /** data object type for this domain object */ - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.contenttypes.Contact"; + public static final String BASE_DATA_OBJECT_TYPE = + "com.arsdigita.cms.contenttypes.Contact"; /** Default constructor. */ public Contact() { @@ -96,7 +96,7 @@ public class Contact extends ContentPage { DataOperation operation = SessionManager .getSession() .retrieveDataOperation( - "com.arsdigita.cms.contenttypes.removeContactFromContentItemAssociation"); + "com.arsdigita.cms.contenttypes.removeContactFromContentItemAssociation"); operation.setParameter("itemID", new Integer(item.getID().intValue())); operation.execute(); } @@ -108,14 +108,16 @@ public class Contact extends ContentPage { private void removeItemMappings() { DataOperation operation = SessionManager .getSession() - .retrieveDataOperation("com.arsdigita.cms.contenttypes.removeContactFromAllAssociations"); + .retrieveDataOperation( + "com.arsdigita.cms.contenttypes.removeContactFromAllAssociations"); operation.setParameter("contactID", new Integer(this.getID().intValue())); operation.execute(); } /** - * Gets the DataAssociation that holds the mapping between this contact and any content items. + * Gets the DataAssociation that holds the mapping between this contact + * and any content items. * @return */ public DataAssociation getItemsForContact() { @@ -131,7 +133,7 @@ public class Contact extends ContentPage { public static Contact getContactForItem(ContentItem item) { s_log.debug("getting contact for item " + item); DataQuery query = SessionManager.getSession().retrieveQuery( - "com.arsdigita.cms.contenttypes.getContactForItem"); + "com.arsdigita.cms.contenttypes.getContactForItem"); query.setParameter("itemID", item.getID()); BigDecimal contactID; Contact contact = null; diff --git a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactAddress.java b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactAddress.java index 77ca3b332..af52ef25e 100755 --- a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactAddress.java +++ b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactAddress.java @@ -30,9 +30,7 @@ import com.arsdigita.persistence.OID; * These objects are associated with Contact objects in this package. * * @author Shashin Shinde sshinde@redhat.com - * * @version $Id: ContactAddress.java 287 2005-02-22 00:29:02Z sskracic $ - * */ public class ContactAddress extends ContentItem { diff --git a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactInitializer.java b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactInitializer.java index 5b4ce3baa..109b9a85b 100755 --- a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactInitializer.java +++ b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactInitializer.java @@ -24,17 +24,16 @@ import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.contenttypes.ui.contact.AddContactPropertiesStep; import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; -import com.arsdigita.domain.SimpleDomainObjectTraversalAdapter; +// import com.arsdigita.domain.SimpleDomainObjectTraversalAdapter; import com.arsdigita.globalization.GlobalizedMessage; -import com.arsdigita.runtime.LegacyInitEvent; +import com.arsdigita.runtime.DomainInitEvent; +// import com.arsdigita.runtime.LegacyInitEvent; /** - * Initializer class to initialize ContentType Contact. + * Initializer class to initialize ContentType Contact. * * @author Shashin Shinde sshinde@redhat.com - * * @version $Id: ContactInitializer.java 287 2005-02-22 00:29:02Z sskracic $ - * */ public class ContactInitializer extends ContentTypeInitializer { @@ -69,25 +68,29 @@ public class ContactInitializer extends ContentTypeInitializer { return phoneTypesList; } - public void init(LegacyInitEvent evt) { + // public void init(LegacyInitEvent evt) { + public void init(DomainInitEvent evt) { super.init(evt); if (ContentSection.getConfig().getHasContactsAuthoringStep()) { // Add the "Contact"authoring step - AuthoringKitWizard.registerAssetStep(getBaseType(), - getAuthoringStep(), getAuthoringStepLabel(), - getAuthoringStepDescription(), getAuthoringStepSortKey()); + AuthoringKitWizard.registerAssetStep( + getBaseType(), + getAuthoringStep(), getAuthoringStepLabel(), + getAuthoringStepDescription(), getAuthoringStepSortKey()); - // and sort out the display - at the moment this is just the basic properties, addresses and phones - ContentItemTraversalAdapter associatedContactTraversalAdapter = new ContentItemTraversalAdapter(); + // and sort out the display - at the moment this is just the + // basic properties, addresses and phones + ContentItemTraversalAdapter associatedContactTraversalAdapter = + new ContentItemTraversalAdapter(); associatedContactTraversalAdapter.addAssociationProperty("/object/phones"); associatedContactTraversalAdapter.addAssociationProperty("/object/contactAddress"); ContentItemTraversalAdapter.registerAssetAdapter( - "associatedContactForItem", - associatedContactTraversalAdapter, - "com.arsdigita.cms.dispatcher.SimpleXMLGenerator"); + "associatedContactForItem", + associatedContactTraversalAdapter, + "com.arsdigita.cms.dispatcher.SimpleXMLGenerator"); } } @@ -99,14 +102,14 @@ public class ContactInitializer extends ContentTypeInitializer { private GlobalizedMessage getAuthoringStepDescription() { return new GlobalizedMessage( - "com.arsdigita.cms.contenttypes.contact_authoring_step_description", - "com.arsdigita.cms.contenttypes.ContactResources"); + "com.arsdigita.cms.contenttypes.contact_authoring_step_description", + "com.arsdigita.cms.contenttypes.ContactResources"); } private GlobalizedMessage getAuthoringStepLabel() { return new GlobalizedMessage( - "com.arsdigita.cms.contenttypes.contact_authoring_step_label", - "com.arsdigita.cms.contenttypes.ContactResources"); + "com.arsdigita.cms.contenttypes.contact_authoring_step_label", + "com.arsdigita.cms.contenttypes.ContactResources"); } private Class getAuthoringStep() { diff --git a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactType.java b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactType.java index a1a9cc636..b3cc2d81d 100755 --- a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactType.java +++ b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactType.java @@ -30,9 +30,7 @@ import com.arsdigita.persistence.OID; * These objects are associated with Contact objects. * * @author Shashin Shinde sshinde@redhat.com - * * @version $Id: ContactType.java 287 2005-02-22 00:29:02Z sskracic $ - * */ public class ContactType extends ContentItem { diff --git a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactTypesCollection.java b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactTypesCollection.java index e16b07ad7..98761de1a 100755 --- a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactTypesCollection.java +++ b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactTypesCollection.java @@ -26,19 +26,17 @@ import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.SessionManager; /** - * * Class which represents a collection of ContactTypes. * * @author Shashin Shinde sshinde@redhat.com - * * @version $Id: ContactTypesCollection.java 287 2005-02-22 00:29:02Z sskracic $ - * */ public class ContactTypesCollection extends DomainCollection { /** Retrieve the collection of ContactTypes. */ public static ContactTypesCollection getContactTypesCollection(){ - DataCollection typesColl = SessionManager.getSession().retrieve(ContactType.BASE_DATA_OBJECT_TYPE); + DataCollection typesColl = SessionManager.getSession(). + retrieve(ContactType.BASE_DATA_OBJECT_TYPE); return new ContactTypesCollection(typesColl); } diff --git a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/package.html b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/package.html new file mode 100644 index 000000000..40dba4cb5 --- /dev/null +++ b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/package.html @@ -0,0 +1,23 @@ + + + +Content type Contact + + + +

+Implementation of a Contact content type.

+

+Contact attributes include +

+ +

Because of these attributes this content type is especially useful for + United Kingdom residents and UK local authorities.

+ + diff --git a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ui/contact/ContactPropertyForm.java b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ui/contact/ContactPropertyForm.java index d4a64bfd9..51cbdc538 100755 --- a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ui/contact/ContactPropertyForm.java +++ b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ui/contact/ContactPropertyForm.java @@ -41,9 +41,7 @@ import com.arsdigita.cms.ui.authoring.BasicPageForm; * ContactPropertiesStep authoring kit step. * * @author Shashin Shinde sshinde@redhat.com - * * @version $Id: ContactPropertyForm.java 287 2005-02-22 00:29:02Z sskracic $ - * */ public class ContactPropertyForm extends BasicPageForm { diff --git a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/util/ContactGlobalizationUtil.java b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/util/ContactGlobalizationUtil.java index 383e7d15c..f96e60ab6 100755 --- a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/util/ContactGlobalizationUtil.java +++ b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/util/ContactGlobalizationUtil.java @@ -27,28 +27,26 @@ import com.arsdigita.globalization.GlobalizedMessage; *

* * @author Shashin Shinde sshinde@redhat.com - * * @version $Id: ContactGlobalizationUtil.java 287 2005-02-22 00:29:02Z sskracic $ - * */ public class ContactGlobalizationUtil { - final public static String BUNDLE_NAME = + final public static String BUNDLE_NAME = "com.arsdigita.cms.contenttypes.util.ContactResourceBundle"; - /** - * This returns a globalized message using the type specific bundle, - * BUNDLE_NAME - */ - public static GlobalizedMessage globalize(String key) { - return new GlobalizedMessage(key, BUNDLE_NAME); - } + /** + * This returns a globalized message using the type specific bundle, + * BUNDLE_NAME + */ + public static GlobalizedMessage globalize(String key) { + return new GlobalizedMessage(key, BUNDLE_NAME); + } - /** - * This returns a globalized message using the type specific bundle, - * BUNDLE_NAME - */ - public static GlobalizedMessage globalize(String key, Object[] args) { - return new GlobalizedMessage(key, BUNDLE_NAME, args); - } + /** + * This returns a globalized message using the type specific bundle, + * BUNDLE_NAME + */ + public static GlobalizedMessage globalize(String key, Object[] args) { + return new GlobalizedMessage(key, BUNDLE_NAME, args); + } } diff --git a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/util/ContactResourceBundle.java b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/util/ContactResourceBundle.java index 7446690e8..52cb76711 100755 --- a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/util/ContactResourceBundle.java +++ b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/util/ContactResourceBundle.java @@ -25,13 +25,10 @@ import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.cms.CMSGlobalized; /** - * * Resource Bundle used in UI for Contact ContentType. * * @author Shashin Shinde sshinde@redhat.com - * * @version $Id: ContactResourceBundle.java 287 2005-02-22 00:29:02Z sskracic $ - * */ public class ContactResourceBundle extends ChainedResourceBundle implements CMSGlobalized { diff --git a/ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDService.java b/ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDService.java index 148afd89f..c66b59103 100755 --- a/ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDService.java +++ b/ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDService.java @@ -31,9 +31,7 @@ import java.math.BigDecimal; * Domain object class to represent ESDService content type. * * @author Shashin Shinde sshinde@redhat.com - * * @version $Id: ESDService.java 287 2005-02-22 00:29:02Z sskracic $ - * */ public class ESDService extends TextPage { diff --git a/ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDServiceInitializer.java b/ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDServiceInitializer.java index 2c94a6241..ff85b2d3c 100755 --- a/ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDServiceInitializer.java +++ b/ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDServiceInitializer.java @@ -18,11 +18,13 @@ package com.arsdigita.cms.contenttypes; /** - * Initializer class to initialize ContentType ESDService. - * @author Shashin Shinde sshinde@redhat.com + * Initializer class to initialize ContentType ESDService. + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). * + * @author Shashin Shinde sshinde@redhat.com * @version $Id: ESDServiceInitializer.java 287 2005-02-22 00:29:02Z sskracic $ - * */ public class ESDServiceInitializer extends ContentTypeInitializer { diff --git a/ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/package.html b/ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/package.html new file mode 100644 index 000000000..4a12d2ae1 --- /dev/null +++ b/ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/package.html @@ -0,0 +1,14 @@ + + + +ESD Service content type + + + +

+ +

+ + + + diff --git a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventInitializer.java b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventInitializer.java index a4905d952..d6cf43afa 100755 --- a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventInitializer.java +++ b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventInitializer.java @@ -21,7 +21,10 @@ package com.arsdigita.cms.contenttypes; import org.apache.log4j.Logger; /** - * Initializer + * Initializes the Event content type. + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #7 $ $Date: 2004/08/17 $ diff --git a/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java b/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java index c7be49ed5..e32cc263b 100755 --- a/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java +++ b/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java @@ -21,23 +21,31 @@ package com.arsdigita.cms.contenttypes; import org.apache.log4j.Logger; /** - * The CMS initializer. + * Initializer class to initialize ContentType FAQ. + * + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). * * @author Justin Ross <jross@redhat.com> * @version $Id: FAQItemInitializer.java 757 2005-09-02 14:12:21Z sskracic $ */ public class FAQItemInitializer extends ContentTypeInitializer { - public final static String versionId = - "$Id: FAQItemInitializer.java 757 2005-09-02 14:12:21Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(FAQItemInitializer.class); + /** + * Constructor, sets the PDL manifest and the object type string + */ public FAQItemInitializer() { super("ccm-cms-types-faqitem.pdl.mf", FAQItem.BASE_DATA_OBJECT_TYPE); } + + /** + * Retrieve location of the assoziated stylesheet. + * @return + */ public String[] getStylesheets() { return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/FAQItem.xsl" diff --git a/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/FAQItemLoader.java b/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/FAQItemLoader.java index 16204abd4..edad04f54 100755 --- a/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/FAQItemLoader.java +++ b/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/FAQItemLoader.java @@ -27,10 +27,6 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; * @version $Id: FAQItemLoader.java 287 2005-02-22 00:29:02Z sskracic $ */ public class FAQItemLoader extends AbstractContentTypeLoader { - public final static String versionId = - "$Id: FAQItemLoader.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/FAQItem.xml" diff --git a/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/package.html b/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/package.html new file mode 100644 index 000000000..27c96224e --- /dev/null +++ b/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/package.html @@ -0,0 +1,40 @@ + + + + FAQ contenttype + + +

+ Assembles several special purpose content objects (content types), where FAQ + is one of them, which contain extended attributes specific for their + content domain and enable some automatic processing. +

+ +

Package Specification

+

+ Each content type is organized in a separate module (ccm-cms-types-[contenttype]). + Detailed description is provided with the domain class [contenttype].java + of each module. +

+ +

Configuration

+

+ Some content types can be configured by the ccm [get|set] + utility. Details about the available parameters can be found in the + [contenttype]Config.java class. The page /ccm/ds/config of + your installed APLAWS web site provides an overview for all content types. +

+ +

Related Documentation

+

+ For overviews, tutorials, examples, guides, and tool documentation, please see: +

+
    + +
  • CMS Administrator Guide
    • +
+ + + + + diff --git a/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemInitializer.java b/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemInitializer.java index 0b6b2f73a..2121d6bd2 100755 --- a/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemInitializer.java +++ b/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemInitializer.java @@ -21,7 +21,11 @@ package com.arsdigita.cms.contenttypes; import org.apache.log4j.Logger; /** - * The CMS initializer. + * Initializes the File Storage Item content type. + * + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). * * @author Justin Ross <jross@redhat.com> * @version $Id: FileStorageItemInitializer.java 287 2005-02-22 00:29:02Z sskracic $ @@ -31,16 +35,27 @@ public class FileStorageItemInitializer extends ContentTypeInitializer { private static final Logger s_log = Logger.getLogger(FileStorageItemInitializer.class); + /** + * Constructor, sets the PDL manifest file and object type string. + */ public FileStorageItemInitializer() { super("ccm-cms-types-filestorageitem.pdl.mf", FileStorageItem.BASE_DATA_OBJECT_TYPE); } + /** + * Retrieve location of traversal adapter + * @return + */ public String getTraversalXML() { return "WEB-INF/traversal-adapters/com/arsdigita/" + "cms/contenttypes/FileStorageItem.xml"; } + /** + * Retrieve location of this content types stylesheet. + * @return + */ public String[] getStylesheets() { return new String[] { "/static/content-types/com/arsdigita/" + diff --git a/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemLoader.java b/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemLoader.java index f0a1db805..0ca65130c 100755 --- a/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemLoader.java +++ b/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemLoader.java @@ -27,10 +27,6 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; * @version $Id: FileStorageItemLoader.java 287 2005-02-22 00:29:02Z sskracic $ */ public class FileStorageItemLoader extends AbstractContentTypeLoader { - public final static String versionId = - "$Id: FileStorageItemLoader.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/FileStorageItem.xml" diff --git a/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemResources_de.properties b/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemResources_de.properties new file mode 100644 index 000000000..912dd8258 --- /dev/null +++ b/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemResources_de.properties @@ -0,0 +1,2 @@ +file_storage_item.authoring.file_attachment.title=Dateianhang +file_storage_item.authoring.file_attachment.description=Dateianhang diff --git a/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemInitializer.java b/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemInitializer.java index 308bf5181..d0f595e35 100755 --- a/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemInitializer.java +++ b/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemInitializer.java @@ -23,7 +23,11 @@ import com.arsdigita.cms.contenttypes.ContentTypeInitializer; import org.apache.log4j.Logger; /** - * Initializer + * Initializes the Form Item content type. + * + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/17 $ @@ -34,16 +38,28 @@ public class FormItemInitializer extends ContentTypeInitializer { private static final Logger s_log = Logger.getLogger(FormItemInitializer.class); + /** + * Constructor, sets the PDL manifest file and object type string. + */ public FormItemInitializer() { super("ccm-cms-types-formitem.pdl.mf", FormItem.BASE_DATA_OBJECT_TYPE); } + /** + * Retrieve location of traversal adapter + * @return + */ public String getTraversalXML() { return "WEB-INF/traversal-adapters/com/arsdigita/" + "cms/formbuilder/FormItem.xml"; } + /** + * Retrieve location of this content types stylesheet. Overwrites parent + * method with FormItem specific value. + * @return + */ public String[] getStylesheets() { return new String[] { "/static/content-types/com/arsdigita/" + diff --git a/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemLoader.java b/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemLoader.java index 0206f80e4..67d7bb78a 100755 --- a/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemLoader.java +++ b/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemLoader.java @@ -30,12 +30,11 @@ import java.util.List; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #9 $ $Date: 2004/08/17 $ + * @version $Id: FormItemLoader.java 755 2005-09-02 13:42:47Z sskracic $ **/ public class FormItemLoader extends AbstractContentTypeLoader { - public final static String versionId = "$Id: FormItemLoader.java 755 2005-09-02 13:42:47Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private final Parameter m_contentSections = new StringParameter ("com.arsdigita.cms.formbuilder.FormItem.sections", Parameter.REQUIRED, "content"); diff --git a/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemResources_de.properties b/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemResources_de.properties new file mode 100644 index 000000000..03de8e09e --- /dev/null +++ b/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemResources_de.properties @@ -0,0 +1,4 @@ +form_item.authoring.controls.description=Elemente des Formulars editieren +form_item.authoring.controls.title=Controls +form_item.authoring.actions.description=Editieren der Aktionen des Formulars +form_item.authoring.actions.title=Aktionen diff --git a/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemInitializer.java b/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemInitializer.java index 3bbe41d03..4c47de43c 100755 --- a/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemInitializer.java +++ b/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemInitializer.java @@ -23,7 +23,11 @@ import com.arsdigita.cms.contenttypes.ContentTypeInitializer; import org.apache.log4j.Logger; /** - * Initializer + * Initializes the Form Section Item content type. + * + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/17 $ @@ -33,16 +37,27 @@ public class FormSectionItemInitializer extends ContentTypeInitializer { private static final Logger s_log = Logger.getLogger(FormSectionItemInitializer.class); + /** + * Constructor, sets the PDL manifest file and object type string. + */ public FormSectionItemInitializer() { super("ccm-cms-types-formsectionitem.pdl.mf", FormSectionItem.BASE_DATA_OBJECT_TYPE); } + /** + * Retrieve location of traversal adapter + * @return + */ public String getTraversalXML() { return "WEB-INF/traversal-adapters/com/arsdigita/" + "cms/formbuilder/FormSectionItem.xml"; } + /** + * Retrieve location of this content types stylesheet. + * @return + */ public String[] getStylesheets() { return new String[] { "/static/content-types/com/arsdigita/cms/" + diff --git a/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemLoader.java b/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemLoader.java index 2b8b8da4f..ea31ec6f7 100755 --- a/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemLoader.java +++ b/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemLoader.java @@ -30,12 +30,11 @@ import java.util.List; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #9 $ $Date: 2004/08/17 $ + * @version $Id: FormSectionItemLoader.java 755 2005-09-02 13:42:47Z sskracic $ **/ public class FormSectionItemLoader extends AbstractContentTypeLoader { - public final static String versionId = "$Id: FormSectionItemLoader.java 755 2005-09-02 13:42:47Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/formbuilder/FormSectionItem.xml" }; diff --git a/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemResources.properties b/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemResources.properties index e2e5d8212..e64ebc8b7 100755 --- a/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemResources.properties +++ b/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemResources.properties @@ -1,4 +1,4 @@ form_section_item.authoring.controls.description=Edit the controls present on the form form_section_item.authoring.controls.title=Controls -form_section_item.authoring.actions.description=Edit the form submission actions +form_section_item.authoring.actions.description=Editieren der Aktionen des Formulars form_section_item.authoring.actions.title=Actions \ No newline at end of file diff --git a/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemResources_de.properties b/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemResources_de.properties new file mode 100644 index 000000000..3a49584a3 --- /dev/null +++ b/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemResources_de.properties @@ -0,0 +1,4 @@ +form_section_item.authoring.controls.description=Elemente des Formulars editieren +form_section_item.authoring.controls.title=Controls +form_section_item.authoring.actions.description=Edit the form submission actions +form_section_item.authoring.actions.title=Aktionen diff --git a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java b/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java index 65789aafd..3649b9699 100755 --- a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java +++ b/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java @@ -22,7 +22,12 @@ import org.apache.log4j.Logger; /** - * The CMS initializer. + * Initializes the Form Item content type. + * + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). This is done by runtimeRuntime startup method which runs the init() + * methods of all initializers (this one just using the parent implementation). * * @author Justin Ross <jross@redhat.com> * @version $Id: GlossaryItemInitializer.java 757 2005-09-02 14:12:21Z sskracic $ @@ -31,11 +36,20 @@ public class GlossaryItemInitializer extends ContentTypeInitializer { private static final Logger s_log = Logger.getLogger(GlossaryItemInitializer.class); + /** + * Constructor, sets the PDL manifest file and object type string. + */ public GlossaryItemInitializer() { super("ccm-cms-types-glossaryitem.pdl.mf", GlossaryItem.BASE_DATA_OBJECT_TYPE); } + /** + * Retrieve location of this content types stylesheet. Overwrites parent + * method with FormItem specific value for use by the parent class worker + * methods. + * @return + */ public String[] getStylesheets() { return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/GlossaryItem.xsl" diff --git a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemLoader.java b/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemLoader.java index 7938ef1b5..85a662eb5 100755 --- a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemLoader.java +++ b/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemLoader.java @@ -28,10 +28,6 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; * @version $Id: GlossaryItemLoader.java 287 2005-02-22 00:29:02Z sskracic $ */ public class GlossaryItemLoader extends AbstractContentTypeLoader { - public final static String versionId = - "$Id: GlossaryItemLoader.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GlossaryItem.xml" diff --git a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryResources_de.properties b/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryResources_de.properties new file mode 100644 index 000000000..64d07e2d1 --- /dev/null +++ b/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryResources_de.properties @@ -0,0 +1,2 @@ +cms.contenttypes.ui.glossary.term=Begriff: +cms.contenttypes.ui.glossary.definition=Definition: \ No newline at end of file diff --git a/ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteInitializer.java b/ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteInitializer.java index ad14d28b2..1339679f2 100755 --- a/ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteInitializer.java +++ b/ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteInitializer.java @@ -27,10 +27,6 @@ import org.apache.log4j.Logger; * @version $Id: InlineSiteInitializer.java 757 2005-09-02 14:12:21Z sskracic $ */ public class InlineSiteInitializer extends ContentTypeInitializer { - public final static String versionId = - "$Id: InlineSiteInitializer.java 757 2005-09-02 14:12:21Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(InlineSiteInitializer.class); diff --git a/ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteLoader.java b/ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteLoader.java index 8c56255b3..0f15d8b03 100755 --- a/ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteLoader.java +++ b/ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteLoader.java @@ -28,10 +28,6 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; * @version $Id: InlineSiteLoader.java 287 2005-02-22 00:29:02Z sskracic $ */ public class InlineSiteLoader extends AbstractContentTypeLoader { - public final static String versionId = - "$Id: InlineSiteLoader.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InlineSite.xml" diff --git a/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobInitializer.java b/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobInitializer.java index 790b8f180..2a4944b66 100755 --- a/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobInitializer.java +++ b/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobInitializer.java @@ -23,12 +23,11 @@ package com.arsdigita.cms.contenttypes; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #7 $ $Date: 2004/08/17 $ + * @version $Id: JobInitializer.java 757 2005-09-02 14:12:21Z sskracic $ **/ public class JobInitializer extends ContentTypeInitializer { - public final static String versionId = "$Id: JobInitializer.java 757 2005-09-02 14:12:21Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public JobInitializer() { super("ccm-cms-types-job.pdl.mf", Job.BASE_DATA_OBJECT_TYPE); diff --git a/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobLoader.java b/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobLoader.java index 0921fdf20..8611fffd9 100755 --- a/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobLoader.java +++ b/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobLoader.java @@ -25,12 +25,11 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #5 $ $Date: 2004/08/17 $ + * @version $Id: JobLoader.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class JobLoader extends AbstractContentTypeLoader { - public final static String versionId = "$Id: JobLoader.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Job.xml" }; diff --git a/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobResources_de.properties b/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobResources_de.properties new file mode 100644 index 000000000..4d26cf760 --- /dev/null +++ b/ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobResources_de.properties @@ -0,0 +1 @@ +job.authoring.basic_properties.description=Editieren der Beschreibungsdaten diff --git a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeInitializer.java b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeInitializer.java index 90c569ee7..76768c6b9 100755 --- a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeInitializer.java +++ b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeInitializer.java @@ -21,24 +21,38 @@ package com.arsdigita.cms.contenttypes; import org.apache.log4j.Logger; /** - * Initializer + * Initializes the Legal Notice content type. + * + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). This is done by runtimeRuntime startup method which runs the init() + * methods of all initializers (this one just using the parent implementation). * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/17 $ + * @version $Id: LegalNoticeInitializer.java 757 2005-09-02 14:12:21Z sskracic $ **/ public class LegalNoticeInitializer extends ContentTypeInitializer { - public final static String versionId = "$Id: LegalNoticeInitializer.java 757 2005-09-02 14:12:21Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final Logger s_log = Logger.getLogger(LegalNoticeInitializer.class); + /** + * Constructor, sets the PDL manifest file and object type string. + */ public LegalNoticeInitializer() { - super("ccm-cms-types-legalnotice.pdl.mf", LegalNotice.BASE_DATA_OBJECT_TYPE); + super("ccm-cms-types-legalnotice.pdl.mf", LegalNotice.BASE_DATA_OBJECT_TYPE); } + /** + * Retrieve location of this content types stylesheet. Overwrites parent + * method with FormItem specific value for use by the parent class worker + * methods. + * @return + */ public String[] getStylesheets() { - return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/LegalNotice.xsl" }; + return new String[] { + "/static/content-types/com/arsdigita/cms/contenttypes/LegalNotice.xsl" }; } } diff --git a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeLoader.java b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeLoader.java index 4b599b84e..2f3ce47a0 100755 --- a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeLoader.java +++ b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeLoader.java @@ -25,12 +25,11 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/17 $ + * @version $Id: LegalNoticeLoader.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class LegalNoticeLoader extends AbstractContentTypeLoader { - public final static String versionId = "$Id: LegalNoticeLoader.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/LegalNotice.xml" }; diff --git a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResrouce_de.properties b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResrouce_de.properties new file mode 100644 index 000000000..7fc3d1f2a --- /dev/null +++ b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResrouce_de.properties @@ -0,0 +1 @@ +legal_notice.authoring.basic_properties.description=Editieren vonTitel, Name und ID diff --git a/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesInitializer.java b/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesInitializer.java index a4ad7fb83..c44bf42de 100755 --- a/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesInitializer.java +++ b/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesInitializer.java @@ -21,23 +21,39 @@ package com.arsdigita.cms.contenttypes; import org.apache.log4j.Logger; /** - * Initializer + * Initializes the Minutes content type. + * + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). This is done by runtimeRuntime startup method which runs the init() + * methods of all initializers (this one just using the parent implementation). * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/17 $ + * @version $Id: MinutesInitializer.java 757 2005-09-02 14:12:21Z sskracic $ **/ public class MinutesInitializer extends ContentTypeInitializer { - public final static String versionId = "$Id: MinutesInitializer.java 757 2005-09-02 14:12:21Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final Logger s_log = Logger.getLogger(MinutesInitializer.class); + + /** + * Constructor, sets the PDL manifest file and object type string. + */ public MinutesInitializer() { super("ccm-cms-types-minutes.pdl.mf", Minutes.BASE_DATA_OBJECT_TYPE); } + /** + * Retrieve location of this content types stylesheet. Overwrites parent + * method with FormItem specific value for use by the parent class worker + * methods. + * + * @return complete path info string + */ public String[] getStylesheets() { - return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/LegalNotice.xsl" }; + return new String[] { + "/static/content-types/com/arsdigita/cms/contenttypes/LegalNotice.xsl" }; } } diff --git a/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesLoader.java b/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesLoader.java index 157ec9fb8..d5e7b4df3 100755 --- a/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesLoader.java +++ b/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesLoader.java @@ -25,12 +25,11 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #7 $ $Date: 2004/08/17 $ + * @version $Id: MinutesLoader.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class MinutesLoader extends AbstractContentTypeLoader { - public final static String versionId = "$Id: MinutesLoader.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Minutes.xml" }; diff --git a/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesResources_de.properties b/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesResources_de.properties new file mode 100644 index 000000000..9be279371 --- /dev/null +++ b/ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesResources_de.properties @@ -0,0 +1 @@ +minutes.authoring.basic_properties.description=Editieren von Titel, Name, Teilnehmer, etc. diff --git a/ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/MOTDItemInitializer.java b/ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/MOTDItemInitializer.java index 37ad4c62d..318a5af41 100755 --- a/ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/MOTDItemInitializer.java +++ b/ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/MOTDItemInitializer.java @@ -19,22 +19,33 @@ package com.arsdigita.cms.contenttypes; /** - * The CMS initializer. + * Initializes the MOTD content type. + * + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). This is done by runtimeRuntime startup method which runs the init() + * methods of all initializers (this one just using the parent implementation). * * @author Justin Ross <jross@redhat.com> * @version $Id: MOTDItemInitializer.java 757 2005-09-02 14:12:21Z sskracic $ */ public class MOTDItemInitializer extends ContentTypeInitializer { - public final static String versionId = - "$Id: MOTDItemInitializer.java 757 2005-09-02 14:12:21Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; + /** + * Constructor, sets the PDL manifest file and object type string. + */ public MOTDItemInitializer() { super("ccm-cms-types-motditem.pdl.mf", MOTDItem.BASE_DATA_OBJECT_TYPE); } + /** + * Retrieve location of this content types stylesheet. Overwrites parent + * method with FormItem specific value for use by the parent class worker + * methods. + * + * @return complete path info string + */ public String[] getStylesheets() { return new String[] { }; } diff --git a/ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/MOTDItemLoader.java b/ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/MOTDItemLoader.java index 92b6b596e..863ab6242 100755 --- a/ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/MOTDItemLoader.java +++ b/ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/MOTDItemLoader.java @@ -28,10 +28,6 @@ import com.arsdigita.loader.PackageLoader; * @version $Id: MOTDItemLoader.java 287 2005-02-22 00:29:02Z sskracic $ */ public class MOTDItemLoader extends PackageLoader { - public final static String versionId = - "$Id: MOTDItemLoader.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; public void run(final ScriptContext ctx) { // XXX content type definition diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSection.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSection.java index 850b4f5b1..2e21c7326 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSection.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSection.java @@ -29,7 +29,7 @@ import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.kernel.permissions.PermissionService; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; - + import org.apache.log4j.Logger; import java.math.BigDecimal; @@ -38,7 +38,7 @@ import java.math.BigDecimal; * Represents a section within a MultiPartArticle * * @author Dave Turner - * @version $Id: ArticleSection.java 1500 2007-03-20 09:25:45Z chrisgilbert23 $ + * @version $Id: ArticleSection.java 1500 2007-03-20 09:25:45Z chrisgilbert23 $ */ public class ArticleSection extends ContentPage { private static final Logger s_log = Logger.getLogger(ArticleSection.class); @@ -63,7 +63,8 @@ public class ArticleSection extends ContentPage { * * @param id the id of the object to retrieve */ - public ArticleSection(BigDecimal id) throws DataObjectNotFoundException { + public ArticleSection(BigDecimal id) + throws DataObjectNotFoundException { this(new OID(BASE_DATA_OBJECT_TYPE, id)); } @@ -72,7 +73,8 @@ public class ArticleSection extends ContentPage { * * @param id the id of the object to retrieve */ - public ArticleSection(OID id) throws DataObjectNotFoundException { + public ArticleSection(OID id) + throws DataObjectNotFoundException { super(id); } @@ -156,97 +158,97 @@ public class ArticleSection extends ContentPage { set(PAGE_BREAK, new Boolean(val)); } - /** - * Depending on config parameter, either return the title - * of the section - * - * OR - * - * return the title of the section at the top of the - * page on which the current section appears unless - * the whole multipart article appears on one page, - * in which case null is returned. - */ - public String getPageTitle() { - - if (MultiPartArticle.getConfig().useSectionTitle()) { - return getTitle(); - } - - s_log.debug("retrieve pageTitle for section " + getTitle() + " ranked " + getRank()); - MultiPartArticle parent = getMPArticle(); - - // is this a single page article? either page break on last section, - // or no page breaks - - - // boolean argument means order by rank ascending - no argument - // currently means ascending, but specify here in case that - // changes - ArticleSectionCollection sections = parent.getSections(true); - sections.addEqualsFilter(PAGE_BREAK, Boolean.TRUE); - Integer firstPageBreak = null; - if (sections.next()) { - firstPageBreak = sections.getArticleSection().getRank(); - s_log.debug("first page break in this article is in section ranked " + firstPageBreak); - } - sections.close(); - int lastSection = parent.getMaxRank(); - s_log.debug("last section of article is ranked " + lastSection); - - if (firstPageBreak == null || firstPageBreak.intValue() == lastSection) { - s_log.debug("this is a single page article"); - return null; - } else { - s_log.debug("this article has more than one page"); - } - - // okay - this article has more than one page - lets find the page break - // before this section and then the section following that page break - // boolean argument means order by rank descending - - sections = parent.getSections(false); - sections.addEqualsFilter(PAGE_BREAK, Boolean.TRUE); - sections.addFilter( - sections.getFilterFactory().lessThan(RANK, getRank(), true)); - - Integer topOfPageRank = new Integer(1); - if (sections.next()) { - topOfPageRank = new Integer(sections.getArticleSection().getRank().intValue() + 1); - s_log.debug("Found top of page rank: " - + topOfPageRank.intValue()); - } else { - // If no page breaks before this section then we must be on - // page one. - s_log.debug("This section is on first page."); - } - sections.close(); - - // Get 'clean' - sections = parent.getSections(false); - sections.addEqualsFilter(RANK, topOfPageRank); - String sectionTitle= null; - while (sections.next()) { - sectionTitle = sections.getArticleSection().getTitle(); - s_log.debug("Found page/section title: " + sectionTitle); - } - - return sectionTitle; - } - - /** - * As sections don't have their own summary, return the parent's search - * summary. - */ - public String getSearchSummary() { - if (MultiPartArticle.getConfig().useParentSummary()) { - MultiPartArticle parent = getMPArticle(); - return parent.getSearchSummary(); - } else { - return super.getSearchSummary(); - } - } - + /** + * Depending on config parameter, either return the title + * of the section + * + * OR + * + * return the title of the section at the top of the + * page on which the current section appears unless + * the whole multipart article appears on one page, + * in which case null is returned. + */ + public String getPageTitle() { + + if (MultiPartArticle.getConfig().useSectionTitle()) { + return getTitle(); + } + + s_log.debug("retrieve pageTitle for section " + getTitle() + " ranked " + getRank()); + MultiPartArticle parent = getMPArticle(); + + // is this a single page article? either page break on last section, + // or no page breaks + + + // boolean argument means order by rank ascending - no argument + // currently means ascending, but specify here in case that + // changes + ArticleSectionCollection sections = parent.getSections(true); + sections.addEqualsFilter(PAGE_BREAK, Boolean.TRUE); + Integer firstPageBreak = null; + if (sections.next()) { + firstPageBreak = sections.getArticleSection().getRank(); + s_log.debug("first page break in this article is in section ranked " + firstPageBreak); + } + sections.close(); + int lastSection = parent.getMaxRank(); + s_log.debug("last section of article is ranked " + lastSection); + + if (firstPageBreak == null || firstPageBreak.intValue() == lastSection) { + s_log.debug("this is a single page article"); + return null; + } else { + s_log.debug("this article has more than one page"); + } + + // okay - this article has more than one page - lets find the page break + // before this section and then the section following that page break + // boolean argument means order by rank descending + + sections = parent.getSections(false); + sections.addEqualsFilter(PAGE_BREAK, Boolean.TRUE); + sections.addFilter( + sections.getFilterFactory().lessThan(RANK, getRank(), true)); + + Integer topOfPageRank = new Integer(1); + if (sections.next()) { + topOfPageRank = new Integer(sections.getArticleSection().getRank().intValue() + 1); + s_log.debug("Found top of page rank: " + + topOfPageRank.intValue()); + } else { + // If no page breaks before this section then we must be on + // page one. + s_log.debug("This section is on first page."); + } + sections.close(); + + // Get 'clean' + sections = parent.getSections(false); + sections.addEqualsFilter(RANK, topOfPageRank); + String sectionTitle= null; + while (sections.next()) { + sectionTitle = sections.getArticleSection().getTitle(); + s_log.debug("Found page/section title: " + sectionTitle); + } + + return sectionTitle; + } + + /** + * As sections don't have their own summary, return the parent's search + * summary. + */ + public String getSearchSummary() { + if (MultiPartArticle.getConfig().useParentSummary()) { + MultiPartArticle parent = getMPArticle(); + return parent.getSearchSummary(); + } else { + return super.getSearchSummary(); + } + } + protected void afterSave() { super.afterSave(); diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java index 90fb2318f..48a9e96de 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java @@ -20,8 +20,10 @@ package com.arsdigita.cms.contenttypes; import com.arsdigita.cms.ContentSectionConfig; import com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel; -import com.arsdigita.cms.search.ContentPageMetadataProvider; +//Unused import +// import com.arsdigita.cms.search.ContentPageMetadataProvider; import com.arsdigita.kernel.URLService; +import com.arsdigita.runtime.DomainInitEvent; import com.arsdigita.runtime.LegacyInitEvent; import com.arsdigita.search.MetadataProviderRegistry; @@ -52,7 +54,9 @@ public class MultiPartArticleInitializer extends ContentTypeInitializer { }; } - public void init(LegacyInitEvent evt) { + // Previously used LegacyInitEvent, allthough no legacy init functionality + // is used here. Wondering. + public void init(DomainInitEvent evt) { super.init(evt); MetadataProviderRegistry.registerAdapter( diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java index bd2f875bb..ab47608df 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java @@ -45,7 +45,6 @@ public class MultiPartArticleLoader extends AbstractContentTypeLoader { private ResourceParameter m_template; - /** * MultiPartArticleLoader Constructor */ diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleSectionURLFinder.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleSectionURLFinder.java index 3b554205b..2c854353b 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleSectionURLFinder.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleSectionURLFinder.java @@ -97,8 +97,8 @@ public class MultiPartArticleSectionURLFinder implements URLFinder { ItemResolver resolver = contentSection.getItemResolver(); String url = resolver.generateItemURL(null, article, - contentSection, - context); + contentSection, + context); final int sep = url.indexOf('?'); URL destination = null; diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/ArticleSectionPanel.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/ArticleSectionPanel.java index 153867ed9..0939d37de 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/ArticleSectionPanel.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/ArticleSectionPanel.java @@ -316,8 +316,6 @@ public class ArticleSectionPanel extends SimpleComponent implements ExtraXMLGene // the position in the list of sections, or the string 'all' private class PageParameter extends ParameterModel { - public static final String versionId = "$Id: ArticleSectionPanel.java 1167 2006-06-14 12:27:28Z fabrice $ by $Author: fabrice $, $DateTime: 2004/08/17 23:15:09 $"; - public PageParameter(String name) { super(name); } diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleEditForm.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleEditForm.java index 98b16a846..ceae1f49a 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleEditForm.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleEditForm.java @@ -100,5 +100,4 @@ public class MultiPartArticleEditForm extends MultiPartArticleForm return (Folder) parent; } - } diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/SectionTable.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/SectionTable.java index 25b0046fc..916bf88c2 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/SectionTable.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/SectionTable.java @@ -55,12 +55,8 @@ import java.math.BigDecimal; */ public class SectionTable extends Table { - /** - * The class has already a logger (s_log), so I removed this. - * Jens Pelzetter 2009-05-29 - */ - /*private static final Logger log = - Logger.getLogger(SectionTable.class.getName());*/ + private static final Logger log = + Logger.getLogger(SectionTable.class.getName()); // column headings public static final String COL_TITLE = "Section"; diff --git a/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java b/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java index e2581281b..22d00453b 100755 --- a/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java +++ b/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java @@ -21,16 +21,18 @@ package com.arsdigita.cms.contenttypes; import org.apache.log4j.Logger; /** - * Initializer + * Initializes the NewsItem content type. + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #7 $ $Date: 2004/08/17 $ + * @version $Id: NewsItemInitializer.java 1594 2007-07-10 10:56:11Z p_boy $ **/ public class NewsItemInitializer extends ContentTypeInitializer { - public final static String versionId = "$Id: NewsItemInitializer.java 1594 2007-07-10 10:56:11Z p_boy $ by $Author: p_boy $, $DateTime: 2004/08/17 23:15:09 $"; - private static final Logger s_log = Logger.getLogger(NewsItemInitializer.class); public NewsItemInitializer() { @@ -38,11 +40,13 @@ public class NewsItemInitializer extends ContentTypeInitializer { } public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/NewsItem.xml"; + return + "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/NewsItem.xml"; } public String[] getStylesheets() { - return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/NewsItem.xsl" }; + return new String[] + { "/static/content-types/com/arsdigita/cms/contenttypes/NewsItem.xsl" }; } } diff --git a/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemLoader.java b/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemLoader.java index d3aef53ce..56f96f380 100755 --- a/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemLoader.java +++ b/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemLoader.java @@ -25,12 +25,11 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/17 $ + * @version $Id: NewsItemLoader.java 1594 2007-07-10 10:56:11Z p_boy $ **/ public class NewsItemLoader extends AbstractContentTypeLoader { - public final static String versionId = "$Id: NewsItemLoader.java 1594 2007-07-10 10:56:11Z p_boy $ by $Author: p_boy $, $DateTime: 2004/08/17 23:15:09 $"; - private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/NewsItem.xml" }; diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java index 97794c15d..a8171939d 100755 --- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java +++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java @@ -21,23 +21,35 @@ package com.arsdigita.cms.contenttypes; import org.apache.log4j.Logger; /** - * The CMS initializer. + * Initializes the Organization content type. + * + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). This is done by runtimeRuntime startup method which runs the init() + * methods of all initializers (this one just using the parent implementation). * * @author Justin Ross <jross@redhat.com> * @version $Id: OrganizationInitializer.java 757 2005-09-02 14:12:21Z sskracic $ */ public class OrganizationInitializer extends ContentTypeInitializer { - public final static String versionId = - "$Id: OrganizationInitializer.java 757 2005-09-02 14:12:21Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; + private static final Logger s_log = Logger.getLogger(OrganizationInitializer.class); + /** + * Constructor, sets the PDL manifest file and object type string. + */ public OrganizationInitializer() { super("ccm-cms-types-organization.pdl.mf", Organization.BASE_DATA_OBJECT_TYPE); } + /** + * Retrieve location of this content types stylesheet. Overwrites parent + * method with FormItem specific value for use by the parent class worker + * methods. + * + * @return complete path info string + */ public String[] getStylesheets() { return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/Organization.xsl" diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationLoader.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationLoader.java index eb58c69dd..972c84639 100755 --- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationLoader.java +++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationLoader.java @@ -28,11 +28,6 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; * @version $Id: OrganizationLoader.java 287 2005-02-22 00:29:02Z sskracic $ */ public class OrganizationLoader extends AbstractContentTypeLoader { - public final static String versionId = - "$Id: OrganizationLoader.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; - private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Organization.xml" diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources_de.properties b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources_de.properties new file mode 100644 index 000000000..20a9f32f3 --- /dev/null +++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources_de.properties @@ -0,0 +1,6 @@ +organization.authoring.logo_image.title=Logo zuordnen +organization.authoring.logo_image.description=Zuordnen eines Logos. +cms.contenttypes.organization.image_option_null=Option wae leer. +cms.contenttypes.organization.chose_image_when_ignoring=Ein Bild ist angegeben, obwohl Option Ignorieren gew\u00E4hlt wurde. +cms.contenttypes.organization.chose_image_when_deleting=Ein Bild ist angegeben, obwohl Option L\u00F6schen gew\u00E4hlt wurde. +cms.contenttypes.organization.chose_image_when_uploading=Ein Bild ist angegeben, obwohl Option Hochladen gew\u00E4hlt wurde. diff --git a/ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseInitializer.java b/ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseInitializer.java index af537cd53..8329d0472 100755 --- a/ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseInitializer.java +++ b/ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseInitializer.java @@ -25,20 +25,30 @@ import org.apache.log4j.Logger; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/17 $ + * @version $Id: PressReleaseInitializer.java 757 2005-09-02 14:12:21Z sskracic $ **/ public class PressReleaseInitializer extends ContentTypeInitializer { - public final static String versionId = "$Id: PressReleaseInitializer.java 757 2005-09-02 14:12:21Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final Logger s_log = Logger.getLogger(PressReleaseInitializer.class); + /** + * Constructor, sets the PDL manifest file and object type string. + */ public PressReleaseInitializer() { super("ccm-cms-types-pressrelease.pdl.mf", PressRelease.BASE_DATA_OBJECT_TYPE); } + /** + * Retrieve location of this content types stylesheet. Overwrites parent + * method with FormItem specific value for use by the parent class worker + * methods. + * + * @return complete path info string + */ public String[] getStylesheets() { - return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/PressRelease.xsl" }; + return new String[] { + "/static/content-types/com/arsdigita/cms/contenttypes/PressRelease.xsl" }; } } diff --git a/ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseLoader.java b/ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseLoader.java index 8e8fbe02d..430211044 100755 --- a/ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseLoader.java +++ b/ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseLoader.java @@ -25,12 +25,11 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/17 $ + * @version $Id: PressReleaseLoader.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class PressReleaseLoader extends AbstractContentTypeLoader { - public final static String versionId = "$Id: PressReleaseLoader.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PressRelease.xml" }; diff --git a/ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseResources_de.properties b/ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseResources_de.properties new file mode 100644 index 000000000..d266b095c --- /dev/null +++ b/ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseResources_de.properties @@ -0,0 +1 @@ +press_release.authoring.basic_properties.description=Editieren von Titel, Name, Kontakt Information, Zusammenfassung, Ref. Id und Erscheinungsdatum diff --git a/ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseResources_fr.properties b/ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseResources_fr.properties new file mode 100644 index 000000000..dfa1073a0 --- /dev/null +++ b/ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseResources_fr.properties @@ -0,0 +1 @@ +press_release.authoring.basic_properties.description=Edit the title, name, contact info, summary, ref. code and release date diff --git a/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceInitializer.java b/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceInitializer.java index 797afc889..cd5aa3580 100755 --- a/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceInitializer.java +++ b/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceInitializer.java @@ -21,23 +21,37 @@ package com.arsdigita.cms.contenttypes; import org.apache.log4j.Logger; /** - * Initializer + * Initializes the Service content type. + * + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). This is done by runtimeRuntime startup method which runs the init() + * methods of all initializers (this one just using the parent implementation). * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/17 $ - **/ - + * @version $Id: ServiceInitializer.java 757 2005-09-02 14:12:21Z sskracic $ + */ public class ServiceInitializer extends ContentTypeInitializer { - public final static String versionId = "$Id: ServiceInitializer.java 757 2005-09-02 14:12:21Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final Logger s_log = Logger.getLogger(ServiceInitializer.class); + /** + * Constructor, sets the PDL manifest file and object type string. + */ public ServiceInitializer() { super("ccm-cms-types-service.pdl.mf", Service.BASE_DATA_OBJECT_TYPE); } + /** + * Retrieve location of this content types stylesheet. Overwrites parent + * method with FormItem specific value for use by the parent class worker + * methods. + * + * @return complete path info string + */ public String[] getStylesheets() { - return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/Service.xsl" }; + return new String[] { + "/static/content-types/com/arsdigita/cms/contenttypes/Service.xsl" }; } } diff --git a/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceLoader.java b/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceLoader.java index 9f113d3a0..29749209e 100755 --- a/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceLoader.java +++ b/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceLoader.java @@ -25,12 +25,11 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/17 $ + * @version $Id: ServiceLoader.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class ServiceLoader extends AbstractContentTypeLoader { - public final static String versionId = "$Id: ServiceLoader.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Service.xml" }; diff --git a/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceResources_de.properties b/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceResources_de.properties new file mode 100644 index 000000000..bc82bace3 --- /dev/null +++ b/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceResources_de.properties @@ -0,0 +1 @@ +service.authoring.basic_properties.description=Editieren von Titel, Name, etc. diff --git a/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceResources_fr.properties b/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceResources_fr.properties new file mode 100644 index 000000000..b10f15e72 --- /dev/null +++ b/ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceResources_fr.properties @@ -0,0 +1 @@ +service.authoring.basic_properties.description=Edit the title, name, contact info, summary, ref. code and release date diff --git a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java index 416f22da4..de25e4e66 100755 --- a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java +++ b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java @@ -21,7 +21,12 @@ package com.arsdigita.cms.contenttypes; import org.apache.log4j.Logger; /** - * The CMS SiteProxy initializer. + * Initializes the SiteProxy content type. + * + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). This is done by runtimeRuntime startup method which runs the init() + * methods of all initializers (this one just using the parent implementation). * * @author Justin Ross <jross@redhat.com> * @version $Id: SiteProxyInitializer.java 757 2005-09-02 14:12:21Z sskracic $ @@ -31,13 +36,21 @@ public class SiteProxyInitializer extends ContentTypeInitializer { private static final Logger s_log = Logger.getLogger(SiteProxyInitializer.class); /** - * SiteProxyInitialize Constructor + * SiteProxyInitialize Constructor, sets the PDL manifest file and + * object type string. */ public SiteProxyInitializer() { super("ccm-cms-types-siteproxy.pdl.mf", SiteProxy.BASE_DATA_OBJECT_TYPE); } + /** + * Retrieve location of this content types stylesheet. Overwrites parent + * method with FormItem specific value for use by the parent class worker + * methods. + * + * @return complete path info string + */ public String[] getStylesheets() { return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/SiteProxy.xsl" diff --git a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyResources_de.properties b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyResources_de.properties new file mode 100644 index 000000000..e723ed57b --- /dev/null +++ b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyResources_de.properties @@ -0,0 +1,12 @@ +cms.contenttypes.siteproxy.error_fetching_url=Fehler beim Lesen der URL: {0} +cms.contenttypes.siteproxy.exception_fetching_url=Fehler beim Lesen der URL: {0} mit Ausnahme Typ " {1} " und Nachricht " {2} " +cms.contenttypes.siteproxy.empty_page_returned=URL: {0} ergab eine leere Seite +cms.contenttypes.ui.siteproxy.kit.label=Site Proxy +cms.contenttypes.ui.siteproxy.kit.description=Ein Proxy Dokument Typ f\u00FCr eine Seite auf einem externen Server +cms.contenttypes.ui.siteproxy.atozstep.label= AtoZ Eigenschaften bearbeiten +cms.contenttypes.ui.siteproxy.atozstep.description= AtoZ Eigenschaften bearbeiten +cms.contenttypes.ui.siteproxy.label.atoztitle=AtoZ Titel +cms.contenttypes.ui.siteproxy.label.usedinatoz=In AtoZ benutzen +cms.contenttypes.ui.siteproxy.option.usedinatoz.yes=Ja +cms.contenttypes.ui.siteproxy.option.usedinatoz.no=Nein +cms.contenttypes.ui.siteproxy.link.editatoz=Editieren diff --git a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyResources_fr.properties b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyResources_fr.properties new file mode 100644 index 000000000..3f690bcaf --- /dev/null +++ b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyResources_fr.properties @@ -0,0 +1,12 @@ +cms.contenttypes.siteproxy.error_fetching_url=Error fetching URL: {0} +cms.contenttypes.siteproxy.exception_fetching_url=Error fetching URL: {0} with exception of type " {1} " and message " {2} " +cms.contenttypes.siteproxy.empty_page_returned=Empty Page Returned for URL: {0} +cms.contenttypes.ui.siteproxy.kit.label=Site Proxy +cms.contenttypes.ui.siteproxy.kit.description=A Proxy item for a page on an external site +cms.contenttypes.ui.siteproxy.atozstep.label=Edit AtoZ properties +cms.contenttypes.ui.siteproxy.atozstep.description=Edit AtoZ properties +cms.contenttypes.ui.siteproxy.label.atoztitle=AtoZ Title +cms.contenttypes.ui.siteproxy.label.usedinatoz=Used in AtoZ +cms.contenttypes.ui.siteproxy.option.usedinatoz.yes=Yes +cms.contenttypes.ui.siteproxy.option.usedinatoz.no=No +cms.contenttypes.ui.siteproxy.link.editatoz=Edit diff --git a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/dispatcher/SiteProxyPanel.java b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/dispatcher/SiteProxyPanel.java index ea8eda0a9..0fcb47ab4 100755 --- a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/dispatcher/SiteProxyPanel.java +++ b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/dispatcher/SiteProxyPanel.java @@ -46,11 +46,10 @@ import java.io.*; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #6 $ $Date: 2004/08/17 $ + * @version $Id: SiteProxyPanel.java 1048 2005-12-11 20:46:12Z apevec $ */ public class SiteProxyPanel extends ContentPanel { - public static final String versionId = "$Id: SiteProxyPanel.java 1048 2005-12-11 20:46:12Z apevec $ by $Author: apevec $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(SiteProxyPanel.class); private static String SITE_PROXY_PANEL_NAME = "cms:siteProxyPanel"; diff --git a/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Initializer.java b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Initializer.java index 8b49c43bb..8c0151e3a 100755 --- a/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Initializer.java +++ b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Initializer.java @@ -21,21 +21,32 @@ package com.arsdigita.cms.contenttypes.xmlfeed; import com.arsdigita.cms.contenttypes.ContentTypeInitializer; /** - * The XML Feed initializer. + * Initializes the XML Feed content type. + * + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). This is done by runtimeRuntime startup method which runs the init() + * methods of all initializers (this one just using the parent implementation). * * @version $Id: Initializer.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Initializer extends ContentTypeInitializer { - public final static String versionId = - "$Id: Initializer.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/02/06 11:50:22 $"; + /** + * Constructor, sets the PDL manifest file and object type string. + */ public Initializer() { super("ccm-cms-types-xmlfeed.pdl.mf", XMLFeed.BASE_DATA_OBJECT_TYPE); } + /** + * Retrieve location of this content types stylesheet. Overwrites parent + * method with FormItem specific value for use by the parent class worker + * methods. + * + * @return complete path info string + */ public String[] getStylesheets() { return new String[] { "/static/content-types/com/" + "arsdigita/cms/contenttypes/XMLFeed.xsl" }; diff --git a/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader.java b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader.java index dba3f4908..cd2281e31 100755 --- a/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader.java +++ b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader.java @@ -31,10 +31,7 @@ import java.util.List; * @version $Id: Loader.java 755 2005-09-02 13:42:47Z sskracic $ */ public class Loader extends AbstractContentTypeLoader { - public final static String versionId = - "$Id: Loader.java 755 2005-09-02 13:42:47Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/02/06 11:50:22 $"; + private final Parameter m_contentSections = new StringParameter ("com.arsdigita.cms.contenttypes.xmlfeed.sections", Parameter.REQUIRED, "forms"); diff --git a/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.java b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.java index c8723df99..392ecc88c 100755 --- a/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.java +++ b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.java @@ -90,8 +90,6 @@ public final class XMLFeed extends FormItem { private static Logger s_log = Logger.getLogger(XMLFeed.class); // ===== Constants ======================================================= // - public static final String versionID = - "$Id: XMLFeed.java 755 2005-09-02 13:42:47Z sskracic $"; /** * The fully qualified model name of the underlying data object, which in diff --git a/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/listener/RetrieveListener.java b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/listener/RetrieveListener.java index 9922d429f..6f6f85c98 100755 --- a/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/listener/RetrieveListener.java +++ b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/listener/RetrieveListener.java @@ -69,19 +69,16 @@ import org.apache.log4j.Logger; * the XmlFeed object. *

* - * @author Miles Barr - * @version $Id: RetrieveListener.java 755 2005-09-02 13:42:47Z sskracic $ - * @since 05-03-2003 - * * @see XmlFeed + * @author Miles Barr + * @since 05-03-2003 + * @version $Id: RetrieveListener.java 755 2005-09-02 13:42:47Z sskracic $ */ public class RetrieveListener implements FormProcessListener{ private static final Logger s_log = Logger.getLogger(RetrieveListener.class); // ===== Constants ======================================================= // - public static final String versionId = - "$Id: RetrieveListener.java 755 2005-09-02 13:42:47Z sskracic $"; /** The key that the results are stored in the request under. */ public static final String REQUEST_RESULTS_KEY = "XML Feed Results"; diff --git a/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XSLFileProperties.java b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XSLFileProperties.java index 2a23c64dc..0b49e58d7 100755 --- a/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XSLFileProperties.java +++ b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XSLFileProperties.java @@ -90,8 +90,6 @@ public final class XSLFileProperties extends SecurityPropertyEditor private static Logger s_log = Logger.getLogger(XSLFileProperties.class); // ===== Constants ======================================================= // - public static final String versionId = - "$Id: XSLFileProperties.java 755 2005-09-02 13:42:47Z sskracic $"; public static final String MIME_TYPE = "application/xsl+xml"; public static final String FILE_UPLOAD = FileUploadSection.FILE_UPLOAD; diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentAssetInitializer.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentAssetInitializer.java index 150ad3ea8..abe0b95d4 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentAssetInitializer.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentAssetInitializer.java @@ -21,6 +21,7 @@ package com.arsdigita.cms.contenttypes; import com.arsdigita.runtime.CompoundInitializer; import com.arsdigita.runtime.RuntimeConfig; import com.arsdigita.runtime.PDLInitializer; +import com.arsdigita.runtime.DomainInitEvent; import com.arsdigita.runtime.LegacyInitEvent; import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.db.DbHelper; @@ -31,9 +32,25 @@ import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; import org.apache.log4j.Logger; +/** + * Provides basic functions required by any specific content asset initialization. + * + * The initializer of each content type will extend this class and + *
  • delegate to this constructor providing its own manifest file
    • + *
  • Overwrite the abstract methods providing its own data
    • + * + * + */ public abstract class ContentAssetInitializer extends CompoundInitializer { + + /** Logger object for this class */ private static Logger s_log = Logger.getLogger(ContentAssetInitializer.class); + /** + * Constructor, sets specific manifest file and initializes PDL. + * + * @param manifestFile + */ protected ContentAssetInitializer(final String manifestFile) { final String url = RuntimeConfig.getConfig().getJDBCURL(); final int database = DbHelper.getDatabaseFromURL(url); @@ -44,7 +61,39 @@ public abstract class ContentAssetInitializer extends CompoundInitializer { new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl")))); } - public void init(LegacyInitEvent evt) { + /** + * Initializes content asset by parsing traversal xml file and registering + * the specified steps in a transient storage which may be modified during + * operation and has to be re-initialized each system startup). + * Essential part of initializing the systems domain coupling machinery. + * + * @param evt Type of initialization + */ + public void init(DomainInitEvent evt) { + super.init(evt); + + final String traversal = getTraversalXML(); + XML.parseResource + (traversal, + new ContentAssetTraversalHandler(getProperty())); + + AuthoringKitWizard.registerAssetStep( + getBaseType(), + getAuthoringStep(), + getAuthoringStepLabel(), + getAuthoringStepDescription(), + getAuthoringStepSortKey() + ); + } + + // Up to version 6.5 ContentAssetInitilizer used init(LegacyInitEvent) for + // initialization, even though it actually initializes the domain coupling + // machinery which is the domain of init(DomainInitEvent). It even didn't + // use any of the legacy initialization features (enterprise.init file). + // Switched to domain init because legacy init is deprecated and we will get + // rid of it. Retained here commented out for documentation purpose during + // transition of contributed content types. +/* public void init(LegacyInitEvent evt) { super.init(evt); final String traversal = getTraversalXML(); @@ -59,26 +108,26 @@ public abstract class ContentAssetInitializer extends CompoundInitializer { getAuthoringStepDescription(), getAuthoringStepSortKey() ); - } + } */ + /** * The base type against which the asset is defined, * typically com.arsdigita.cms.ContentPage */ public abstract String getBaseType(); - /** * Returns the path to the XML file defintions for the * asset, eg /WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachments.xml */ public abstract String getTraversalXML(); + /** * The name of the association between the item * and the asset, eg 'fileAttachments'. */ public abstract String getProperty(); - /** * The class of the authoring kit step @@ -89,10 +138,12 @@ public abstract class ContentAssetInitializer extends CompoundInitializer { * The label for the authoring step */ public abstract GlobalizedMessage getAuthoringStepLabel(); + /** * The description for the authoring step */ public abstract GlobalizedMessage getAuthoringStepDescription(); + /** * The sort key for the authoring step */ diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentTypeInitializer.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentTypeInitializer.java index 6bca4710c..b582c578f 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentTypeInitializer.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentTypeInitializer.java @@ -21,7 +21,8 @@ package com.arsdigita.cms.contenttypes; import com.arsdigita.runtime.CompoundInitializer; import com.arsdigita.runtime.RuntimeConfig; import com.arsdigita.runtime.PDLInitializer; -import com.arsdigita.runtime.LegacyInitEvent; +import com.arsdigita.runtime.DomainInitEvent; +/* import com.arsdigita.runtime.LegacyInitEvent; Legacy Init removed */ import com.arsdigita.db.DbHelper; import com.arsdigita.domain.xml.TraversalHandler; import com.arsdigita.persistence.pdl.ManifestSource; @@ -34,11 +35,38 @@ import com.arsdigita.util.StringUtils; import org.apache.log4j.Logger; +/** + * Provides basic functions required by any specific content type initialization. + * + * The initializer of each content type will extend this class and + *
  • delegate to this constructor providing its own manifest file and Base Data + * Object Type
    • + *
  • Overwrite getStylesheets() providing its specific stylesheet(s)
    • + *
  • optionally overwrite getTraversalXML() it necessary.
    • + *
  • optionally overwrite init(DomainObjectEvent), first delegating to this + * init() method for common basic tasks and then add its own specific initialization + * tasks.
    • + * + * + */ public abstract class ContentTypeInitializer extends CompoundInitializer { + + /** Logger object for this class */ private static Logger s_log = Logger.getLogger(ContentTypeInitializer.class); + /** + * Base Data Object Type (i.e. fully qualified domain class name) of the + * content type. Will be set by each content type with its own value by + * constructor.*/ private final String m_objectType; + /** Just a placeholder in abstract method */ public static final String[] EMPTY_ARRAY = new String[0]; + /** + * Constructor, sets specific manifest file and object type. + * + * @param manifestFile + * @param objectType Base Data Object Type of the content type + */ protected ContentTypeInitializer(final String manifestFile, final String objectType) { final String url = RuntimeConfig.getConfig().getJDBCURL(); @@ -54,10 +82,54 @@ public abstract class ContentTypeInitializer extends CompoundInitializer { } /** - * + * Registers the content type (in a transient store (map) which has to be + * re-initialized each system startup), essential part of initializing the + * systems domain coupling machinery. + * * @param evt Type of initialization */ - public void init(LegacyInitEvent evt) { + public void init(DomainInitEvent evt) { + super.init(evt); + + final String traversal = getTraversalXML(); + if (!StringUtils.emptyString(traversal)) { + XML.parseResource + (traversal, + new TraversalHandler()); + } + + try { + + ContentType type = ContentType.findByAssociatedObjectType(m_objectType); + + MetadataProviderRegistry.registerAdapter( + m_objectType, + new ContentPageMetadataProvider()); + + final String[] stylesheets = getStylesheets(); + for (int i = 0; i < stylesheets.length; i++) { + String stylesheet = stylesheets[i]; + ContentType.registerXSLFile(type, stylesheet); + + } + } catch (com.arsdigita.domain.DataObjectNotFoundException e) { + s_log.debug("Unable to register the stylesheet for " + + m_objectType + + " because the content type was not found. " + + "This is normal during the load script but " + + "should not appear during server startup."); + } + + } + + // Up to version 6.5 ContentTypeInitilizer used init(LegacyInitEvent) for + // initialization, even though it actually initializes the domain coupling + // machinery which is the domain of init(DomainInitEvent). It even didn't + // use any of the legacy initialization features (enterprise.init file). + // Switched to domain init because legacy init is deprecated and we will get + // rid of it. Retained here commented out for documentation purpose during + // transition of contributed content types. +/* public void init(LegacyInitEvent evt) { super.init(evt); final String traversal = getTraversalXML(); @@ -90,21 +162,27 @@ public abstract class ContentTypeInitializer extends CompoundInitializer { } } - +*/ + /** - * Should be overwritten by each content type to provide its TraversalXML + * Retrieves the content types traversal adapter. + * Has to be overwritten by each specific content type to provide its + * TraversalXML if it uses one. * - * @return + * @return Fully qualified file name (relative to docuemnt / context root) + * to traversal adapter. */ public String getTraversalXML() { return ""; } /** - * Should be overwritten by each content types initializer to provide the - * correct location of is stylesheets. + * Retrieves a list of style sheets assoziated with a content type. + * Has to be overwritten by each specific content types initializer to + * provide the correct location of its stylesheets. * - * @return + * @return List (array) of fully qualified file names (relative to docuemnt / + * context root) to content types style sheets. */ public String[] getStylesheets() { return EMPTY_ARRAY; diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentPanel.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentPanel.java index 5f87d36b7..f8f15b77b 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentPanel.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentPanel.java @@ -35,11 +35,10 @@ import com.arsdigita.xml.Element; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #10 $ $Date: 2004/08/17 $ + * @version $Id: ContentPanel.java 1848 2009-03-10 03:17:42Z terry $ */ public class ContentPanel extends SimpleComponent { - public static final String versionId = "$Id: ContentPanel.java 1848 2009-03-10 03:17:42Z terry $ by $Author: terry $, $DateTime: 2004/08/17 23:15:09 $"; - public ContentPanel() { super(); } diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentSectionDispatcher.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentSectionDispatcher.java index d694dbe70..925d8f926 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentSectionDispatcher.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentSectionDispatcher.java @@ -40,11 +40,10 @@ import javax.servlet.http.HttpServletResponse; * * @author Karl Goldstein (karlg@arsdigita.com) * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ContentSectionDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class ContentSectionDispatcher implements Dispatcher { - public static final String versionId = "$Id: ContentSectionDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String CONTENT_ITEM = "com.arsdigita.cms.dispatcher.item"; static final String CONTENT_SECTION = "com.arsdigita.cms.dispatcher.section"; diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/PhaseCollection.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/PhaseCollection.java index d43eb40f3..bd7a9559a 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/PhaseCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/PhaseCollection.java @@ -25,16 +25,15 @@ import com.arsdigita.persistence.DataCollection; /** * This class contains a collection for Phases * - * @author Jack Chung (flattop@arsdigita.com) - * @version $Revision: #8 $ $Date: 2004/08/17 $ - * * @see DomainCollection * @see DataCollection + * + * @author Jack Chung (flattop@arsdigita.com) + * @version $Revision: #8 $ $Date: 2004/08/17 $ + * @version $Id: PhaseCollection.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class PhaseCollection extends DomainCollection { - public static final String versionId = "$Id: PhaseCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Constructor. */ diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/PhaseDefinition.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/PhaseDefinition.java index dd4312453..959faf512 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/PhaseDefinition.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/PhaseDefinition.java @@ -33,13 +33,10 @@ import java.math.BigDecimal; * @author Michael Pih (pihman@arsdigita.com) * @author Xixi D'Moon (xdmoon@arsdigita.com) * @version $Revision: #11 $ $Date: 2004/08/17 $ + * @version $Id: PhaseDefinition.java 287 2005-02-22 00:29:02Z sskracic $ */ public class PhaseDefinition extends ACSObject { - public static final String versionId = - "$Id: PhaseDefinition.java 287 2005-02-22 00:29:02Z sskracic $" - + " by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.PhaseDefinition"; diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/PhaseDefinitionCollection.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/PhaseDefinitionCollection.java index ad16bf57a..ee2cca881 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/PhaseDefinitionCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/PhaseDefinitionCollection.java @@ -25,16 +25,15 @@ import com.arsdigita.persistence.DataCollection; /** * This class contains a collection fo Phase Definitions * - * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #8 $ $Date: 2004/08/17 $ - * * @see DomainCollection * @see DataCollection + * + * @author Michael Pih (pihman@arsdigita.com) + * @version $Revision: #8 $ $Date: 2004/08/17 $ + * @version $Id: PhaseDefinitionCollection.java 287 2005-02-22 00:29:02Z sskracic $ */ public class PhaseDefinitionCollection extends DomainCollection { - public static final String versionId = "$Id: PhaseDefinitionCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Constructor. * diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java index 135dfda01..a2f398bde 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java @@ -33,10 +33,6 @@ import org.apache.log4j.Logger; * @version $Id: PublishLifecycleListener.java 754 2005-09-02 13:26:17Z sskracic $ */ public class PublishLifecycleListener implements LifecycleListener { - public static final String versionId = - "$Id: PublishLifecycleListener.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (PublishLifecycleListener.class); diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishingException.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishingException.java index acb70b0bf..d159b775b 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishingException.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishingException.java @@ -26,11 +26,10 @@ import com.arsdigita.util.UncheckedWrapperException; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #7 $ $Date: 2004/08/17 $ + * @version $Id: PublishingException.java 287 2005-02-22 00:29:02Z sskracic $ */ public class PublishingException extends UncheckedWrapperException { - public static final String versionId = "$Id: PublishingException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public PublishingException(String message) { super(message); } diff --git a/ccm-cms/src/com/arsdigita/cms/publishToFile/LocalRequestPassword.java b/ccm-cms/src/com/arsdigita/cms/publishToFile/LocalRequestPassword.java index 9c72f0adc..07e5ad1a3 100755 --- a/ccm-cms/src/com/arsdigita/cms/publishToFile/LocalRequestPassword.java +++ b/ccm-cms/src/com/arsdigita/cms/publishToFile/LocalRequestPassword.java @@ -27,25 +27,23 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; - /*** - * Static methods that can be used to include a password with - * requests to the local host. These methods can be used to increase - * the security of the requests to the local host that publishToFile - * makes to get the html pages to publish. Method - * setLocalRequestPassword sets the password (cookie) before making - * the request to the localhost. Code that processes the request - * would use method validLocalRequest to check for the cookie - * (password) value. - * - * @author Jeff Teeters - * - * @version $Revision: #12 $ $DateTime: 2004/08/17 23:15:09 $ - ***/ - +/** + * Static methods that can be used to include a password with + * requests to the local host. These methods can be used to increase + * the security of the requests to the local host that publishToFile + * makes to get the html pages to publish. Method + * setLocalRequestPassword sets the password (cookie) before making + * the request to the localhost. Code that processes the request + * would use method validLocalRequest to check for the cookie + * (password) value. + * + * @author Jeff Teeters + * + * @version $Revision: #12 $ $DateTime: 2004/08/17 23:15:09 $ + * @ version $Id + */ public class LocalRequestPassword { - public static final String versionId = "$Id"; - private static Logger s_log = Logger.getLogger(LocalRequestPassword.class); @@ -54,11 +52,11 @@ public class LocalRequestPassword { public static String m_localRequestPassword = null; - /*** + /** * Get a password for use in making a cookie used for server requests to itself. * This can be used to increase the security of the system because it allows for a check * to make sure the request is from the server. - ***/ + */ static private String getLocalRequestPassword() { if (m_localRequestPassword == null) { // not set, initialize to random number diff --git a/ccm-cms/src/com/arsdigita/cms/publishToFile/PublishToFile.java b/ccm-cms/src/com/arsdigita/cms/publishToFile/PublishToFile.java index 8bd59be86..6df7cc98c 100755 --- a/ccm-cms/src/com/arsdigita/cms/publishToFile/PublishToFile.java +++ b/ccm-cms/src/com/arsdigita/cms/publishToFile/PublishToFile.java @@ -253,10 +253,10 @@ public class PublishToFile implements PublishToFileListener { public void transactionEnd() { } - /*** + /** * Process move task (for moving an item or folder to another folder). * @param qe QueueEntry for move task. - ***/ + */ protected boolean move(QueueEntry qe) { ContentItem liveItem = qe.getItem(); ContentItem dstFolder= Utilities.getContentItemOrNull( @@ -460,11 +460,11 @@ public class PublishToFile implements PublishToFileListener { } - /*** + /** * Read the content of a page from a url. * @param location url to get the page from * @return Body (content) and content-type of page at the url. - ***/ + */ private RetrievedFile readHTML(String location) { return m_provider.fetchHTML(location); } @@ -571,9 +571,9 @@ public class PublishToFile implements PublishToFileListener { return true; } - /*** + /** * publish asset (such as an image) to file system. - ***/ + */ private void writeAsset(Asset asset, PublishedFile f) { Assert.assertTrue(ContentItem.LIVE.equals(asset.getVersion())); diff --git a/ccm-cms/src/com/arsdigita/cms/publishToFile/PublishedFile.java b/ccm-cms/src/com/arsdigita/cms/publishToFile/PublishedFile.java index d7e7ca34e..a0a539113 100755 --- a/ccm-cms/src/com/arsdigita/cms/publishToFile/PublishedFile.java +++ b/ccm-cms/src/com/arsdigita/cms/publishToFile/PublishedFile.java @@ -49,8 +49,6 @@ import java.math.BigDecimal; **/ class PublishedFile extends DomainObject { - public static final String versionId = "$Id"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.publishToFile.PublishedFile"; diff --git a/ccm-cms/src/com/arsdigita/cms/publishToFile/PublishedLink.java b/ccm-cms/src/com/arsdigita/cms/publishToFile/PublishedLink.java index f327599bd..d8969ae09 100755 --- a/ccm-cms/src/com/arsdigita/cms/publishToFile/PublishedLink.java +++ b/ccm-cms/src/com/arsdigita/cms/publishToFile/PublishedLink.java @@ -40,7 +40,6 @@ import java.sql.SQLException; * @version 1.0 **/ class PublishedLink extends DomainObject { - public static final String versionId = "$Id"; public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.publishToFile.PublishedLink"; diff --git a/ccm-cms/src/com/arsdigita/cms/publishToFile/SetLocalRequestPassword.java b/ccm-cms/src/com/arsdigita/cms/publishToFile/SetLocalRequestPassword.java index a9da2efba..0126fc006 100755 --- a/ccm-cms/src/com/arsdigita/cms/publishToFile/SetLocalRequestPassword.java +++ b/ccm-cms/src/com/arsdigita/cms/publishToFile/SetLocalRequestPassword.java @@ -31,11 +31,11 @@ import java.net.URLConnection; * * @author Jeff Teeters (teeters@arsdigita.com) * @version $Revision: #7 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: SetLocalRequestPassword.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface SetLocalRequestPassword { - public static final String versionId = "$Id: SetLocalRequestPassword.java 287 2005-02-22 00:29:02Z sskracic $"; /** * Sets one or more passwords (cookies) on a connection that is the diff --git a/ccm-cms/src/com/arsdigita/cms/search/AssetMetadataProvider.java b/ccm-cms/src/com/arsdigita/cms/search/AssetMetadataProvider.java index 92eda8415..331197458 100755 --- a/ccm-cms/src/com/arsdigita/cms/search/AssetMetadataProvider.java +++ b/ccm-cms/src/com/arsdigita/cms/search/AssetMetadataProvider.java @@ -30,6 +30,7 @@ import org.apache.log4j.Logger; * * @author Daniel Berrange * @version $Revision: #5 $ $Date: 2004/08/17 $ + * @version $Id: AssetMetadataProvider.java 287 2005-02-22 00:29:02Z sskracic $ */ public class AssetMetadataProvider extends ContentItemMetadataProvider { @@ -39,10 +40,6 @@ public class AssetMetadataProvider extends ContentItemMetadataProvider { private static final Logger s_log = Logger.getLogger(AssetMetadataProvider.class); - public final static String versionId = - "$Id: AssetMetadataProvider.java 287 2005-02-22 00:29:02Z sskracic $" - + " by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public String getTitle(DomainObject dobj) { Asset item = (Asset)dobj; String title = item.getName(); diff --git a/ccm-cms/src/com/arsdigita/cms/search/ContentItemMetadataProvider.java b/ccm-cms/src/com/arsdigita/cms/search/ContentItemMetadataProvider.java index 259555160..46f1e51d8 100755 --- a/ccm-cms/src/com/arsdigita/cms/search/ContentItemMetadataProvider.java +++ b/ccm-cms/src/com/arsdigita/cms/search/ContentItemMetadataProvider.java @@ -18,9 +18,9 @@ */ package com.arsdigita.cms.search; -import com.arsdigita.cms.Asset; +import com.arsdigita.cms.Asset; import com.arsdigita.cms.ContentItem; -import com.arsdigita.cms.ContentPage; +import com.arsdigita.cms.ContentPage; import com.arsdigita.domain.DomainObject; import com.arsdigita.kernel.Party; import com.arsdigita.search.ContentType; @@ -40,16 +40,13 @@ import org.apache.log4j.Logger; * subclass of {@link com.arsdigita.cms.ContentItem}. * * @author Daniel Berrange - * @version $Revision: 1.1.2.1 $ $Date: 2005/10/04 12:09:55 $ + * @version $Revision: 1.1.2.1 $ $Date: 2005/10/04 12:09:55 $ + * @version $Id: ContentItemMetadataProvider.java 1263 2006-07-17 08:18:47Z cgyg9330 $ */ public abstract class ContentItemMetadataProvider implements MetadataProvider { private static final Logger s_log = Logger.getLogger(ContentItemMetadataProvider.class); - public final static String versionId = - "$Id: ContentItemMetadataProvider.java 1263 2006-07-17 08:18:47Z cgyg9330 $" - + " by $Author: cgyg9330 $, $DateTime: 2004/08/17 23:15:09 $"; - public String getTypeSpecificInfo(DomainObject dobj) { ContentItem item = (ContentItem) dobj; return ContentItem.LIVE.equals(item.getVersion()) ? @@ -82,9 +79,9 @@ public abstract class ContentItemMetadataProvider implements MetadataProvider { return item.getLastModifiedUser(); } - public boolean isIndexable (DomainObject dobj) { - return true; - } + public boolean isIndexable (DomainObject dobj) { + return true; + } public ContentProvider[] getContent(DomainObject dobj, ContentType type) { List content = new ArrayList(); @@ -101,40 +98,40 @@ public abstract class ContentItemMetadataProvider implements MetadataProvider { } content.add(new TextContentProvider("text", dobj, getClass().getName())); - if (dobj instanceof ContentPage) { - if (((ContentPage)dobj).indexAssetsWithPage()) { - - content.add(new TextContentProvider("text", dobj, - AssetExtractor.class.getName())); - } - } else { + if (dobj instanceof ContentPage) { + if (((ContentPage)dobj).indexAssetsWithPage()) { + + content.add(new TextContentProvider("text", dobj, + AssetExtractor.class.getName())); + } + } else { content.add(new TextContentProvider("text", dobj, AssetExtractor.class.getName())); } - } else if (type == ContentType.RAW) { - // if assets are indexed separately for this type, don't index them here. If that is the case, - // then the asset itself must have a separate metadataprovider registered to ensure that - // the asset will be indexed - if (dobj instanceof ContentPage) { - if (((ContentPage)dobj).indexAssetsWithPage()) { - AssetExtractor ex = new AssetExtractor(); - ex.walk(dobj, AssetExtractor.class.getName()); - content.addAll(ex.getContent()); - } // else do nothing - } else { - // by default, add content for these items - asset applications should register their own - // metadataproviders to ensure they react correctly to the value of ContentPage.indexAssetsWithPage - // - // only the asset istelf knows how to refer to it's owning article in order to find out if it - // should be indexed or not + } else if (type == ContentType.RAW) { + // if assets are indexed separately for this type, don't index them here. If that is the case, + // then the asset itself must have a separate metadataprovider registered to ensure that + // the asset will be indexed + if (dobj instanceof ContentPage) { + if (((ContentPage)dobj).indexAssetsWithPage()) { + AssetExtractor ex = new AssetExtractor(); + ex.walk(dobj, AssetExtractor.class.getName()); + content.addAll(ex.getContent()); + } // else do nothing + } else { + // by default, add content for these items - asset applications should register their own + // metadataproviders to ensure they react correctly to the value of ContentPage.indexAssetsWithPage + // + // only the asset istelf knows how to refer to it's owning article in order to find out if it + // should be indexed or not AssetExtractor ex = new AssetExtractor(); ex.walk(dobj, AssetExtractor.class.getName()); content.addAll(ex.getContent()); } - - } - + + } + return (ContentProvider[])content.toArray( new ContentProvider[content.size()]); } diff --git a/ccm-cms/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java b/ccm-cms/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java index 721a95d89..4f9995f93 100755 --- a/ccm-cms/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java +++ b/ccm-cms/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java @@ -32,6 +32,7 @@ import org.apache.log4j.Logger; * * @author Daniel Berrange * @version $Revision: #5 $ $Date: 2004/08/17 $ + * @version $Id: ContentPageMetadataProvider.java 1166 2006-06-14 11:45:15Z fabrice $ */ public class ContentPageMetadataProvider extends ContentItemMetadataProvider { @@ -41,10 +42,6 @@ public class ContentPageMetadataProvider extends ContentItemMetadataProvider { private static final Logger s_log = Logger.getLogger(ContentPageMetadataProvider.class); - public final static String versionId = - "$Id: ContentPageMetadataProvider.java 1166 2006-06-14 11:45:15Z fabrice $" - + " by $Author: fabrice $, $DateTime: 2004/08/17 23:15:09 $"; - public String getTitle(DomainObject dobj) { if (dobj instanceof ContentPage) { ContentPage item = (ContentPage)dobj; diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/DocMgrConfig.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/DocMgrConfig.java index 0f5044f88..56730fd1a 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/DocMgrConfig.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/DocMgrConfig.java @@ -29,11 +29,6 @@ import com.arsdigita.util.parameter.StringParameter; */ public final class DocMgrConfig extends AbstractConfig { - public static final String versionId = - "$Id: //apps/docmgr-cms/dev/src/com/arsdigita/cms/docmgr/DocMgrConfig.java#4 $" + - "$Author: cwolfe $" + - "$DateTime: 2004/01/14 15:24:15 $"; - private static final Logger s_log = Logger.getLogger(DocMgrConfig.class); private Parameter m_contentSection; diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/dispatcher/DocumentAssetPage.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/dispatcher/DocumentAssetPage.java index deea89f16..cae820ffb 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/dispatcher/DocumentAssetPage.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/dispatcher/DocumentAssetPage.java @@ -45,8 +45,6 @@ import com.arsdigita.util.Assert; */ public class DocumentAssetPage extends CMSPage { - public static final String versionId = "$Id: //cms/6.0/src/com/arsdigita/cms/dispatcher/DocumentAssetPage.java#1 $ by $Author: dennis $, $DateTime: 2003/08/18 23:54:14 $"; - private static final Logger s_log = Logger.getLogger(DocumentAssetPage.class); diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/dispatcher/MultilingualDocumentResolver.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/dispatcher/MultilingualDocumentResolver.java index a2ccbd717..2c44ca98e 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/dispatcher/MultilingualDocumentResolver.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/dispatcher/MultilingualDocumentResolver.java @@ -61,10 +61,6 @@ import com.arsdigita.web.Web; * @version $Id: //apps/docmgr-cms/dev/src/com/arsdigita/cms/docmgr/dispatcher/MultilingualDocumentResolver.java#1 $ */ public class MultilingualDocumentResolver extends AbstractItemResolver implements ItemResolver { - public static final String versionId = - "$Id: //apps/docmgr-cms/dev/src/com/arsdigita/cms/docmgr/dispatcher/MultilingualDocumentResolver.java#1 $" + - "$Author: cwolfe $" + - "$DateTime: 2003/11/26 14:30:10 $"; private static final Logger s_log = Logger.getLogger (MultilingualDocumentResolver.class); diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/installer/DocLinkInitializer.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/installer/DocLinkInitializer.java index b699308b9..53893d17b 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/installer/DocLinkInitializer.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/installer/DocLinkInitializer.java @@ -7,15 +7,25 @@ import com.arsdigita.cms.docmgr.DocLink; /* * Instantiates the DocLink content type + * Initializes the DocLink content type. * - * @version $Id: PrescriptiveInitializer.java,v 1.3 2003/06/30 21:47:31 cwolfe Exp $ + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). This is done by runtimeRuntime startup method which runs the init() + * methods of all initializers (this one just using the parent implementation). + * + * @version $Id: DocLinkInitializer.java,v 1.3 2003/06/30 21:47:31 cwolfe Exp $ */ public class DocLinkInitializer extends ContentTypeInitializer { private static Category s_log = Category.getInstance(DocLinkInitializer.class); - // using empty mf, everything is loaded by DocumentInitializer + // + /** + * Constructor, sets the PDL manifest file and object type string. + * Using empty mf here, everything is loaded by DocumentInitializer + */ public DocLinkInitializer() { super("empty.pdl.mf", DocLink.BASE_DATA_OBJECT_TYPE); } @@ -24,7 +34,15 @@ public class DocLinkInitializer extends ContentTypeInitializer { return "/WEB-INF/traversal-adapters/com/arsdigita/cms/docmgr/DocLink.xml"; } + /** + * Retrieve location of this content types stylesheet. Overwrites parent + * method with FormItem specific value for use by the parent class worker + * methods. + * + * @return fully qualified path info string relative to document root + */ public String[] getStylesheets() { - return new String[] { "/static/content-types/com/arsdigita/cms/docmgr/DocLink.xsl" }; + return new String[] { + "/static/content-types/com/arsdigita/cms/docmgr/DocLink.xsl" }; } } diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/installer/DocumentInitializer.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/installer/DocumentInitializer.java index dfec5888a..a1d7b7b6c 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/installer/DocumentInitializer.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/installer/DocumentInitializer.java @@ -15,7 +15,10 @@ public class DocumentInitializer extends ContentTypeInitializer { private static Category s_log = Category.getInstance(DocumentInitializer.class); - // using the whole module's mf + /** + * Constructor, sets the PDL manifest file and object type string. + * Using the whole module's mf here + */ public DocumentInitializer() { super("ccm-docmgr.pdl.mf", Document.BASE_DATA_OBJECT_TYPE); } @@ -24,7 +27,15 @@ public class DocumentInitializer extends ContentTypeInitializer { return "/WEB-INF/traversal-adapters/com/arsdigita/cms/docmgr/Document.xml"; } + /** + * Retrieve location of this content types stylesheet. Overwrites parent + * method with FormItem specific value for use by the parent class worker + * methods. + * + * @return fully qualified path info string reltive to document (context) root + */ public String[] getStylesheets() { - return new String[] { "/static/content-types/com/arsdigita/cms/docmgr/Document.xsl" }; + return new String[] { + "/static/content-types/com/arsdigita/cms/docmgr/Document.xsl" }; } } diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/CategoryDocsNavigatorPortlet.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/CategoryDocsNavigatorPortlet.java index d9c4a3de4..3bdeb008f 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/CategoryDocsNavigatorPortlet.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/CategoryDocsNavigatorPortlet.java @@ -39,10 +39,6 @@ import com.arsdigita.xml.Element; */ public class CategoryDocsNavigatorPortlet extends AppPortlet implements DMConstants { - public static final String versionId = - "$Id: //apps/docmgr-cms/dev/src/com/arsdigita/cms/docmgr/ui/CategoryDocsNavigatorPortlet.java#2 $" + - "$Author: cwolfe $" + - "$DateTime: 2003/08/12 11:48:50 $"; protected static org.apache.log4j.Category s_log = org.apache.log4j.Category.getInstance diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/CategoryItemsBrowser.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/CategoryItemsBrowser.java index 6c7bf0e5d..5d944e2f1 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/CategoryItemsBrowser.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/CategoryItemsBrowser.java @@ -51,8 +51,6 @@ import com.arsdigita.web.Web; */ public class CategoryItemsBrowser extends DataTable implements DMConstants { - public static final String versionId = "$Id: //apps/docmgr-cms/dev/src/com/arsdigita/cms/docmgr/ui/CategoryItemsBrowser.java#7 $ by $Author: cwolfe $, $DateTime: 2003/09/19 15:46:00 $"; - private static final org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(CategoryItemsBrowser.class); diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DCNDispatcher.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DCNDispatcher.java index eec058c19..097e09076 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DCNDispatcher.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DCNDispatcher.java @@ -27,10 +27,6 @@ import com.arsdigita.bebop.TabbedPane; */ public class DCNDispatcher extends DMDispatcher implements DMConstants { - public static final String versionId = - "$Id: //apps/docmgr-cms/dev/src/com/arsdigita/cms/docmgr/ui/DCNDispatcher.java#2 $" + - "$Author: cwolfe $" + - "$DateTime: 2003/08/14 12:28:36 $"; private static Category s_log = Category.getInstance (DCNDispatcher.class.getName()); diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMDispatcher.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMDispatcher.java index f48f4b01c..a29637d34 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMDispatcher.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMDispatcher.java @@ -54,13 +54,10 @@ import com.arsdigita.web.Web; * Dispatcher for document manager application. * * @author Stefan Deusch + * @version $Id: DMDispatcher.java,v 1.2 2005/01/18 08:37:08 pkopunec Exp $ */ public class DMDispatcher extends BebopMapDispatcher implements DMConstants { - public static final String versionId = - "$Id: DMDispatcher.java,v 1.2 2005/01/18 08:37:08 pkopunec Exp $" + - "$Author: pkopunec $" + - "$DateTime: 2003/10/27 15:42:01 $"; private static Category s_log = Category.getInstance (DMDispatcher.class.getName()); diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMUtils.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMUtils.java index 113bc74a0..882bd14dc 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMUtils.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMUtils.java @@ -48,10 +48,6 @@ import com.arsdigita.web.Web; * @author Stefan Deusch */ public class DMUtils implements DMConstants { - public static final String versionId = - "$Id: //apps/docmgr-cms/dev/src/com/arsdigita/cms/docmgr/ui/DMUtils.java#3 $" + - "$Author: sshinde $" + - "$DateTime: 2003/12/12 20:18:12 $"; private static final Logger s_log = Logger.getLogger(DMUtils.class); diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FilePropertiesPanel.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FilePropertiesPanel.java index a645384be..e026b799d 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FilePropertiesPanel.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FilePropertiesPanel.java @@ -39,12 +39,9 @@ import com.arsdigita.xml.Element; * file in tabular form. * * @author StefanDeusch@computer.org, ddao@arsdigita.com + * @version $Id: FilePropertiesPanel.java,v 1.4 2004/12/09 14:46:39 pkopunec Exp $ */ class FilePropertiesPanel extends SimpleComponent implements DMConstants { - public static final String versionId = - "$Id: FilePropertiesPanel.java,v 1.4 2004/12/09 14:46:39 pkopunec Exp $" + - "$Author: pkopunec $" + - "$DateTime: 2003/09/19 15:46:00 $"; private static final Logger s_log = Logger.getLogger (FilePropertiesPanel.class); diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FileUploadForm.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FileUploadForm.java index ab6d76b49..44ba004fe 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FileUploadForm.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FileUploadForm.java @@ -61,10 +61,6 @@ import com.arsdigita.versioning.Versions; public class FileUploadForm extends Form implements FormInitListener, FormValidationListener, FormProcessListener, DMConstants { - public static final String versionId = - "$Id: //apps/docmgr-cms/dev/src/com/arsdigita/cms/docmgr/ui/FileUploadForm.java#5 $" + - "$Author: cwolfe $" + - "$DateTime: 2003/08/13 14:35:17 $"; private static final Logger s_log = Logger.getLogger(FileUploadForm.class); diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FolderCreateForm.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FolderCreateForm.java index 1c53a543e..4e47b643b 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FolderCreateForm.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FolderCreateForm.java @@ -52,10 +52,6 @@ import com.arsdigita.kernel.permissions.PermissionService; */ class FolderCreateForm extends Form implements FormInitListener, FormValidationListener, FormProcessListener, DMConstants { - public static final String versionId = - "$Id: //apps/docmgr-cms/dev/src/com/arsdigita/cms/docmgr/ui/FolderCreateForm.java#2 $" + - "$Author: cwolfe $" + - "$DateTime: 2003/08/05 10:40:23 $"; private StringParameter m_FolderName; private StringParameter m_FolderDesc; diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/LegacyCategoryDocsNavigatorPortlet.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/LegacyCategoryDocsNavigatorPortlet.java index 29870f512..882490045 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/LegacyCategoryDocsNavigatorPortlet.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/LegacyCategoryDocsNavigatorPortlet.java @@ -39,10 +39,6 @@ import com.arsdigita.xml.Element; */ public class LegacyCategoryDocsNavigatorPortlet extends AppPortlet implements DMConstants { - public static final String versionId = - "$Id: //apps/docmgr-cms/dev/src/com/arsdigita/cms/docmgr/ui/LegacyCategoryDocsNavigatorPortlet.java#1 $" + - "$Author: cwolfe $" + - "$DateTime: 2004/01/14 15:24:15 $"; protected static org.apache.log4j.Category s_log = org.apache.log4j.Category.getInstance diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/RecentUpdatedDocsPortlet.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/RecentUpdatedDocsPortlet.java index b240acff6..1f339dca0 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/RecentUpdatedDocsPortlet.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/RecentUpdatedDocsPortlet.java @@ -51,10 +51,9 @@ import com.arsdigita.xml.Element; * portal. * * @author Stefan Deusch + * @version $Id: RecentUpdatedDocsPortlet.java,v 1.5 2005/12/08 14:46:55 pkopunec Exp $ */ public class RecentUpdatedDocsPortlet extends AppPortlet { - public static final String versionId = "$Id: RecentUpdatedDocsPortlet.java,v 1.5 2005/12/08 14:46:55 pkopunec Exp $" + "$Author: pkopunec $" - + "$DateTime: 2003/12/12 20:18:12 $"; public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.docmgr.ui.RecentUpdatedDocsPortlet"; diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/content/DocIndexPage.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/content/DocIndexPage.java index 307d37893..fca022fec 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/content/DocIndexPage.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/content/DocIndexPage.java @@ -58,10 +58,6 @@ import com.arsdigita.persistence.SessionManager; * @version $Id: //apps/docmgr-cms/dev/src/com/arsdigita/cms/docmgr/ui/content/DocIndexPage.java#1 $ */ public class DocIndexPage extends CMSPage implements RequestListener { - public static final String versionId = - "$Id: //apps/docmgr-cms/dev/src/com/arsdigita/cms/docmgr/ui/content/DocIndexPage.java#1 $" + - "$Author: cwolfe $" + - "$DateTime: 2003/11/26 14:30:10 $"; private static final Logger s_log = Logger.getLogger(DocIndexPage.class); diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java index 9711a47be..5a9189c48 100755 --- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java +++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java @@ -78,7 +78,8 @@ import com.arsdigita.domain.xml.TraversalHandler; import com.arsdigita.xml.XML; /** - * The CMS initializer. + * Initializer for ccm-ldn-navigation. + * Executes recursivly at each system startup. * * @author Justin Ross <jross@redhat.com> * @version $Id: Initializer.java 755 2005-09-02 13:42:47Z sskracic $ diff --git a/ccm-ldn-terms/src/com/arsdigita/london/terms/TermsConfig.java b/ccm-ldn-terms/src/com/arsdigita/london/terms/TermsConfig.java index b63bc47e8..c6236b5b9 100755 --- a/ccm-ldn-terms/src/com/arsdigita/london/terms/TermsConfig.java +++ b/ccm-ldn-terms/src/com/arsdigita/london/terms/TermsConfig.java @@ -24,11 +24,15 @@ import com.arsdigita.util.parameter.ResourceParameter; import com.arsdigita.util.parameter.StringParameter; import java.io.InputStream; -import java.io.IOException; +// import java.io.IOException; import org.apache.log4j.Logger; +/** + * + * + */ public class TermsConfig extends AbstractConfig { private static final Logger s_log = Logger.getLogger(TermsConfig.class); @@ -52,14 +56,26 @@ public class TermsConfig extends AbstractConfig { loadInfo(); } + /** + * + * @return + */ InputStream getTraversalAdapters() { return (InputStream) get(m_adapters); } + /** + * + * @return + */ public String getDefaultDomainKey() { return (String)get(m_defaultDomain); } + /** + * + * @return + */ public Domain getDefaultDomain() { return Domain.retrieve(getDefaultDomainKey()); } diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Initializer.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Initializer.java index dd3d7af87..0b040ae7d 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Initializer.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Initializer.java @@ -27,13 +27,16 @@ import com.arsdigita.runtime.PDLInitializer; import com.arsdigita.runtime.RuntimeConfig; /** - * The CMS initializer. + * Initializes ccm-simplesurvey at each system startup. * * @author Justin Ross <jross@redhat.com> * @version $Id: Initializer.java 759 2005-09-02 15:25:32Z sskracic $ */ public class Initializer extends CompoundInitializer { + /** + * Constructor. Delegates to the old initializer system. + */ public Initializer() { final String url = RuntimeConfig.getConfig().getJDBCURL(); final int database = DbHelper.getDatabaseFromURL(url); diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Loader.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Loader.java index 5ef552785..294f5bc51 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Loader.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Loader.java @@ -31,7 +31,8 @@ import com.arsdigita.web.ApplicationType; import org.apache.log4j.Logger; /** - * Loader. + * Initial load (non-resurring) at install time for ccm-simplesurvey. Creates + * application type in database. * * @author Justin Ross <jross@redhat.com> * @version $Id: Loader.java 759 2005-09-02 15:25:32Z sskracic $ @@ -40,6 +41,10 @@ public class Loader extends PackageLoader { private static final Logger s_log = Logger.getLogger(Loader.class); + /** + * + * @param ctx + */ public void run(final ScriptContext ctx) { new KernelExcursion() { public void excurse() { @@ -49,13 +54,19 @@ public class Loader extends PackageLoader { }.run(); } + /** + * Helper method which does the actual work of preparing an application + * type and stores it in the database. + */ private void setupSimpleSurveyPackage() { + ApplicationSetup setup = new ApplicationSetup(s_log); setup.setApplicationObjectType(SimpleSurvey.BASE_DATA_OBJECT_TYPE); setup.setKey("simplesurvey"); setup.setTitle("Simple Survey"); - setup.setDescription("Simple Survey"); + // setup.setDescription("Simple Survey"); + setup.setDescription("A simple survey application."); setup.setInstantiator(new ACSObjectInstantiator() { public DomainObject doNewInstance(DataObject dataObject) { return new SimpleSurvey(dataObject); diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ResponseCollection.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ResponseCollection.java index 4aa527549..3146be7b9 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ResponseCollection.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ResponseCollection.java @@ -31,7 +31,6 @@ import com.arsdigita.util.Assert; * @version $Id: ResponseCollection.java 755 2005-09-02 13:42:47Z sskracic $ */ public class ResponseCollection extends DomainCollection { - public static final String versionId = "$Id: ResponseCollection.java 755 2005-09-02 13:42:47Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:26:27 $"; protected ResponseCollection(DataCollection dataCollection) { super(dataCollection); diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SimpleSurvey.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SimpleSurvey.java index a74c6f975..614a68c8e 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SimpleSurvey.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SimpleSurvey.java @@ -79,8 +79,8 @@ public class SimpleSurvey extends Application { * @return path name to the applications servlet/JSP */ public String getServletPath() { - // sufficient if installed into its own web appl. context (ccm-simplesurvey) - // return "/files"; + // If installed into its own web appl. context (ccm-simplesurvey) + // return "/files"; is sufficient. return "/ccm-simplesurvey/files"; } diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SurveyCollection.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SurveyCollection.java index 9ab98fbc6..8209ab21c 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SurveyCollection.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SurveyCollection.java @@ -31,7 +31,6 @@ import com.arsdigita.util.Assert; * @version $Id: SurveyCollection.java 755 2005-09-02 13:42:47Z sskracic $ */ public class SurveyCollection extends DomainCollection { - public static final String versionId = "$Id: SurveyCollection.java 755 2005-09-02 13:42:47Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:26:27 $"; protected SurveyCollection(DataCollection dataCollection) { super(dataCollection); diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTableModel.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTableModel.java index 6b0dc2992..e33b76d24 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTableModel.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTableModel.java @@ -36,12 +36,9 @@ import com.arsdigita.util.Assert; * * @author Peter Marklund * @version $Id: AdminSurveyTableModel.java 755 2005-09-02 13:42:47Z sskracic $ - * */ public class AdminSurveyTableModel implements TableModel { - public static final String versionId = "$Id: AdminSurveyTableModel.java 755 2005-09-02 13:42:47Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:26:27 $"; - private SurveyCollection m_surveys; private Survey m_survey; diff --git a/environment/project.xml.iaw b/environment/project.xml.iaw index 45641626d..ca060ff7f 100644 --- a/environment/project.xml.iaw +++ b/environment/project.xml.iaw @@ -8,7 +8,7 @@ name="aplaws-iaw" prettyName="APLAWS plus" version="1-0-9" - release="rc-4" + release="rc-5" webxml="web.xml-aplaws" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">